From e55556ddcb7cff422a4a606c26a9e49ee2b1314d Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Sat, 18 Feb 2023 03:13:07 -0500 Subject: [PATCH] enemy+npc flags (#946) * npc flags 1 * enemy & npc flags * removed item headers * minor item cleanup * coverage --------- Co-authored-by: HailSanta --- include/common_structs.h | 11 +- include/dead_structs.h | 60 --- include/enums.h | 137 +++--- include/functions.h | 6 +- include/npc.h | 24 +- include/script_api/battle.h | 2 +- include/script_api/common.h | 3 + include/variables.h | 2 +- src/18F340.c | 12 +- src/190B20.c | 26 +- src/23680.c | 185 ++++---- src/38F00.c | 4 +- src/39210_len_aa0.c | 30 +- src/77480.c | 16 +- src/7E9D0.c | 6 +- src/7bb60_len_41b0.c | 1 - src/a5dd0_len_114e0.c | 4 +- src/actor_api.c | 10 +- src/battle/area/jan/actor/jungle_fuzzy.c | 4 +- src/battle/battle.h | 2 +- .../item => common/move}/ItemRefund.inc.c | 0 src/battle/common/move/StarBeamSupport.inc.c | 2 +- .../{move/item => common/move}/UseItem.inc.c | 0 src/battle/move/item/coconut.c | 12 +- src/battle/move/item/coconut.h | 16 - src/battle/move/item/dizzy_dial.c | 13 +- src/battle/move/item/dizzy_dial.h | 16 - src/battle/move/item/dried_shroom.c | 17 +- src/battle/move/item/dried_shroom.h | 17 - src/battle/move/item/dusty_hammer.c | 22 +- src/battle/move/item/dusty_hammer.h | 13 - src/battle/move/item/egg_missile.c | 62 +-- src/battle/move/item/egg_missile.h | 15 - src/battle/move/item/electro_pop.c | 22 +- src/battle/move/item/electro_pop.h | 19 - src/battle/move/item/fire_flower.c | 13 +- src/battle/move/item/fire_flower.h | 17 - src/battle/move/item/food.c | 28 +- src/battle/move/item/food.h | 24 -- src/battle/move/item/fright_jar.c | 13 +- src/battle/move/item/fright_jar.h | 16 - src/battle/move/item/hustle_drink.c | 11 +- src/battle/move/item/hustle_drink.h | 17 - src/battle/move/item/insecticide_herb.c | 13 +- src/battle/move/item/insecticide_herb.h | 16 - src/battle/move/item/life_shroom.c | 17 +- src/battle/move/item/life_shroom.h | 21 - src/battle/move/item/mushroom.c | 19 +- src/battle/move/item/mushroom.h | 23 - src/battle/move/item/mystery.c | 131 +++--- src/battle/move/item/mystery.h | 22 - src/battle/move/item/pebble.c | 17 +- src/battle/move/item/pebble.h | 13 - src/battle/move/item/please_come_back.c | 11 +- src/battle/move/item/please_come_back.h | 12 - src/battle/move/item/pow_block.c | 12 +- src/battle/move/item/pow_block.h | 18 - src/battle/move/item/repel_gel.c | 11 +- src/battle/move/item/repel_gel.h | 15 - src/battle/move/item/shooting_star.c | 14 +- src/battle/move/item/shooting_star.h | 18 - src/battle/move/item/sleepy_sheep.c | 19 +- src/battle/move/item/sleepy_sheep.h | 23 - src/battle/move/item/snowman_doll.c | 13 +- src/battle/move/item/snowman_doll.h | 19 - src/battle/move/item/stone_cap.c | 13 +- src/battle/move/item/stone_cap.h | 17 - src/battle/move/item/stop_watch.c | 12 +- src/battle/move/item/stop_watch.h | 20 - src/battle/move/item/strange_cake.c | 72 ++-- src/battle/move/item/strange_cake.h | 27 -- src/battle/move/item/super_soda.c | 17 +- src/battle/move/item/super_soda.h | 20 - src/battle/move/item/tasty_tonic.c | 13 +- src/battle/move/item/tasty_tonic.h | 16 - src/battle/move/item/thunder_bolt.c | 13 +- src/battle/move/item/thunder_bolt.h | 17 - src/battle/move/item/thunder_rage.c | 10 +- src/battle/move/item/thunder_rage.h | 17 - src/battle/move/item/ultra_shroom.c | 21 +- src/battle/move/item/ultra_shroom.h | 17 - src/battle/move/item/unknown_item.c | 21 +- src/battle/move/item/unknown_item.h | 17 - src/battle/move/item/volt_shroom.c | 13 +- src/battle/move/item/volt_shroom.h | 16 - src/battle/move/star_power/chill_out.c | 2 +- src/battle/move/star_power/focus.c | 2 +- src/battle/move/star_power/lullaby.c | 2 +- src/battle/move/star_power/peach_focus.c | 2 +- src/battle/move/star_power/refresh.c | 2 +- src/battle/move/star_power/smooch.c | 2 +- src/battle/move/star_power/star_storm.c | 2 +- src/battle/move/star_power/time_out.c | 2 +- src/battle/move/star_power/twink_dash.c | 2 +- src/battle/move/star_power/up_and_away.c | 2 +- src/battle/use_items.c | 75 ++-- src/encounter.c | 194 ++++----- src/encounter_api.c | 26 +- src/entity/sbk_omo/StarBoxLauncher.c | 4 +- src/entity/sbk_omo/Tweester.c | 2 +- src/evt/npc_api.c | 2 +- src/inspect_icon.c | 7 +- src/npc.c | 402 +++++++++--------- src/npc_collision.c | 16 +- src/world/action/sneaky_parasol.c | 4 +- src/world/area_arn/arn_02/arn_02_4_npc.c | 6 +- src/world/area_arn/arn_03/arn_03_3_npc.c | 18 +- src/world/area_arn/arn_04/arn_04_3_npc.c | 8 +- src/world/area_arn/arn_05/arn_05_3_npc.c | 22 +- src/world/area_arn/arn_07/arn_07_5_npc.c | 30 +- src/world/area_arn/arn_08/arn_08_6_npc.c | 2 +- src/world/area_arn/arn_09/arn_09_5_npc.c | 2 +- src/world/area_arn/arn_10/arn_10_3_npc.c | 4 +- src/world/area_arn/arn_11/arn_11_3_npc.c | 2 +- src/world/area_arn/arn_12/arn_12_3_npc.c | 4 +- src/world/area_arn/arn_13/arn_13_3_npc.c | 4 +- src/world/area_dgb/dgb_00/dgb_00_3_npc.c | 14 +- src/world/area_dgb/dgb_01/dgb_01_5_npc.c | 18 +- src/world/area_dgb/dgb_02/dgb_02_3_npc.c | 4 +- src/world/area_dgb/dgb_03/dgb_03_5_npc.c | 6 +- src/world/area_dgb/dgb_04/dgb_04_3_npc.c | 2 +- src/world/area_dgb/dgb_05/dgb_05_5_npc.c | 4 +- src/world/area_dgb/dgb_06/dgb_06_4_npc.c | 2 +- src/world/area_dgb/dgb_08/dgb_08_3_npc.c | 22 +- src/world/area_dgb/dgb_09/dgb_09_4_npc.c | 6 +- src/world/area_dgb/dgb_15/dgb_15_3_npc.c | 2 +- src/world/area_dgb/dgb_16/dgb_16_4_npc.c | 12 +- src/world/area_dgb/dgb_18/dgb_18_3_npc.c | 6 +- src/world/area_dro/dro_01/dro_01_3_npc.c | 26 +- .../dro_01/npc_hint_dryite_companion.c | 4 +- src/world/area_dro/dro_01/npc_shop_owner.c | 2 +- src/world/area_dro/dro_02/dro_02_5_npc.c | 26 +- src/world/area_dro/dro_02/npc_moustafa.c | 16 +- .../area_end/end_00/end_00_3_parade_setup.c | 4 +- src/world/area_end/end_00/end_00_5_koopas.c | 8 +- .../area_end/end_00/end_00_9_huff_n_puff.c | 10 +- .../area_end/end_01/end_01_3_parade_setup.c | 4 +- .../area_end/end_01/end_01_4_opera_float.c | 6 +- src/world/area_flo/flo_00/flo_00_3_npc.c | 20 +- src/world/area_flo/flo_03/flo_03_3_npc.c | 44 +- src/world/area_flo/flo_07/flo_07_3_npc.c | 2 +- src/world/area_flo/flo_08/flo_08_4_npc.c | 22 +- src/world/area_flo/flo_09/flo_09_5_npc.c | 10 +- src/world/area_flo/flo_10/flo_10_5_npc.c | 6 +- src/world/area_flo/flo_11/flo_11_3_npc.c | 4 +- src/world/area_flo/flo_12/flo_12_3_npc.c | 26 +- src/world/area_flo/flo_13/flo_13_4_npc.c | 24 +- src/world/area_flo/flo_14/flo_14_3_bubbles.c | 2 +- src/world/area_flo/flo_14/flo_14_4_npc.c | 8 +- src/world/area_flo/flo_15/flo_15_3_npc.c | 6 +- src/world/area_flo/flo_16/flo_16_5_npc.c | 4 +- src/world/area_flo/flo_17/flo_17_4_npc.c | 12 +- src/world/area_flo/flo_18/flo_18_4_npc.c | 26 +- .../area_flo/flo_19/flo_19_5_beanstalk.c | 2 +- src/world/area_flo/flo_21/flo_21_4_npc.c | 64 +-- src/world/area_flo/flo_22/flo_22_3_npc.c | 8 +- src/world/area_flo/flo_22/flo_22_4_well.c | 4 +- src/world/area_flo/flo_23/flo_23_3_npc.c | 6 +- src/world/area_flo/flo_25/flo_25_3_npc.c | 6 +- src/world/area_hos/hos_00/hos_00_4_npc.c | 4 +- src/world/area_hos/hos_00/hos_00_6_scenes.c | 4 +- src/world/area_hos/hos_01/hos_01_2_main.c | 2 +- src/world/area_hos/hos_01/hos_01_4_npc.c | 16 +- src/world/area_hos/hos_01/hos_01_6_star_way.c | 2 +- src/world/area_hos/hos_02/hos_02_5_npc.c | 6 +- src/world/area_hos/hos_03/hos_03_6_npc.c | 2 +- src/world/area_hos/hos_05/hos_05_4_npc.c | 36 +- src/world/area_hos/hos_05/hos_05_5_intro.c | 16 +- src/world/area_hos/hos_06/hos_06_3_merlow.c | 4 +- src/world/area_hos/hos_10/hos_10_2_npc1.c | 18 +- src/world/area_hos/hos_10/hos_10_3_npc2.c | 16 +- src/world/area_isk/isk_02/isk_02_3_ambush.c | 6 +- src/world/area_isk/isk_02/isk_02_5_npc.c | 30 +- src/world/area_isk/isk_04/isk_04_5_npc.c | 4 +- src/world/area_isk/isk_05/isk_05_3_npc.c | 6 +- src/world/area_isk/isk_07/isk_07_3_npc.c | 36 +- src/world/area_isk/isk_07/isk_07_7_ambush.c | 6 +- src/world/area_isk/isk_08/isk_08_2_npc.c | 2 +- src/world/area_isk/isk_13/isk_13_3_npc.c | 6 +- src/world/area_isk/isk_14/isk_14_3_npc.c | 8 +- src/world/area_isk/isk_16/isk_16_2_npc.c | 6 +- src/world/area_isk/isk_18/isk_18_2_npc.c | 6 +- src/world/area_iwa/iwa_00/iwa_00_3_npc.c | 16 +- src/world/area_iwa/iwa_01/iwa_01_4_npc.c | 6 +- src/world/area_iwa/iwa_02/iwa_02_3_npc.c | 10 +- src/world/area_iwa/iwa_03/iwa_03_3_npc.c | 10 +- src/world/area_iwa/iwa_04/iwa_04_4_npc.c | 4 +- src/world/area_iwa/iwa_10/iwa_10_3_npc.c | 16 +- src/world/area_iwa/iwa_10/iwa_10_4_train.c | 2 +- .../area_iwa/iwa_10/iwa_10_6_parakarry.c | 2 +- src/world/area_iwa/iwa_11/iwa_11_5_npc.c | 2 +- src/world/area_jan/jan_00/jan_00_2_npc.c | 30 +- src/world/area_jan/jan_01/jan_01_3_npc.c | 22 +- src/world/area_jan/jan_02/jan_02_3_npc.c | 20 +- src/world/area_jan/jan_03/jan_03_4_npc.c | 38 +- src/world/area_jan/jan_04/jan_04_4_npc.c | 6 +- src/world/area_jan/jan_05/jan_05_5_npc.c | 16 +- src/world/area_jan/jan_06/jan_06_6_npc.c | 10 +- src/world/area_jan/jan_07/jan_07_3_npc.c | 20 +- src/world/area_jan/jan_08/jan_08_3_bushes.c | 6 +- src/world/area_jan/jan_08/jan_08_5_npc.c | 10 +- src/world/area_jan/jan_09/jan_09_3_npc.c | 2 +- src/world/area_jan/jan_10/jan_10_3_npc.c | 8 +- src/world/area_jan/jan_11/jan_11_3_npc.c | 4 +- src/world/area_jan/jan_12/jan_12_5_npc.c | 2 +- src/world/area_jan/jan_14/jan_14_2_vines.c | 4 +- src/world/area_jan/jan_14/jan_14_4_npc.c | 4 +- src/world/area_jan/jan_15/jan_15_2_npc.c | 4 +- src/world/area_jan/jan_16/jan_16_3_npc.c | 16 +- src/world/area_jan/jan_22/jan_22_3_npc.c | 70 +-- src/world/area_jan/jan_22/jan_22_5_zipline.c | 2 +- src/world/area_jan/jan_23/jan_23_3_npc.c | 14 +- src/world/area_kgr/kgr_02/kgr_02_3_npc.c | 2 +- .../area_kkj/kkj_00/kkj_00_3_npc_intro.c | 22 +- .../area_kkj/kkj_00/kkj_00_5_npc_ending.c | 80 ++-- src/world/area_kkj/kkj_01/kkj_01_3_npc.c | 26 +- src/world/area_kkj/kkj_02/kkj_02_3_npc.c | 4 +- src/world/area_kkj/kkj_03/kkj_03_3_npc.c | 2 +- .../area_kkj/kkj_10/kkj_10_3_npcs_early.c | 4 +- .../area_kkj/kkj_10/kkj_10_4_npcs_later.c | 12 +- .../area_kkj/kkj_11/kkj_11_5_npcs_early.c | 10 +- .../area_kkj/kkj_11/kkj_11_6_npcs_later.c | 16 +- src/world/area_kkj/kkj_12/kkj_12_2_npc.c | 16 +- .../area_kkj/kkj_13/kkj_13_3_npcs_finale.c | 6 +- .../area_kkj/kkj_13/kkj_13_4_npcs_intro.c | 12 +- .../area_kkj/kkj_14/kkj_14_4_npc_guards.c | 4 +- src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c | 4 +- src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c | 4 +- src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c | 8 +- .../area_kkj/kkj_15/kkj_15_10_npc_chapter3.c | 8 +- .../area_kkj/kkj_15/kkj_15_8_npc_chapter0.c | 12 +- .../area_kkj/kkj_15/kkj_15_9_npc_chapter1.c | 6 +- .../area_kkj/kkj_16/kkj_16_2_npcs_early.c | 10 +- .../area_kkj/kkj_16/kkj_16_3_npcs_later.c | 10 +- src/world/area_kkj/kkj_18/kkj_18_3_npc.c | 16 +- src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c | 8 +- .../area_kkj/kkj_19/kkj_19_3_npcs_intro.c | 4 +- .../area_kkj/kkj_19/kkj_19_4_npcs_peach.c | 4 +- src/world/area_kkj/kkj_19/kkj_19_5_baking.c | 16 +- src/world/area_kkj/kkj_20/kkj_20_4_npc.c | 6 +- .../area_kkj/kkj_23/kkj_23_3_npcs_finale.c | 6 +- .../area_kkj/kkj_23/kkj_23_4_npcs_peach.c | 12 +- src/world/area_kkj/kkj_23/kkj_23_5_scene.c | 2 +- .../area_kkj/kkj_25/kkj_25_2_npc_initial.c | 10 +- .../area_kkj/kkj_25/kkj_25_3_npc_midpoint.c | 24 +- .../area_kkj/kkj_25/kkj_25_4_npc_final.c | 10 +- .../area_kkj/kkj_25/kkj_25_7_kammy_defeated.c | 16 +- src/world/area_kkj/kkj_29/kkj_29_2_npc.c | 8 +- src/world/area_kmr/kmr_00/kmr_00_3_revival.c | 16 +- src/world/area_kmr/kmr_00/kmr_00_4_npc.c | 16 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 54 +-- src/world/area_kmr/kmr_02/kmr_02_7_kammy.c | 8 +- src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 4 +- src/world/area_kmr/kmr_04/kmr_04_3_npc.c | 6 +- src/world/area_kmr/kmr_05/kmr_05_3_npc.c | 10 +- src/world/area_kmr/kmr_06/kmr_06_3_npc.c | 4 +- src/world/area_kmr/kmr_07/kmr_07_3_npc.c | 8 +- src/world/area_kmr/kmr_09/kmr_09_3_npc.c | 12 +- src/world/area_kmr/kmr_10/kmr_10_3_npc.c | 2 +- src/world/area_kmr/kmr_11/kmr_11_4_npc.c | 10 +- src/world/area_kmr/kmr_11/kmr_11_5_entity.c | 2 +- src/world/area_kmr/kmr_12/kmr_12_3_npc.c | 8 +- src/world/area_kmr/kmr_20/kmr_20_10_npc.c | 24 +- src/world/area_kmr/kmr_20/kmr_20_3_rooms.c | 4 +- src/world/area_kmr/kmr_20/kmr_20_5_entity.c | 4 +- .../area_kmr/kmr_20/kmr_20_9_npc_scenes.c | 4 +- src/world/area_kmr/kmr_22/kmr_22_2_npc.c | 62 +-- src/world/area_kmr/kmr_23/kmr_23_2_npc.c | 30 +- src/world/area_kmr/kmr_30/kmr_30_2_npc.c | 2 +- src/world/area_kpa/kpa_01/kpa_01_3_npc.c | 4 +- src/world/area_kpa/kpa_03/kpa_03_3_npc.c | 10 +- src/world/area_kpa/kpa_08/kpa_08_4_npc.c | 2 +- src/world/area_kpa/kpa_10/kpa_10_3_npc.c | 6 +- src/world/area_kpa/kpa_102/kpa_102_3_npc.c | 4 +- src/world/area_kpa/kpa_11/kpa_11_4_npc.c | 8 +- src/world/area_kpa/kpa_113/kpa_113_5_npc.c | 2 +- src/world/area_kpa/kpa_115/kpa_115_4_npc.c | 2 +- src/world/area_kpa/kpa_130/kpa_130_3_npc.c | 16 +- src/world/area_kpa/kpa_133/kpa_133_4_npc.c | 2 +- src/world/area_kpa/kpa_134/kpa_134_4_npc.c | 2 +- src/world/area_kpa/kpa_16/kpa_16_4_npc.c | 8 +- src/world/area_kpa/kpa_17/kpa_17_4_npc.c | 8 +- src/world/area_kpa/kpa_50/kpa_50_3_npc.c | 6 +- src/world/area_kpa/kpa_51/kpa_51_3_npc.c | 6 +- src/world/area_kpa/kpa_52/kpa_52_4_npc.c | 4 +- src/world/area_kpa/kpa_53/kpa_53_3_npc.c | 10 +- src/world/area_kpa/kpa_61/kpa_61_3_npc.c | 4 +- src/world/area_kpa/kpa_63/kpa_63_4_scenes.c | 2 +- src/world/area_kpa/kpa_70/kpa_70_3_npc.c | 4 +- src/world/area_kpa/kpa_81/kpa_81_3_npc.c | 4 +- src/world/area_kpa/kpa_82/kpa_82_3_npc.c | 88 ++-- src/world/area_kpa/kpa_83/kpa_83_3_npc.c | 14 +- src/world/area_kpa/kpa_91/kpa_91_3_npc.c | 10 +- src/world/area_kpa/kpa_95/kpa_95_4_npc.c | 10 +- src/world/area_kpa/kpa_96/kpa_96_3_npc.c | 2 +- src/world/area_kzn/kzn_01/kzn_01_2_npc.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_3_npc.c | 4 +- src/world/area_kzn/kzn_03/kzn_03_2_npc.c | 24 +- src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c | 2 +- src/world/area_kzn/kzn_04/kzn_04_3_npc.c | 12 +- src/world/area_kzn/kzn_07/kzn_07_4_npc.c | 4 +- src/world/area_kzn/kzn_08/kzn_08_3_npc.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_3_zipline.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 18 +- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 16 +- src/world/area_kzn/kzn_17/kzn_17_3_npc.c | 10 +- src/world/area_kzn/kzn_18/kzn_18_2_npc.c | 4 +- src/world/area_kzn/kzn_19/kzn_19_4_npc.c | 4 +- src/world/area_kzn/kzn_20/kzn_20_3_npc.c | 10 +- src/world/area_kzn/kzn_22/kzn_22_4_npc.c | 8 +- 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 | 12 +- .../area_mac/mac_00/mac_00_13_epilogue_npc.c | 22 +- src/world/area_mac/mac_00/mac_00_5_npc.c | 40 +- .../area_mac/mac_00/npc/dojo_members.inc.c | 28 +- .../area_mac/mac_01/mac_01_10_intro_npc.c | 8 +- .../area_mac/mac_01/mac_01_11_epilogue_npc.c | 24 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 70 +-- .../area_mac/mac_01/npc/flower_gate.inc.c | 8 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 12 +- src/world/area_mac/mac_02/mac_02_6_npc.c | 18 +- src/world/area_mac/mac_02/npc/tayce_t.inc.c | 4 +- src/world/area_mac/mac_03/mac_03_3_train.c | 4 +- src/world/area_mac/mac_03/mac_03_4_npc.c | 52 +-- src/world/area_mac/mac_03/mac_03_8_demo.c | 2 +- src/world/area_mac/mac_04/mac_04_6_npc.c | 38 +- .../area_mac/mac_04/mac_04_7_wish_scene.c | 2 +- src/world/area_mac/mac_04/mac_04_8_entity.c | 4 +- src/world/area_mac/mac_04/npc_harry_t.inc.c | 4 +- src/world/area_mac/mac_04/npc_muskular.inc.c | 2 +- .../area_mac/mac_04/npc_toybox_shyguy.inc.c | 2 +- src/world/area_mac/mac_05/mac_05_3_main.c | 4 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 52 +-- src/world/area_mac/mac_06/mac_06_3_npc.c | 8 +- .../area_mac/machi/machi_4_goomba_king.c | 2 +- src/world/area_mac/machi/machi_5_npc.c | 12 +- src/world/area_mac/machi/machi_6_misstar.c | 2 +- src/world/area_mgm/mgm_00/mgm_00_2_npc.c | 6 +- src/world/area_mgm/mgm_01/mgm_01_2_npc.c | 2 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 68 +-- src/world/area_mim/mim_01/mim_01_6_npc.c | 2 +- src/world/area_mim/mim_02/mim_02_3_npc.c | 4 +- src/world/area_mim/mim_04/mim_04_6_npc.c | 2 +- src/world/area_mim/mim_05/mim_05_6_npc.c | 4 +- src/world/area_mim/mim_06/mim_06_6_npc.c | 2 +- src/world/area_mim/mim_07/mim_07_6_npc.c | 2 +- src/world/area_mim/mim_08/mim_08_5_npc.c | 6 +- src/world/area_mim/mim_09/mim_09_6_npc.c | 2 +- src/world/area_mim/mim_10/mim_10_4_npc.c | 2 +- src/world/area_mim/mim_11/mim_11_5_npc.c | 2 +- src/world/area_mim/mim_12/mim_12_5_gate.c | 8 +- src/world/area_nok/nok_01/nok_01_4_npc.c | 46 +- src/world/area_nok/nok_01/npcs_crisis.inc.c | 16 +- src/world/area_nok/nok_02/nok_02_6_npc.c | 58 +-- src/world/area_nok/nok_02/npcs_crisis.inc.c | 10 +- src/world/area_nok/nok_02/npcs_normal.inc.c | 4 +- src/world/area_nok/nok_03/nok_03_4_npc.c | 12 +- src/world/area_nok/nok_04/nok_04_4_npc.c | 16 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 24 +- src/world/area_nok/nok_12/nok_12_6_npc.c | 10 +- src/world/area_nok/nok_14/nok_14_5_npc.c | 12 +- src/world/area_nok/nok_15/nok_15_4_npc.c | 4 +- src/world/area_obk/obk_01/obk_01_6_npc.c | 10 +- src/world/area_obk/obk_02/obk_02_3_npc.c | 4 +- src/world/area_obk/obk_03/obk_03_6_npc.c | 2 +- src/world/area_obk/obk_04/obk_04_3_npc.c | 26 +- src/world/area_obk/obk_04/obk_04_6_game.c | 2 +- src/world/area_obk/obk_05/obk_05_5_npc.c | 4 +- .../area_obk/obk_07/obk_07_4_fireplace.c | 4 +- src/world/area_obk/obk_07/obk_07_5_npc.c | 6 +- src/world/area_obk/obk_08/obk_08_3_cabinets.c | 4 +- src/world/area_obk/obk_08/obk_08_5_npc.c | 28 +- src/world/area_obk/obk_08/obk_08_6_game.c | 6 +- src/world/area_omo/common/ToyTrain.inc.c | 24 +- src/world/area_omo/omo_01/omo_01_4_npc.c | 10 +- src/world/area_omo/omo_02/omo_02_6_npc.c | 6 +- src/world/area_omo/omo_03/omo_03_5_npc.c | 8 +- src/world/area_omo/omo_03/omo_03_6_train.c | 4 +- src/world/area_omo/omo_04/omo_04_5_npc.c | 6 +- src/world/area_omo/omo_05/omo_05_4_npc.c | 18 +- src/world/area_omo/omo_06/omo_06_5_npc.c | 4 +- src/world/area_omo/omo_07/omo_07_4_npc.c | 22 +- src/world/area_omo/omo_08/omo_08_6_npc.c | 14 +- src/world/area_omo/omo_09/omo_09_7_npc.c | 22 +- src/world/area_omo/omo_10/omo_10_5_npc.c | 4 +- src/world/area_omo/omo_11/omo_11_5_npc.c | 4 +- src/world/area_omo/omo_12/omo_12_3_npc.c | 26 +- src/world/area_omo/omo_13/omo_13_4_npc.c | 10 +- src/world/area_omo/omo_14/omo_14_3_npc.c | 26 +- src/world/area_omo/omo_15/omo_15_3_npc.c | 22 +- src/world/area_omo/omo_16/omo_16_3_npc.c | 2 +- src/world/area_omo/omo_17/omo_17_4_npc.c | 8 +- .../area_osr/osr_00/osr_00_3_npc_intro.c | 2 +- .../area_osr/osr_00/osr_00_4_npc_epilogue.c | 24 +- src/world/area_osr/osr_01/osr_01_3_npc.c | 2 +- src/world/area_osr/osr_02/osr_02_3_npc.c | 22 +- .../area_osr/osr_02/osr_02_4_npc_peach.c | 2 +- src/world/area_osr/osr_03/osr_03_2_npc.c | 2 +- src/world/area_pra/pra_01/pra_01_3_npc.c | 4 +- src/world/area_pra/pra_04/pra_04_4_npc.c | 2 +- src/world/area_pra/pra_09/pra_09_3_npc.c | 88 ++-- src/world/area_pra/pra_10/pra_10_3_npc.c | 4 +- src/world/area_pra/pra_13/pra_13_3_npc.c | 18 +- src/world/area_pra/pra_18/pra_18_3_npc.c | 12 +- src/world/area_pra/pra_19/pra_19_3_npc.c | 72 ++-- src/world/area_pra/pra_32/pra_32_3_npc.c | 10 +- src/world/area_pra/pra_35/pra_35_3_npc.c | 4 +- src/world/area_pra/pra_36/pra_36_3_npc.c | 2 +- src/world/area_pra/pra_37/pra_37_3_npc.c | 2 +- src/world/area_pra/pra_38/pra_38_3_npc.c | 4 +- src/world/area_pra/pra_39/pra_39_3_npc.c | 2 +- src/world/area_sam/sam_01/sam_01_2_main.c | 4 +- src/world/area_sam/sam_01/sam_01_3_rooms.c | 4 +- src/world/area_sam/sam_01/sam_01_4_npc.c | 42 +- src/world/area_sam/sam_01/sam_01_5_scenes.c | 24 +- src/world/area_sam/sam_02/sam_02_4_npc.c | 14 +- src/world/area_sam/sam_03/sam_03_3_npc1.c | 6 +- src/world/area_sam/sam_03/sam_03_4_npc2.c | 4 +- src/world/area_sam/sam_04/sam_04_3_snowmen.c | 24 +- src/world/area_sam/sam_04/sam_04_4_npc.c | 16 +- src/world/area_sam/sam_05/sam_05_4_npc.c | 40 +- src/world/area_sam/sam_06/sam_06_4_npc.c | 20 +- src/world/area_sam/sam_07/sam_07_5_npc.c | 6 +- src/world/area_sam/sam_08/sam_08_4_npc.c | 12 +- src/world/area_sam/sam_08/sam_08_5_scenes.c | 24 +- src/world/area_sam/sam_10/sam_10_5_npc.c | 2 +- src/world/area_sam/sam_11/sam_11_5_npc.c | 48 +-- src/world/area_sam/sam_11/sam_11_6_pond.c | 12 +- src/world/area_sam/sam_12/sam_12_3_npc.c | 2 +- src/world/area_sbk/sbk_01/sbk_01_2_npc.c | 4 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 6 +- src/world/area_sbk/sbk_03/sbk_03_2_npc.c | 8 +- src/world/area_sbk/sbk_04/sbk_04_2_npc.c | 4 +- src/world/area_sbk/sbk_05/sbk_05_3_npc.c | 20 +- src/world/area_sbk/sbk_06/sbk_06_2_npc.c | 2 +- src/world/area_sbk/sbk_11/sbk_11_2_npc.c | 4 +- src/world/area_sbk/sbk_12/sbk_12_2_npc.c | 6 +- src/world/area_sbk/sbk_13/sbk_13_2_npc.c | 6 +- src/world/area_sbk/sbk_15/sbk_15_2_npc.c | 4 +- src/world/area_sbk/sbk_22/sbk_22_2_npc.c | 4 +- src/world/area_sbk/sbk_25/sbk_25_2_npc.c | 4 +- src/world/area_sbk/sbk_26/sbk_26_2_npc.c | 2 +- src/world/area_sbk/sbk_30/sbk_30_3_npc.c | 6 +- src/world/area_sbk/sbk_31/sbk_31_2_npc.c | 2 +- src/world/area_sbk/sbk_32/sbk_32_2_npc.c | 6 +- src/world/area_sbk/sbk_34/sbk_34_2_npc.c | 4 +- src/world/area_sbk/sbk_35/sbk_35_2_npc.c | 2 +- src/world/area_sbk/sbk_40/sbk_40_2_npc.c | 4 +- src/world/area_sbk/sbk_42/sbk_42_2_npc.c | 4 +- src/world/area_sbk/sbk_44/sbk_44_2_npc.c | 6 +- src/world/area_sbk/sbk_51/sbk_51_2_npc.c | 4 +- src/world/area_sbk/sbk_53/sbk_53_2_npc.c | 6 +- src/world/area_sbk/sbk_55/sbk_55_2_npc.c | 4 +- src/world/area_sbk/sbk_60/sbk_60_2_npc.c | 2 +- src/world/area_sbk/sbk_62/sbk_62_2_npc.c | 6 +- src/world/area_sbk/sbk_63/sbk_63_2_npc.c | 4 +- src/world/area_sbk/sbk_66/sbk_66_2_npc.c | 12 +- src/world/area_tik/tik_01/tik_01_5_npc.c | 2 +- src/world/area_tik/tik_02/tik_02_5_npc.c | 2 +- src/world/area_tik/tik_04/tik_04_5_npc.c | 6 +- src/world/area_tik/tik_05/tik_05_5_npc.c | 4 +- src/world/area_tik/tik_07/tik_07_6_npc.c | 4 +- src/world/area_tik/tik_08/tik_08_5_npc.c | 2 +- src/world/area_tik/tik_09/tik_09_5_npc.c | 6 +- src/world/area_tik/tik_12/tik_12_5_npc.c | 2 +- src/world/area_tik/tik_15/tik_15_5_npc.c | 2 +- src/world/area_tik/tik_18/tik_18_4_npc.c | 4 +- src/world/area_tik/tik_20/tik_20_3_npc.c | 4 +- src/world/area_tik/tik_23/tik_23_4_npc.c | 6 +- src/world/area_tik/tik_24/tik_24_5_npc.c | 4 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 6 +- src/world/area_trd/trd_01/trd_01_3_npc.c | 8 +- src/world/area_trd/trd_02/trd_02_3_npc.c | 6 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 8 +- src/world/area_trd/trd_04/trd_04_3_npc.c | 6 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 4 +- src/world/area_trd/trd_06/trd_06_1_main.c | 18 +- src/world/area_trd/trd_06/trd_06_2_falling.c | 8 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 12 +- .../area_trd/trd_06/trd_06_4_npc_koopa_bros.c | 8 +- src/world/area_trd/trd_07/trd_07_2_npc.c | 6 +- src/world/area_trd/trd_08/trd_08_3_npc.c | 10 +- src/world/area_trd/trd_09/trd_09_3_npc.c | 34 +- src/world/area_trd/trd_10/trd_10_2_npc.c | 20 +- src/world/area_tst/tst_04/tst_04_4_npc.c | 2 +- src/world/common/atomic/ToadHouse.data.inc.c | 4 +- .../common/atomic/ToadHouseHos.data.inc.c | 4 +- .../common/complete/LetterDelivery.inc.c | 4 +- src/world/common/complete/Quizmo.inc.c | 12 +- src/world/common/enemy/BombshellBill.h | 2 +- src/world/common/enemy/BulletBill.h | 2 +- src/world/common/enemy/Clubba.h | 2 +- src/world/common/enemy/DryBones.h | 2 +- src/world/common/enemy/FlyingMagikoopa.h | 2 +- src/world/common/enemy/FrostClubba.h | 2 +- src/world/common/enemy/FrostPiranha.h | 2 +- src/world/common/enemy/Gulpit.h | 2 +- src/world/common/enemy/HammerBros.h | 2 +- src/world/common/enemy/HeartPlant.inc.c | 2 +- src/world/common/enemy/HurtPlant.inc.c | 2 +- src/world/common/enemy/MBush.inc.c | 6 +- src/world/common/enemy/Magikoopa.h | 2 +- .../common/enemy/MontyMole_GroundAmbush.inc.c | 6 +- .../common/enemy/MontyMole_StoneThrower.inc.c | 6 +- .../common/enemy/MontyMole_WallAmbush.inc.c | 8 +- src/world/common/enemy/PiranhaPlant.h | 2 +- src/world/common/enemy/PutridPiranha.h | 2 +- src/world/common/enemy/Sentinel.inc.c | 4 +- src/world/common/enemy/SpearGuy.h | 2 +- src/world/common/enemy/SpyGuy.h | 2 +- src/world/common/enemy/StoneChomp.inc.c | 6 +- src/world/common/enemy/ai/AvoidPlayerAI.inc.c | 7 - src/world/common/enemy/ai/BulletBillAI.inc.c | 14 +- src/world/common/enemy/ai/CleftAI.inc.c | 4 +- src/world/common/enemy/ai/FlyingAI.inc.c | 11 +- .../common/enemy/ai/FlyingMagikoopaAI.inc.c | 2 +- .../common/enemy/ai/FlyingNoAttackAI.inc.c | 7 - src/world/common/enemy/ai/GrooveGuyAI.inc.c | 4 +- src/world/common/enemy/ai/GuardAI.inc.c | 4 +- src/world/common/enemy/ai/HoppingAI.inc.c | 4 +- src/world/common/enemy/ai/KoopaPatrolAI.inc.c | 8 +- src/world/common/enemy/ai/LakituAI.inc.c | 8 - src/world/common/enemy/ai/MagikoopaAI.inc.c | 10 +- .../common/enemy/ai/MagikoopaSpellAI.inc.c | 8 +- src/world/common/enemy/ai/MeleeHitbox.inc.c | 24 +- src/world/common/enemy/ai/MontyMoleAI.inc.c | 10 +- src/world/common/enemy/ai/ParatroopaAI.inc.c | 4 +- .../common/enemy/ai/PatrolNoAttackAI.inc.c | 12 +- .../common/enemy/ai/PiranhaPlantAI.inc.c | 10 +- .../common/enemy/ai/ProjectileHitbox.inc.c | 24 +- .../common/enemy/ai/RangedAttackAI.inc.c | 4 +- .../common/enemy/ai/ShyGuyPatrolAI.inc.c | 4 +- .../common/enemy/ai/ShyGuyWanderAI.inc.c | 4 +- src/world/common/enemy/ai/SpinyAI.inc.c | 14 +- .../common/enemy/ai/States_TackleAI.inc.c | 4 +- src/world/common/enemy/ai/StoneChompAI.inc.c | 4 +- src/world/common/enemy/ai/TackleAI.inc.c | 10 +- src/world/common/enemy/ai/WanderMeleeAI.inc.c | 4 - src/world/common/entity/Pipe.inc.c | 2 +- src/world/common/entity/SuperBlock.inc.c | 2 +- .../common/todo/AwaitPlayerNearNpc.inc.c | 2 +- .../common/todo/CheckPartnerFlags1000.inc.c | 2 +- .../common/util/ChangeNpcToPartner.inc.c | 2 +- src/world/dead/area_flo/flo_00/flo_00.h | 1 - src/world/dead/area_flo/flo_00/flo_00_3_npc.c | 20 +- src/world/dead/area_flo/flo_03/flo_03.h | 1 - src/world/dead/area_flo/flo_03/flo_03_3_npc.c | 44 +- src/world/dead/area_flo/flo_07/flo_07.h | 1 - src/world/dead/area_flo/flo_07/flo_07_3_npc.c | 2 +- src/world/dead/area_flo/flo_08/flo_08.h | 1 - src/world/dead/area_flo/flo_08/flo_08_4_npc.c | 22 +- src/world/dead/area_flo/flo_09/flo_09.h | 1 - src/world/dead/area_flo/flo_09/flo_09_5_npc.c | 10 +- src/world/dead/area_flo/flo_10/flo_10.h | 3 +- src/world/dead/area_flo/flo_10/flo_10_5_npc.c | 6 +- src/world/dead/area_flo/flo_11/flo_11.h | 1 - src/world/dead/area_flo/flo_11/flo_11_3_npc.c | 4 +- src/world/dead/area_flo/flo_12/flo_12.h | 1 - src/world/dead/area_flo/flo_12/flo_12_3_npc.c | 26 +- src/world/dead/area_flo/flo_13/flo_13.h | 1 - src/world/dead/area_flo/flo_13/flo_13_4_npc.c | 24 +- src/world/dead/area_flo/flo_14/flo_14.h | 1 - .../dead/area_flo/flo_14/flo_14_3_bubbles.c | 2 +- src/world/dead/area_flo/flo_14/flo_14_4_npc.c | 8 +- src/world/dead/area_flo/flo_15/flo_15.h | 1 - src/world/dead/area_flo/flo_15/flo_15_3_npc.c | 6 +- src/world/dead/area_flo/flo_16/flo_16.h | 1 - src/world/dead/area_flo/flo_16/flo_16_5_npc.c | 4 +- src/world/dead/area_flo/flo_17/flo_17.h | 1 - src/world/dead/area_flo/flo_17/flo_17_4_npc.c | 12 +- src/world/dead/area_flo/flo_18/flo_18.h | 1 - src/world/dead/area_flo/flo_18/flo_18_4_npc.c | 26 +- src/world/dead/area_flo/flo_19/flo_19.h | 1 - .../dead/area_flo/flo_19/flo_19_5_beanstalk.c | 2 +- src/world/dead/area_kzn/kzn_11/kzn_11.h | 1 - src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c | 16 +- src/world/dead/area_kzn/kzn_17/kzn_17.h | 1 - src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c | 10 +- src/world/dead/area_kzn/kzn_18/kzn_18.h | 1 - src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c | 4 +- src/world/dead/area_kzn/kzn_19/kzn_19.h | 1 - src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c | 4 +- src/world/dead/area_kzn/kzn_20/kzn_20.h | 1 - src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c | 10 +- src/world/dead/area_kzn/kzn_22/kzn_22.h | 1 - src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c | 8 +- src/world/dead/area_kzn/kzn_23/kzn_23.h | 1 - src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- src/world/partner/bombette.c | 20 +- src/world/partner/bow.c | 6 +- src/world/partner/goombario.c | 6 +- src/world/partner/goompa.c | 2 +- src/world/partner/kooper.c | 26 +- src/world/partner/lakilester.c | 48 +-- src/world/partner/parakarry.c | 16 +- src/world/partner/sushie.c | 20 +- src/world/partner/watt.c | 8 +- src/world/partners.c | 48 +-- .../asm/nonmatchings/npc/npc_get_render_yaw.s | 154 ------- ver/jp/undefined_syms.txt | 5 +- ver/us/asm/bss2.s | 7 +- .../asm/nonmatchings/npc/npc_get_render_yaw.s | 154 ------- ver/us/symbol_addrs.txt | 12 +- 604 files changed, 3576 insertions(+), 4479 deletions(-) delete mode 100644 include/dead_structs.h rename src/battle/{move/item => common/move}/ItemRefund.inc.c (100%) rename src/battle/{move/item => common/move}/UseItem.inc.c (100%) delete mode 100644 src/battle/move/item/coconut.h delete mode 100644 src/battle/move/item/dizzy_dial.h delete mode 100644 src/battle/move/item/dried_shroom.h delete mode 100644 src/battle/move/item/dusty_hammer.h delete mode 100644 src/battle/move/item/egg_missile.h delete mode 100644 src/battle/move/item/electro_pop.h delete mode 100644 src/battle/move/item/fire_flower.h delete mode 100644 src/battle/move/item/food.h delete mode 100644 src/battle/move/item/fright_jar.h delete mode 100644 src/battle/move/item/hustle_drink.h delete mode 100644 src/battle/move/item/insecticide_herb.h delete mode 100644 src/battle/move/item/life_shroom.h delete mode 100644 src/battle/move/item/mushroom.h delete mode 100644 src/battle/move/item/mystery.h delete mode 100644 src/battle/move/item/pebble.h delete mode 100644 src/battle/move/item/please_come_back.h delete mode 100644 src/battle/move/item/pow_block.h delete mode 100644 src/battle/move/item/repel_gel.h delete mode 100644 src/battle/move/item/shooting_star.h delete mode 100644 src/battle/move/item/sleepy_sheep.h delete mode 100644 src/battle/move/item/snowman_doll.h delete mode 100644 src/battle/move/item/stone_cap.h delete mode 100644 src/battle/move/item/stop_watch.h delete mode 100644 src/battle/move/item/strange_cake.h delete mode 100644 src/battle/move/item/super_soda.h delete mode 100644 src/battle/move/item/tasty_tonic.h delete mode 100644 src/battle/move/item/thunder_bolt.h delete mode 100644 src/battle/move/item/thunder_rage.h delete mode 100644 src/battle/move/item/ultra_shroom.h delete mode 100644 src/battle/move/item/unknown_item.h delete mode 100644 src/battle/move/item/volt_shroom.h delete mode 100644 ver/jp/asm/nonmatchings/npc/npc_get_render_yaw.s delete mode 100644 ver/us/asm/nonmatchings/npc/npc_get_render_yaw.s diff --git a/include/common_structs.h b/include/common_structs.h index 573e474036..3cfbf6d7fe 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -192,13 +192,22 @@ typedef struct NpcHistoryPoint { /* 0x04 */ Vec3f pos; } NpcHistoryPoint; // size = 0x10 +typedef struct FollowAnims { + /* 0x00 */ AnimID walk; + /* 0x04 */ AnimID jump; + /* 0x08 */ AnimID fall; + /* 0x0C */ AnimID land; + /* 0x10 */ AnimID idle; + /* 0x14 */ AnimID run; +} FollowAnims; // size = 0x18 + typedef struct NpcFollowData { /* 0x000 */ NpcHistoryPoint moveHistory[40]; /* 0x280 */ s32 lastPointIdx; /* 0x284 */ s32 targetPointIdx; /* 0x288 */ s32 followState; /* 0x28C */ s32 targetNpcID; - /* 0x290 */ s32* animIDs; + /* 0x290 */ FollowAnims* anims; /* 0x294 */ f32 walkSpeed; /* 0x298 */ f32 runSpeed; /* 0x29C */ f32 idleRadius; diff --git a/include/dead_structs.h b/include/dead_structs.h deleted file mode 100644 index 58afb1e573..0000000000 --- a/include/dead_structs.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef _DEAD_STRUCTS_H_ -#define _DEAD_STRUCTS_H_ - -#include "common_structs.h" -#include "enums.h" -#include "script_api/map.h" - -typedef struct DeadEnemy { - /* 0x000 */ s32 flags; - /* 0x004 */ s8 encounterIndex; - /* 0x005 */ s8 encountered; - /* 0x006 */ u8 scriptGroup; /* scripts launched for this npc controller will be assigned this group */ - /* 0x007 */ s8 unk_07; - /* 0x008 */ s16 npcID; - /* 0x00A */ s16 spawnPos[3]; - /* 0x010 */ Vec3s unk_10; - /* 0x016 */ char unk_16[2]; - /* 0x018 */ struct NpcSettings* npcSettings; - /* 0x01C */ EvtScript* initBytecode; - /* 0x020 */ EvtScript* interactBytecode; - /* 0x024 */ EvtScript* aiBytecode; - /* 0x028 */ EvtScript* hitBytecode; - /* 0x02C */ EvtScript* auxBytecode; - /* 0x030 */ EvtScript* defeatBytecode; - /* 0x034 */ struct Evt* initScript; - /* 0x038 */ struct Evt* interactScript; - /* 0x03C */ struct Evt* aiScript; - /* 0x040 */ struct Evt* hitScript; - /* 0x044 */ struct Evt* auxScript; - /* 0x048 */ struct Evt* defeatScript; - /* 0x04C */ s32 initScriptID; - /* 0x050 */ s32 interactScriptID; - /* 0x054 */ s32 aiScriptID; - /* 0x058 */ s32 hitScriptID; - /* 0x05C */ s32 auxScriptID; - /* 0x060 */ s32 defeatScriptID; - /* 0x064 */ void* unk_64; - /* 0x068 */ char unk_68[4]; - /* 0x06C */ s32 varTable[16]; - /* 0x0AC */ s32 aiDetectFlags; - /* 0x0B0 */ s32 aiFlags; - /* 0x0B4 */ s8 aiSuspendTime; - /* 0x0B5 */ s8 instigatorValue; - /* 0x0B6 */ char unk_B6[2]; - /* 0x0B8 */ EvtScript* unk_B8; // some bytecode - /* 0x0BC */ struct Evt* unk_BC; // some script - /* 0x0C0 */ s32 unk_C0; // some script ID - /* 0x0C4 */ s32 unk_C4; - /* 0x0C8 */ s32 unk_C8; - /* 0x0CC */ s32* animList; - /* 0x0D0 */ EnemyTerritory* territory; - /* 0x0D4 */ EnemyDrops* drops; - /* 0x0D8 */ u32 tattleMsg; - /* 0x0DC */ char unk_DC[42]; - /* 0x108 */ Vec3f unk_108; // Associated NPC Pos? - /* 0x114 */ f32 unk_114; - /* 0x118 */ f32 unk_118; -} DeadEnemy; // size = 0x11C - -#endif diff --git a/include/enums.h b/include/enums.h index b2cbf502a8..d684a1b0ca 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3450,41 +3450,38 @@ enum NpcPalSwapState { }; enum NpcFlags { - NPC_FLAG_1 = 0x00000001, - NPC_FLAG_2 = 0x00000002, - NPC_FLAG_4 = 0x00000004, - NPC_FLAG_8 = 0x00000008, - NPC_FLAG_HAS_SHADOW = 0x00000010, ///< Set by default and by enable_npc_shadow - NPC_FLAG_20 = 0x00000020, - NPC_FLAG_IGNORE_WORLD_COLLISION = 0x00000040, - NPC_FLAG_UPSIDE_DOWN = 0x00000080, ///< Render NPCs upside-down - NPC_FLAG_100 = 0x00000100, // TODO - NPC_FLAG_GRAVITY = 0x00000200, ///< Enables gravity. Does nothing if NPC_FLAG_JUMPING is set. - NPC_FLAG_LOCK_ANIMS = 0x00000400, ///< Do not allow scripts to change animation - NPC_FLAG_JUMPING = 0x00000800, ///< Causes NpcMoveTo() to ignore stairs - NPC_FLAG_1000 = 0x00001000, - NPC_FLAG_NO_PROJECT_SHADOW = 0x00002000, ///< Draw shadow at base of sprite instead of projecting to ground - NPC_FLAG_4000 = 0x00004000, - NPC_FLAG_8000 = 0x00008000, - NPC_FLAG_DIRTY_SHADOW = 0x00010000, ///< Set if shadow model is dirty (needs to be repositioned etc.) - NPC_FLAG_REFLECT_WALL = 0x00020000, ///< Mirror rendering across z=0 - NPC_FLAG_40000 = 0x00040000, ///< Yaw? - NPC_FLAG_REFLECT_FLOOR = 0x00080000, ///< Mirror rendering across y=0 - NPC_FLAG_MOTION_BLUR = 0x00100000, ///< Gives motion blur effect as NPC moves. Set by enable_npc_blur - NPC_FLAG_200000 = 0x00200000, - NPC_FLAG_400000 = 0x00400000, - NPC_FLAG_HIDING = 0x00800000, - NPC_FLAG_1000000 = 0x01000000, // TODO. fails assert in set_npc_sprite - NPC_FLAG_SIMPLIFIED_PHYSICS = 0x02000000, - /// Use simpler, faster physics calculations: - /// - Perform only one lateral collision test during motion - /// - Allow falling below Y=-2000 (by default, NPC_FLAG_JUMPING is set when an NPC falls out-of-bounds) - NPC_FLAG_PARTICLE = 0x04000000, - NPC_FLAG_WORLD_COLLISION_DIRTY = 0x08000000, - NPC_FLAG_10000000 = 0x10000000, - NPC_FLAG_20000000 = 0x20000000, - NPC_FLAG_NO_ANIMS_LOADED = 0x40000000, ///< Npc has no animations loaded - NPC_FLAG_80000000 = 0x80000000, + NPC_FLAG_ENABLED = 0x00000001, // Does nothing aside from making npc->flags != + NPC_FLAG_INVISIBLE = 0x00000002, // NPC will not be drawn or cause surface effects while moving + NPC_FLAG_INACTIVE = 0x00000004, // NPC will not render, move, or have collisions with other NPCs. They may still be interacted with. + NPC_FLAG_8 = 0x00000008, + NPC_FLAG_HAS_SHADOW = 0x00000010, // Set by default and by enable_npc_shadow + NPC_FLAG_NO_SHADOW_RAYCAST = 0x00000020, // Shadows are tied to NPC position instead of raycasting below the NPC + NPC_FLAG_IGNORE_WORLD_COLLISION = 0x00000040, + NPC_FLAG_UPSIDE_DOWN = 0x00000080, // Render NPCs upside-down + NPC_FLAG_IGNORE_PLAYER_COLLISION = 0x00000100, + NPC_FLAG_GRAVITY = 0x00000200, // Enables gravity. Does nothing if NPC_FLAG_JUMPING is set. + NPC_FLAG_DONT_UPDATE_SHADOW_Y = 0x00000400, // When shadow raycasting is off, only X and Z update as NPC moves + NPC_FLAG_JUMPING = 0x00000800, + NPC_FLAG_FALLING = 0x00001000, + NPC_FLAG_COLLDING_WITH_WORLD = 0x00002000, // Colliding with world in front or to the sides of the NPC + NPC_FLAG_COLLDING_FORWARD_WITH_WORLD = 0x00004000, // Colliding with world directly in front of NPC + NPC_FLAG_IGNORE_ENTITY_COLLISION = 0x00008000, + NPC_FLAG_DIRTY_SHADOW = 0x00010000, // Set if shadow is dirty (needs to be repositioned etc.) + NPC_FLAG_REFLECT_WALL = 0x00020000, // Mirror rendering across z=0 + NPC_FLAG_IGNORE_CAMERA_FOR_YAW = 0x00040000, // Do not adjust renderYaw to face the camera + NPC_FLAG_REFLECT_FLOOR = 0x00080000, // Mirror rendering across y=0 + NPC_FLAG_MOTION_BLUR = 0x00100000, // Gives motion blur effect as NPC moves. Set by enable_npc_blur + NPC_FLAG_200000 = 0x00200000, + NPC_FLAG_TOUCHES_GROUND = 0x00400000, // Can cause effects to play when touching special surface types + NPC_FLAG_HIDING = 0x00800000, + NPC_FLAG_HAS_NO_SPRITE = 0x01000000, + NPC_FLAG_COLLIDING_WITH_NPC = 0x02000000, + NPC_FLAG_PARTNER = 0x04000000, + NPC_FLAG_WORLD_COLLISION_DIRTY = 0x08000000, + NPC_FLAG_10000000 = 0x10000000, + NPC_FLAG_20000000 = 0x20000000, + NPC_FLAG_NO_ANIMS_LOADED = 0x40000000, // Npc has no animations loaded + NPC_FLAG_SUSPENDED = 0x80000000, }; enum PlayerStatusFlags { @@ -3524,7 +3521,7 @@ enum PlayerStatusFlags { /* Forces Mario's sprite to either face exactly left or right, without transitioning. */ PS_FLAG_NO_FLIPPING = 0x00200000, /* Prevents Mario from moving laterally */ - PS_FLAG_MOVEMENT_LOCKED = 0x00400000, + PS_FLAG_MOVEMENT_LOCKED = 0x00400000, //TODO misnamed /* Stops Mario from air steering or using a special jump during a scripted fall */ PS_FLAG_SCRIPTED_FALL = 0x00800000, /* Not fully sure about this one, but appears to mark the frame that the check for what to hammer occurs */ @@ -5015,45 +5012,45 @@ enum MapRoomNotifications { }; enum EnemyFlags { - ENEMY_FLAG_PASSIVE = 0x00000001, ///< Collision does not trigger battle - ENEMY_FLAG_2 = 0x00000002, - ENEMY_FLAG_4 = 0x00000004, - ENEMY_FLAG_ENABLE_HIT_SCRIPT = 0x00000008, - ENEMY_FLAG_FLED = 0x00000010, - ENEMY_FLAG_DISABLE_AI = 0x00000020, ///< Disable movement AI and collision (idle animation plays) - ENEMY_FLAG_40 = 0x00000040, - ENEMY_FLAG_80 = 0x00000080, - ENEMY_FLAG_100 = 0x00000100, - ENEMY_FLAG_200 = 0x00000200, - ENEMY_FLAG_400 = 0x00000400, - ENEMY_FLAG_800 = 0x00000800, - ENEMY_FLAG_GRAVITY = 0x00001000, - ENEMY_FLAG_2000 = 0x00002000, - ENEMY_FLAG_4000 = 0x00004000, - ENEMY_FLAG_8000 = 0x00008000, - ENEMY_FLAG_10000 = 0x00010000, - ENEMY_FLAG_USE_PLAYER_SPRITE = 0x00020000, ///< Used for Peach NPCs - ENEMY_FLAG_40000 = 0x00040000, - ENEMY_FLAG_80000 = 0x00080000, - ENEMY_FLAG_100000 = 0x00100000, - ENEMY_FLAG_200000 = 0x00200000, - ENEMY_FLAG_400000 = 0x00400000, - ENEMY_FLAG_NO_DROPS = 0x00800000, ///< Do not drop hearts, flowers, or coins on defeat - ENEMY_FLAG_IGNORE_TOUCH = 0x01000000, - ENEMY_FLAG_IGNORE_JUMP = 0x02000000, - ENEMY_FLAG_IGNORE_HAMMER = 0x04000000, - ENEMY_FLAG_8000000 = 0x08000000, - ENEMY_FLAG_10000000 = 0x10000000, - ENEMY_FLAG_20000000 = 0x20000000, - ENEMY_FLAG_40000000 = 0x40000000, // spawn in AI_STATE_CHASE_INIT - ENEMY_FLAG_80000000 = 0x80000000, + ENEMY_FLAG_PASSIVE = 0x00000001, // Not hostile; collision does not trigger battle + ENEMY_FLAG_2 = 0x00000002, // Unused + ENEMY_FLAG_4 = 0x00000004, + ENEMY_FLAG_ENABLE_HIT_SCRIPT = 0x00000008, + ENEMY_FLAG_FLED = 0x00000010, + ENEMY_FLAG_DISABLE_AI = 0x00000020, // Disable movement AI and collision (idle animation plays) + ENEMY_FLAG_PROJECTILE = 0x00000040, + ENEMY_FLAG_DONT_UPDATE_SHADOW_Y = 0x00000080, + ENEMY_FLAG_IGNORE_WORLD_COLLISION = 0x00000100, + ENEMY_FLAG_IGNORE_PLAYER_COLLISION = 0x00000200, + ENEMY_FLAG_IGNORE_ENTITY_COLLISION = 0x00000400, + ENEMY_FLAG_800 = 0x00000800, // Corresponds with NPC_FLAG_8 + ENEMY_FLAG_GRAVITY = 0x00001000, + ENEMY_FLAG_NO_SHADOW_RAYCAST = 0x00002000, + ENEMY_FLAG_HAS_NO_SPRITE = 0x00004000, + ENEMY_FLAG_8000 = 0x00008000, // Corresponds with NPC_FLAG_10000000 + ENEMY_FLAG_10000 = 0x00010000, // Corresponds with NPC_FLAG_20000000 + ENEMY_FLAG_USE_PLAYER_SPRITE = 0x00020000, // Used for Peach NPCs + ENEMY_FLAG_40000 = 0x00040000, + ENEMY_FLAG_80000 = 0x00080000, + ENEMY_FLAG_100000 = 0x00100000, + ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN = 0x00200000, + ENEMY_FLAG_400000 = 0x00400000, + ENEMY_FLAG_NO_DROPS = 0x00800000, // Do not drop hearts, flowers, or coins on defeat + ENEMY_FLAG_IGNORE_TOUCH = 0x01000000, + ENEMY_FLAG_IGNORE_JUMP = 0x02000000, + ENEMY_FLAG_IGNORE_HAMMER = 0x04000000, + ENEMY_FLAG_CANT_INTERACT = 0x08000000, // Makes passive NPCs non-interactable. Hostile NPCs are always non-interactible. + ENEMY_FLAG_IGNORE_PARTNER = 0x10000000, + ENEMY_FLAG_IGNORE_SPIN = 0x20000000, + ENEMY_FLAG_BEGIN_WITH_CHASING = 0x40000000, // Starts in state AI_STATE_CHASE_INIT instead of AI_STATE_WANDER_INIT on spawn or AI resume + ENEMY_FLAG_SUSPENDED = 0x80000000, }; #define COMMON_PASSIVE_FLAGS \ ENEMY_FLAG_PASSIVE \ | ENEMY_FLAG_ENABLE_HIT_SCRIPT \ - | ENEMY_FLAG_100 \ - | ENEMY_FLAG_400 \ + | ENEMY_FLAG_IGNORE_WORLD_COLLISION \ + | ENEMY_FLAG_IGNORE_ENTITY_COLLISION \ | ENEMY_FLAG_800 // used with enemy->aiFlags diff --git a/include/functions.h b/include/functions.h index e4b730c04f..279964b363 100644 --- a/include/functions.h +++ b/include/functions.h @@ -376,7 +376,7 @@ void btl_draw_upgrade_windows(s32); void btl_state_draw_celebration(void); void func_8024F7C8(void); -void func_80263E08(Actor*, ActorPart*, s32); +void func_80263E08(Actor*, ActorPart*, AnimID); void func_80266978(void); void func_80266B14(void); s32 btl_cam_is_moving_done(void); @@ -446,7 +446,7 @@ void set_npc_shadow_scale(Shadow* shadow, f32 height, f32 npcRadius); void set_npc_animation(Npc* npc, u32 animID); void set_peach_shadow_scale(Shadow* shadow, f32 scale); s32 is_block_on_ground(Entity* block); -void set_animation(s32 actorID, s32, s32 animationIndex); +void set_animation(s32 actorID, s32 partID, AnimID animID); void set_animation_rate(s32 actorID, s32 partID, f32 rate); void set_model_flags(u16, s32, s32); void init_enter_world_shared(void); @@ -1025,7 +1025,7 @@ void sync_status_menu(void); void create_cameras_a(void); void func_80045AC0(void); void func_8005AF84(void); -void npc_follow_init(Npc*, s32, s32*, f32, f32, s32, s32); +void npc_follow_init(Npc*, s32, FollowAnims*, f32, f32, s32, s32); void npc_update_npc_tracking(Npc*); void npc_follow_npc(Npc*); void create_encounters(void); diff --git a/include/npc.h b/include/npc.h index 7bfee9e5a7..8d19c821e0 100644 --- a/include/npc.h +++ b/include/npc.h @@ -305,10 +305,10 @@ typedef struct Enemy { /* 0x04 */ s8 encounterIndex; /* 0x05 */ s8 encountered; /* 0x06 */ u8 scriptGroup; /* scripts launched for this npc controller will be assigned this group */ - /* 0x07 */ s8 unk_07; + /* 0x07 */ s8 hitboxIsActive; // when set, contact will trigger a first strike /* 0x08 */ s16 npcID; /* 0x0A */ s16 spawnPos[3]; - /* 0x10 */ Vec3s unk_10; + /* 0x10 */ Vec3s unk_10; //TODO hitbox pos? /* 0x16 */ char unk_16[2]; /* 0x18 */ NpcSettings* npcSettings; /* 0x1C */ EvtScript* initBytecode; @@ -352,9 +352,15 @@ typedef struct Enemy { /* 0xD4 */ EnemyDrops* drops; /* 0xD8 */ u32 tattleMsg; /* 0xDC */ s32 unk_DC; - /* 0xE0 */ s16 unk_E0; + /* 0xE0 */ s16 savedNpcYaw; /* 0xE2 */ char unk_E2[6]; -} Enemy; // size = 0xE8 + #ifdef _DEAD_H_ + /* 0x0DC */ char unk_E8[32]; + /* 0x108 */ Vec3f unk_108; // Associated NPC Pos? + /* 0x114 */ f32 unk_114; + /* 0x118 */ f32 unk_118; + #endif +} Enemy; // size = 0xE8, dead size = 0x11C typedef struct Encounter { /* 0x00 */ s32 count; @@ -457,7 +463,7 @@ s32 npc_do_player_collision(Npc* npc); void npc_do_gravity(Npc* npc); -s32 func_800397E8(Npc* npc, f32 arg1); +s32 func_800397E8(Npc* npc, f32 velocity); /// Updates all NPCs. void update_npcs(void); @@ -558,8 +564,8 @@ void npc__reset_current_decoration(Npc* npc, s32 idx); /// Finds the closest NPC to a given point within a radius. Ignores Y position. /// -/// NPCs with NPC_FLAG_PARTICLE set are ignored. -/// See also npc_find_closest_simple(), which requires that NPC_FLAG_PARTICLE be set. +/// NPCs with NPC_FLAG_PARTNER set are ignored. +/// See also npc_find_closest_simple(), which requires that NPC_FLAG_PARTNER be set. /// /// @param x X position /// @param y Y position (unused) @@ -571,8 +577,8 @@ Npc* npc_find_closest(f32 x, f32 y, f32 z, f32 radius); /// Finds the closest simple-hitbox NPC to a given point within a radius. Ignores Y position. /// -/// Only NPCs with NPC_FLAG_PARTICLE set are considered. -/// See also npc_find_closest(), which requires that NPC_FLAG_PARTICLE be unset. +/// Only NPCs with NPC_FLAG_PARTNER set are considered. +/// See also npc_find_closest(), which requires that NPC_FLAG_PARTNER be unset. /// /// @param x X position /// @param y Y position (unused) diff --git a/include/script_api/battle.h b/include/script_api/battle.h index ecc3cb395d..c23d6a0859 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -27,6 +27,7 @@ ApiStatus WaitForMessageBoxDone(Evt* script, s32 isInitialCall); ApiStatus ForceCloseMessageBox(Evt* script, s32 isInitialCall); ApiStatus SetMessageBoxDuration(Evt* script, s32 isInitialCall); ApiStatus ItemDamageEnemy(Evt* script, s32 isInitialCall); +ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall); ApiStatus ItemSpookEnemy(Evt* script, s32 isInitialCall); ApiStatus ItemCheckHit(Evt* script, s32 isInitialCall); ApiStatus ActorSpeak(Evt* script, s32 isInitialCall); @@ -53,7 +54,6 @@ ApiStatus IncrementPlayerHP(Evt* script, s32 isInitialCall); ApiStatus IncrementPlayerFP(Evt* script, s32 isInitialCall); ApiStatus StartRumbleWithParams(Evt* script, s32 isInitialCall); ApiStatus LoadItemScript(Evt* script, s32 isInitialCall); -ApiStatus LoadFreeItemScript(Evt* script, s32 isInitialCall); ApiStatus LoadMoveScript(Evt* script, s32 isInitialCall); ApiStatus LoadBattleSection(Evt* script, s32 isInitialCall); ApiStatus GetBattlePhase(Evt* script, s32 isInitialCall); diff --git a/include/script_api/common.h b/include/script_api/common.h index 7528c7645a..a848b4e106 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -306,8 +306,11 @@ ApiStatus SetVirtualEntityRotation(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityJumpGravity(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); +ApiStatus SetVirtualEntityMoveSpeed(Evt* script, s32 isInitialCall); +ApiStatus VirtualEntityMoveTo(Evt* script, s32 isInitialCall); ApiStatus VirtualEntityJumpTo(Evt* script, s32 isInitialCall); ApiStatus VirtualEntityLandJump(Evt* script, s32 isInitialCall); + ApiStatus FacePlayerTowardPoint(Evt* script, s32 isInitialCall); ApiStatus func_802D2C14(Evt* script, s32 isInitialCall); ApiStatus ShowConsumableChoicePopup(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index 24e52000e6..d76614b487 100644 --- a/include/variables.h +++ b/include/variables.h @@ -161,7 +161,7 @@ extern s32 PrevPlayerCamRelativeYaw; extern s32 D_800F7B44; extern f32 D_8010C938; extern f32 D_8010C990; -extern s32 D_8010C978; +extern s32 NpcHitQueryColliderID; extern Vec3s btl_actorHomePositions[]; extern SaveData gCurrentSaveFile; diff --git a/src/18F340.c b/src/18F340.c index e7324894f9..3a201e17c1 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -33,7 +33,7 @@ void func_80260A60(void) { if (battleStatus->flags2 & BS_FLAGS2_PEACH_BATTLE) { actorPart->idleAnimations = bPeachIdleAnims; - set_animation(0, 0, 0xA0002); + set_animation(0, 0, ANIM_Peach_A0002); } else if (!battleStatus->outtaSightActive) { actorPart->idleAnimations = bMarioIdleAnims; } @@ -63,7 +63,7 @@ ApiStatus activate_defend_command(Evt* script, s32 isInitialCall) { deduct_current_move_fp(); gBattleStatus.flags1 |= BS_FLAGS1_PLAYER_DEFENDING; actorPart->idleAnimations = bMarioDefendAnims; - set_animation(0, 0, 0x10014); + set_animation(0, 0, ANIM_Mario_Crouch); return ApiStatus_DONE2; } @@ -1568,7 +1568,7 @@ EvtScript MerleeRunOut = { EVT_RETURN EVT_END_IF EVT_WAIT(15) - EVT_CALL(ShowMessageBox, 3, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_03, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END @@ -1585,7 +1585,7 @@ EvtScript MerleeAttackBonus = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_CALL(CreateNpc, -10, ANIM_BattleMerlee_Gather) - EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(SetNpcRenderMode, -10, 34) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, 0, 65, 20) EVT_CHILD_THREAD @@ -1634,7 +1634,7 @@ EvtScript MerleeDefenseBonus = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_CALL(CreateNpc, -10, ANIM_BattleMerlee_Gather) - EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(SetNpcRenderMode, -10, 34) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, 0, 65, 20) EVT_CHILD_THREAD @@ -1688,7 +1688,7 @@ EvtScript MerleeExpBonus = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_CALL(CreateNpc, -10, ANIM_BattleMerlee_Gather) - EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(SetNpcRenderMode, -10, 34) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, 0, 65, 20) EVT_CHILD_THREAD diff --git a/src/190B20.c b/src/190B20.c index 208a1e9766..e478909d8e 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -967,17 +967,17 @@ void func_80263CC4(s32 arg0) { start_script(&D_80293820, 10, 0)->varTable[0] = arg0; } -void set_animation(s32 actorID, s32 partID, s32 animationIndex) { - if (animationIndex >= 0) { +void set_animation(s32 actorID, s32 partID, AnimID animID) { + if ((s32) animID >= 0) { Actor* actor = get_actor(actorID); ActorPart* part; switch (actorID & ACTOR_CLASS_MASK) { case ACTOR_CLASS_PLAYER: part = &actor->partsTable[0]; - if (part->currentAnimation != animationIndex) { - part->currentAnimation = animationIndex; - spr_update_player_sprite(PLAYER_SPRITE_MAIN, animationIndex, part->animationRate); + if (part->currentAnimation != animID) { + part->currentAnimation = animID; + spr_update_player_sprite(PLAYER_SPRITE_MAIN, animID, part->animationRate); } break; case ACTOR_CLASS_PARTNER: @@ -991,17 +991,17 @@ void set_animation(s32 actorID, s32 partID, s32 animationIndex) { part = &actor->partsTable[0]; } - if (part->currentAnimation != animationIndex) { - part->currentAnimation = animationIndex; - spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate); + if (part->currentAnimation != animID) { + part->currentAnimation = animID; + spr_update_sprite(part->spriteInstanceID, animID, part->animationRate); part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID); } break; case ACTOR_CLASS_ENEMY: part = get_actor_part(actor, partID); - if (part->currentAnimation != animationIndex) { - part->currentAnimation = animationIndex; - spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate); + if (part->currentAnimation != animID) { + part->currentAnimation = animID; + spr_update_sprite(part->spriteInstanceID, animID, part->animationRate); part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID); } break; @@ -1009,8 +1009,8 @@ void set_animation(s32 actorID, s32 partID, s32 animationIndex) { } } -void func_80263E08(Actor* actor, ActorPart* part, s32 anim) { - if (anim >= 0) { +void func_80263E08(Actor* actor, ActorPart* part, AnimID anim) { + if ((s32) anim >= 0) { switch (actor->actorID & ACTOR_CLASS_MASK) { case ACTOR_CLASS_PLAYER: if (part->currentAnimation != anim) { diff --git a/src/23680.c b/src/23680.c index b85c8bd8c7..1f437ba9fc 100644 --- a/src/23680.c +++ b/src/23680.c @@ -2,7 +2,7 @@ #include "npc.h" #include "effects.h" -extern s32 D_8014B7F0; +extern s32 gLastRenderTaskCount; void spawn_drops(Enemy* enemy) { PlayerData* playerData = &gPlayerData; @@ -11,34 +11,34 @@ void spawn_drops(Enemy* enemy) { Npc* npc = get_npc_unsafe(enemy->npcID); Camera* camera = &gCameras[gCurrentCameraID]; s32 pickupDelay; - s32 sp28; - s32 numShadowSpaces; + s32 availableRenderTasks; + s32 availableShadows; s32 itemToDrop; f32 x, y, z; - f32 temp_f20; + f32 threshold; f32 chance; f32 attempts; - f32 temp_f24; + f32 fraction; s32 maxCoinBonus; s32 minCoinBonus; s32 tempMax; - s32 var_fp; - s32 var_s1; + s32 spawnCounter; + s32 dropCount; s32 totalWeight; s32 facingAngleSign; s32 angleMult; s32 i, j; s32 flags; - numShadowSpaces = 0; + availableShadows = 0; for (i = 0; i < MAX_SHADOWS; i++) { if (get_shadow_by_index(i) == NULL) { - numShadowSpaces++; + availableShadows++; } } - var_fp = 0; - sp28 = 246 - D_8014B7F0; + spawnCounter = 0; + availableRenderTasks = 256 - 10 - gLastRenderTaskCount; facingAngleSign = clamp_angle(camera->currentYaw + 90.0f); x = npc->pos.x; y = npc->pos.y + (npc->collisionHeight / 2); @@ -47,7 +47,7 @@ void spawn_drops(Enemy* enemy) { angleMult = 0; pickupDelay = 0; - var_s1 = drops->itemDropChance; + dropCount = drops->itemDropChance; if (drops->itemDropChance > rand_int(100)) { tempMax = 0; @@ -60,7 +60,7 @@ void spawn_drops(Enemy* enemy) { } totalWeight = 0; - var_s1 = rand_int(tempMax); + dropCount = rand_int(tempMax); itemToDrop = ITEM_NONE; for (i = 0; i < 8; i++) { @@ -75,7 +75,7 @@ void spawn_drops(Enemy* enemy) { } } - if (totalWeight >= var_s1) { + if (totalWeight >= dropCount) { itemToDrop = drops->itemDrops[3 * i]; do { } while (0); // TODO required to match break; @@ -90,13 +90,13 @@ void spawn_drops(Enemy* enemy) { if (itemToDrop != ITEM_NONE) { make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + angleMult * 360, 0); - var_fp++; + spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; - if (var_fp >= 12) { + if (spawnCounter >= 12) { angleMult++; facingAngleSign = angleMult * 8; - var_fp = 0; + spawnCounter = 0; } if (drops->itemDrops[3 * i + 2] >= 0) { @@ -108,35 +108,33 @@ void spawn_drops(Enemy* enemy) { if (encounter->dropWhackaBump) { encounter->dropWhackaBump = FALSE; make_item_entity(ITEM_WHACKAS_BUMP, x, y, z, 4, pickupDelay, facingAngleSign + angleMult * 360, 0); - var_fp++; + spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; - if (var_fp >= 12) { + if (spawnCounter >= 12) { angleMult++; facingAngleSign = angleMult * 8; - var_fp = 0; + spawnCounter = 0; } } - var_s1 = 0; - temp_f24 = playerData->curHP / (f32) playerData->curMaxHP; + dropCount = 0; itemToDrop = ITEM_NONE; + fraction = playerData->curHP / (f32) playerData->curMaxHP; for (i = 0; i < 8; i++) { - attempts = drops->heartDrops[4 * i]; - temp_f20 = drops->heartDrops[4 * i + 1]; - attempts /= 32767.0f; - temp_f20 /= 32767.0f; + attempts = drops->heartDrops[4 * i]; + threshold = drops->heartDrops[4 * i + 1]; + attempts /= 32767.0f; + threshold /= 32767.0f; - if (temp_f24 <= attempts && - rand_int(100) <= temp_f20 * 100.0f) - { + if (fraction <= attempts && rand_int(100) <= threshold * 100.0f) { attempts = drops->heartDrops[4 * i + 2]; chance = drops->heartDrops[4 * i + 3]; chance /= 32767.0f; for (j = 0; j < attempts; j++) { if (rand_int(100) <= chance * 100.0f) { - var_s1++; + dropCount++; } } break; @@ -144,56 +142,53 @@ void spawn_drops(Enemy* enemy) { } if (is_ability_active(ABILITY_HEART_FINDER) != 0) { - s32 temp = var_s1 + 1; - var_s1 = temp + rand_int(2); + dropCount += 1 + rand_int(2); } if (enemy->flags & ENEMY_FLAG_NO_DROPS) { - var_s1 = 0; + dropCount = 0; } - if (var_s1 != 0) { + if (dropCount != 0) { itemToDrop = ITEM_HEART; } - if (var_s1 * 2 > sp28) { - var_s1 = sp28 / 2; + if (dropCount * 2 > availableRenderTasks) { + dropCount = availableRenderTasks / 2; } - sp28 -= 2 * var_s1; - if (var_s1 > numShadowSpaces) { - var_s1 = numShadowSpaces; + availableRenderTasks -= 2 * dropCount; + if (dropCount > availableShadows) { + dropCount = availableShadows; } - numShadowSpaces -= var_s1; + availableShadows -= dropCount; - for (i = 0; i < var_s1; i++) { + for (i = 0; i < dropCount; i++) { make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + (angleMult * 360), 0); - var_fp++; + spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; - if (var_fp >= 12) { - var_fp = 0; + if (spawnCounter >= 12) { + spawnCounter = 0; angleMult++; facingAngleSign = angleMult * 8; } } - var_s1 = 0; + dropCount = 0; itemToDrop = ITEM_NONE; - temp_f24 = playerData->curFP / (f32) playerData->curMaxFP; + fraction = playerData->curFP / (f32) playerData->curMaxFP; for (i = 0; i < 8; i++) { - attempts = drops->flowerDrops[4 * i + 0]; - temp_f20 = drops->flowerDrops[4 * i + 1]; - attempts /= 32767.0f; - temp_f20 /= 32767.0f; + attempts = drops->flowerDrops[4 * i + 0]; + threshold = drops->flowerDrops[4 * i + 1]; + attempts /= 32767.0f; + threshold /= 32767.0f; - if (temp_f24 <= attempts && - rand_int(100) <= temp_f20 * 100.0f) - { + if (fraction <= attempts && rand_int(100) <= threshold * 100.0f) { attempts = drops->flowerDrops[4 * i + 2]; chance = drops->flowerDrops[4 * i + 3]; chance /= 32767.0f; for (j = 0; j < attempts; j++) { if (rand_int(100) <= chance * 100.0f) { - var_s1++; + dropCount++; } } break; @@ -201,32 +196,31 @@ void spawn_drops(Enemy* enemy) { } if (is_ability_active(ABILITY_FLOWER_FINDER) != 0) { - s32 temp = var_s1 + 1; - var_s1 = temp + rand_int(2); + dropCount += 1 + rand_int(2); } if (enemy->flags & ENEMY_FLAG_NO_DROPS) { - var_s1 = 0; + dropCount = 0; } - if (var_s1 != 0) { + if (dropCount != 0) { itemToDrop = ITEM_FLOWER_POINT; } - if (var_s1 * 2 > sp28) { - var_s1 = sp28 / 2; + if (dropCount * 2 > availableRenderTasks) { + dropCount = availableRenderTasks / 2; } - sp28 -= 2 * var_s1; - if (var_s1 > numShadowSpaces) { - var_s1 = numShadowSpaces; + availableRenderTasks -= 2 * dropCount; + if (dropCount > availableShadows) { + dropCount = availableShadows; } - numShadowSpaces -= var_s1; + availableShadows -= dropCount; - for (i = 0; i < var_s1; i++) { + for (i = 0; i < dropCount; i++) { make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + (angleMult * 360), 0); - var_fp++; + spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; - if (var_fp >= 12) { - var_fp = 0; + if (spawnCounter >= 12) { + spawnCounter = 0; angleMult++; facingAngleSign = angleMult * 8; } @@ -238,61 +232,60 @@ void spawn_drops(Enemy* enemy) { tempMax = drops->maxCoinBonus; if (drops->maxCoinBonus < drops->minCoinBonus) { - var_s1 = minCoinBonus; + dropCount = minCoinBonus; minCoinBonus = tempMax; - tempMax = var_s1; + tempMax = dropCount; } if (minCoinBonus < 0) { - var_s1 = rand_int(tempMax - minCoinBonus) + minCoinBonus; + dropCount = rand_int(tempMax - minCoinBonus) + minCoinBonus; } else { - var_s1 = tempMax - minCoinBonus; - if (var_s1 != 0) { - var_s1 = rand_int(var_s1) + minCoinBonus; + dropCount = tempMax - minCoinBonus; + if (dropCount != 0) { + dropCount = rand_int(dropCount) + minCoinBonus; } else { - var_s1 = minCoinBonus; + dropCount = minCoinBonus; } } - if (var_s1 < 0) { - var_s1 = 0; + if (dropCount < 0) { + dropCount = 0; } - var_s1 = var_s1 + encounter->coinsEarned; - + dropCount = dropCount + encounter->coinsEarned; if (is_ability_active(ABILITY_PAY_OFF) != 0) { - var_s1 += encounter->damageTaken / 2; + dropCount += encounter->damageTaken / 2; encounter->damageTaken = 0; } if (encounter->merleeCoinBonus != 0) { encounter->merleeCoinBonus = 0; - var_s1 *= 3; + dropCount *= 3; } if (is_ability_active(ABILITY_MONEY_MONEY) != 0) { - var_s1 *= 2; + dropCount *= 2; } - if (var_s1 > 20) { - var_s1 = 20; + if (dropCount > 20) { + dropCount = 20; } if (enemy->flags & ENEMY_FLAG_NO_DROPS) { - var_s1 = 0; + dropCount = 0; } - if (var_s1 * 2 > sp28) { - var_s1 = sp28 / 2; + if (dropCount * 2 > availableRenderTasks) { + dropCount = availableRenderTasks / 2; } - sp28 -= 2 * var_s1; + availableRenderTasks -= 2 * dropCount; - if (var_s1 > numShadowSpaces) { - var_s1 = numShadowSpaces; + if (dropCount > availableShadows) { + dropCount = availableShadows; } - for (i = 0; i < var_s1; i++) { + for (i = 0; i < dropCount; i++) { make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + (angleMult * 360), 0); - var_fp++; + spawnCounter++; pickupDelay += 2; facingAngleSign = facingAngleSign + 30.0; - if (var_fp >= 12) { - var_fp = 0; + if (spawnCounter >= 12) { + spawnCounter = 0; angleMult++; facingAngleSign = angleMult * 8; } @@ -878,12 +871,12 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) { 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) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } switch (script->AI_TEMP_STATE) { diff --git a/src/38F00.c b/src/38F00.c index 4929c4f85b..0cac9c59cf 100644 --- a/src/38F00.c +++ b/src/38F00.c @@ -63,7 +63,7 @@ EvtScript D_800939B4 = { EVT_IF_EQ(LVar0, 0) EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(D_800939A4)) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY | NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_JUMPING, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, LVar2) EVT_SET(LVar0, 0) @@ -76,7 +76,7 @@ EvtScript D_800939B4 = { EVT_END_LOOP EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_6, 255, 255, 255, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(func_8005DDF0) EVT_CALL(BindNpcAI, NPC_SELF, LVar1) diff --git a/src/39210_len_aa0.c b/src/39210_len_aa0.c index 4aac7045f4..3310934cd0 100644 --- a/src/39210_len_aa0.c +++ b/src/39210_len_aa0.c @@ -35,7 +35,7 @@ void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* outAirborne) { } -void npc_follow_init(Npc* npc, s32 targetNpcID, s32* animIDs, f32 walkSpeed, f32 runSpeed, s32 idleRadius, s32 walkRadius) { +void npc_follow_init(Npc* npc, s32 targetNpcID, FollowAnims* anims, f32 walkSpeed, f32 runSpeed, s32 idleRadius, s32 walkRadius) { PlayerStatus* playerStatus = &gPlayerStatus; NpcFollowData* followData; s32 i; @@ -53,15 +53,15 @@ void npc_follow_init(Npc* npc, s32 targetNpcID, s32* animIDs, f32 walkSpeed, f32 followData->targetPointIdx = 0; followData->followState = NPC_FOLLOW_STATE_RUN; followData->targetNpcID = targetNpcID; - followData->animIDs = animIDs; + followData->anims = anims; followData->walkSpeed = walkSpeed; followData->runSpeed = runSpeed; followData->idleRadius = idleRadius; followData->walkRadius = walkRadius; - npc->currentAnim = followData->animIDs[4]; + npc->currentAnim = followData->anims->idle; npc->jumpVelocity = 0.0f; npc->flags |= NPC_FLAG_GRAVITY; - npc->flags &= ~NPC_FLAG_100; + npc->flags &= ~NPC_FLAG_IGNORE_PLAYER_COLLISION; npc->collisionChannel = COLLISION_CHANNEL_10000; } @@ -129,9 +129,9 @@ void npc_follow_npc(Npc* npc) { npc->moveSpeed = followData->runSpeed; } - npc->currentAnim = followData->animIDs[5]; - if (!(npc->flags & NPC_FLAG_1000)) { - npc->currentAnim = followData->animIDs[2]; + npc->currentAnim = followData->anims->run; + if (!(npc->flags & NPC_FLAG_FALLING)) { + npc->currentAnim = followData->anims->fall; } while (TRUE) { @@ -157,7 +157,7 @@ void npc_follow_npc(Npc* npc) { if (followData->targetPointIdx == followData->lastPointIdx) { npc->moveSpeed = 0.0f; yaw = npc->yaw; - npc->currentAnim = followData->animIDs[4]; + npc->currentAnim = followData->anims->idle; break; } @@ -165,7 +165,7 @@ void npc_follow_npc(Npc* npc) { if (dist <= followData->idleRadius) { npc->moveSpeed = 0.0f; yaw = npc->yaw; - npc->currentAnim = followData->animIDs[4]; + npc->currentAnim = followData->anims->idle; followData->followState = NPC_FOLLOW_STATE_IDLE; break; } @@ -177,7 +177,7 @@ void npc_follow_npc(Npc* npc) { historyPoint = &followData->moveHistory[followData->targetPointIdx]; targetX = historyPoint->pos.x; targetZ = historyPoint->pos.z; - if (npc->flags & NPC_FLAG_1000) { + if (npc->flags & NPC_FLAG_FALLING) { if (historyPoint->isAirborne) { followData->followState = NPC_FOLLOW_STATE_JUMP; break; @@ -185,12 +185,12 @@ void npc_follow_npc(Npc* npc) { } } - if (!(npc->flags & NPC_FLAG_1000)) { + if (!(npc->flags & NPC_FLAG_FALLING)) { npc->moveSpeed *= 0.5f; } npc->yaw = yaw; npc_move_heading(npc, npc->moveSpeed, yaw); - if ((npc->flags & NPC_FLAG_4000) && (npc->flags & NPC_FLAG_1000)) { + if ((npc->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD) && (npc->flags & NPC_FLAG_FALLING)) { followData->followState = NPC_FOLLOW_STATE_JUMP; } break; @@ -230,7 +230,7 @@ void npc_follow_npc(Npc* npc) { } npc->moveSpeed = npc->planarFlyDist / npc->duration; npc->jumpVelocity = (currentY + (npc->jumpScale * npc->duration * npc->duration * 0.5f)) / npc->duration; - npc->currentAnim = followData->animIDs[1]; + npc->currentAnim = followData->anims->jump; npc->flags &= ~NPC_FLAG_GRAVITY; followData->followState = NPC_FOLLOW_STATE_FALL; } @@ -239,7 +239,7 @@ void npc_follow_npc(Npc* npc) { npc->jumpVelocity -= npc->jumpScale; npc->pos.y += npc->jumpVelocity; if (npc->jumpVelocity <= 0.0f) { - npc->currentAnim = followData->animIDs[2]; + npc->currentAnim = followData->anims->fall; } npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (npc->jumpVelocity <= 0.0f) { @@ -250,7 +250,7 @@ void npc_follow_npc(Npc* npc) { if (npc_raycast_down_sides(npc->collisionChannel, ¤tX, ¤tY, ¤tZ, &dist) != 0 && dist <= fabsf(npc->jumpVelocity) + 8.0) { - npc->currentAnim = followData->animIDs[3]; + npc->currentAnim = followData->anims->land; npc->jumpVelocity = 0.0f; npc->pos.y = currentY; npc->flags |= NPC_FLAG_GRAVITY; diff --git a/src/77480.c b/src/77480.c index aec442e7c4..eb8ee516cc 100644 --- a/src/77480.c +++ b/src/77480.c @@ -41,7 +41,7 @@ void check_for_interactables(void); void func_800E0AD0(void); void func_800E0B14(void); void update_partner_timers(void); -void player_sprite_behaviour(void); +void player_update_sprite(void); s32 get_player_back_anim(s32 arg0); void appendGfx_player(void* data); void appendGfx_player_spin(void* data); @@ -655,7 +655,7 @@ void update_player(void) { handle_floor_behavior(); } - player_sprite_behaviour(); + player_update_sprite(); gameStatus = gGameStatusPtr; gameStatus->playerPos.x = playerStatus->position.x; @@ -1071,8 +1071,7 @@ s32 has_valid_conversation_npc(void) { s32 cond; if (npc != NULL && !(npc->flags & NPC_FLAG_10000000)) { - cond = (playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) - == PS_FLAG_HAS_CONVERSATION_NPC; + cond = (playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC; ret = cond; } return ret; @@ -1202,8 +1201,11 @@ void check_for_interactables(void) { curInteraction = -1; break; } - } else if (((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) - && (npc != NULL) && (npc->flags & NPC_FLAG_10000000)) { + } else if ( + ((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) + && (npc != NULL) + && (npc->flags & NPC_FLAG_10000000) + ) { curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; if (playerStatus->interactingWithID == curInteraction) { return; @@ -1295,7 +1297,7 @@ void update_partner_timers(void) { } } -void player_sprite_behaviour(void) { +void player_update_sprite(void) { PlayerStatus* playerStatus = &gPlayerStatus; f32 cameraYaw = gCameras[gCurrentCameraID].currentYaw; f32 camRelativeYaw = get_clamped_angle_diff(cameraYaw, playerStatus->currentYaw); diff --git a/src/7E9D0.c b/src/7E9D0.c index 1a55060b41..165d8f49b7 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -586,7 +586,7 @@ void peach_check_for_parasol_input(void) { disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise); if (disguiseNpc != NULL) { - disguiseNpc->flags &= ~NPC_FLAG_40000; + disguiseNpc->flags &= ~NPC_FLAG_IGNORE_CAMERA_FOR_YAW; } } } @@ -602,7 +602,7 @@ void peach_sync_disguise_npc(void) { if (PeachDisguiseNpcIndex >= 0) { Npc* npc = get_npc_by_index(PeachDisguiseNpcIndex); - if (npc->flags & NPC_FLAG_40000) { + if (npc->flags & NPC_FLAG_IGNORE_CAMERA_FOR_YAW) { npc->renderYaw = playerStatus->spriteFacingAngle; } else { npc->yaw = playerStatus->targetYaw; @@ -630,7 +630,7 @@ Npc* peach_make_disguise_npc(s32 peachDisguise) { playerStatus->peachDisguise = peachDisguise; gGameStatusPtr->peachDisguise = peachDisguise; - bpPtr->flags = NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_40000; + bpPtr->flags = NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW; bpPtr->initialAnim = BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle; bpPtr->onUpdate = NULL; bpPtr->onRender = NULL; diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index 92e92970f7..ff238d241a 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -681,7 +681,6 @@ void collision_main_lateral(void) { } collisionStatus->currentWall = result; if (!(playerStatus->flags & PS_FLAG_MOVEMENT_LOCKED) && playerStatus->actionState != ACTION_STATE_HAMMER) { - if (speed == 0.0f) { collision_check_player_intersecting_world(0, 0, playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].currentYaw); diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 30e4033fe4..d5afa5f884 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -484,7 +484,7 @@ DepthFloatFactors depthFloatLookupTable[] = { // The multiplication by 32 comes from scaling the RSP does to increase depth precision. #define MAX_VIEWPORT_DEPTH (2 * 32 * ((G_MAXZ / 2))) -s32 D_8014B7F0 = 0; +s32 gLastRenderTaskCount = 0; // padding? s32 D_8014B7F4 = 0; @@ -6231,7 +6231,7 @@ void execute_render_tasks(void) { } } - D_8014B7F0 = taskCount; + gLastRenderTaskCount = taskCount; taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; if (gOverrideFlags & GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION) { Mtx* dispMtx; diff --git a/src/actor_api.c b/src/actor_api.c index 76cfb20f38..a6c597fc6c 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -810,17 +810,17 @@ ApiStatus SetAnimation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - s32 a1; - s32 animationIndex; + s32 partID; + AnimID animID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - a1 = evt_get_variable(script, *args++); - animationIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); + animID = evt_get_variable(script, *args++); - set_animation(actorID, a1, animationIndex); + set_animation(actorID, partID, animID); return ApiStatus_DONE2; } diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index f7272d24e6..9156a04e04 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -426,7 +426,7 @@ EvtScript N(leechAttack) = { EVT_WAIT(30) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, 49, 32767) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 32767) EVT_CALL(ShowActionHud, 1) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) @@ -437,7 +437,7 @@ EvtScript N(leechAttack) = { EVT_SET(LVarD, 0) EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Bite) EVT_SET(LocalFlag(0), 0) diff --git a/src/battle/battle.h b/src/battle/battle.h index a02d7ecd1a..07ddd490f9 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -298,7 +298,7 @@ typedef struct BattleMoveEntry { .romStart = name##_ROM_START, \ .romEnd = name##_ROM_END, \ .vramStart = name##_VRAM, \ - .mainScript = &battle_item_##name##_##main \ + .mainScript = &battle_item_##name##_##EVS_UseItem \ } typedef struct ActorBlueprint { diff --git a/src/battle/move/item/ItemRefund.inc.c b/src/battle/common/move/ItemRefund.inc.c similarity index 100% rename from src/battle/move/item/ItemRefund.inc.c rename to src/battle/common/move/ItemRefund.inc.c diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 572acb2077..78284f320c 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -124,7 +124,7 @@ EvtScript N(802A2C20) = { EVT_CALL(PlaySound, SOUND_2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, 100, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/item/UseItem.inc.c b/src/battle/common/move/UseItem.inc.c similarity index 100% rename from src/battle/move/item/UseItem.inc.c rename to src/battle/common/move/UseItem.inc.c diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c index b59194e0b7..e3118314ec 100644 --- a/src/battle/move/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -1,14 +1,16 @@ -#include "coconut.h" +#include "common.h" +#include "script_api/battle.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/move/item/coconut.png.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_coconut -#include "UseItem.inc.c" +#include "battle/common/move/ItemRefund.inc.c" +#include "battle/common/move/UseItem.inc.c" static s32 _pad = 0; +#include "battle/move/item/coconut.png.h" #include "battle/move/item/coconut.png.inc.c" #include "battle/move/item/coconut.pal.inc.c" @@ -44,7 +46,7 @@ Gfx N(displayList)[] = { EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST); -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_COCONUT) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) diff --git a/src/battle/move/item/coconut.h b/src/battle/move/item/coconut.h deleted file mode 100644 index 413fe5a1fb..0000000000 --- a/src/battle/move/item/coconut.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BATTLE_ITEM_COCONUT -#define BATTLE_ITEM_COCONUT - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_coconut - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -API_CALLABLE(func_802A1000_72F720); -API_CALLABLE(func_802A11D4_72F8F4); - -#endif diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index 91e95cc82c..7057bf4e90 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -1,9 +1,12 @@ -#include "dizzy_dial.h" +#include "common.h" +#include "script_api/battle.h" #include "camera.h" +#define NAMESPACE battle_item_dizzy_dial + static s32 D_802A1CD0; -#include "ItemRefund.inc.c" +#include "battle/common/move/ItemRefund.inc.c" void func_802A123C_727B4C(void) { func_80138D88(0, 0, 0x140, 0xF0, 160.0f); @@ -43,10 +46,10 @@ API_CALLABLE(N(func_802A1270_727B80)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000009A) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_DIZZY_DIAL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/move/item/dizzy_dial.h b/src/battle/move/item/dizzy_dial.h deleted file mode 100644 index 897a082df9..0000000000 --- a/src/battle/move/item/dizzy_dial.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BATTLE_ITEM_DIZZY_DIAL -#define BATTLE_ITEM_DIZZY_DIAL - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_dizzy_dial - -API_CALLABLE(ItemAfflictEnemy); -API_CALLABLE(N(func_802A1270_727B80)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/dried_shroom.c b/src/battle/move/item/dried_shroom.c index 5fd1ff0c28..7f811fc920 100644 --- a/src/battle/move/item/dried_shroom.c +++ b/src/battle/move/item/dried_shroom.c @@ -1,9 +1,12 @@ -#include "dried_shroom.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_dried_shroom -API_CALLABLE(N(func_802A123C_71CF1C)) { +#include "battle/common/move/ItemRefund.inc.c" + +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -25,17 +28,17 @@ API_CALLABLE(N(func_802A12FC_71CFDC)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000008D) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_DRIED_SHROOM) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_StickOutTongue) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A123C_71CF1C), LVar0, LVar1, LVar2, 1) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, 1) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) diff --git a/src/battle/move/item/dried_shroom.h b/src/battle/move/item/dried_shroom.h deleted file mode 100644 index 3312b87931..0000000000 --- a/src/battle/move/item/dried_shroom.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_DRIED_SHROOM -#define BATTLE_ITEM_DRIED_SHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_dried_shroom - -API_CALLABLE(N(func_802A123C_71CF1C)); -API_CALLABLE(N(func_802A12FC_71CFDC)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c index 7130bac318..1711d54d34 100644 --- a/src/battle/move/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -1,25 +1,27 @@ -#include "dusty_hammer.h" +#include "common.h" +#include "script_api/battle.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/move/item/dusty_hammer.png.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_dusty_hammer -#include "UseItem.inc.c" +#include "battle/common/move/ItemRefund.inc.c" +#include "battle/common/move/UseItem.inc.c" static s32 _pad = 0; // XXX +#include "battle/move/item/dusty_hammer.png.h" #include "battle/move/item/dusty_hammer.png.inc.c" #include "battle/move/item/dusty_hammer.pal.inc.c" -Vtx N(model)[] = { +Vtx N(DustyHammerVtx)[] = { { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, { .v = {{ 15, -16, 0 }, FALSE, { 1024, 0 }, { 0, 0, 0, 255 }}}, { .v = {{ 15, 15, 0 }, FALSE, { 1024, 1024 }, { 0, 0, 0, 255 }}}, { .v = {{ -16, 15, 0 }, FALSE, { 0, 1024 }, { 0, 0, 0, 255 }}}, }; -Gfx N(displayList)[] = { +Gfx N(DustyHammerGfx)[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -34,16 +36,16 @@ Gfx N(displayList)[] = { gsDPLoadTextureTile_4b(battle_item_dusty_hammer_png, G_IM_FMT_CI, battle_item_dusty_hammer_png_width, battle_item_dusty_hammer_png_height, 0, 0, battle_item_dusty_hammer_png_width - 1, battle_item_dusty_hammer_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSPVertex(N(DustyHammerVtx), ARRAY_COUNT(N(DustyHammerVtx)), 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST); +EntityModelScript N(EMS_DustyHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(DustyHammerGfx), RENDER_MODE_ALPHATEST); -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_DUSTY_HAMMER) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -51,7 +53,7 @@ EvtScript N(main) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(modelCommandList))) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_DustyHammer))) EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_CALL(MultiplyByActorScale, LVar0) EVT_CALL(SetVirtualEntityScale, LVarA, LVar0, LVar0, LVar0) diff --git a/src/battle/move/item/dusty_hammer.h b/src/battle/move/item/dusty_hammer.h deleted file mode 100644 index f08458e9eb..0000000000 --- a/src/battle/move/item/dusty_hammer.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef BATTLE_ITEM_DUSTY_HAMMER -#define BATTLE_ITEM_DUSTY_HAMMER - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_dusty_hammer - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index 5fb98c2b9f..9677885f30 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -1,13 +1,12 @@ -#include "egg_missile.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/move/item/egg_missile1.png.h" -#include "battle/move/item/egg_missile2.png.h" -#include "battle/move/item/egg_missile3.png.h" -#include "battle/move/item/egg_missile4.png.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_egg_missile + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_71CF1C)) { Bytecode* args = script->ptrReadPos; @@ -21,27 +20,34 @@ API_CALLABLE(N(func_802A123C_71CF1C)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" static s32 _pad = 0; +#include "battle/move/item/egg_missile1.png.h" #include "battle/move/item/egg_missile1.png.inc.c" #include "battle/move/item/egg_missile1.pal.inc.c" + +#include "battle/move/item/egg_missile2.png.h" #include "battle/move/item/egg_missile2.png.inc.c" #include "battle/move/item/egg_missile2.pal.inc.c" + +#include "battle/move/item/egg_missile3.png.h" #include "battle/move/item/egg_missile3.png.inc.c" #include "battle/move/item/egg_missile3.pal.inc.c" + +#include "battle/move/item/egg_missile4.png.h" #include "battle/move/item/egg_missile4.png.inc.c" #include "battle/move/item/egg_missile4.pal.inc.c" -Vtx N(model)[] = { +Vtx N(EggMissileVtx)[] = { { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, { .v = {{ 15, -16, 0 }, FALSE, { 1024, 0 }, { 0, 0, 0, 255 }}}, { .v = {{ 15, 15, 0 }, FALSE, { 1024, 1024 }, { 0, 0, 0, 255 }}}, { .v = {{ -16, 15, 0 }, FALSE, { 0, 1024 }, { 0, 0, 0, 255 }}}, }; -Gfx N(frame1_displayList)[] = { +Gfx N(Frame1Gfx)[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -56,14 +62,14 @@ Gfx N(frame1_displayList)[] = { gsDPLoadTextureTile_4b(battle_item_egg_missile1_png, G_IM_FMT_CI, battle_item_egg_missile1_png_width, battle_item_egg_missile1_png_height, 0, 0, battle_item_egg_missile1_png_width - 1, battle_item_egg_missile1_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSPVertex(N(EggMissileVtx), ARRAY_COUNT(N(EggMissileVtx)), 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -Gfx N(frame2_displayList)[] = { +Gfx N(Frame2Gfx)[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -78,14 +84,14 @@ Gfx N(frame2_displayList)[] = { gsDPLoadTextureTile_4b(battle_item_egg_missile2_png, G_IM_FMT_CI, battle_item_egg_missile2_png_width, 0, 0, 0, battle_item_egg_missile2_png_width - 1, battle_item_egg_missile2_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSPVertex(N(EggMissileVtx), ARRAY_COUNT(N(EggMissileVtx)), 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -Gfx N(frame3_displayList)[] = { +Gfx N(Frame3Gfx)[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -100,14 +106,14 @@ Gfx N(frame3_displayList)[] = { gsDPLoadTextureTile_4b(battle_item_egg_missile3_png, G_IM_FMT_CI, battle_item_egg_missile3_png_width, 0, 0, 0, battle_item_egg_missile3_png_width - 1, battle_item_egg_missile3_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSPVertex(N(EggMissileVtx), ARRAY_COUNT(N(EggMissileVtx)), 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -Gfx N(frame4_displayList)[] = { +Gfx N(Frame4Gfx)[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -122,34 +128,34 @@ Gfx N(frame4_displayList)[] = { gsDPLoadTextureTile_4b(battle_item_egg_missile4_png, G_IM_FMT_CI, battle_item_egg_missile4_png_width, 0, 0, 0, battle_item_egg_missile4_png_width - 1, battle_item_egg_missile4_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSPVertex(N(EggMissileVtx), ARRAY_COUNT(N(EggMissileVtx)), 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -EntityModelScript N(modelCommandList) = { +EntityModelScript N(EMS_EggMissile) = { ems_SetRenderMode(RENDER_MODE_ALPHATEST) - ems_Draw(N(frame1_displayList), 2) - ems_Draw(N(frame2_displayList), 2) - ems_Draw(N(frame3_displayList), 2) + ems_Draw(N(Frame1Gfx), 2) + ems_Draw(N(Frame2Gfx), 2) + ems_Draw(N(Frame3Gfx), 2) ems_Restart ems_End }; EntityModelScript unusedModelScript = STANDARD_ENTITY_MODEL_SCRIPT( - N(frame4_displayList), RENDER_MODE_ALPHATEST); + N(Frame4Gfx), RENDER_MODE_ALPHATEST); -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_EGG_MISSILE) - EVT_EXEC_WAIT(battle_item_egg_missile_UseItemWithEffect) + EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, 0, 0, 65558) + EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_Throw) EVT_CALL(PlaySound, 1018) EVT_WAIT(3) - EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(battle_item_egg_missile_modelCommandList)) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_EggMissile))) EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 42) @@ -170,8 +176,8 @@ EvtScript N(main) = { EVT_ADD(LVar2, 5) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(DeleteVirtualEntity, LVarA) - EVT_CALL(PlaySound, 8208) - EVT_CALL(battle_item_egg_missile_func_802A123C_71CF1C, LVar0, LVar1, LVar2) + EVT_CALL(PlaySound, SOUND_2010) + EVT_CALL(N(func_802A123C_71CF1C), LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(StartRumble, 5) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) @@ -181,7 +187,7 @@ EvtScript N(main) = { EVT_END_THREAD EVT_CALL(GetItemPower, 200, LVar0, LVar1) EVT_CALL(ItemDamageEnemy, LVar0, 402653698, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_EXEC_WAIT(battle_item_egg_missile_PlayerGoHome) + EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN EVT_END }; diff --git a/src/battle/move/item/egg_missile.h b/src/battle/move/item/egg_missile.h deleted file mode 100644 index 9d3cbd8a38..0000000000 --- a/src/battle/move/item/egg_missile.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef BATTLE_ITEM_EGG_MISSILE -#define BATTLE_ITEM_EGG_MISSILE - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_egg_missile - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -API_CALLABLE(N(func_802A123C_71CF1C)); - -#endif diff --git a/src/battle/move/item/electro_pop.c b/src/battle/move/item/electro_pop.c index 802118d579..8118b31e5e 100644 --- a/src/battle/move/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -1,7 +1,11 @@ -#include "electro_pop.h" +#include "common.h" +#include "script_api/battle.h" + #include "effects.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_electro_pop + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_7307DC)) { BattleStatus* battleStatus = &gBattleStatus; @@ -12,7 +16,7 @@ API_CALLABLE(N(func_802A123C_7307DC)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A127C_73081C)) { +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -24,7 +28,7 @@ API_CALLABLE(N(func_802A127C_73081C)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A133C_7308DC)) { +API_CALLABLE(N(ShowFlowerRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -82,15 +86,15 @@ API_CALLABLE(N(func_802A14F0_730A90)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x000000CC) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_ELECTRO_POP) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlaySound, SOUND_379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_7307DC)) @@ -99,7 +103,7 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) - EVT_CALL(N(func_802A133C_7308DC), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(ShowFlowerRecoveryFX), LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) diff --git a/src/battle/move/item/electro_pop.h b/src/battle/move/item/electro_pop.h deleted file mode 100644 index 65bfaadb24..0000000000 --- a/src/battle/move/item/electro_pop.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef BATTLE_ITEM_ELECTRO_POP -#define BATTLE_ITEM_ELECTRO_POP - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_electro_pop - -API_CALLABLE(N(func_802A123C_7307DC)); -API_CALLABLE(N(func_802A14F0_730A90)); -API_CALLABLE(N(func_802A133C_7308DC)); -API_CALLABLE(N(AddFP)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index 563c5555bb..dba3b9f25d 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -1,8 +1,11 @@ -#include "fire_flower.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_fire_flower + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_716E9C)) { Bytecode* args = script->ptrReadPos; @@ -33,10 +36,10 @@ API_CALLABLE(N(func_802A1378_716FD8)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000080) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_FIRE_FLOWER) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(PlaySound, SOUND_377) diff --git a/src/battle/move/item/fire_flower.h b/src/battle/move/item/fire_flower.h deleted file mode 100644 index e3ad2dbb39..0000000000 --- a/src/battle/move/item/fire_flower.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_FIRE_FLOWER -#define BATTLE_ITEM_FIRE_FLOWER - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_fire_flower - -API_CALLABLE(N(FadeBackgroundToBlack)); -API_CALLABLE(N(func_802A123C_716E9C)); -API_CALLABLE(N(func_802A1378_716FD8)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/food.c b/src/battle/move/item/food.c index e43f581811..85969b0d08 100644 --- a/src/battle/move/item/food.c +++ b/src/battle/move/item/food.c @@ -1,10 +1,13 @@ -#include "food.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" +#define NAMESPACE battle_item_food + extern EntityModelScript D_80283EE8; -#include "ItemRefund.inc.c" +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_73330C)) { Bytecode* args = script->ptrReadPos; @@ -44,7 +47,7 @@ API_CALLABLE(N(func_802A12EC_7333BC)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1378_733448)) { +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -56,7 +59,7 @@ API_CALLABLE(N(func_802A1378_733448)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1438_733508)) { +API_CALLABLE(N(ShowFlowerRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -69,7 +72,6 @@ API_CALLABLE(N(func_802A1438_733508)) { } #include "common/AddHP.inc.c" - #include "common/AddFP.inc.c" API_CALLABLE(N(func_802A15A0_733670)) { @@ -96,9 +98,9 @@ API_CALLABLE(N(func_802A15A0_733670)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(script6) = { +EvtScript N(EVS_FeedPartner) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -176,15 +178,15 @@ EvtScript N(script6) = { EVT_END }; -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET(LVarE, LVar1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SET(LVarA, LVar1) EVT_CALL(N(func_802A15A0_733670), LVarA) EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_IF_EQ(LVar0, 256) - EVT_EXEC_WAIT(N(script6)) + EVT_IF_EQ(LVar0, ACTOR_PARTNER) + EVT_EXEC_WAIT(N(EVS_FeedPartner)) EVT_RETURN EVT_END_IF EVT_SET(LVar1, LVarE) @@ -201,19 +203,19 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A1378_733448), LVar0, LVar1, LVar2, LVarB) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, LVarB) EVT_END_IF EVT_IF_LT(LVarB, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A1378_733448), LVar0, LVar1, LVar2, LVarB) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, LVarB) EVT_END_IF EVT_IF_GT(LVarC, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) - EVT_CALL(N(func_802A1438_733508), LVar0, LVar1, LVar2, LVarC) + EVT_CALL(N(ShowFlowerRecoveryFX), LVar0, LVar1, LVar2, LVarC) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) diff --git a/src/battle/move/item/food.h b/src/battle/move/item/food.h deleted file mode 100644 index b94854d519..0000000000 --- a/src/battle/move/item/food.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef BATTLE_ITEM_FOOD -#define BATTLE_ITEM_FOOD - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_food - -API_CALLABLE(N(func_802A123C_73330C)); -API_CALLABLE(N(func_802A12EC_7333BC)); -API_CALLABLE(N(func_802A15A0_733670)); -API_CALLABLE(N(func_802A1378_733448)); -API_CALLABLE(N(func_802A1438_733508)); -API_CALLABLE(N(AddHP)); -API_CALLABLE(N(AddFP)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); -extern EvtScript N(EatItem); -extern EvtScript N(DrinkItem); - -#endif diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index e463834205..537958309b 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -1,7 +1,10 @@ -#include "fright_jar.h" +#include "common.h" +#include "script_api/battle.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_fright_jar + +#include "battle/common/move/ItemRefund.inc.c" #include "common/FadeBackgroundToBlack.inc.c" @@ -21,10 +24,10 @@ API_CALLABLE(N(func_802A12D4_72BBE4)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000098) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_FRIGHT_JAR) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) EVT_THREAD diff --git a/src/battle/move/item/fright_jar.h b/src/battle/move/item/fright_jar.h deleted file mode 100644 index 429eee223a..0000000000 --- a/src/battle/move/item/fright_jar.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BATTLE_ITEM_FRIGHT_JAR -#define BATTLE_ITEM_FRIGHT_JAR - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_fright_jar - -API_CALLABLE(N(FadeBackgroundToBlack)); -API_CALLABLE(N(func_802A12D4_72BBE4)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index 6b8a713b72..122ad03bb5 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -1,6 +1,9 @@ -#include "hustle_drink.h" +#include "common.h" +#include "script_api/battle.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_hustle_drink + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_72619C)) { BattleStatus* battleStatus = &gBattleStatus; @@ -34,9 +37,9 @@ API_CALLABLE(N(func_802A12C4_726224)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_HUSTLE_DRINK) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(DrinkItem)) diff --git a/src/battle/move/item/hustle_drink.h b/src/battle/move/item/hustle_drink.h deleted file mode 100644 index eb32576f1b..0000000000 --- a/src/battle/move/item/hustle_drink.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_HUSTLE_DRINK -#define BATTLE_ITEM_HUSTLE_DRINK - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_hustle_drink - -API_CALLABLE(N(func_802A12C4_726224)); -API_CALLABLE(N(func_802A123C_72619C)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(DrinkItem); - -#endif diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index 25c4a45601..efe1d34fb8 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -1,10 +1,12 @@ -#include "insecticide_herb.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/move/item/insecticide_herb.png.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_insecticide_herb + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_72A98C)) { BattleStatus* battleStatus = &gBattleStatus; @@ -49,10 +51,11 @@ API_CALLABLE(N(func_802A12E0_72AA30)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" static s32 _pad = 0; // XXX +#include "battle/move/item/insecticide_herb.png.h" #include "battle/move/item/insecticide_herb.png.inc.c" #include "battle/move/item/insecticide_herb.pal.inc.c" @@ -88,7 +91,7 @@ Gfx N(displayList)[] = { EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST); -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_INSECTICIDE_HERB) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) diff --git a/src/battle/move/item/insecticide_herb.h b/src/battle/move/item/insecticide_herb.h deleted file mode 100644 index fd807d3ba4..0000000000 --- a/src/battle/move/item/insecticide_herb.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BATTLE_ITEM_INSECTICIDE_HERB -#define BATTLE_ITEM_INSECTICIDE_HERB - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_insecticide_herb - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -API_CALLABLE(N(func_802A12E0_72AA30)); -API_CALLABLE(N(func_802A123C_72A98C)); -API_CALLABLE(N(func_802A1280_72A9D0)); - -#endif diff --git a/src/battle/move/item/life_shroom.c b/src/battle/move/item/life_shroom.c index 05d0d66390..183807d37b 100644 --- a/src/battle/move/item/life_shroom.c +++ b/src/battle/move/item/life_shroom.c @@ -1,10 +1,13 @@ -#include "life_shroom.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" +#define NAMESPACE battle_item_life_shroom + extern EntityModelScript D_80283EE8; -#include "ItemRefund.inc.c" +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_72E76C)) { Bytecode* args = script->ptrReadPos; @@ -44,7 +47,7 @@ API_CALLABLE(N(func_802A12EC_72E81C)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1378_72E8A8)) { +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -85,7 +88,7 @@ API_CALLABLE(N(func_802A1484_72E9B4)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) @@ -165,7 +168,7 @@ EvtScript N(script6) = { EVT_END }; -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET(LVarF, LVar1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SET(LVarA, LVar1) @@ -176,7 +179,7 @@ EvtScript N(main) = { EVT_EXEC_WAIT(N(script6)) EVT_RETURN EVT_END_IF - EVT_SET_CONST(LVarA, 0x00000095) + EVT_SET_CONST(LVarA, ITEM_LIFE_SHROOM) EVT_SET(LVar1, LVarF) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) @@ -184,7 +187,7 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A1378_72E8A8), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) diff --git a/src/battle/move/item/life_shroom.h b/src/battle/move/item/life_shroom.h deleted file mode 100644 index 237634cfa3..0000000000 --- a/src/battle/move/item/life_shroom.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef BATTLE_ITEM_LIFE_SHROOM -#define BATTLE_ITEM_LIFE_SHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_life_shroom - -API_CALLABLE(N(func_802A123C_72E76C)); -API_CALLABLE(N(func_802A12EC_72E81C)); -API_CALLABLE(N(func_802A1484_72E9B4)); -API_CALLABLE(N(func_802A1438_72E968)); -API_CALLABLE(N(func_802A1378_72E8A8)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/item/mushroom.c b/src/battle/move/item/mushroom.c index f01bab8b46..0a40212600 100644 --- a/src/battle/move/item/mushroom.c +++ b/src/battle/move/item/mushroom.c @@ -1,10 +1,13 @@ -#include "mushroom.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" +#define NAMESPACE battle_item_mushroom + extern EntityModelScript D_80283EE8; -#include "ItemRefund.inc.c" +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_715A8C)) { Bytecode* args = script->ptrReadPos; @@ -44,7 +47,7 @@ API_CALLABLE(N(func_802A12EC_715B3C)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1378_715BC8)) { +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -56,7 +59,7 @@ API_CALLABLE(N(func_802A1378_715BC8)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1438_715C88)) { +API_CALLABLE(N(ShowFlowerRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -84,7 +87,7 @@ API_CALLABLE(N(func_802A15A0_715DF0)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) @@ -164,7 +167,7 @@ EvtScript N(script6) = { EVT_END }; -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET(LVarE, LVar1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SET(LVarA, LVar1) @@ -185,13 +188,13 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A1378_715BC8), LVar0, LVar1, LVar2, LVarB) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, LVarB) EVT_END_IF EVT_IF_GT(LVarC, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) - EVT_CALL(N(func_802A1438_715C88), LVar0, LVar1, LVar2, LVarC) + EVT_CALL(N(ShowFlowerRecoveryFX), LVar0, LVar1, LVar2, LVarC) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) diff --git a/src/battle/move/item/mushroom.h b/src/battle/move/item/mushroom.h deleted file mode 100644 index fef2eb4ed8..0000000000 --- a/src/battle/move/item/mushroom.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef BATTLE_ITEM_MUSHROOM -#define BATTLE_ITEM_MUSHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_mushroom - -API_CALLABLE(N(func_802A123C_715A8C)); -API_CALLABLE(N(func_802A12EC_715B3C)); -API_CALLABLE(N(func_802A15A0_715DF0)); -API_CALLABLE(N(func_802A1378_715BC8)); -API_CALLABLE(N(func_802A1438_715C88)); -API_CALLABLE(N(AddHP)); -API_CALLABLE(N(AddFP)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index 579daed608..c3e229092c 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -1,10 +1,73 @@ -#include "mystery.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/move/item/mystery.png.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_mystery + +#include "battle/common/move/ItemRefund.inc.c" + +#include "battle/common/move/UseItem.inc.c" + +static s32 _pad = 0; + +#include "battle/move/item/mystery.png.h" +#include "battle/move/item/mystery.png.inc.c" +#include "battle/move/item/mystery.pal.inc.c" + +Vtx N(model)[] = { + { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, + { .v = {{ 15, -16, 0 }, FALSE, { 1024, 0 }, { 0, 0, 0, 255 }}}, + { .v = {{ 15, 15, 0 }, FALSE, { 1024, 1024 }, { 0, 0, 0, 255 }}}, + { .v = {{ -16, 15, 0 }, FALSE, { 0, 1024 }, { 0, 0, 0, 255 }}}, +}; + +Gfx N(displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, battle_item_mystery_pal), + gsDPLoadTextureTile_4b(battle_item_mystery_png, G_IM_FMT_CI, battle_item_mystery_png_width, battle_item_mystery_png_height, 0, 0, battle_item_mystery_png_width - 1, battle_item_mystery_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST); + +s32 N(D_802A227C_72D82C)[8] = { + ITEM_MUSHROOM, + ITEM_SUPER_SHROOM, + ITEM_FIRE_FLOWER, + ITEM_STONE_CAP, + ITEM_DIZZY_DIAL, + ITEM_THUNDER_RAGE, + ITEM_PEBBLE, + ITEM_MUSHROOM +}; + +s32 N(D_802A229C_72D84C)[8] = { + ITEM_MUSHROOM, + ITEM_SUPER_SHROOM, + ITEM_PEBBLE, + ITEM_STONE_CAP, + ITEM_MUSHROOM, + ITEM_SUPER_SHROOM, + ITEM_PEBBLE, + ITEM_MUSHROOM +}; extern IconHudScriptPair gItemHudScripts[]; @@ -171,67 +234,7 @@ API_CALLABLE(N(func_802A188C_72CE3C)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" - -static s32 _pad = 0; - -#include "battle/move/item/mystery.png.inc.c" -#include "battle/move/item/mystery.pal.inc.c" - -Vtx N(model)[] = { - { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, - { .v = {{ 15, -16, 0 }, FALSE, { 1024, 0 }, { 0, 0, 0, 255 }}}, - { .v = {{ 15, 15, 0 }, FALSE, { 1024, 1024 }, { 0, 0, 0, 255 }}}, - { .v = {{ -16, 15, 0 }, FALSE, { 0, 1024 }, { 0, 0, 0, 255 }}}, -}; - -Gfx N(displayList)[] = { - gsDPPipeSync(), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsDPSetTexturePersp(G_TP_PERSP), - gsDPSetTextureDetail(G_TD_CLAMP), - gsDPSetTextureLOD(G_TL_TILE), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureFilter(G_TF_AVERAGE), - gsDPSetTextureConvert(G_TC_FILT), - gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, battle_item_mystery_pal), - gsDPLoadTextureTile_4b(battle_item_mystery_png, G_IM_FMT_CI, battle_item_mystery_png_width, battle_item_mystery_png_height, 0, 0, battle_item_mystery_png_width - 1, battle_item_mystery_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), - gsSPClearGeometryMode(G_LIGHTING), - gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsDPPipeSync(), - gsSPEndDisplayList(), -}; - -EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST); - -s32 N(D_802A227C_72D82C)[8] = { - ITEM_MUSHROOM, - ITEM_SUPER_SHROOM, - ITEM_FIRE_FLOWER, - ITEM_STONE_CAP, - ITEM_DIZZY_DIAL, - ITEM_THUNDER_RAGE, - ITEM_PEBBLE, - ITEM_MUSHROOM -}; - -s32 N(D_802A229C_72D84C)[8] = { - ITEM_MUSHROOM, - ITEM_SUPER_SHROOM, - ITEM_PEBBLE, - ITEM_STONE_CAP, - ITEM_MUSHROOM, - ITEM_SUPER_SHROOM, - ITEM_PEBBLE, - ITEM_MUSHROOM -}; - -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_MYSTERY) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD diff --git a/src/battle/move/item/mystery.h b/src/battle/move/item/mystery.h deleted file mode 100644 index 81fac9190b..0000000000 --- a/src/battle/move/item/mystery.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BATTLE_ITEM_MYSTERY -#define BATTLE_ITEM_MYSTERY - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_mystery - -API_CALLABLE(N(func_802A13E4_72C994)); -API_CALLABLE(N(func_802A188C_72CE3C)); - -typedef struct N(tempStc) { - s32 iconId; - s32 unk_04; -} N(tempStc); - -extern s32 N(D_802A227C_72D82C)[8]; -extern s32 N(D_802A229C_72D84C)[8]; -extern EvtScript N(UseItemWithEffect); - -#endif diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index 31ede09600..ba69c6f6c2 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -1,13 +1,16 @@ -#include "pebble.h" +#include "common.h" +#include "script_api/battle.h" #include "ld_addrs.h" -#include "battle/move/item/pebble.png.h" +#include "entity.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_pebble -#include "UseItem.inc.c" +#include "battle/common/move/ItemRefund.inc.c" +#include "battle/common/move/UseItem.inc.c" static s32 _pad = 0; +#include "battle/move/item/pebble.png.h" #include "battle/move/item/pebble.png.inc.c" #include "battle/move/item/pebble.pal.inc.c" @@ -40,11 +43,9 @@ Gfx N(displayList)[] = { gsSPEndDisplayList(), }; -s32 N(modelCommandList)[] = { - 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), (s32) &N(displayList), 0x00000002, 0x00000000, -}; +EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST); -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_PEBBLE) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) diff --git a/src/battle/move/item/pebble.h b/src/battle/move/item/pebble.h deleted file mode 100644 index 264cc1d921..0000000000 --- a/src/battle/move/item/pebble.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef BATTLE_ITEM_PEBBLE -#define BATTLE_ITEM_PEBBLE - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_pebble - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/please_come_back.c b/src/battle/move/item/please_come_back.c index ef0f8e8700..f560f99ce8 100644 --- a/src/battle/move/item/please_come_back.c +++ b/src/battle/move/item/please_come_back.c @@ -1,10 +1,12 @@ -#include "please_come_back.h" +#include "common.h" +#include "script_api/battle.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_please_come_back -#include "UseItem.inc.c" +#include "battle/common/move/ItemRefund.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_DIZZY_DIAL) //@bug should be ITEM_PLEASE_COME_BACK EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) @@ -18,4 +20,3 @@ EvtScript N(main) = { EVT_RETURN EVT_END }; - diff --git a/src/battle/move/item/please_come_back.h b/src/battle/move/item/please_come_back.h deleted file mode 100644 index 15088f18cb..0000000000 --- a/src/battle/move/item/please_come_back.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef BATTLE_ITEM_PLEASE_COME_BACK -#define BATTLE_ITEM_PLEASE_COME_BACK - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_please_come_back - -extern EvtScript N(UseItemWithEffect); - -#endif diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 57647e0804..5319317697 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -1,6 +1,10 @@ -#include "pow_block.h" +#include "common.h" +#include "script_api/battle.h" +#include "entity.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_pow_block + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_718A8C)) { BattleStatus* battleStatus = &gBattleStatus; @@ -45,9 +49,9 @@ API_CALLABLE(N(func_802A1318_718B68)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_POW_BLOCK) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_WAIT(10) diff --git a/src/battle/move/item/pow_block.h b/src/battle/move/item/pow_block.h deleted file mode 100644 index 24cccc06b6..0000000000 --- a/src/battle/move/item/pow_block.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef BATTLE_ITEM_POW_BLOCK -#define BATTLE_ITEM_POW_BLOCK - -#include "common.h" -#include "script_api/battle.h" -#include "entity.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_pow_block - -API_CALLABLE(N(func_802A1318_718B68)); -API_CALLABLE(N(func_802A123C_718A8C)); -API_CALLABLE(N(func_802A12E4_718B34)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index c60c302a3e..0d3cbc1aae 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -1,6 +1,9 @@ -#include "repel_gel.h" +#include "common.h" +#include "script_api/battle.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_repel_gel + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_72DDAC)) { BattleStatus* battleStatus = &gBattleStatus; @@ -14,9 +17,9 @@ API_CALLABLE(N(func_802A123C_72DDAC)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_REPEL_GEL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_375) diff --git a/src/battle/move/item/repel_gel.h b/src/battle/move/item/repel_gel.h deleted file mode 100644 index 8c7b427a42..0000000000 --- a/src/battle/move/item/repel_gel.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef BATTLE_ITEM_REPEL_GEL -#define BATTLE_ITEM_REPEL_GEL - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_repel_gel - -API_CALLABLE(N(func_802A123C_72DDAC)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index f268d12d6f..ea013e413c 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -1,10 +1,14 @@ -#include "shooting_star.h" +#include "common.h" +#include "script_api/battle.h" + #include "effects.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_shooting_star -API_CALLABLE(battle_item_shooting_star_func_802A123C_71D9AC) { +#include "battle/common/move/ItemRefund.inc.c" + +API_CALLABLE(N(func_802A123C_71D9AC)) { s32 t1 = 200; s32 r1 = rand_int(t1) + 100; // 100-299 s32 r2 = rand_int(40); // 0-39 @@ -62,9 +66,9 @@ API_CALLABLE(N(func_802A14D4_71DC44)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_SHOOTING_STAR) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD diff --git a/src/battle/move/item/shooting_star.h b/src/battle/move/item/shooting_star.h deleted file mode 100644 index 843e27f503..0000000000 --- a/src/battle/move/item/shooting_star.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef BATTLE_ITEM_SHOOTING_STAR -#define BATTLE_ITEM_SHOOTING_STAR - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_shooting_star - -API_CALLABLE(N(func_802A1444_71DBB4)); -API_CALLABLE(N(func_802A123C_71D9AC)); -API_CALLABLE(N(func_802A1388_71DAF8)); -API_CALLABLE(N(func_802A14D4_71DC44)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index 2c88104e34..e52fd0f123 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -1,12 +1,12 @@ -#include "sleepy_sheep.h" +#include "common.h" +#include "script_api/battle.h" #include "entity.h" #include "ld_addrs.h" #include "effects.h" -#include "battle/move/item/sleepy_sheep1.png.h" -#include "battle/move/item/sleepy_sheep2.png.h" -#include "battle/move/item/sleepy_sheep3.png.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_sleepy_sheep + +#include "battle/common/move/ItemRefund.inc.c" s32 virtual_entity_create(EntityModelScript*); void virtual_entity_set_pos(s32, s32, s32, s32); @@ -166,14 +166,19 @@ API_CALLABLE(N(func_802A1848_71EE98)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" static s32 _pad = 0; +#include "battle/move/item/sleepy_sheep1.png.h" #include "battle/move/item/sleepy_sheep1.png.inc.c" #include "battle/move/item/sleepy_sheep1.pal.inc.c" + +#include "battle/move/item/sleepy_sheep2.png.h" #include "battle/move/item/sleepy_sheep2.png.inc.c" #include "battle/move/item/sleepy_sheep2.pal.inc.c" + +#include "battle/move/item/sleepy_sheep3.png.h" #include "battle/move/item/sleepy_sheep3.png.inc.c" #include "battle/move/item/sleepy_sheep3.pal.inc.c" @@ -280,7 +285,7 @@ EntityModelScript N(modelCommandList3) = { ems_End }; -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_SLEEPY_SHEEP) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) diff --git a/src/battle/move/item/sleepy_sheep.h b/src/battle/move/item/sleepy_sheep.h deleted file mode 100644 index d65df1607c..0000000000 --- a/src/battle/move/item/sleepy_sheep.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef BATTLE_ITEM_SLEEPY_SHEEP -#define BATTLE_ITEM_SLEEPY_SHEEP - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_sleepy_sheep - -API_CALLABLE(SetVirtualEntityMoveSpeed); -API_CALLABLE(VirtualEntityMoveTo); -API_CALLABLE(ItemAfflictEnemy); - -API_CALLABLE(N(func_802A123C_71E88C)); -API_CALLABLE(N(func_802A1740_71ED90)); -API_CALLABLE(N(func_802A1848_71EE98)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif - - diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index 7fd5f74781..94a283a1ac 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -1,8 +1,11 @@ -#include "snowman_doll.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_snowman_doll + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_71C06C)) { Bytecode* args = script->ptrReadPos; @@ -34,10 +37,10 @@ API_CALLABLE(N(func_802A13B8_71C1E8)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000081) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_SNOWMAN_DOLL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_363) diff --git a/src/battle/move/item/snowman_doll.h b/src/battle/move/item/snowman_doll.h deleted file mode 100644 index ed4d8359b2..0000000000 --- a/src/battle/move/item/snowman_doll.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef BATTLE_ITEM_SNOWMAN_DOLL -#define BATTLE_ITEM_SNOWMAN_DOLL - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_snowman_doll - -API_CALLABLE(N(FadeBackgroundToBlack)); -API_CALLABLE(N(func_802A123C_71C06C)); -API_CALLABLE(N(func_802A13B8_71C1E8)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif - - diff --git a/src/battle/move/item/stone_cap.c b/src/battle/move/item/stone_cap.c index 0c2f3f6fd7..5d024d441c 100644 --- a/src/battle/move/item/stone_cap.c +++ b/src/battle/move/item/stone_cap.c @@ -1,7 +1,10 @@ -#include "stone_cap.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_stone_cap + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_7217DC)) { BattleStatus* battleStatus = &gBattleStatus; @@ -45,10 +48,10 @@ API_CALLABLE(N(func_802A123C_7217DC)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000088) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_STONE_CAP) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySound, SOUND_361) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30009) diff --git a/src/battle/move/item/stone_cap.h b/src/battle/move/item/stone_cap.h deleted file mode 100644 index 6028945d17..0000000000 --- a/src/battle/move/item/stone_cap.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_STONE_CAP -#define BATTLE_ITEM_STONE_CAP - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_stone_cap - -API_CALLABLE(N(func_802A123C_7217DC)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif - - diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index 762368f50f..a2ee02e634 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -1,8 +1,10 @@ -#include "stop_watch.h" +#include "common.h" +#include "script_api/battle.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_stop_watch +#include "battle/common/move/ItemRefund.inc.c" #include "common/FadeBackgroundToBlack.inc.c" API_CALLABLE(N(func_802A12D4_7270A4)) { @@ -21,10 +23,10 @@ API_CALLABLE(N(func_802A12D4_7270A4)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000092) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_STOP_WATCH) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD EVT_WAIT(5) diff --git a/src/battle/move/item/stop_watch.h b/src/battle/move/item/stop_watch.h deleted file mode 100644 index 7ad4a56b1d..0000000000 --- a/src/battle/move/item/stop_watch.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef BATTLE_ITEM_STOP_WATCH -#define BATTLE_ITEM_STOP_WATCH - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_stop_watch - -API_CALLABLE(ItemAfflictEnemy); - -API_CALLABLE(N(FadeBackgroundToBlack)); -API_CALLABLE(N(func_802A12D4_7270A4)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif - - diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index 353f324833..c8a3845a40 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -1,14 +1,39 @@ -#include "strange_cake.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "hud_element.h" + +#define NAMESPACE battle_item_strange_cake + +#include "battle/common/move/ItemRefund.inc.c" +#include "battle/common/move/UseItem.inc.c" + +static s32 _pad = 0; // XXX + #include "battle/move/item/strange_cake1.png.h" +#include "battle/move/item/strange_cake1.png.inc.c" +#include "battle/move/item/strange_cake1.pal.inc.c" + #include "battle/move/item/strange_cake2.png.h" +#include "battle/move/item/strange_cake2.png.inc.c" +#include "battle/move/item/strange_cake2.pal.inc.c" + #include "battle/move/item/strange_cake3.png.h" +#include "battle/move/item/strange_cake3.png.inc.c" +#include "battle/move/item/strange_cake3.pal.inc.c" -#include "ItemRefund.inc.c" +HudScript N(D_802A27D0) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake1, 32, 32); +HudScript N(D_802A27F8) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake2, 32, 32); +HudScript N(D_802A2820) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake3, 32, 32); -extern HudScript* N(D_802A2848_732B48)[]; -extern s32 N(D_802A2858_732B58)[]; +HudScript* N(D_802A2848_732B48)[] = { + &N(D_802A27F8), &N(D_802A2820), &N(D_802A27D0), &N(D_802A27F8) +}; + +// indexes into D_802A2848_732B48 +s32 N(D_802A2858_732B58)[] = { + 0, 1, 2, 0, 1, 0 +}; BSS s32 D_802A2DD4; // unused? BSS s32 D_802A2DD8[5]; @@ -151,7 +176,7 @@ s32 N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -API_CALLABLE(N(func_802A1818_731B18)) { +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -162,7 +187,7 @@ API_CALLABLE(N(func_802A1818_731B18)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A18D8_731BD8)) { +API_CALLABLE(N(ShowFlowerRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -174,7 +199,6 @@ API_CALLABLE(N(func_802A18D8_731BD8)) { } #include "common/AddHP.inc.c" - #include "common/AddFP.inc.c" API_CALLABLE(N(func_802A1A40_731D40)) { @@ -237,31 +261,11 @@ API_CALLABLE(N(func_802A1B68_731E68)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +extern EvtScript N(script7); +extern EvtScript N(script8); +extern EvtScript N(script9); -static s32 _pad = 0; // XXX - -#include "battle/move/item/strange_cake1.png.inc.c" -#include "battle/move/item/strange_cake1.pal.inc.c" -#include "battle/move/item/strange_cake2.png.inc.c" -#include "battle/move/item/strange_cake2.pal.inc.c" -#include "battle/move/item/strange_cake3.png.inc.c" -#include "battle/move/item/strange_cake3.pal.inc.c" - -HudScript N(D_802A27D0) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake1, 32, 32); -HudScript N(D_802A27F8) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake2, 32, 32); -HudScript N(D_802A2820) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake3, 32, 32); - -HudScript* N(D_802A2848_732B48)[] = { - &N(D_802A27F8), &N(D_802A2820), &N(D_802A27D0), &N(D_802A27F8) -}; - -// indexes into D_802A2848_732B48 -s32 N(D_802A2858_732B58)[] = { - 0, 1, 2, 0, 1, 0 -}; - -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar1, ITEM_KOOKY_COOKIE) EVT_SET_CONST(LVarA, ITEM_KOOKY_COOKIE) @@ -272,7 +276,7 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) - EVT_CALL(N(func_802A18D8_731BD8), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(ShowFlowerRecoveryFX), LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) @@ -317,7 +321,7 @@ EvtScript N(script7) = { EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_10002) EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, 87, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(N(func_802A1AD8_731DD8)) EVT_WAIT(20) EVT_CALL(ShowMessageBox, 16, 60) @@ -330,7 +334,7 @@ EvtScript N(script8) = { EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_10002) EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, 51, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(N(func_802A1B14_731E14)) EVT_WAIT(20) EVT_CALL(ShowMessageBox, 17, 60) diff --git a/src/battle/move/item/strange_cake.h b/src/battle/move/item/strange_cake.h deleted file mode 100644 index 9d67592d78..0000000000 --- a/src/battle/move/item/strange_cake.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef BATTLE_ITEM_STRANGE_CAKE -#define BATTLE_ITEM_STRANGE_CAKE - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_strange_cake - -API_CALLABLE(N(func_802A1A8C_731D8C)); -API_CALLABLE(N(func_802A18D8_731BD8)); -API_CALLABLE(N(AddFP)); -API_CALLABLE(N(func_802A13E4_7316E4)); -API_CALLABLE(N(func_802A1AD8_731DD8)); -API_CALLABLE(N(func_802A1B14_731E14)); -API_CALLABLE(N(func_802A1B68_731E68)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); -extern EvtScript N(script7); -extern EvtScript N(script8); -extern EvtScript N(script9); - -#endif - - diff --git a/src/battle/move/item/super_soda.c b/src/battle/move/item/super_soda.c index a322d88703..83b117a89f 100644 --- a/src/battle/move/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -1,10 +1,13 @@ -#include "super_soda.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "entity.h" +#define NAMESPACE battle_item_super_soda + extern EntityModelScript D_80283EE8; -#include "ItemRefund.inc.c" +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_724F1C)) { Bytecode* args = script->ptrReadPos; @@ -75,7 +78,7 @@ API_CALLABLE(N(func_802A1378_725058)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A1418_7250F8)) { +API_CALLABLE(N(ShowFlowerRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -88,7 +91,7 @@ API_CALLABLE(N(func_802A1418_7250F8)) { #include "common/AddFP.inc.c" -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) @@ -168,8 +171,8 @@ EvtScript N(script6) = { EVT_END }; -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000009B) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_SUPER_SODA) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -180,7 +183,7 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A1418_7250F8), LVar0, LVar1, LVar2, 5) + EVT_CALL(N(ShowFlowerRecoveryFX), LVar0, LVar1, LVar2, 5) EVT_CALL(N(AddFP), 5) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) diff --git a/src/battle/move/item/super_soda.h b/src/battle/move/item/super_soda.h deleted file mode 100644 index 702ed4c6cc..0000000000 --- a/src/battle/move/item/super_soda.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef BATTLE_ITEM_SUPER_SODA -#define BATTLE_ITEM_SUPER_SODA - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_super_soda - -API_CALLABLE(N(func_802A123C_724F1C)); -API_CALLABLE(N(func_802A12EC_724FCC)); -API_CALLABLE(N(func_802A1418_7250F8)); -API_CALLABLE(N(AddFP)); -API_CALLABLE(N(func_802A1378_725058)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); - -#endif diff --git a/src/battle/move/item/tasty_tonic.c b/src/battle/move/item/tasty_tonic.c index 488395b262..ce406117b4 100644 --- a/src/battle/move/item/tasty_tonic.c +++ b/src/battle/move/item/tasty_tonic.c @@ -1,7 +1,10 @@ -#include "tasty_tonic.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_tasty_tonic + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_72223C)) { s32 actorId = evt_get_variable(script, *script->ptrReadPos); @@ -30,10 +33,10 @@ API_CALLABLE(N(func_802A123C_72223C)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x89) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_TASTY_TONIC) EVT_EXEC_WAIT(battle_item_tasty_tonic_UseItemWithEffect) EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, LVar0, LVar1) diff --git a/src/battle/move/item/tasty_tonic.h b/src/battle/move/item/tasty_tonic.h deleted file mode 100644 index 7265afaca0..0000000000 --- a/src/battle/move/item/tasty_tonic.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BATTLE_ITEM_TASTY_TONIC -#define BATTLE_ITEM_TASTY_TONIC - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_tasty_tonic - -API_CALLABLE(N(func_802A123C_72223C)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(DrinkItem); - -#endif diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index 203f3a3646..a5cbc9d160 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -1,8 +1,11 @@ -#include "thunder_bolt.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_thunder_bolt + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_722D7C)) { Actor* enemyTarget = get_actor(script->owner1.enemyID); @@ -50,10 +53,10 @@ API_CALLABLE(N(func_802A1420_722F60)) { return ApiStatus_BLOCK; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x84) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_THUNDER_BOLT) EVT_EXEC_WAIT(battle_item_thunder_bolt_UseItemWithEffect) EVT_THREAD EVT_WAIT(5) diff --git a/src/battle/move/item/thunder_bolt.h b/src/battle/move/item/thunder_bolt.h deleted file mode 100644 index b413ddd168..0000000000 --- a/src/battle/move/item/thunder_bolt.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_THUNDER_BOLT -#define BATTLE_ITEM_THUNDER_BOLT - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_thunder_bolt - -API_CALLABLE(N(FadeBackgroundToBlack)); -API_CALLABLE(N(func_802A123C_722D7C)); -API_CALLABLE(N(func_802A1420_722F60)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index 5dd5ff9f57..e1db641035 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -1,9 +1,11 @@ -#include "thunder_rage.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" #include "model.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_thunder_rage +#include "battle/common/move/ItemRefund.inc.c" #include "common/FadeBackgroundToBlack.inc.c" API_CALLABLE(N(func_802A12D4_71B474)) { @@ -50,9 +52,9 @@ API_CALLABLE(N(func_802A1354_71B4F4)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { +EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_THUNDER_RAGE) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CHILD_THREAD diff --git a/src/battle/move/item/thunder_rage.h b/src/battle/move/item/thunder_rage.h deleted file mode 100644 index ac54dbbf6b..0000000000 --- a/src/battle/move/item/thunder_rage.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_THUNDER_RAGE -#define BATTLE_ITEM_THUNDER_RAGE - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_thunder_rage - -API_CALLABLE(N(FadeBackgroundToBlack)); -API_CALLABLE(N(func_802A1354_71B4F4)); -API_CALLABLE(N(func_802A12D4_71B474)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/move/item/ultra_shroom.c b/src/battle/move/item/ultra_shroom.c index d8e03f4425..69be54ef08 100644 --- a/src/battle/move/item/ultra_shroom.c +++ b/src/battle/move/item/ultra_shroom.c @@ -1,9 +1,12 @@ -#include "ultra_shroom.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_ultra_shroom -API_CALLABLE(N(func_802A123C_7239BC)) { +#include "battle/common/move/ItemRefund.inc.c" + +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -14,7 +17,7 @@ API_CALLABLE(N(func_802A123C_7239BC)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A12FC_723A7C)) { +API_CALLABLE(N(HealPlayer10)) { PlayerData* playerData = &gPlayerData; playerData->curHP += 10; @@ -24,10 +27,10 @@ API_CALLABLE(N(func_802A12FC_723A7C)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000008C) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_SUPER_SHROOM) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(AddBattleCamZoom, 50) EVT_CALL(MoveBattleCamOver, 20) @@ -35,12 +38,12 @@ EvtScript N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A123C_7239BC), LVar0, LVar1, LVar2, 10) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, 10) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 10) - EVT_CALL(N(func_802A12FC_723A7C)) + EVT_CALL(N(HealPlayer10)) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) EVT_WAIT(30) diff --git a/src/battle/move/item/ultra_shroom.h b/src/battle/move/item/ultra_shroom.h deleted file mode 100644 index 3f3b7adad4..0000000000 --- a/src/battle/move/item/ultra_shroom.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_ULTRA_SHROOM -#define BATTLE_ITEM_ULTRA_SHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_ultra_shroom - -API_CALLABLE(N(func_802A123C_7239BC)); -API_CALLABLE(N(func_802A12FC_723A7C)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/item/unknown_item.c b/src/battle/move/item/unknown_item.c index 28fad66215..57b2b3fd46 100644 --- a/src/battle/move/item/unknown_item.c +++ b/src/battle/move/item/unknown_item.c @@ -1,9 +1,12 @@ -#include "unknown_item.h" +#include "common.h" +#include "script_api/battle.h" #include "effects.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_unknown_item -API_CALLABLE(N(func_802A123C_72447C)) { +#include "battle/common/move/ItemRefund.inc.c" + +API_CALLABLE(N(ShowHeartRecoveryFX)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -14,7 +17,7 @@ API_CALLABLE(N(func_802A123C_72447C)) { return ApiStatus_DONE2; } -API_CALLABLE(N(func_802A12FC_72453C)) { +API_CALLABLE(N(HealPlayer20)) { PlayerData* playerData = &gPlayerData; playerData->curHP += 20; @@ -24,21 +27,21 @@ API_CALLABLE(N(func_802A12FC_72453C)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000008E) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_ULTRA_SHROOM) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(N(func_802A123C_72447C), LVar0, LVar1, LVar2, 20) + EVT_CALL(N(ShowHeartRecoveryFX), LVar0, LVar1, LVar2, 20) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 20) - EVT_CALL(N(func_802A12FC_72453C)) + EVT_CALL(N(HealPlayer20)) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) EVT_WAIT(30) diff --git a/src/battle/move/item/unknown_item.h b/src/battle/move/item/unknown_item.h deleted file mode 100644 index 086f99d723..0000000000 --- a/src/battle/move/item/unknown_item.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef BATTLE_ITEM_UNKNOWN_ITEM -#define BATTLE_ITEM_UNKNOWN_ITEM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_unknown_item - -API_CALLABLE(N(func_802A123C_72447C)); -API_CALLABLE(N(func_802A12FC_72453C)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c index fa22b733fb..542575719a 100644 --- a/src/battle/move/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -1,6 +1,9 @@ -#include "volt_shroom.h" +#include "common.h" +#include "script_api/battle.h" -#include "ItemRefund.inc.c" +#define NAMESPACE battle_item_volt_shroom + +#include "battle/common/move/ItemRefund.inc.c" API_CALLABLE(N(func_802A123C_71AA2C)) { BattleStatus* battleStatus = &gBattleStatus; @@ -11,10 +14,10 @@ API_CALLABLE(N(func_802A123C_71AA2C)) { return ApiStatus_DONE2; } -#include "UseItem.inc.c" +#include "battle/common/move/UseItem.inc.c" -EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000008B) +EvtScript N(EVS_UseItem) = { + EVT_SET_CONST(LVarA, ITEM_VOLT_SHROOM) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) diff --git a/src/battle/move/item/volt_shroom.h b/src/battle/move/item/volt_shroom.h deleted file mode 100644 index 25fec5481c..0000000000 --- a/src/battle/move/item/volt_shroom.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef BATTLE_ITEM_VOLT_SHROOM -#define BATTLE_ITEM_VOLT_SHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_volt_shroom - -API_CALLABLE(N(func_802A123C_71AA2C)); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index 792a4be301..15fcf9a622 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -217,7 +217,7 @@ EvtScript N(802A2020) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index d31131cc19..da80f553db 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -166,7 +166,7 @@ EvtScript N(802A1D60) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index cdff4b0d23..e569197731 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -152,7 +152,7 @@ EvtScript N(802A1D50) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index e43202e8e8..1dde7d60c7 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -130,7 +130,7 @@ EvtScript N(802A1C60) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/refresh.c b/src/battle/move/star_power/refresh.c index 2808d2bd3a..aac2edf92f 100644 --- a/src/battle/move/star_power/refresh.c +++ b/src/battle/move/star_power/refresh.c @@ -239,7 +239,7 @@ EvtScript N(802A21A0) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index bdd6fde397..e42e342cd8 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -138,7 +138,7 @@ EvtScript N(802A1D60) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index 5b4ccddd74..8b6d4c5472 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -152,7 +152,7 @@ EvtScript N(802A1E20) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index 2a14bc2306..eb9edd776f 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -124,7 +124,7 @@ EvtScript N(802A1C50) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/twink_dash.c b/src/battle/move/star_power/twink_dash.c index a8d6fb3e55..5530334624 100644 --- a/src/battle/move/star_power/twink_dash.c +++ b/src/battle/move/star_power/twink_dash.c @@ -143,7 +143,7 @@ EvtScript N(802A1CE0) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index d922d6caf3..3835137913 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -185,7 +185,7 @@ EvtScript N(802A1E00) = { EVT_CALL(PlaySound, 0x2041) EVT_CALL(CreateNpc, 100, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_40000)), TRUE) + EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) EVT_CALL(SetNpcPos, 100, -75, 150, 0) EVT_CALL(SetNpcDecoration, 100, 0, 5) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) diff --git a/src/battle/use_items.c b/src/battle/use_items.c index a6372355f2..5af22fdeed 100644 --- a/src/battle/use_items.c +++ b/src/battle/use_items.c @@ -2,8 +2,40 @@ #include "ld_addrs.h" #include "battle.h" -s32 D_80293B80[] = { - -1, +extern EvtScript battle_item_food_EVS_UseItem; +extern EvtScript battle_item_mushroom_EVS_UseItem; +extern EvtScript battle_item_fire_flower_EVS_UseItem; +extern EvtScript battle_item_dusty_hammer_EVS_UseItem; +extern EvtScript battle_item_pow_block_EVS_UseItem; +extern EvtScript battle_item_pebble_EVS_UseItem; +extern EvtScript battle_item_volt_shroom_EVS_UseItem; +extern EvtScript battle_item_thunder_rage_EVS_UseItem; +extern EvtScript battle_item_snowman_doll_EVS_UseItem; +extern EvtScript battle_item_shooting_star_EVS_UseItem; +extern EvtScript battle_item_sleepy_sheep_EVS_UseItem; +extern EvtScript battle_item_stone_cap_EVS_UseItem; +extern EvtScript battle_item_tasty_tonic_EVS_UseItem; +extern EvtScript battle_item_thunder_bolt_EVS_UseItem; +extern EvtScript battle_item_super_soda_EVS_UseItem; +extern EvtScript battle_item_hustle_drink_EVS_UseItem; +extern EvtScript battle_item_stop_watch_EVS_UseItem; +extern EvtScript battle_item_dizzy_dial_EVS_UseItem; +extern EvtScript battle_item_please_come_back_EVS_UseItem; +extern EvtScript battle_item_egg_missile_EVS_UseItem; +extern EvtScript battle_item_insecticide_herb_EVS_UseItem; +extern EvtScript battle_item_fright_jar_EVS_UseItem; +extern EvtScript battle_item_mystery_EVS_UseItem; +extern EvtScript battle_item_repel_gel_EVS_UseItem; +extern EvtScript battle_item_life_shroom_EVS_UseItem; +extern EvtScript battle_item_coconut_EVS_UseItem; +extern EvtScript battle_item_electro_pop_EVS_UseItem; +extern EvtScript battle_item_strange_cake_EVS_UseItem; + +#define GENERIC_FOOD_ITEM -1 + +// items in this list must correspond with BattleMoveEntry in gBattleItemTable +s32 ItemKeys[] = { + GENERIC_FOOD_ITEM, ITEM_MUSHROOM, ITEM_FIRE_FLOWER, ITEM_DUSTY_HAMMER, @@ -38,35 +70,6 @@ s32 D_80293B80[] = { ITEM_NONE }; -extern EvtScript battle_item_food_main; -extern EvtScript battle_item_mushroom_main; -extern EvtScript battle_item_fire_flower_main; -extern EvtScript battle_item_dusty_hammer_main; -extern EvtScript battle_item_pow_block_main; -extern EvtScript battle_item_pebble_main; -extern EvtScript battle_item_volt_shroom_main; -extern EvtScript battle_item_thunder_rage_main; -extern EvtScript battle_item_snowman_doll_main; -extern EvtScript battle_item_shooting_star_main; -extern EvtScript battle_item_sleepy_sheep_main; -extern EvtScript battle_item_stone_cap_main; -extern EvtScript battle_item_tasty_tonic_main; -extern EvtScript battle_item_thunder_bolt_main; -extern EvtScript battle_item_super_soda_main; -extern EvtScript battle_item_hustle_drink_main; -extern EvtScript battle_item_stop_watch_main; -extern EvtScript battle_item_dizzy_dial_main; -extern EvtScript battle_item_please_come_back_main; -extern EvtScript battle_item_egg_missile_main; -extern EvtScript battle_item_insecticide_herb_main; -extern EvtScript battle_item_fright_jar_main; -extern EvtScript battle_item_mystery_main; -extern EvtScript battle_item_repel_gel_main; -extern EvtScript battle_item_life_shroom_main; -extern EvtScript battle_item_coconut_main; -extern EvtScript battle_item_electro_pop_main; -extern EvtScript battle_item_strange_cake_main; - BattleMoveEntry gBattleItemTable[] = { BTL_ITEM(food), BTL_ITEM(mushroom), @@ -107,7 +110,7 @@ u16 D_80293E04[] = { 1, 31, 1, 5, 1, 2, 9, 3, 9, 3, 9, 1, 10, 6, 10, 6, 10, 4, 11, 8, 11, 8, 11, 4, 12, 3, 12, 3, 12, 1, }; -ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { +API_CALLABLE(LoadItemScript) { PlayerData* playerData = &gPlayerData; BattleStatus* battleStatus = &gBattleStatus; s16 itemID = battleStatus->moveArgument; @@ -136,7 +139,7 @@ ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { } } - itemPtr = &D_80293B80[0]; + itemPtr = &ItemKeys[0]; for (i = 0; *itemPtr != ITEM_NONE; i++, itemPtr++) { if (*itemPtr == battleStatus->moveArgument) { break; @@ -159,7 +162,7 @@ ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus LoadFreeItemScript(Evt* script, s32 isInitialCall) { +API_CALLABLE(LoadMysteryItemScript) { BattleStatus* battleStatus = &gBattleStatus; Actor* actor = battleStatus->playerActor; ItemData* item = &gItemTable[battleStatus->moveArgument]; @@ -176,7 +179,7 @@ ApiStatus LoadFreeItemScript(Evt* script, s32 isInitialCall) { battleStatus->currentTargetID = target->actorID; battleStatus->currentTargetPart = target->partID; - itemPtr = &D_80293B80[0]; + itemPtr = &ItemKeys[0]; for (i = 0; *itemPtr != ITEM_NONE; i++, itemPtr++) { if (*itemPtr == battleStatus->moveArgument){ break; @@ -199,7 +202,7 @@ ApiStatus LoadFreeItemScript(Evt* script, s32 isInitialCall) { EvtScript UseMystery = { EVT_WAIT(2) - EVT_CALL(LoadFreeItemScript) + EVT_CALL(LoadMysteryItemScript) EVT_EXEC_WAIT(LVar0) EVT_RETURN EVT_END diff --git a/src/encounter.c b/src/encounter.c index 62d8732193..2548f148e4 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -32,7 +32,7 @@ EvtScript D_80077C44 = { EVT_CALL(FadeBackgroundToBlack) EVT_WAIT(10) EVT_CALL(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) - EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcYaw, NPC_BTL_MERLEE, 0) EVT_CALL(GetCamLookAtObjVector) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, LVar0, LVar1, LVar2) @@ -417,9 +417,9 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) { } if (script->functionTemp[1] & 1) { - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; } else { - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; } if (script->functionTemp[1] == 15) { @@ -437,7 +437,7 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) { script->functionTemp[1]--; if (script->functionTemp[1] == 0) { - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; return ApiStatus_DONE1; } @@ -489,7 +489,7 @@ void update_encounters_neutral(void) { f32 colRadius; f32 hammerDir; - s32 cond; + s32 triggeredBattle; s32 cond2; s32 firstStrikeType; s32 suspendTime; @@ -564,11 +564,11 @@ void update_encounters_neutral(void) { } if (suspendTime & 1) { - npc->flags |= NPC_FLAG_80000000; - enemy->flags |= ENEMY_FLAG_80000000; + npc->flags |= NPC_FLAG_SUSPENDED; + enemy->flags |= ENEMY_FLAG_SUSPENDED; } else { - npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAG_80000000; + npc->flags &= ~NPC_FLAG_SUSPENDED; + enemy->flags &= ~ENEMY_FLAG_SUSPENDED; } script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { @@ -588,11 +588,11 @@ void update_encounters_neutral(void) { clear_script_flags(script, EVT_FLAG_SUSPENDED); } } - } else if (!(enemy->flags & ENEMY_FLAG_200000)) { + } else if (!(enemy->flags & ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN)) { get_screen_coords(gCurrentCameraID, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); if ((screenX < -160 || screenX > 480 || screenY < -120 || screenY > 360 || screenZ < 0) && !(enemy->flags & ENEMY_FLAG_PASSIVE)) { - npc->flags |= NPC_FLAG_80000000; - enemy->flags |= ENEMY_FLAG_80000000; + npc->flags |= NPC_FLAG_SUSPENDED; + enemy->flags |= ENEMY_FLAG_SUSPENDED; script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { set_script_flags(script, EVT_FLAG_SUSPENDED); @@ -602,8 +602,8 @@ void update_encounters_neutral(void) { set_script_flags(script, EVT_FLAG_SUSPENDED); } } else { - npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAG_80000000; + npc->flags &= ~NPC_FLAG_SUSPENDED; + enemy->flags &= ~ENEMY_FLAG_SUSPENDED; script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { clear_script_flags(script, EVT_FLAG_SUSPENDED); @@ -614,8 +614,8 @@ void update_encounters_neutral(void) { } } } else { - npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAG_80000000; + npc->flags &= ~NPC_FLAG_SUSPENDED; + enemy->flags &= ~ENEMY_FLAG_SUSPENDED; script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { clear_script_flags(script, EVT_FLAG_SUSPENDED); @@ -626,22 +626,22 @@ void update_encounters_neutral(void) { } } - if (enemy->flags & ENEMY_FLAG_80000000) { + if (enemy->flags & ENEMY_FLAG_SUSPENDED) { continue; } if (enemy->flags & ENEMY_FLAG_PASSIVE) { if (!(enemy->flags & ENEMY_FLAG_400000)) { if (npc == playerStatus->encounteredNPC) { - enemy->unk_E0 = npc->yaw; + enemy->savedNpcYaw = npc->yaw; npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); script = get_script_by_id(enemy->aiScriptID); if (script != NULL) { set_script_flags(script, EVT_FLAG_SUSPENDED); } } else { - if (enemy->unk_E0 != 12345) { - npc->yaw = enemy->unk_E0; - enemy->unk_E0 = 12345; + if (enemy->savedNpcYaw != 12345) { + npc->yaw = enemy->savedNpcYaw; + enemy->savedNpcYaw = 12345; } script = get_script_by_id(enemy->aiScriptID); if (script != NULL) { @@ -667,7 +667,7 @@ void update_encounters_neutral(void) { continue; } do { - if (!(enemy->flags & ENEMY_FLAG_10000000) && partner_test_enemy_collision(npc) != 0) { + if (!(enemy->flags & ENEMY_FLAG_IGNORE_PARTNER) && partner_test_enemy_collision(npc)) { currentEncounter->hitType = ENCOUNTER_TRIGGER_PARTNER; enemy->encountered = ENCOUNTER_TRIGGER_PARTNER; currentEncounter->currentEncounter = encounter; @@ -741,7 +741,7 @@ void update_encounters_neutral(void) { break; } } - if (enemy->unk_07 != 0) { + if (enemy->hitboxIsActive) { npcX = enemy->unk_10.x; npcY = enemy->unk_10.y; npcZ = enemy->unk_10.z; @@ -749,20 +749,20 @@ void update_encounters_neutral(void) { angle1 = fabsf(get_clamped_angle_diff(atan2(playerX, playerZ, npcX, npcZ), playerYaw)); angle2 = fabsf(get_clamped_angle_diff(atan2(npcX, npcZ, playerX, playerZ), npcYaw)); - cond = FALSE; + triggeredBattle = FALSE; if (angle1 >= 90.0f && angle2 >= 90.0f) { - cond = FALSE; + triggeredBattle = FALSE; } if (angle1 < 90.0f && angle2 >= 90.0f) { - cond = TRUE; + triggeredBattle = TRUE; } if (angle1 >= 90.0f && angle2 < 90.0f) { - cond = FALSE; + triggeredBattle = FALSE; } if (angle1 < 90.0f && angle2 < 90.0f) { - cond = TRUE; + triggeredBattle = TRUE; } - if (cond) { + if (triggeredBattle) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); currentEncounter->hitType = ENCOUNTER_TRIGGER_HAMMER; currentEncounter->hitTier = gPlayerData.hammerLevel; @@ -804,7 +804,7 @@ void update_encounters_neutral(void) { break; } } - cond = FALSE; + triggeredBattle = FALSE; if (npcY + colHeight < playerY + playerJumpColHeight * 0.5f) { if (playerStatus->actionState == ACTION_STATE_FALLING || playerStatus->actionState == ACTION_STATE_STEP_DOWN || @@ -814,13 +814,13 @@ void update_encounters_neutral(void) { playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_JUMP || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) { - cond = TRUE; + triggeredBattle = TRUE; } } if (playerY + playerJumpColHeight < npcY + colHeight * 0.5f) { - cond = FALSE; + triggeredBattle = FALSE; } - if (cond) { + if (triggeredBattle) { if (gPlayerData.bootsLevel < 0) { currentEncounter->hitType = ENCOUNTER_TRIGGER_NONE; enemy->encountered = ENCOUNTER_TRIGGER_NONE; @@ -889,14 +889,14 @@ void update_encounters_neutral(void) { continue; } } - cond = FALSE; + triggeredBattle = FALSE; if (is_ability_active(ABILITY_SPIN_ATTACK) && gPlayerData.level >= enemy->npcSettings->level) { - cond = !currentEncounter->scriptedBattle; + triggeredBattle = !currentEncounter->scriptedBattle; } if (is_ability_active(ABILITY_DIZZY_ATTACK)) { - cond = TRUE; + triggeredBattle = TRUE; } - if ((playerStatus->animFlags & PA_FLAG_SPINNING) && !(enemy->flags & ENEMY_FLAG_20000000) && cond) { + if ((playerStatus->animFlags & PA_FLAG_SPINNING) && !(enemy->flags & ENEMY_FLAG_IGNORE_SPIN) && triggeredBattle) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f); testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); @@ -918,22 +918,24 @@ void update_encounters_neutral(void) { testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f); fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3); + // if the hitbox is active, trigger a first strike firstStrikeType = FIRST_STRIKE_NONE; - if (enemy->unk_07 != 0) { + if (enemy->hitboxIsActive) { if (is_ability_active(ABILITY_CHILL_OUT)) { firstStrikeType = FIRST_STRIKE_NONE; } else { firstStrikeType = FIRST_STRIKE_ENEMY; } } - if (!is_ability_active(ABILITY_BUMP_ATTACK) || gPlayerData.level < enemy->npcSettings->level || (enemy->flags & ENEMY_FLAG_40)) { - currentEncounter->firstStrikeType = firstStrikeType; - } else { - if (!currentEncounter->scriptedBattle) { - firstStrikeType = FIRST_STRIKE_NONE; - } - currentEncounter->firstStrikeType = firstStrikeType; + // cancel the first strike if bump attack is applicable + if ((is_ability_active(ABILITY_BUMP_ATTACK) + && (gPlayerData.level >= enemy->npcSettings->level) + && !(enemy->flags & ENEMY_FLAG_PROJECTILE)) + && !currentEncounter->scriptedBattle + ) { + firstStrikeType = FIRST_STRIKE_NONE; } + currentEncounter->firstStrikeType = firstStrikeType; } goto START_BATTLE; } @@ -963,7 +965,7 @@ START_BATTLE: if (enemy->flags & ENEMY_FLAG_DISABLE_AI) { continue; } - if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_PROJECTILE) && enemy != currentEncounter->currentEnemy) { continue; } @@ -1017,7 +1019,7 @@ START_BATTLE: if (enemy->flags & ENEMY_FLAG_DISABLE_AI) { continue; } - if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_PROJECTILE) && enemy != currentEncounter->currentEnemy) { continue; } @@ -1064,7 +1066,7 @@ START_BATTLE: if (enemy->flags & ENEMY_FLAG_DISABLE_AI) { continue; } - if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_PROJECTILE) && enemy != currentEncounter->currentEnemy) { continue; } if (enemy->hitBytecode != NULL) { @@ -1124,7 +1126,7 @@ START_BATTLE: if (enemy->flags & ENEMY_FLAG_DISABLE_AI) { continue; } - if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_PROJECTILE) && enemy != currentEncounter->currentEnemy) { continue; } if (enemy->hitBytecode != NULL) { @@ -1206,7 +1208,7 @@ START_BATTLE: if (enemy->flags & ENEMY_FLAG_DISABLE_AI) { continue; } - if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_PROJECTILE) && enemy != currentEncounter->currentEnemy) { continue; } if (enemy->hitBytecode != NULL) { @@ -1301,15 +1303,15 @@ void update_encounters_pre_battle(void) { } enemy = currentEncounter->currentEnemy; - if (currentEncounter->hitType != ENCOUNTER_TRIGGER_NONE && - currentEncounter->hitType != ENCOUNTER_TRIGGER_SPIN && - is_ability_active(ABILITY_FIRST_ATTACK) && - (playerData->level >= enemy->npcSettings->level) && - !(enemy->flags & ENEMY_FLAG_40) && - !currentEncounter->scriptedBattle) - { + if (currentEncounter->hitType != ENCOUNTER_TRIGGER_NONE + && currentEncounter->hitType != ENCOUNTER_TRIGGER_SPIN + && is_ability_active(ABILITY_FIRST_ATTACK) + && (playerData->level >= enemy->npcSettings->level) + && !(enemy->flags & ENEMY_FLAG_PROJECTILE) + && !currentEncounter->scriptedBattle + ) { currentEncounter->unk_94 = 0; - currentEncounter->battleStartCountdown = 0xA; + currentEncounter->battleStartCountdown = 10; D_80077C40 = 1; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN; return; @@ -1319,14 +1321,14 @@ void update_encounters_pre_battle(void) { if (( (is_ability_active(ABILITY_BUMP_ATTACK)) && (playerData->level >= enemy->npcSettings->level) && - (!(enemy->flags & ENEMY_FLAG_40) && + (!(enemy->flags & ENEMY_FLAG_PROJECTILE) && !(currentEncounter->scriptedBattle)) ) || ( (enemy = currentEncounter->currentEnemy, (currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN)) && (is_ability_active(ABILITY_SPIN_ATTACK)) && playerData->level >= enemy->npcSettings->level && - !(enemy->flags & ENEMY_FLAG_40) && + !(enemy->flags & ENEMY_FLAG_PROJECTILE) && !currentEncounter->scriptedBattle )) { @@ -1572,7 +1574,7 @@ void update_encounters_post_battle(void) { Evt* script; Enemy* enemy; s32 i, j; - s32 cond; + s32 hasDefeatScript; Npc* npc; switch (gEncounterSubState) { @@ -1704,7 +1706,7 @@ void update_encounters_post_battle(void) { } break; case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_KILL: - cond = FALSE; + hasDefeatScript = FALSE; encounter = currentEncounter->currentEncounter; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; @@ -1718,12 +1720,12 @@ void update_encounters_post_battle(void) { continue; } if (does_script_exist(enemy->defeatScriptID)) { - cond = TRUE; + hasDefeatScript = TRUE; } else { enemy->defeatScript = NULL; } } - if (!cond) { + if (!hasDefeatScript) { if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { suggest_player_anim_clearUnkFlag(ANIM_Mario_ThumbsUp); } @@ -1835,7 +1837,7 @@ void update_encounters_post_battle(void) { break; case ENCOUNTER_SUBSTATE_POST_BATTLE_102: encounter = currentEncounter->currentEncounter; - cond = FALSE; + hasDefeatScript = FALSE; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if (enemy == NULL) { @@ -1843,13 +1845,13 @@ void update_encounters_post_battle(void) { } if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) { if (does_script_exist(enemy->defeatScriptID)) { - cond = TRUE; + hasDefeatScript = TRUE; } else { enemy->defeatScript = NULL; } } } - if (!cond) { + if (!hasDefeatScript) { for (i = 0; i < currentEncounter->numEncounters; i++) { encounter = currentEncounter->encounterList[i]; if (encounter == NULL) { @@ -1967,7 +1969,7 @@ void update_encounters_post_battle(void) { } break; case ENCOUNTER_SUBSTATE_POST_BATTLE_202: - cond = FALSE; + hasDefeatScript = FALSE; encounter = currentEncounter->currentEncounter; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; @@ -1976,13 +1978,13 @@ void update_encounters_post_battle(void) { } if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) { if (does_script_exist(enemy->defeatScriptID)) { - cond = TRUE; + hasDefeatScript = TRUE; } else { enemy->defeatScript = NULL; } } } - if (!cond) { + if (!hasDefeatScript) { for (i = 0; i < currentEncounter->numEncounters; i++) { encounter = currentEncounter->encounterList[i]; if (encounter == NULL) { @@ -2085,7 +2087,7 @@ void update_encounters_post_battle(void) { } break; case ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_TO_NEUTRAL: - cond = FALSE; + hasDefeatScript = FALSE; encounter = currentEncounter->currentEncounter; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; @@ -2094,13 +2096,13 @@ void update_encounters_post_battle(void) { } if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) { if (does_script_exist(enemy->defeatScriptID)) { - cond = TRUE; + hasDefeatScript = TRUE; } else { enemy->defeatScript = NULL; } } } - if (!cond) { + if (!hasDefeatScript) { for (i = 0; i < currentEncounter->numEncounters; i++) { encounter = currentEncounter->encounterList[i]; if (encounter == NULL) { @@ -2167,11 +2169,11 @@ void update_encounters_post_battle(void) { npc = get_npc_unsafe(enemy->npcID); if (enemy->aiSuspendTime != 0) { if (enemy->aiSuspendTime & 1) { - npc->flags |= NPC_FLAG_80000000; - enemy->flags |= ENEMY_FLAG_80000000; + npc->flags |= NPC_FLAG_SUSPENDED; + enemy->flags |= ENEMY_FLAG_SUSPENDED; } else { - npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAG_80000000; + npc->flags &= ~NPC_FLAG_SUSPENDED; + enemy->flags &= ~ENEMY_FLAG_SUSPENDED; } } } @@ -2301,7 +2303,7 @@ s32 check_conversation_trigger(void) { continue; } - if (encounterEnemy->flags & (ENEMY_FLAG_80000000 | ENEMY_FLAG_DISABLE_AI)) { + if (encounterEnemy->flags & (ENEMY_FLAG_SUSPENDED | ENEMY_FLAG_DISABLE_AI)) { continue; } @@ -2309,7 +2311,7 @@ s32 check_conversation_trigger(void) { continue; } - if ((encounterEnemy->flags & ENEMY_FLAG_8000000) || encounterEnemy->interactBytecode == NULL) { + if ((encounterEnemy->flags & ENEMY_FLAG_CANT_INTERACT) || encounterEnemy->interactBytecode == NULL) { continue; } @@ -2354,7 +2356,7 @@ s32 check_conversation_trigger(void) { if (npc_test_move_taller_with_slipping(0, &xTemp, &yTemp, &zTemp, length, atan2(npcX, npcZ, playerX, playerZ), npcCollisionHeight, - 2.0f * npcCollisionRadius) != 0) { + 2.0f * npcCollisionRadius)) { continue; } } @@ -2492,7 +2494,7 @@ void create_encounters(void) { enemy->hitScriptID = 0; enemy->auxScriptID = 0; enemy->defeatScriptID = 0; - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; enemy->instigatorValue = 0; enemy->aiDetectFlags = npcData->aiDetectFlags; @@ -2551,20 +2553,20 @@ void create_encounters(void) { newNpc->homePos.y = newNpc->pos.y; newNpc->homePos.z = newNpc->pos.z; set_npc_yaw(newNpc, npcData->yaw); - enemy->unk_E0 = 12345; + enemy->savedNpcYaw = 12345; if (newNpc->collisionRadius >= 24.0) { newNpc->shadowScale = newNpc->collisionRadius / 24.0; } else { newNpc->shadowScale = 1.0f; } - if (enemy->flags & ENEMY_FLAG_100) { + if (enemy->flags & ENEMY_FLAG_IGNORE_WORLD_COLLISION) { newNpc->flags |= NPC_FLAG_IGNORE_WORLD_COLLISION; } - if (enemy->flags & ENEMY_FLAG_200) { - newNpc->flags |= NPC_FLAG_100; + if (enemy->flags & ENEMY_FLAG_IGNORE_PLAYER_COLLISION) { + newNpc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; } - if (enemy->flags & ENEMY_FLAG_400) { - newNpc->flags |= NPC_FLAG_8000; + if (enemy->flags & ENEMY_FLAG_IGNORE_ENTITY_COLLISION) { + newNpc->flags |= NPC_FLAG_IGNORE_ENTITY_COLLISION; } if (enemy->flags & ENEMY_FLAG_800) { newNpc->flags |= NPC_FLAG_8; @@ -2573,13 +2575,13 @@ void create_encounters(void) { newNpc->flags |= NPC_FLAG_GRAVITY; } if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) { - newNpc->flags |= NPC_FLAG_100; + newNpc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; } - if (enemy->flags & ENEMY_FLAG_4000) { - newNpc->flags |= NPC_FLAG_1000000; + if (enemy->flags & ENEMY_FLAG_HAS_NO_SPRITE) { + newNpc->flags |= NPC_FLAG_HAS_NO_SPRITE; } - if (enemy->flags & ENEMY_FLAG_2000) { - newNpc->flags |= NPC_FLAG_20; + if (enemy->flags & ENEMY_FLAG_NO_SHADOW_RAYCAST) { + newNpc->flags |= NPC_FLAG_NO_SHADOW_RAYCAST; } if (enemy->flags & ENEMY_FLAG_8000) { newNpc->flags |= NPC_FLAG_10000000; @@ -2587,12 +2589,12 @@ void create_encounters(void) { if (enemy->flags & ENEMY_FLAG_10000) { newNpc->flags |= NPC_FLAG_20000000; } - if (enemy->flags & ENEMY_FLAG_80) { - newNpc->flags |= NPC_FLAG_LOCK_ANIMS; + if (enemy->flags & ENEMY_FLAG_DONT_UPDATE_SHADOW_Y) { + newNpc->flags |= NPC_FLAG_DONT_UPDATE_SHADOW_Y; } - enemy->scriptGroup = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + enemy->scriptGroup = EVT_GROUP_0B; if (enemy->flags & ENEMY_FLAG_PASSIVE) { - enemy->scriptGroup = EVT_GROUP_08 | EVT_GROUP_02; + enemy->scriptGroup = EVT_GROUP_0A; } if (npcSettings->otherAI != NULL) { script = start_script(npcSettings->otherAI, EVT_PRIORITY_A, 0); diff --git a/src/encounter_api.c b/src/encounter_api.c index 1a798ce005..bc118680b7 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -211,21 +211,21 @@ void start_battle(Evt* script, s32 songID) { encounter = currentEncounter->currentEncounter; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; - if ((enemy != NULL && ( - !(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy) - ) && enemy->hitBytecode != NULL) { - Evt* hitEvtInstance; - enemy->encountered = TRUE; + if (enemy != NULL && (!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy)) { + if (enemy->hitBytecode != NULL) { + Evt* hitEvtInstance; + enemy->encountered = TRUE; - hitEvtInstance = start_script(enemy->hitBytecode, EVT_PRIORITY_A, 0); + hitEvtInstance = start_script(enemy->hitBytecode, EVT_PRIORITY_A, 0); - enemy->hitScript = hitEvtInstance; - enemy->hitScriptID = hitEvtInstance->id; + enemy->hitScript = hitEvtInstance; + enemy->hitScriptID = hitEvtInstance->id; - hitEvtInstance = enemy->hitScript; - hitEvtInstance->owner1.enemy = enemy; - hitEvtInstance->owner2.npcID = enemy->npcID; - hitEvtInstance->groupFlags = enemy->scriptGroup; + hitEvtInstance = enemy->hitScript; + hitEvtInstance->owner1.enemy = enemy; + hitEvtInstance->owner2.npcID = enemy->npcID; + hitEvtInstance->groupFlags = enemy->scriptGroup; + } } } @@ -712,7 +712,7 @@ ApiStatus SelfEnemyOverrideSyncPos(Evt* script, s32 isInitialCall) { Enemy* owner = script->owner1.enemy; Npc* npc = get_npc_unsafe(script->owner2.npcID); - owner->unk_07 = evt_get_variable(script, *args++); + owner->hitboxIsActive = evt_get_variable(script, *args++); owner->unk_10.x = npc->pos.x; owner->unk_10.y = npc->pos.y; owner->unk_10.z = npc->pos.z; diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c index a905b2c7a5..beeb753190 100644 --- a/src/entity/sbk_omo/StarBoxLauncher.c +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -75,8 +75,8 @@ void entity_StarBoxLauncher_check_launch(Entity* entity) { add_vec2D_polar(&x, &z, 10.0f, func_800E5348()); if (npc_raycast_down_sides(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth) != 0) { - if (D_8010C978 & COLLISION_WITH_ENTITY_BIT) { - result = get_entity_type(D_8010C978) == ENTITY_TYPE_STAR_BOX_LAUCHER; + if (NpcHitQueryColliderID & COLLISION_WITH_ENTITY_BIT) { + result = get_entity_type(NpcHitQueryColliderID) == ENTITY_TYPE_STAR_BOX_LAUCHER; } } } else if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && (actionState == ACTION_STATE_SPIN_POUND || actionState == ACTION_STATE_TORNADO_POUND)) { diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c index b1bf2671bd..0c6d72b855 100644 --- a/src/entity/sbk_omo/Tweester.c +++ b/src/entity/sbk_omo/Tweester.c @@ -268,7 +268,7 @@ void entity_Tweester_idle(Entity* entity) { if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE || partnerActionStatus->actingPartner != PARTNER_BOW) { if (playerStatus->actionState == ACTION_STATE_USE_TWEESTER) { Npc* npc = npc_find_closest_simple(entity->position.x, entity->position.y, entity->position.z, 50.0f); - if (npc != NULL && (npc->flags & NPC_FLAG_PARTICLE)) { + if (npc != NULL && (npc->flags & NPC_FLAG_PARTNER)) { TweesterTouchingPartner = entity; } } diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index 02142e8b10..ad9794e9f1 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -806,7 +806,7 @@ s32 BringPartnerOut(Evt *script, s32 isInitialCall) { partner = get_npc_unsafe(NPC_PARTNER); partner->npcID = -5; - bpPointer->flags = NPC_FLAG_100; + bpPointer->flags = NPC_FLAG_IGNORE_PLAYER_COLLISION; bpPointer->initialAnim = gPartnerAnimations[wExtraPartnerID].fly; bpPointer->onUpdate = NULL; bpPointer->onRender = NULL; diff --git a/src/inspect_icon.c b/src/inspect_icon.c index 180e27e84c..eccaaf0379 100644 --- a/src/inspect_icon.c +++ b/src/inspect_icon.c @@ -106,8 +106,11 @@ s32 func_802B7450_E20560(void) { curInteraction = -1; break; } - } else if (((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) - && (npc != NULL) && (npc->flags & NPC_FLAG_10000000)) { + } else if ( + ((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) + && (npc != NULL) + && (npc->flags & NPC_FLAG_10000000) + ) { curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; if (playerStatus->interactingWithID == curInteraction) { return TRUE; diff --git a/src/npc.c b/src/npc.c index 633b15b797..d0ccc08c4f 100644 --- a/src/npc.c +++ b/src/npc.c @@ -40,8 +40,6 @@ s32 D_80077C34 = 0; s16 D_80077C38 = 4; s16 D_80077C3A = 4; -extern s16 D_8010C97A; - void STUB_npc_callback(Npc* npc) { } @@ -106,7 +104,7 @@ s32 create_npc_impl(NpcBlueprint* blueprint, AnimID* animList, s32 isPeachNpc) { gNpcCount++; ASSERT(npc != NULL); - npc->flags = blueprint->flags | (NPC_FLAG_400000 | NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW | NPC_FLAG_1); + npc->flags = blueprint->flags | (NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW | NPC_FLAG_ENABLED); if (isPeachNpc) { npc->flags |= NPC_FLAG_NO_ANIMS_LOADED; } @@ -172,14 +170,14 @@ s32 create_npc_impl(NpcBlueprint* blueprint, AnimID* animList, s32 isPeachNpc) { } if (!isPeachNpc) { npc->extraAnimList = animList; - if (!(npc->flags & NPC_FLAG_1000000)) { - if (!(npc->flags & NPC_FLAG_PARTICLE)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { + if (!(npc->flags & NPC_FLAG_PARTNER)) { npc->spriteInstanceID = spr_load_npc_sprite(npc->currentAnim, animList); } else { npc->spriteInstanceID = spr_load_npc_sprite(npc->currentAnim | SPRITE_ID_TAIL_ALLOCATE, animList); } } else { - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; } } @@ -219,7 +217,7 @@ void free_npc_by_index(s32 listIndex) { } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - ASSERT((npc->flags & NPC_FLAG_1000000) || !spr_free_sprite(npc->spriteInstanceID)); + ASSERT((npc->flags & NPC_FLAG_HAS_NO_SPRITE) || !spr_free_sprite(npc->spriteInstanceID)); } delete_shadow(npc->shadowIndex); @@ -248,7 +246,7 @@ void free_npc(Npc* npc) { } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - ASSERT((npc->flags & NPC_FLAG_1000000) || !spr_free_sprite(npc->spriteInstanceID)); + ASSERT((npc->flags & NPC_FLAG_HAS_NO_SPRITE) || !spr_free_sprite(npc->spriteInstanceID)); } delete_shadow(npc->shadowIndex); @@ -277,101 +275,108 @@ Npc* get_npc_by_index(s32 listIndex) { return (*gCurrentNpcListPtr)[listIndex & ~BATTLE_NPC_ID_BIT]; } +// checks for lateral collision with the world directly in front of the NPC and in an X pattern offset 45 degrees from +// the forward direction. when a collision is detected, the NPC position is adjusted an appropriate NPC flags are set +// to signal the collision has occurred. void npc_do_world_collision(Npc* npc) { - f32 temp_f0; - s32 phi_v0; - f32 temp_x; - f32 temp_y; - f32 temp_z; + f32 testAngle; + s32 hit; + f32 testX; + f32 testY; + f32 testZ; if (npc->flags & NPC_FLAG_IGNORE_WORLD_COLLISION) { npc->flags |= NPC_FLAG_WORLD_COLLISION_DIRTY; - } else if ((npc->pos.x != npc->colliderPos.x) || (npc->pos.y != npc->colliderPos.y) - || (npc->pos.z != npc->colliderPos.z) || npc->flags & NPC_FLAG_WORLD_COLLISION_DIRTY) { + } else if ( + (npc->pos.x != npc->colliderPos.x) + || (npc->pos.y != npc->colliderPos.y) + || (npc->pos.z != npc->colliderPos.z) + || npc->flags & NPC_FLAG_WORLD_COLLISION_DIRTY + ) { npc->flags &= ~NPC_FLAG_WORLD_COLLISION_DIRTY; - temp_f0 = clamp_angle(npc->yaw); - temp_x = npc->pos.x; - temp_y = npc->pos.y; - temp_z = npc->pos.z; + testAngle = clamp_angle(npc->yaw); + testX = npc->pos.x; + testY = npc->pos.y; + testZ = npc->pos.z; - if (!(npc->flags & NPC_FLAG_PARTICLE)) { - phi_v0 = npc_test_move_simple_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, npc->collisionRadius); + if (!(npc->flags & NPC_FLAG_PARTNER)) { + hit = npc_test_move_simple_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius); } else { - phi_v0 = npc_test_move_complex_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, npc->collisionRadius); + hit = npc_test_move_complex_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius); } - if (phi_v0) { - npc->flags |= (NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_4000); - npc->currentWall = D_8010C97A; - npc->pos.x = temp_x; - npc->pos.z = temp_z; + if (hit) { + npc->flags |= (NPC_FLAG_COLLDING_WITH_WORLD | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD); + npc->currentWall = NpcHitQueryColliderID; + npc->pos.x = testX; + npc->pos.z = testZ; } else { - npc->flags &= ~(NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_4000); + npc->flags &= ~(NPC_FLAG_COLLDING_WITH_WORLD | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD); } - temp_f0 = clamp_angle(npc->yaw + 45.0f); - temp_x = npc->pos.x; - temp_y = npc->pos.y; - temp_z = npc->pos.z; + testAngle = clamp_angle(npc->yaw + 45.0f); + testX = npc->pos.x; + testY = npc->pos.y; + testZ = npc->pos.z; - if (!(npc->flags & NPC_FLAG_PARTICLE)) { - phi_v0 = npc_test_move_simple_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, npc->collisionRadius); + if (!(npc->flags & NPC_FLAG_PARTNER)) { + hit = npc_test_move_simple_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius); } else { - phi_v0 = npc_test_move_taller_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, npc->collisionRadius); + hit = npc_test_move_taller_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius); } - if (phi_v0) { - npc->flags |= NPC_FLAG_NO_PROJECT_SHADOW; - npc->pos.x = temp_x; - npc->pos.z = temp_z; + if (hit) { + npc->flags |= NPC_FLAG_COLLDING_WITH_WORLD; + npc->pos.x = testX; + npc->pos.z = testZ; } else { - npc->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + npc->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } - temp_f0 = clamp_angle(npc->yaw - 45.0f); - temp_x = npc->pos.x; - temp_y = npc->pos.y; - temp_z = npc->pos.z; - if (!(npc->flags & NPC_FLAG_PARTICLE)) { - phi_v0 = npc_test_move_simple_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, npc->collisionRadius); + testAngle = clamp_angle(npc->yaw - 45.0f); + testX = npc->pos.x; + testY = npc->pos.y; + testZ = npc->pos.z; + if (!(npc->flags & NPC_FLAG_PARTNER)) { + hit = npc_test_move_simple_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius); } else { - phi_v0 = npc_test_move_taller_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, npc->collisionRadius); + hit = npc_test_move_taller_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius); } - if (phi_v0 != 0) { - npc->flags |= NPC_FLAG_NO_PROJECT_SHADOW; - npc->pos.x = temp_x; - npc->pos.z = temp_z; + if (hit != 0) { + npc->flags |= NPC_FLAG_COLLDING_WITH_WORLD; + npc->pos.x = testX; + npc->pos.z = testZ; } else { - npc->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + npc->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } - if (npc->flags & NPC_FLAG_PARTICLE) { - temp_f0 = clamp_angle(npc->yaw + 45.0f + 180.0f); - temp_x = npc->pos.x; - temp_y = npc->pos.y; - temp_z = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, + if (npc->flags & NPC_FLAG_PARTNER) { + testAngle = clamp_angle(npc->yaw + 45.0f + 180.0f); + testX = npc->pos.x; + testY = npc->pos.y; + testZ = npc->pos.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius) != 0) { - npc->flags |= NPC_FLAG_NO_PROJECT_SHADOW; - npc->pos.x = temp_x; - npc->pos.z = temp_z; + npc->flags |= NPC_FLAG_COLLDING_WITH_WORLD; + npc->pos.x = testX; + npc->pos.z = testZ; } else { - npc->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + npc->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } - temp_f0 = clamp_angle((npc->yaw - 45.0f) + 180.0f); - temp_x = npc->pos.x; - temp_y = npc->pos.y; - temp_z = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &temp_x, &temp_y, &temp_z, 0, temp_f0, npc->collisionHeight, + testAngle = clamp_angle((npc->yaw - 45.0f) + 180.0f); + testX = npc->pos.x; + testY = npc->pos.y; + testZ = npc->pos.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &testX, &testY, &testZ, 0, testAngle, npc->collisionHeight, npc->collisionRadius) != 0) { - npc->flags |= NPC_FLAG_NO_PROJECT_SHADOW; - npc->pos.x = temp_x; - npc->pos.z = temp_z; + npc->flags |= NPC_FLAG_COLLDING_WITH_WORLD; + npc->pos.x = testX; + npc->pos.z = testZ; return; } - npc->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + npc->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } } } @@ -394,8 +399,8 @@ void npc_do_other_npc_collision(Npc* npc) { s32 collision; s32 i; - if (!(npc->flags & NPC_FLAG_100)) { - npc->flags &= ~NPC_FLAG_SIMPLIFIED_PHYSICS; + if (!(npc->flags & NPC_FLAG_IGNORE_PLAYER_COLLISION)) { + npc->flags &= ~NPC_FLAG_COLLIDING_WITH_NPC; thisBuf = npc->collisionRadius * 0.5f; thisX = npc->pos.x; thisY = npc->pos.y; @@ -404,7 +409,7 @@ void npc_do_other_npc_collision(Npc* npc) { for (i = 0; i < 0x40; i++) { otherNpc = get_npc_by_index(i); if (otherNpc != NULL && npc != otherNpc) { - if (otherNpc->flags != 0 && !(otherNpc->flags & (NPC_FLAG_80000000 | NPC_FLAG_100))) { + if (otherNpc->flags != 0 && !(otherNpc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_IGNORE_PLAYER_COLLISION))) { if (!(otherNpc->pos.y + otherNpc->collisionHeight < thisY) && !(thisY + npc->collisionHeight < otherNpc->pos.y)) { @@ -417,9 +422,9 @@ void npc_do_other_npc_collision(Npc* npc) { if (!(thisBuf + otherBuf <= dist)) { collision = FALSE; - if (npc->flags & NPC_FLAG_PARTICLE) { + if (npc->flags & NPC_FLAG_PARTNER) { collision = gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE; - } else if (!(otherNpc->flags & NPC_FLAG_PARTICLE) || gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE) { + } else if (!(otherNpc->flags & NPC_FLAG_PARTNER) || gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE) { collision = TRUE; } @@ -431,7 +436,7 @@ void npc_do_other_npc_collision(Npc* npc) { thisX += temp_f22_3 * 0.1f; thisZ += temp_f22_4 * 0.1f; } - npc->flags |= NPC_FLAG_SIMPLIFIED_PHYSICS; + npc->flags |= NPC_FLAG_COLLIDING_WITH_NPC; } } } @@ -450,7 +455,7 @@ INCLUDE_ASM(s32, "npc", npc_do_player_collision, Npc* npc); void npc_do_gravity(Npc* npc) { if (npc->flags & NPC_FLAG_GRAVITY) { if (npc->flags & NPC_FLAG_JUMPING) { - npc->flags &= ~NPC_FLAG_1000; + npc->flags &= ~NPC_FLAG_FALLING; } else { f32 xTemp; f32 yTemp; @@ -468,7 +473,7 @@ void npc_do_gravity(Npc* npc) { yTemp = npc->pos.y + 13.0f; - if (!(npc->flags & NPC_FLAG_PARTICLE)) { + if (!(npc->flags & NPC_FLAG_PARTNER)) { hit = npc_raycast_down_sides(npc->collisionChannel, &xTemp, &yTemp, &zTemp, &length); } else { hit = npc_raycast_down_around(npc->collisionChannel, &xTemp, &yTemp, &zTemp, &length, npc->yaw, @@ -477,52 +482,52 @@ void npc_do_gravity(Npc* npc) { if (hit && length <= oldLength) { npc->jumpVelocity = 0.0f; - npc->flags |= NPC_FLAG_1000; + npc->flags |= NPC_FLAG_FALLING; npc->pos.y = yTemp; - npc->currentFloor = D_8010C97A; + npc->currentFloor = NpcHitQueryColliderID; } else { - npc->flags &= ~NPC_FLAG_1000; + npc->flags &= ~NPC_FLAG_FALLING; } } } } -s32 func_800397E8(Npc* npc, f32 arg1) { +s32 func_800397E8(Npc* npc, f32 velocity) { if (!(npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_8))) { f32 x; f32 y; f32 z; f32 length; - f32 oldLength; + f32 testLength; s32 phi_v0; if (npc->flags & NPC_FLAG_JUMPING) { - npc->flags &= ~NPC_FLAG_1000; + npc->flags &= ~NPC_FLAG_FALLING; return FALSE; } - length = oldLength = fabsf(arg1) + 16; + length = testLength = fabsf(velocity) + 16; x = npc->pos.x; y = npc->pos.y + 13; z = npc->pos.z; - if (!(npc->flags & NPC_FLAG_PARTICLE)) { + if (!(npc->flags & NPC_FLAG_PARTNER)) { phi_v0 = npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &length); } else { phi_v0 = npc_raycast_down_around(npc->collisionChannel, &x, &y, &z, &length, npc->yaw, npc->collisionRadius); } - if (phi_v0 != 0 && length <= oldLength) { + if (phi_v0 != 0 && length <= testLength) { npc->pos.y = y; - npc->currentFloor = D_8010C97A; - npc->flags |= NPC_FLAG_1000; + npc->currentFloor = NpcHitQueryColliderID; + npc->flags |= NPC_FLAG_FALLING; return TRUE; } } else { return FALSE; } - npc->flags &= ~NPC_FLAG_1000; + npc->flags &= ~NPC_FLAG_FALLING; return FALSE; } @@ -535,18 +540,18 @@ void update_npcs(void) { if (!(gOverrideFlags & (GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400))) { s32 i; - for (i = 0; i < 0x40; i++) { + for (i = 0; i < MAX_NPCS; i++) { Npc* npc = (*gCurrentNpcListPtr)[i]; if (npc != NULL) { if (npc->flags != 0) { - if (npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_4)) { + if (npc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_INACTIVE)) { npc_do_world_collision(npc); continue; } npc->onUpdate(npc); - if (npc->flags & NPC_FLAG_8000) { + if (npc->flags & NPC_FLAG_IGNORE_ENTITY_COLLISION) { npc->collisionChannel |= COLLISION_IGNORE_ENTITIES; } else { npc->collisionChannel &= ~COLLISION_IGNORE_ENTITIES; @@ -554,7 +559,7 @@ void update_npcs(void) { npc->currentFloor = -1; npc->currentWall = -1; - npc->flags &= ~(NPC_FLAG_4000 | NPC_FLAG_NO_PROJECT_SHADOW); + npc->flags &= ~(NPC_FLAG_COLLDING_FORWARD_WITH_WORLD | NPC_FLAG_COLLDING_WITH_WORLD); npc_do_world_collision(npc); npc_do_gravity(npc); @@ -566,7 +571,7 @@ void update_npcs(void) { update_npc_blur(npc); } - if ((npc->pos.y < -2000.0f) && !(npc->flags & NPC_FLAG_PARTICLE)) { + if ((npc->pos.y < -2000.0f) && !(npc->flags & NPC_FLAG_PARTNER)) { npc->pos.y = playerStatus->position.y; npc->jumpVelocity = 0.0f; npc->moveSpeed = 0.0f; @@ -575,7 +580,7 @@ void update_npcs(void) { } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { if (npc->currentAnim != 0) { if (npc->spriteInstanceID >= 0) { spr_update_sprite(npc->spriteInstanceID, npc->currentAnim, npc->animationSpeed); @@ -598,13 +603,12 @@ void update_npcs(void) { x = npc->pos.x; y = npc->pos.y; z = npc->pos.z; - if (!(npc->flags & NPC_FLAG_20)) { - if ( - x != npc->colliderPos.x || - y != npc->colliderPos.y || - z != npc->colliderPos.z || - (npc->flags & NPC_FLAG_DIRTY_SHADOW)) - { + if (!(npc->flags & NPC_FLAG_NO_SHADOW_RAYCAST)) { + if ( x != npc->colliderPos.x + || y != npc->colliderPos.y + || z != npc->colliderPos.z + || (npc->flags & NPC_FLAG_DIRTY_SHADOW) + ) { x = npc->pos.x; y = npc->pos.y + (npc->collisionHeight / 2); z = npc->pos.z; @@ -621,13 +625,14 @@ void update_npcs(void) { npc->flags &= ~NPC_FLAG_DIRTY_SHADOW; } } else { - if (npc->flags & NPC_FLAG_LOCK_ANIMS) { + if (npc->flags & NPC_FLAG_DONT_UPDATE_SHADOW_Y) { shadow->position.x = npc->pos.x; + shadow->position.z = npc->pos.z; } else { shadow->position.x = npc->pos.x; shadow->position.y = npc->pos.y; + shadow->position.z = npc->pos.z; } - shadow->position.z = npc->pos.z; } } @@ -637,7 +642,7 @@ void update_npcs(void) { npc_update_decorations(npc); if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { if (npc->spriteInstanceID < 0) { npc->spriteInstanceID++; if (npc->spriteInstanceID == -1) { @@ -654,34 +659,34 @@ void update_npcs(void) { } } -// float regalloc, issue at the bottom with a mov.s -#ifdef NON_MATCHING f32 npc_get_render_yaw(Npc* npc) { Camera* camera = &gCameras[gCurrentCamID]; f32 cameraYaw; - f32 temp; - s32 phi_s0; + f32 camRelativeYaw; + f32 yaw; + s32 direction; if (!(gOverrideFlags & (GLOBAL_OVERRIDES_8000 | GLOBAL_OVERRIDES_4000))) { cameraYaw = camera->currentYaw; - temp = get_clamped_angle_diff(cameraYaw, npc->yaw); + camRelativeYaw = get_clamped_angle_diff(cameraYaw, npc->yaw); - if (temp < -5.0f && temp > -175.0f) { - phi_s0 = 0; - temp = clamp_angle(0.0f); - } else if (temp > 5.0f && temp < 175.0f) { - phi_s0 = 1; - temp = clamp_angle(180.0f); + if (camRelativeYaw < -5.0f && camRelativeYaw > -175.0f) { + direction = 0; + camRelativeYaw = 0.0f; + } else if (camRelativeYaw > 5.0f && camRelativeYaw < 175.0f) { + direction = 1; + camRelativeYaw = 180.0f; } else { - phi_s0 = 2; - temp = clamp_angle(npc->yawCamOffset); + // direction is close to flipping, use saved value + direction = 2; + camRelativeYaw = npc->yawCamOffset; } - npc->yawCamOffset = temp; + npc->yawCamOffset = yaw = clamp_angle(camRelativeYaw); - if (!(npc->flags & NPC_FLAG_40000)) { - if (npc->isFacingAway != phi_s0 && phi_s0 != 2) { - npc->isFacingAway = phi_s0; + if (!(npc->flags & NPC_FLAG_IGNORE_CAMERA_FOR_YAW)) { + if (npc->isFacingAway != direction && direction != 2) { + npc->isFacingAway = direction; if (npc->isFacingAway) { npc->turnAroundYawAdjustment = 180; @@ -707,16 +712,16 @@ f32 npc_get_render_yaw(Npc* npc) { npc->turnAroundYawAdjustment = 0; } - temp = clamp_angle(clamp_angle(npc->turnAroundYawAdjustment + temp) - cameraYaw); - npc->renderYaw = temp; - return temp; + npc->renderYaw = clamp_angle(clamp_angle(npc->turnAroundYawAdjustment + yaw) - cameraYaw); + yaw = npc->renderYaw; + } else { + yaw = npc->renderYaw; } + } else { + yaw = npc->renderYaw; } - return npc->renderYaw; + return yaw; } -#else -INCLUDE_ASM(f32, "npc", npc_get_render_yaw); -#endif void appendGfx_npc(void* data) { Npc* npc = data; @@ -767,7 +772,7 @@ void appendGfx_npc(void* data) { } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000) && (npc->currentAnim != 0) && (npc->spriteInstanceID >= 0)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE) && (npc->currentAnim != 0) && (npc->spriteInstanceID >= 0)) { npc_draw_with_palswap(npc, renderYaw, mtx1); npc->animNotifyValue = spr_get_notify_value(npc->spriteInstanceID); } @@ -801,7 +806,7 @@ void appendGfx_npc(void* data) { } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000) && (npc->currentAnim != 0)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE) && (npc->currentAnim != 0)) { spr_draw_npc_sprite(npc->spriteInstanceID, renderYaw, 0, 0, mtx1); } } else { @@ -831,7 +836,7 @@ void appendGfx_npc(void* data) { guMtxCatF(mtx2, mtx1, mtx1); } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000) && (npc->currentAnim != 0)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE) && (npc->currentAnim != 0)) { spr_draw_npc_sprite(npc->spriteInstanceID, renderYaw, 0, 0, mtx1); } } else { @@ -842,56 +847,52 @@ void appendGfx_npc(void* data) { } void render_npcs(void) { - f32 temp_f20; Npc* npc; - f32 phi_f20; - s32 i; RenderTask renderTask; RenderTask* renderTaskPtr = &renderTask; - f32 x; - f32 y; - f32 z; - f32 s; Camera* cam = &gCameras[gCurrentCamID]; + f32 x, y, z, s; + f32 renderDist; + s32 i; for (i = 0; i < MAX_NPCS; i++) { - Npc* npc = (*gCurrentNpcListPtr)[i]; - if (npc != NULL) { - if (npc->flags && !(npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_1000000 | NPC_FLAG_4 | NPC_FLAG_2))) { - transform_point(cam->perspectiveMatrix, npc->pos.x, npc->pos.y, npc->pos.z, 1.0f, &x, &y, &z, &s); - if (!(s < 0.01) || !(s > -0.01)) { - phi_f20 = ((z * 5000.0f) / s) + 5000.0f; - if (phi_f20 < 0.0f) { - phi_f20 = 0.0f; - } else if (phi_f20 > 10000.0f) { - phi_f20 = 10000.0f; - } + if ((npc != NULL) + && (npc->flags != 0) + && !(npc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_HAS_NO_SPRITE | NPC_FLAG_INACTIVE | NPC_FLAG_INVISIBLE)) + ) { + transform_point(cam->perspectiveMatrix, npc->pos.x, npc->pos.y, npc->pos.z, 1.0f, &x, &y, &z, &s); + if (!(s < 0.01) || !(s > -0.01)) { + renderDist = ((z * 5000.0f) / s) + 5000.0f; + if (renderDist < 0.0f) { + renderDist = 0.0f; + } else if (renderDist > 10000.0f) { + renderDist = 10000.0f; + } - renderTaskPtr->distance = -phi_f20; + renderTaskPtr->distance = -renderDist; + renderTaskPtr->appendGfxArg = npc; + renderTaskPtr->appendGfx = appendGfx_npc; + renderTaskPtr->renderMode = npc->renderMode; + + if (npc->flags & NPC_FLAG_HIDING) { + u8 r, g, b, a; + get_background_color_blend(&r, &g, &b, &a); + npc->alpha2 = 255 - a; + } else { + npc->alpha2 = 255; + } + + if (npc->alpha2 != 0) { + queue_render_task(renderTaskPtr); + } + + if (npc->flags & NPC_FLAG_MOTION_BLUR) { + renderTaskPtr->distance = -renderDist; + renderTaskPtr->appendGfx = appendGfx_npc_blur; renderTaskPtr->appendGfxArg = npc; - renderTaskPtr->appendGfx = appendGfx_npc; - renderTaskPtr->renderMode = npc->renderMode; - - if (npc->flags & NPC_FLAG_HIDING) { - u8 r, g, b, a; - get_background_color_blend(&r, &g, &b, &a); - npc->alpha2 = 255 - a; - } else { - npc->alpha2 = 255; - } - - if (npc->alpha2 != 0) { - queue_render_task(renderTaskPtr); - } - - if (npc->flags & NPC_FLAG_MOTION_BLUR) { - renderTaskPtr->distance = -phi_f20; - renderTaskPtr->appendGfx = appendGfx_npc_blur; - renderTaskPtr->appendGfxArg = npc; - renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - queue_render_task(renderTaskPtr); - } + renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; + queue_render_task(renderTaskPtr); } } } @@ -961,11 +962,11 @@ void disable_npc_shadow(Npc* npc) { } void set_npc_sprite(Npc* npc, s32 anim, AnimID* extraAnimList) { - ASSERT((npc->flags & NPC_FLAG_1000000) || spr_free_sprite(npc->spriteInstanceID) == 0); + ASSERT((npc->flags & NPC_FLAG_HAS_NO_SPRITE) || spr_free_sprite(npc->spriteInstanceID) == 0); npc->extraAnimList = extraAnimList; - if (!(npc->flags & NPC_FLAG_1000000)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { npc->spriteInstanceID = spr_load_npc_sprite(anim, extraAnimList); ASSERT(npc->spriteInstanceID >= 0); } @@ -973,7 +974,7 @@ void set_npc_sprite(Npc* npc, s32 anim, AnimID* extraAnimList) { npc->currentAnim = anim; if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { spr_update_sprite(npc->spriteInstanceID, anim, npc->animationSpeed); } } @@ -1092,7 +1093,7 @@ void appendGfx_npc_blur(void* data) { } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { spr_draw_npc_sprite(npc->spriteInstanceID, (s32) yaw, 0, 0, sp20); } } else { @@ -1122,15 +1123,15 @@ void npc_reload_all(void) { Npc* npc = (*gCurrentNpcListPtr)[i]; if (npc != NULL) { if (npc->flags && !(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000)) { - if (!(npc->flags & NPC_FLAG_PARTICLE)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { + if (!(npc->flags & NPC_FLAG_PARTNER)) { npc->spriteInstanceID = spr_load_npc_sprite(npc->currentAnim, npc->extraAnimList); } else { npc->spriteInstanceID = spr_load_npc_sprite(npc->currentAnim | SPRITE_ID_TAIL_ALLOCATE, npc->extraAnimList); } } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000) && (npc->palSwapType != 0)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE) && (npc->palSwapType != 0)) { npc->spritePaletteList = spr_get_npc_palettes(npc->currentAnim >> 16); npc->paletteCount = 0; while (npc->spritePaletteList[npc->paletteCount] != (PAL_PTR) -1) { @@ -1139,7 +1140,7 @@ void npc_reload_all(void) { npc->unk_C0 = spr_get_npc_color_variations(npc->currentAnim >> 16); } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { - if (!(npc->flags & NPC_FLAG_1000000)) { + if (!(npc->flags & NPC_FLAG_HAS_NO_SPRITE)) { for (j = 0; j < 2; j++) { npc_reset_current_decoration(npc, j); } @@ -1877,8 +1878,8 @@ Npc* npc_find_closest(f32 x, f32 y, f32 z, f32 radius) { for (i = 0; i < ARRAY_COUNT(*gCurrentNpcListPtr); i++) { Npc* npc = (*gCurrentNpcListPtr)[i]; - if (npc != NULL && npc->flags != 0 && !(npc->flags & NPC_FLAG_PARTICLE)) { - if (!(npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_4))) { + if (npc != NULL && npc->flags != 0 && !(npc->flags & NPC_FLAG_PARTNER)) { + if (!(npc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_INACTIVE))) { f32 distance = fabsf(dist2D(npc->pos.x, npc->pos.z, x, z)); if (distance <= maxDist) { @@ -1903,8 +1904,8 @@ Npc* npc_find_closest_simple(f32 x, f32 y, f32 z, f32 radius) { for (i = 0; i < ARRAY_COUNT(*gCurrentNpcListPtr); i++) { Npc* npc = (*gCurrentNpcListPtr)[i]; - if (npc != NULL && npc->flags != 0 && (npc->flags & NPC_FLAG_PARTICLE)) { - if (!(npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_4))) { + if (npc != NULL && npc->flags != 0 && (npc->flags & NPC_FLAG_PARTNER)) { + if (!(npc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_INACTIVE))) { f32 distance = fabsf(dist2D(npc->pos.x, npc->pos.z, x, z)); if (distance <= maxDist) { @@ -1938,16 +1939,16 @@ s32 npc_find_standing_on_entity(s32 entityIndex) { if (npc->flags == 0) { continue; } - if (npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_4)) { + if (npc->flags & (NPC_FLAG_SUSPENDED | NPC_FLAG_INACTIVE)) { continue; } - if (npc->flags & NPC_FLAG_PARTICLE) { - var_v1 = i; // TODO required to match (dummy if statement to load NPC_FLAG_PARTICLE into s5) + if (npc->flags & NPC_FLAG_PARTNER) { + var_v1 = i; // TODO required to match (dummy if statement to load NPC_FLAG_PARTNER into s5) } if (npc->pos.y < y) { continue; } - if (npc->flags & (NPC_FLAG_8000 | NPC_FLAG_8)) { + if (npc->flags & (NPC_FLAG_IGNORE_ENTITY_COLLISION | NPC_FLAG_8)) { var_v1 = npc_get_collider_below(npc); if (var_v1 != 0) { if (idx == var_v1) { @@ -1974,7 +1975,7 @@ s32 npc_get_collider_below(Npc* npc) { f32 z; f32 yaw; - if (npc->flags & NPC_FLAG_PARTICLE) { + if (npc->flags & NPC_FLAG_PARTNER) { y = get_shadow_by_index(npc->shadowIndex)->position.y + 13.0f; } else { y = npc->pos.y + 13.0f; @@ -1986,7 +1987,7 @@ s32 npc_get_collider_below(Npc* npc) { if (npc_raycast_down_sides(COLLISION_CHANNEL_8000 | COLLISION_CHANNEL_10000 | COLLISION_CHANNEL_20000, &x, &y, &z, &yaw)) { if (yaw <= 16.0f) { - return D_8010C978; + return NpcHitQueryColliderID; } } return 0; @@ -2074,7 +2075,7 @@ void func_8003D624(Npc* npc, s32 foldType, s32 arg2, s32 arg3, s32 arg4, s32 arg void func_8003D660(Npc* npc, s32 arg1) { PartnerActionStatus* temp = &gPartnerActionStatus; - if ((npc->flags & (NPC_FLAG_400000 | NPC_FLAG_2)) == NPC_FLAG_400000) { + if ((npc->flags & (NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_INVISIBLE)) == NPC_FLAG_TOUCHES_GROUND) { if (npc->moveSpeed != 0.0f) { s32 surfaceType = get_collider_flags((u16)npc->currentFloor) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; switch (surfaceType) { @@ -2534,13 +2535,12 @@ void kill_enemy(Enemy* enemy) { } do { - if (!(enemy->flags & ENEMY_FLAG_4)) { - if (!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || (enemy == encounterStatus->currentEnemy)) { - if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) { - if (!(enemy->flags & ENEMY_FLAG_FLED)) { - COPY_set_defeated(encounterStatus->mapID, encounter->encounterID + i); - } - } + if (!(enemy->flags & ENEMY_FLAG_4) + && (!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || (enemy == encounterStatus->currentEnemy)) + && !(enemy->flags & ENEMY_FLAG_PASSIVE) + ) { + if (!(enemy->flags & ENEMY_FLAG_FLED)) { + COPY_set_defeated(encounterStatus->mapID, encounter->encounterID + i); } } } while (0); // required to match diff --git a/src/npc_collision.c b/src/npc_collision.c index 2aaa6c117e..7c61e494a9 100644 --- a/src/npc_collision.c +++ b/src/npc_collision.c @@ -112,7 +112,7 @@ s32 npc_raycast_down_around(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f3 if (colliderID >= 0) { if (depth <= minDepth) { hitYAhead = startY; - D_8010C978 = colliderID; + NpcHitQueryColliderID = colliderID; D_8010C98C = colliderID; D_8010C970 = hitYAhead; minDepth = depth; @@ -135,7 +135,7 @@ s32 npc_raycast_down_around(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f3 if (colliderID >= 0) { if (depth <= minDepth) { hitYBehindRight = startY; - D_8010C978 = colliderID; + NpcHitQueryColliderID = colliderID; D_8010C968 = colliderID; D_8010C94C = hitYBehindRight; minDepth = depth; @@ -158,7 +158,7 @@ s32 npc_raycast_down_around(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f3 if (colliderID >= 0) { if (depth <= minDepth) { hitYBehindLeft = startY; - D_8010C978 = colliderID; + NpcHitQueryColliderID = colliderID; D_8010C968 = colliderID; D_8010C974 = hitYBehindLeft; minDepth = depth; @@ -228,7 +228,7 @@ s32 npc_raycast_down_sides(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f32 if (colliderID >= 0) { if (depth <= minDepth) { hitYAhead = startY; - D_8010C978 = colliderID; + NpcHitQueryColliderID = colliderID; D_8010C98C = colliderID; D_8010C970 = hitYAhead; minDepth = depth; @@ -251,7 +251,7 @@ s32 npc_raycast_down_sides(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f32 if (colliderID >= 0) { if (depth <= minDepth) { hitYBehind = startY; - D_8010C978 = colliderID; + NpcHitQueryColliderID = colliderID; D_8010C968 = colliderID; D_8010C94C = hitYBehind; minDepth = depth; @@ -322,7 +322,7 @@ s32 npc_raycast_up(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32* *startX = cHitX; *startY = cHitY; *startZ = cHitZ; - D_8010C978 = ret; + NpcHitQueryColliderID = ret; return TRUE; } } @@ -517,7 +517,7 @@ s32 npc_test_move_with_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 len npc_get_slip_vector(&outX, &outY, aX, aZ, bX, bZ); *x += a + outX; *z += b + outY; - D_8010C978 = raycastHitID; + NpcHitQueryColliderID = raycastHitID; phi_s2 = raycastHitID; } @@ -557,7 +557,7 @@ s32 npc_test_move_without_slipping(s32 ignoreFlags, f32* x, f32* y, f32* z, f32 *x += depthDiff * dirY; *z += depthDiff * cosThetaTemp; - D_8010C978 = hitID; + NpcHitQueryColliderID = hitID; ret = hitID; } diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index d97ea2a744..f395ad5b9f 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -109,7 +109,7 @@ void action_update_parasol(void) { transformation->reverted = 1; transformation->revertTime = 12; disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); - disguiseNpc->flags |= NPC_FLAG_40000; + disguiseNpc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW; playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; sfx_play_sound_at_player(SOUND_FD, SOUND_SPACE_MODE_0); } @@ -229,7 +229,7 @@ void action_update_parasol(void) { if (--playerStatus->currentStateTime == 0) { set_time_freeze_mode(TIME_FREEZE_NORMAL); disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); - disguiseNpc->flags &= ~NPC_FLAG_40000; + disguiseNpc->flags &= ~NPC_FLAG_IGNORE_CAMERA_FOR_YAW; playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; set_action_state(ACTION_STATE_IDLE); enable_player_static_collisions(); diff --git a/src/world/area_arn/arn_02/arn_02_4_npc.c b/src/world/area_arn/arn_02/arn_02_4_npc.c index fa696c8ea0..9f87b9507d 100644 --- a/src/world/area_arn/arn_02/arn_02_4_npc.c +++ b/src/world/area_arn/arn_02/arn_02_4_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_HyperCleft_01) = { } }, .settings = &N(NpcSettings_HyperCleft), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_HyperCleft_02) = { } }, .settings = &N(NpcSettings_HyperCleft), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -66,7 +66,7 @@ NpcData N(NpcData_HyperGoomba) = { } }, .settings = &N(NpcSettings_HyperGoomba), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c b/src/world/area_arn/arn_03/arn_03_3_npc.c index f04c299de8..eed6665b41 100644 --- a/src/world/area_arn/arn_03/arn_03_3_npc.c +++ b/src/world/area_arn/arn_03/arn_03_3_npc.c @@ -388,7 +388,7 @@ NpcData N(NpcData_Boo_01) = { }, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_LovesBow, @@ -400,7 +400,7 @@ NpcData N(NpcData_Boo_02) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_02), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooA, @@ -426,7 +426,7 @@ NpcData N(NpcData_Boo_03) = { }, .init = &N(EVS_NpcInit_Boo_03), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooB, @@ -438,7 +438,7 @@ NpcData N(NpcData_Boo_04) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_04), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooC, @@ -450,7 +450,7 @@ NpcData N(NpcData_Boo_05) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_05), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -514,7 +514,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_06), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -524,7 +524,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_07), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -534,7 +534,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_08), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -544,7 +544,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_09), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, diff --git a/src/world/area_arn/arn_04/arn_04_3_npc.c b/src/world/area_arn/arn_04/arn_04_3_npc.c index fbcda8da09..20eb14e7d4 100644 --- a/src/world/area_arn/arn_04/arn_04_3_npc.c +++ b/src/world/area_arn/arn_04/arn_04_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_HyperParagoomba) = { } }, .settings = &N(NpcSettings_HyperParagoomba), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -44,7 +44,7 @@ NpcData N(NpcData_HyperGoomba) = { } }, .settings = &N(NpcSettings_HyperGoomba_Patrol), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -67,7 +67,7 @@ NpcData N(NpcData_HyperCleft_01) = { } }, .settings = &N(NpcSettings_HyperCleft), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -90,7 +90,7 @@ NpcData N(NpcData_HyperCleft_02) = { } }, .settings = &N(NpcSettings_HyperCleft), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, 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 a8f8da2c42..95de251f34 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 @@ -185,7 +185,7 @@ EvtScript N(EVS_NpcInit_Boo_03) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Boo_03))) EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH3_SAW_TUBBA_EAT_BOO) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CASE_LT(STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_LT(STORY_CH3_DEFEATED_TUBBA_BLUBBA) @@ -249,7 +249,7 @@ NpcData N(NpcData_Boo_01)[] = { }, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooD, @@ -260,7 +260,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_02), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooE, @@ -271,7 +271,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_03), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooF, @@ -282,7 +282,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_04), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooG, @@ -307,7 +307,7 @@ NpcData N(NpcData_Boo_01)[] = { }, .init = &N(EVS_NpcInit_Boo_05), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooH, @@ -640,7 +640,7 @@ NpcData N(NpcData_Tubba) = { .yaw = 270, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), @@ -705,7 +705,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_06), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -715,7 +715,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_07), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -725,7 +725,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_08), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -735,7 +735,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_09), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index b8a7b76f27..c4b914e0b3 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -492,7 +492,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Skolar, ANIM_WorldSkolar_TalkAngry, ANIM_WorldSkolar_Idle, 512, MSG_CH3_00D5) - EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) @@ -565,7 +565,7 @@ NpcData N(NpcData_Tubba)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), @@ -576,7 +576,7 @@ NpcData N(NpcData_Tubba)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }, @@ -589,7 +589,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -600,7 +600,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -611,7 +611,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -622,7 +622,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -633,7 +633,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boo), @@ -644,7 +644,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boo), @@ -657,7 +657,7 @@ NpcData N(NpcData_Bow) = { .yaw = 0, .init = &N(EVS_NpcInit_Bow), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBow_Idle, @@ -685,7 +685,7 @@ NpcData N(NpcData_Bootler) = { .yaw = 0, .init = &N(EVS_NpcInit_Bootler), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, @@ -736,7 +736,7 @@ NpcData N(NpcData_HyperParagoomba_01) = { }, .init = &N(EVS_NpcInit_HyperParagoomba), .settings = &N(NpcSettings_HyperParagoomba), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -760,7 +760,7 @@ NpcData N(NpcData_HyperParagoomba_02) = { }, .init = &N(EVS_NpcInit_HyperParagoomba), .settings = &N(NpcSettings_HyperParagoomba), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -784,7 +784,7 @@ NpcData N(NpcData_HyperParagoomba_03) = { }, .init = &N(EVS_NpcInit_HyperParagoomba), .settings = &N(NpcSettings_HyperParagoomba), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -796,7 +796,7 @@ NpcData N(NpcData_Skolar) = { .yaw = 0, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }; diff --git a/src/world/area_arn/arn_08/arn_08_6_npc.c b/src/world/area_arn/arn_08/arn_08_6_npc.c index aacb123d0d..2556498340 100644 --- a/src/world/area_arn/arn_08/arn_08_6_npc.c +++ b/src/world/area_arn/arn_08/arn_08_6_npc.c @@ -51,7 +51,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_09/arn_09_5_npc.c b/src/world/area_arn/arn_09/arn_09_5_npc.c index 2ff7db719b..c29450af7a 100644 --- a/src/world/area_arn/arn_09/arn_09_5_npc.c +++ b/src/world/area_arn/arn_09/arn_09_5_npc.c @@ -51,7 +51,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_10/arn_10_3_npc.c b/src/world/area_arn/arn_10/arn_10_3_npc.c index 966cab485f..074c3956ee 100644 --- a/src/world/area_arn/arn_10/arn_10_3_npc.c +++ b/src/world/area_arn/arn_10/arn_10_3_npc.c @@ -65,7 +65,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; @@ -88,7 +88,7 @@ NpcData N(NpcData_HyperGoomba) = { }, .init = &N(EVS_NpcInit_HyperGoomba), .settings = &N(NpcSettings_HyperGoomba), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_arn/arn_11/arn_11_3_npc.c b/src/world/area_arn/arn_11/arn_11_3_npc.c index 6eb77249fb..4f49d45b96 100644 --- a/src/world/area_arn/arn_11/arn_11_3_npc.c +++ b/src/world/area_arn/arn_11/arn_11_3_npc.c @@ -155,7 +155,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_12/arn_12_3_npc.c b/src/world/area_arn/arn_12/arn_12_3_npc.c index e217776e01..837a1ef7f8 100644 --- a/src/world/area_arn/arn_12/arn_12_3_npc.c +++ b/src/world/area_arn/arn_12/arn_12_3_npc.c @@ -66,7 +66,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; @@ -89,7 +89,7 @@ NpcData N(NpcData_HyperGoomba) = { }, .init = &N(EVS_NpcInit_HyperGoomba), .settings = &N(NpcSettings_HyperGoomba), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_arn/arn_13/arn_13_3_npc.c b/src/world/area_arn/arn_13/arn_13_3_npc.c index b5bee138a0..0d1c1a63d6 100644 --- a/src/world/area_arn/arn_13/arn_13_3_npc.c +++ b/src/world/area_arn/arn_13/arn_13_3_npc.c @@ -66,7 +66,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; @@ -89,7 +89,7 @@ NpcData N(NpcData_HyperGoomba) = { }, .init = &N(EVS_NpcInit_HyperGoomba), .settings = &N(NpcSettings_HyperGoomba), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, 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 2537b26ca6..7f675f2b95 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 @@ -441,7 +441,7 @@ NpcData N(NpcData_Boo_01) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_BraveBoo, @@ -453,7 +453,7 @@ NpcData N(NpcData_Boo_02) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_02), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -464,7 +464,7 @@ NpcData N(NpcData_Boo_03) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_03), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -475,7 +475,7 @@ NpcData N(NpcData_Boo_04) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_04), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -486,7 +486,7 @@ NpcData N(NpcData_Boo_05) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_05), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -497,7 +497,7 @@ NpcData N(NpcData_Boo_06) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_06), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -654,7 +654,7 @@ NpcData N(NpcData_Sentinel) = { .yaw = 90, .init = &N(EVS_NpcInit_Sentinel), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c index 220fbe16f2..9e60ab43e7 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c +++ b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c @@ -94,12 +94,12 @@ EvtScript N(EVS_NpcDefeat_Tubba_Floor2) = { EvtScript N(EVS_NpcInit_Tubba_Floor2) = { EVT_IF_NE(GB_ARN_Tubba_MapID, 1) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_RETURN EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_RETURN EVT_END_IF EVT_CALL(SetNpcPos, NPC_Tubba, 137, 244, 35) @@ -261,7 +261,7 @@ NpcData N(NpcData_Sentinel_01) = { }, .init = &N(EVS_NpcInit_Sentinel_01), .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -284,7 +284,7 @@ NpcData N(NpcData_Sentinel_02) = { }, .init = &N(EVS_NpcInit_Sentinel_02), .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -307,7 +307,7 @@ NpcData N(NpcData_Sentinel_03) = { }, .init = &N(EVS_NpcInit_Sentinel_03), .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -330,7 +330,7 @@ NpcData N(NpcData_Sentinel_04) = { }, .init = &N(EVS_NpcInit_Sentinel_04), .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -356,7 +356,7 @@ NpcData N(NpcData_Tubba_Floor3) = { .yaw = 270, .init = &N(EVS_NpcInit_Tubba_Floor3), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), @@ -382,7 +382,7 @@ NpcData N(NpcData_Tubba_Floor2) = { }, .init = &N(EVS_NpcInit_Tubba_Floor2), .settings = &N(NpcSettings_TubbaBlubba_Patrol), - .flags = ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), @@ -415,7 +415,7 @@ NpcData N(NpcData_Tubba_Floor1) = { }, .init = &N(EVS_NpcInit_Tubba_Floor1), .settings = &N(NpcSettings_TubbaBlubba_Patrol), - .flags = ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), diff --git a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c index 7e5ecd565e..a3b8b3dd93 100644 --- a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c +++ b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c @@ -22,7 +22,7 @@ NpcData N(NpcData_Clubba_01)[] = { } }, .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -49,7 +49,7 @@ NpcData N(NpcData_Clubba_02)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c index 3a339438a3..8882147b2e 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c +++ b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c @@ -32,7 +32,7 @@ NpcData N(NpcData_Clubba_Wander)[] = { } }, .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -60,7 +60,7 @@ NpcData N(NpcData_Clubba_Patrol)[] = { } }, .settings = &N(NpcSettings_Clubba_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -87,7 +87,7 @@ NpcData N(NpcData_Clubba_Napping)[] = { }, .init = &N(EVS_NpcInit_Clubba_Napping), .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c index 93e8b40f0f..842b5fbc8b 100644 --- a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c +++ b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Sentinel) = { } }, .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c index 4dbe5893a7..aa381e00e7 100644 --- a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c +++ b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Clubba_01)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -47,7 +47,7 @@ NpcData N(NpcData_Clubba_02)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c index 52c4c611f6..3249984f48 100644 --- a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c +++ b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c @@ -29,7 +29,7 @@ NpcData N(NpcData_Boo) = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_HidingBoo, diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c index b1e91c5e28..379958000b 100644 --- a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c +++ b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c @@ -138,12 +138,12 @@ EvtScript N(EVS_NpcDefeat_Tubba) = { EvtScript N(EVS_NpcInit_Tubba) = { EVT_IF_LT(GB_StoryProgress, STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_RETURN EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_RETURN EVT_END_IF EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) @@ -153,7 +153,7 @@ EvtScript N(EVS_NpcInit_Tubba) = { EVT_CASE_EQ(dgb_08_ENTRY_0) EVT_IF_NE(GB_ARN_Tubba_MapID, 8) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_ELSE EVT_CALL(SetNpcPos, NPC_SELF, -130, 0, 200) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Tubba))) @@ -198,7 +198,7 @@ NpcData N(NpcData_Tubba) = { }, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -222,7 +222,7 @@ NpcData N(NpcData_Clubba_01)[] = { } }, .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -249,7 +249,7 @@ NpcData N(NpcData_Clubba_02)[] = { } }, .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -276,7 +276,7 @@ NpcData N(NpcData_Clubba_03)[] = { } }, .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -302,7 +302,7 @@ NpcData N(NpcData_Sentinel_01) = { } }, .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -324,7 +324,7 @@ NpcData N(NpcData_Sentinel_02) = { } }, .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -412,7 +412,7 @@ NpcData N(NpcData_LastClubba) = { }, .init = &N(EVS_NpcInit_LastClubba), .settings = &N(NpcSettings_LastClubba), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -449,7 +449,7 @@ NpcData N(NpcData_Clubba_Unused) = { }, .init = &N(EVS_NpcInit_Clubba_Unused), .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), diff --git a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c index 057cad57a2..84d28f3ebd 100644 --- a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c +++ b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c @@ -26,7 +26,7 @@ NpcData N(NpcData_Clubba_Wander)[] = { } }, .settings = &N(NpcSettings_Clubba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -64,7 +64,7 @@ NpcData N(NpcData_Clubba_Napping)[] = { }, .init = &N(EVS_NpcInit_Clubba_Napping), .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -90,7 +90,7 @@ NpcData N(NpcData_Sentinel) = { } }, .settings = &N(NpcSettings_Sentinel), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; diff --git a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c index 3ede3e1298..406b5cdf81 100644 --- a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c +++ b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c @@ -187,7 +187,7 @@ NpcData N(NpcData_Tubba) = { }, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = CLUBBA_DROPS, .animations = TUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c index dfba27841b..1fbbd65e7b 100644 --- a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c +++ b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Clubba_01)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), @@ -48,7 +48,7 @@ NpcData N(NpcData_Clubba_02)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -74,7 +74,7 @@ NpcData N(NpcData_Clubba_03)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -100,7 +100,7 @@ NpcData N(NpcData_Clubba_04)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -126,7 +126,7 @@ NpcData N(NpcData_Clubba_05)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -152,7 +152,7 @@ NpcData N(NpcData_Clubba_06)[] = { } }, .settings = &N(NpcSettings_Clubba_Napping), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c index 4cc879a938..2c30c326a8 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c +++ b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c @@ -373,7 +373,7 @@ EvtScript N(EVS_Scene_YakkeyShouts) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(40) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 845, 0, 140) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcJump1, NPC_SELF, 845, 35, 145, 15) @@ -469,7 +469,7 @@ EvtScript N(EVS_Scene_YakkeyShouts) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SUB(LVar1, 10) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -509,7 +509,7 @@ NpcData N(NpcData_Tubba) = { }, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = TUBBA_ANGRY_ANIMS, }; 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 0ea8ea43c1..f13276de73 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 @@ -196,7 +196,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Mouser_01), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_Greeter, @@ -219,7 +219,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_Dryite_01), .settings = &N(NpcSettings_Dryite_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_YELLOW_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteA, @@ -230,7 +230,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 61, .init = &N(EVS_NpcInit_Dryite_02), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteD, @@ -241,7 +241,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 74, .init = &N(EVS_NpcInit_HintDryite), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteB, @@ -252,7 +252,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 257, .init = &N(EVS_NpcInit_Dryite_04), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteC, @@ -263,7 +263,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 271, .init = &N(EVS_NpcInit_Composer), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { ANIM_Musician_Composer_Idle, @@ -291,7 +291,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShopOwner), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, .tattle = MSG_NpcTattle_DRO_ShopOwner, @@ -303,7 +303,7 @@ NpcData N(PassiveNPCs)[] = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_01 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, @@ -343,7 +343,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_DojoGrad), .settings = &N(NpcSettings_Dryite_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BROWN_ANIMS, .tattle = MSG_NpcTattle_DRO_DojoGraduate, @@ -368,7 +368,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_Dryite_06), .settings = &N(NpcSettings_Dryite_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BROWN_ANIMS, .tattle = MSG_NpcTattle_DRO_WorriedDryite, @@ -382,7 +382,7 @@ NpcData N(ThreeSisterNPCs)[] = { .yaw = 62, .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -393,7 +393,7 @@ NpcData N(ThreeSisterNPCs)[] = { .yaw = 63, .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -404,7 +404,7 @@ NpcData N(ThreeSisterNPCs)[] = { .yaw = 244, .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, diff --git a/src/world/area_dro/dro_01/npc_hint_dryite_companion.c b/src/world/area_dro/dro_01/npc_hint_dryite_companion.c index c2e7bd9ce5..e754272e27 100644 --- a/src/world/area_dro/dro_01/npc_hint_dryite_companion.c +++ b/src/world/area_dro/dro_01/npc_hint_dryite_companion.c @@ -31,12 +31,12 @@ EvtScript N(EVS_NpcInteract_Dryite_04) = { EVT_END_LOOP EVT_END_CHILD_THREAD EVT_CALL(N(GetRunToPos)) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Run) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.5)) EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar1, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(5) EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) EVT_ADD(LVar0, 180) diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c index 2eff9c4fd4..ff4d3119a5 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CASE_LT(STORY_CH2_SHADY_MOUSE_LEFT_SHOP) EVT_CALL(N(AwaitPlayerApproachShop), 16, 190, -134, -131) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -180) EVT_EXEC_WAIT(N(EVS_OpenShopDoor)) EVT_WAIT(10) 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 d3ef0ad7b5..5314560e89 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 @@ -264,7 +264,7 @@ EvtScript N(EVS_NpcIdle_Mouser_03) = { EVT_LABEL(20) EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Idle) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) @@ -362,7 +362,7 @@ NpcData N(PassiveNPCs)[] = { .territory = { .temp = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }}, .init = &N(EVS_NpcInit_Archeologist), .settings = &N(NpcSettings_Archeologist), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { ANIM_Archeologist_Idle, @@ -391,7 +391,7 @@ NpcData N(PassiveNPCs)[] = { .territory = { .temp = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, .init = &N(EVS_NpcInit_MrE), .settings = &N(NpcSettings_Dryite_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteE, @@ -402,7 +402,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_DisguisedMoustafa), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DISGUISED_MOUSTAFA_ANIMS, .tattle = MSG_NpcTattle_Sheek, @@ -413,7 +413,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ToadHouseKeeper), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_DRO_ToadHouseToad, @@ -424,7 +424,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcAuxAI_Merlee), .settings = &N(NpcSettings_Merlee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { ANIM_WorldMerlee_Idle, @@ -452,7 +452,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Moustafa), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSTAFA_ANIMS, .tattle = MSG_NpcTattle_Moustafa, @@ -463,7 +463,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite_02), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteF, @@ -474,7 +474,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite_03), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_VisitedShootingStarSummit, @@ -485,7 +485,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Mouser_01), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_CrushingOnMerlee, @@ -496,7 +496,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mouser_02), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_TellsTales, @@ -507,7 +507,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Mouser_03), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, }, @@ -518,7 +518,7 @@ NpcData N(PassiveNPCs)[] = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } }, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_dro/dro_02/npc_moustafa.c b/src/world/area_dro/dro_02/npc_moustafa.c index da67dee233..96797e1d5b 100644 --- a/src/world/area_dro/dro_02/npc_moustafa.c +++ b/src/world/area_dro/dro_02/npc_moustafa.c @@ -40,8 +40,8 @@ EvtScript N(EVS_Moustafa_ResetCam) = { EvtScript N(EVS_Moustafa_Unveiling) = { EVT_CALL(SetNpcYaw, NPC_Moustafa, 270) - EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_GrabCloak) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_ThrownCloak) @@ -60,11 +60,11 @@ EvtScript N(EVS_Moustafa_Unveiling) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, NPC_DisguisedMoustafa, 0, NPC_DISPOSE_POS_Y, -250) EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle) - EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(30) EVT_RETURN EVT_END @@ -187,13 +187,13 @@ EvtScript N(EVS_NpcInteract_Moustafa) = { EVT_WAIT(10) EVT_CALL(func_802D2C14, 1) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -391, -260, 0) EVT_CALL(InterpPlayerYaw, 90, 3) - EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_EXEC_GET_TID(N(EVS_PartyWatchingMoustafa), LVarA) - EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(FadeOutMusic, 0, 500) EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutMoustafa, TRUE) EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C3) 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 81b5921631..b9ecc69c50 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 @@ -33,7 +33,7 @@ API_CALLABLE(N(CreateParadeNPC)) { NpcBlueprint bp; Npc* npc; - bp.flags = NPC_FLAG_100; + bp.flags = NPC_FLAG_IGNORE_PLAYER_COLLISION; bp.initialAnim = npcInfo->initialAnim; bp.onUpdate = NULL; bp.onRender = NULL; @@ -42,7 +42,7 @@ API_CALLABLE(N(CreateParadeNPC)) { npc = get_npc_by_index(create_standard_npc(&bp, npcInfo->animList)); npc->npcID = npcID; - npc->flags &= ~NPC_FLAG_PARTICLE; + npc->flags &= ~NPC_FLAG_PARTNER; npc->pos.x = npcInfo->pos.x; npc->pos.y = npcInfo->pos.y; npc->pos.z = npcInfo->pos.z; diff --git a/src/world/area_end/end_00/end_00_5_koopas.c b/src/world/area_end/end_00/end_00_5_koopas.c index 0b2bca6046..0b6fea5d8d 100644 --- a/src/world/area_end/end_00/end_00_5_koopas.c +++ b/src/world/area_end/end_00/end_00_5_koopas.c @@ -105,7 +105,7 @@ EvtScript N(EVS_KoopaBros_Green) = { }; EvtScript N(EVS_Bobomb1) = { - EVT_CALL(SetNpcFlagBits, NPC_Bobomb1, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb1, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb1, -1900, 43, 70) EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim0B) @@ -127,7 +127,7 @@ EvtScript N(EVS_Bobomb1) = { }; EvtScript N(EVS_Bobomb2) = { - EVT_CALL(SetNpcFlagBits, NPC_Bobomb2, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb2, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb2, -1870, 43, 70) EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim0B) @@ -149,7 +149,7 @@ EvtScript N(EVS_Bobomb2) = { }; EvtScript N(EVS_Bobomb3) = { - EVT_CALL(SetNpcFlagBits, NPC_Bobomb3, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb3, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb3, -1840, 43, 70) EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim0B) @@ -171,7 +171,7 @@ EvtScript N(EVS_Bobomb3) = { }; EvtScript N(EVS_Bobomb4) = { - EVT_CALL(SetNpcFlagBits, NPC_Bobomb4, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb4, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb4, -1810, 43, 70) EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim0B) diff --git a/src/world/area_end/end_00/end_00_9_huff_n_puff.c b/src/world/area_end/end_00/end_00_9_huff_n_puff.c index 0106e88054..c17cc32a9f 100644 --- a/src/world/area_end/end_00/end_00_9_huff_n_puff.c +++ b/src/world/area_end/end_00/end_00_9_huff_n_puff.c @@ -328,11 +328,11 @@ EvtScript N(EVS_ParadePhase_HuffNPuff) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffBody, NPC_FLAG_400000, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffFace, NPC_FLAG_400000, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffArms, NPC_FLAG_400000, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_TuffPuff1, NPC_FLAG_400000, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_TuffPuff2, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffBody, NPC_FLAG_TOUCHES_GROUND, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffFace, NPC_FLAG_TOUCHES_GROUND, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffArms, NPC_FLAG_TOUCHES_GROUND, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TuffPuff1, NPC_FLAG_TOUCHES_GROUND, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TuffPuff2, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcScale, NPC_HuffNPuffBody, EVT_FLOAT(0.75), EVT_FLOAT(0.75), 1) EVT_CALL(SetNpcScale, NPC_HuffNPuffFace, EVT_FLOAT(0.75), EVT_FLOAT(0.75), 1) EVT_CALL(SetNpcScale, NPC_HuffNPuffArms, EVT_FLOAT(0.75), EVT_FLOAT(0.75), 1) diff --git a/src/world/area_end/end_01/end_01_3_parade_setup.c b/src/world/area_end/end_01/end_01_3_parade_setup.c index e91c18459c..d4bfb8feff 100644 --- a/src/world/area_end/end_01/end_01_3_parade_setup.c +++ b/src/world/area_end/end_01/end_01_3_parade_setup.c @@ -29,7 +29,7 @@ API_CALLABLE(N(CreateParadeNPC)) { NpcBlueprint bp; Npc* npc; - bp.flags = NPC_FLAG_100; + bp.flags = NPC_FLAG_IGNORE_PLAYER_COLLISION; bp.initialAnim = npcInfo->initialAnim; bp.onUpdate = NULL; bp.onRender = NULL; @@ -38,7 +38,7 @@ API_CALLABLE(N(CreateParadeNPC)) { npc = get_npc_by_index(create_standard_npc(&bp, npcInfo->animList)); npc->npcID = npcID; - npc->flags &= ~NPC_FLAG_PARTICLE; + npc->flags &= ~NPC_FLAG_PARTNER; npc->pos.x = npcInfo->pos.x; npc->pos.y = npcInfo->pos.y; npc->pos.z = npcInfo->pos.z; diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/end_01_4_opera_float.c index e5edea7d3f..8109832657 100644 --- a/src/world/area_end/end_01/end_01_4_opera_float.c +++ b/src/world/area_end/end_01/end_01_4_opera_float.c @@ -118,7 +118,7 @@ void N(gfx_build_set_spotlight_alpha)(void) { } EvtScript N(EVS_MakeSpiritAppear) = { - EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater1, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater1, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(GetNpcPos, LVarA, LVar2, LVar3, LVar4) EVT_SUB(LVar3, 120) EVT_SET(LVar5, LVar3) @@ -161,7 +161,7 @@ EvtScript N(EVS_ParadePhase_StarSpirits) = { }; EvtScript N(EVS_SkatingPenguin1) = { - EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater1, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater1, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CHILD_THREAD EVT_LOOP(0) EVT_CALL(SetNpcAnimation, NPC_PenguinSkater1, ANIM_ParadeIceShow_Violin_SkateKickLeft) @@ -182,7 +182,7 @@ EvtScript N(EVS_SkatingPenguin1) = { }; EvtScript N(EVS_SkatingPenguin2) = { - EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater2, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater2, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CHILD_THREAD EVT_LOOP(0) EVT_CALL(SetNpcAnimation, NPC_PenguinSkater2, ANIM_ParadeIceShow_Violin_SkateKickLeft) diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index 1b995c24d7..2adbff5fbc 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -199,7 +199,7 @@ EvtScript N(EVS_NpcInit_Wisterwood) = { EVT_CALL(EnableGroup, MODEL_tuta, FALSE) EVT_CALL(EnableGroup, MODEL_g54, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 50, 70, -230) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_IF_LT(GB_StoryProgress, STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) EVT_EXEC(N(EVS_Wisterwood_Introduction)) @@ -518,7 +518,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00DA) - EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) @@ -624,7 +624,7 @@ NpcData N(NpcData_Wisterwood) = { .yaw = 270, .init = &N(EVS_NpcInit_Wisterwood), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, }; @@ -650,7 +650,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_01), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbA, @@ -675,7 +675,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_02), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_PURPLE_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbB, @@ -700,7 +700,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_03), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_GREEN_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbC, @@ -725,7 +725,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_04), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_YELLOW_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbD, @@ -738,7 +738,7 @@ NpcData N(NpcData_Tolielup) = { .yaw = 90, .init = &N(EVS_NpcInit_Tolielup), .settings = &N(NpcSettings_Tolielup), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOLIELUP_ANIMS, .tattle = MSG_NpcTattle_Tolielup, @@ -750,7 +750,7 @@ NpcData N(NpcData_Klevar) = { .yaw = 0, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }; @@ -761,7 +761,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 270, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, 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 f0101bd3f8..9351334dae 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 @@ -390,7 +390,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_01, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_01, TRUE) @@ -403,7 +403,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) @@ -424,14 +424,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_01, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_01, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 30, LVar0) EVT_ADD(LVar0, 60) EVT_SET(MV_NextBurrowTime_Mole_01, LVar0) @@ -469,7 +469,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_02, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_02, TRUE) @@ -482,7 +482,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) @@ -503,14 +503,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_02, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_02, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 35, LVar0) EVT_ADD(LVar0, 55) EVT_SET(MV_NextBurrowTime_Mole_02, LVar0) @@ -548,7 +548,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_03, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_03, TRUE) @@ -561,7 +561,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) @@ -582,14 +582,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_03, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_03, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 40, LVar0) EVT_ADD(LVar0, 50) EVT_SET(MV_NextBurrowTime_Mole_03, LVar0) @@ -627,7 +627,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_04, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_04, TRUE) @@ -640,7 +640,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) @@ -661,14 +661,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_04, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_04, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 45, LVar0) EVT_ADD(LVar0, 45) EVT_SET(MV_NextBurrowTime_Mole_04, LVar0) @@ -782,7 +782,7 @@ NpcData N(NpcData_Petunia) = { .yaw = 270, .init = &N(EVS_NpcInit_Petunia), .settings = &N(NpcSettings_Petunia), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Petunia_Idle, @@ -811,7 +811,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 90, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Dayzee_Anim01, @@ -839,7 +839,7 @@ NpcData N(NpcData_MontyMole_01) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_01), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -867,7 +867,7 @@ NpcData N(NpcData_MontyMole_02) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_02), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -895,7 +895,7 @@ NpcData N(NpcData_MontyMole_03) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_03), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -923,7 +923,7 @@ NpcData N(NpcData_MontyMole_04) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_04), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c index 894325b579..8e2ae843f4 100644 --- a/src/world/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/area_flo/flo_07/flo_07_3_npc.c @@ -237,7 +237,7 @@ NpcData N(NpcData_Posie) = { .yaw = 90, .init = &N(EVS_NpcInit_Posie), .settings = &N(NpcSettings_Posie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = POSIE_ANIMS, .tattle = MSG_NpcTattle_Posie, 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 4b496ecce4..a31cc6aef9 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 @@ -163,7 +163,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowGateFlower, @@ -186,7 +186,7 @@ NpcData N(NpcData_Dayzee_01) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -209,7 +209,7 @@ NpcData N(NpcData_Dayzee_02) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -232,7 +232,7 @@ NpcData N(NpcData_Dayzee_03) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -255,7 +255,7 @@ NpcData N(NpcData_Dayzee_04) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -278,7 +278,7 @@ NpcData N(NpcData_Dayzee_05) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -301,7 +301,7 @@ NpcData N(NpcData_Dayzee_06) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -324,7 +324,7 @@ NpcData N(NpcData_Dayzee_07) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -340,10 +340,10 @@ EvtScript N(EVS_NpcInit_AmazyDayzee) = { EVT_END_IF EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 30) - EVT_CALL(SetNpcFlagBits, NPC_Dayzee_02, NPC_FLAG_2 | NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dayzee_02, NPC_FLAG_INVISIBLE | NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_Dayzee_02, NPC_DISPOSE_LOCATION) EVT_ELSE - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_END_THREAD @@ -369,7 +369,7 @@ NpcData N(NpcData_AmazyDayzee) = { }, .init = &N(EVS_NpcInit_AmazyDayzee), .settings = &N(NpcSettings_AmazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = AMAZY_DAYZEE_DROPS, .animations = AMAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_09/flo_09_5_npc.c b/src/world/area_flo/flo_09/flo_09_5_npc.c index 20f5634a33..b696b9c7d0 100644 --- a/src/world/area_flo/flo_09/flo_09_5_npc.c +++ b/src/world/area_flo/flo_09/flo_09_5_npc.c @@ -27,7 +27,7 @@ EvtScript N(EVS_NpcAI_Bzzap_02) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_END_SWITCH @@ -75,7 +75,7 @@ NpcData N(NpcData_Dayzee_01) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -98,7 +98,7 @@ NpcData N(NpcData_Dayzee_02) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -121,7 +121,7 @@ NpcData N(NpcData_Bzzap_01) = { } }, .settings = &N(NpcSettings_Bzzap), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -145,7 +145,7 @@ NpcData N(NpcData_Bzzap_02) = { }, .init = &N(EVS_NpcInit_Bzzap_02), .settings = &N(NpcSettings_Bzzap_02), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 f01ba866f0..53c6277c98 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 @@ -95,10 +95,10 @@ EvtScript N(EVS_MovePlayerToTalk) = { EVT_ELSE EVT_ADD(LVar0, 40) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, LVar0, LVar5, 15) EVT_CALL(PlayerFaceNpc, NPC_Lily, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_END_SWITCH EVT_RETURN @@ -204,7 +204,7 @@ NpcData N(NpcData_Lily) = { .yaw = 270, .init = &N(EVS_NpcInit_Lily), .settings = &N(NpcSettings_Lily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LILY_ANIMS, .tattle = MSG_NpcTattle_Lily, diff --git a/src/world/area_flo/flo_11/flo_11_3_npc.c b/src/world/area_flo/flo_11/flo_11_3_npc.c index 7d6a12ac73..ee35cca673 100644 --- a/src/world/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/area_flo/flo_11/flo_11_3_npc.c @@ -375,7 +375,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, @@ -385,7 +385,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c b/src/world/area_flo/flo_12/flo_12_3_npc.c index 9942a86641..48a607047c 100644 --- a/src/world/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/area_flo/flo_12/flo_12_3_npc.c @@ -37,9 +37,9 @@ EvtScript N(EVS_Scene_SunReturns) = { EvtScript N(EVS_PlayerApproachRosie) = { EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, -5, 20, 20) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(PlayerFaceNpc, NPC_Rosie, TRUE) EVT_RETURN EVT_END @@ -47,11 +47,11 @@ EvtScript N(EVS_PlayerApproachRosie) = { EvtScript N(EVS_PlayerApproachRosieAndItem) = { EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, -5, 20, 20) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(PlayerFaceNpc, NPC_Rosie, TRUE) EVT_RETURN EVT_END @@ -76,7 +76,7 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_CASE_EQ(1) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Rosie_Talk, ANIM_Rosie_Idle, 5, MSG_CH6_008E) EVT_END_SWITCH - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_TakeOut) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) @@ -163,23 +163,23 @@ EvtScript N(EVS_NpcInit_Rosie) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 35) EVT_CALL(SetNpcPos, NPC_Dummy, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_HAS_SHADOW, TRUE) EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH6_GOT_CRYSTAL_BERRY) EVT_IF_EQ(GF_FLO12_Met_Rosie, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_SET(LVarA, LVar0) EVT_END_IF EVT_CASE_LT(STORY_CH6_GOT_WATER_STONE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_SET(LVarA, LVar0) EVT_CASE_DEFAULT - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) EVT_CALL(MakeItemEntity, ITEM_CRYSTAL_BERRY, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_SET(LVarA, LVar0) @@ -195,7 +195,7 @@ NpcData N(NpcData_Rosie)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rosie), .settings = &N(NpcSettings_Rosie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = ROSIE_ANIMS, .tattle = MSG_NpcTattle_Rosie, @@ -205,7 +205,7 @@ NpcData N(NpcData_Rosie)[] = { .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = ROSIE_ANIMS, }, diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c index cc66a9cb68..946e00ce61 100644 --- a/src/world/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/area_flo/flo_13/flo_13_4_npc.c @@ -312,7 +312,7 @@ EvtScript N(EVS_Lakilulu_FlyAway) = { EVT_THREAD EVT_CALL(N(PlayLakiluluFlightSounds), 55) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakilulu, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakilulu, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_EXEC_GET_TID(N(EVS_Laklilulu_ManageYaw), LVar9) EVT_CALL(LoadPath, 55, EVT_PTR(N(FlightPath_LakiluluDeparts)), ARRAY_COUNT(N(FlightPath_LakiluluDeparts)), EASING_LINEAR) EVT_LABEL(20) @@ -598,7 +598,7 @@ NpcData N(NpcData_Lakilester) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilester), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, @@ -626,7 +626,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -655,7 +655,7 @@ NpcData N(NpcData_Lakilulu_Spiny) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu_Spiny), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -695,7 +695,7 @@ NpcData N(NpcData_Lakitu_01) = { }, .init = &N(EVS_NpcInit_Lakitu), .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -719,7 +719,7 @@ NpcData N(NpcData_Lakitu_02) = { }, .init = &N(EVS_NpcInit_Lakitu), .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -743,7 +743,7 @@ NpcData N(NpcData_Spiny_01) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -767,7 +767,7 @@ NpcData N(NpcData_Spiny_02) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -791,7 +791,7 @@ NpcData N(NpcData_Spiny_03) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -815,7 +815,7 @@ NpcData N(NpcData_Spiny_04) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -839,7 +839,7 @@ NpcData N(NpcData_Spiny_05) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -863,7 +863,7 @@ NpcData N(NpcData_Spiny_06) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c index d37b1e038b..a460efe983 100644 --- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c @@ -117,7 +117,7 @@ EvtScript N(EVS_RideBigBubble) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetModelCenter, MODEL_o167) EVT_THREAD EVT_ADD(LVar2, -10) diff --git a/src/world/area_flo/flo_14/flo_14_4_npc.c b/src/world/area_flo/flo_14/flo_14_4_npc.c index c9f003591d..c2f4f272d9 100644 --- a/src/world/area_flo/flo_14/flo_14_4_npc.c +++ b/src/world/area_flo/flo_14/flo_14_4_npc.c @@ -40,9 +40,9 @@ EvtScript N(EVS_NpcInteract_BubbleFlower) = { EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 0, MSG_CH6_0061) EVT_SET(AF_FLO_BlowingBigBubble, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, 555, 110, 20) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(func_802CF56C, 2) EVT_WAIT(5) @@ -84,7 +84,7 @@ NpcData N(NpcData_BubbleFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_BubbleFlower), .settings = &N(NpcSettings_BubbleFlower), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_BubblePlant, @@ -107,7 +107,7 @@ NpcData N(NpcData_Bzzap) = { } }, .settings = &N(NpcSettings_Bzzap), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_15/flo_15_3_npc.c b/src/world/area_flo/flo_15/flo_15_3_npc.c index 9c35933a99..d60aa8ca19 100644 --- a/src/world/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/area_flo/flo_15/flo_15_3_npc.c @@ -126,7 +126,7 @@ EvtScript N(EVS_Sun_DescendFromSky) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_KILL_THREAD(LVar9) - EVT_CALL(SetNpcFlagBits, NPC_Sun_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Sun_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_Sun_01, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Sun_01, LVar0, 450, LVar2, 30) EVT_CALL(DisablePlayerInput, FALSE) @@ -204,7 +204,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_01), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, @@ -215,7 +215,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_02), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, diff --git a/src/world/area_flo/flo_16/flo_16_5_npc.c b/src/world/area_flo/flo_16/flo_16_5_npc.c index 5d4b4ddd3a..c0aaffffdc 100644 --- a/src/world/area_flo/flo_16/flo_16_5_npc.c +++ b/src/world/area_flo/flo_16/flo_16_5_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_TuffPuff_01) = { } }, .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -43,7 +43,7 @@ NpcData N(NpcData_TuffPuff_02) = { } }, .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_17/flo_17_4_npc.c b/src/world/area_flo/flo_17/flo_17_4_npc.c index 98f2680d7c..17256e4ce8 100644 --- a/src/world/area_flo/flo_17/flo_17_4_npc.c +++ b/src/world/area_flo/flo_17/flo_17_4_npc.c @@ -23,7 +23,7 @@ NpcData N(NpcData_Lakitu_01) = { } }, .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -46,7 +46,7 @@ NpcData N(NpcData_Lakitu_02) = { } }, .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -69,7 +69,7 @@ NpcData N(NpcData_Spiny_01) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -92,7 +92,7 @@ NpcData N(NpcData_Spiny_02) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -115,7 +115,7 @@ NpcData N(NpcData_Spiny_03) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -138,7 +138,7 @@ NpcData N(NpcData_Spiny_04) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index 5d04fadbba..21bc3e3fec 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) EVT_LOOP(0) @@ -104,7 +104,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_WAIT(15) EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR) EVT_LOOP(0) @@ -117,7 +117,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_02, 270, 0) EVT_CALL(LoadPath, 70, EVT_PTR(N(RetreatPath_Lakitu_02)), ARRAY_COUNT(N(RetreatPath_Lakitu_02)), EASING_LINEAR) EVT_LOOP(0) @@ -130,7 +130,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0) EVT_CALL(LoadPath, 80, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR) EVT_LOOP(0) @@ -158,15 +158,15 @@ EvtScript N(EVS_ChargeAtPlayer) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_GT(LVar2, -61) EVT_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Lakitu_01, LVar0, 55, LVar3) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Lakitu_02, LVar0, 55, LVar3) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Lakitu_03, LVar0, 55, LVar3) EVT_END_CHILD_THREAD EVT_WAIT(LVar4) @@ -338,7 +338,7 @@ EvtScript N(EVS_GenericHitReaction) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-6.0)) EVT_EXEC_WAIT(N(EVS_ReactionFacePlayer)) EVT_SWITCH(AB_FLO_GuardedMachineHitCount) @@ -604,7 +604,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -615,7 +615,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -626,7 +626,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_03), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -637,7 +637,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Magikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -648,7 +648,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_FlyingMagikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c index 2ed998de2a..b6e3e07350 100644 --- a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c @@ -106,7 +106,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o108, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o122, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetCamType, CAM_DEFAULT, 1, FALSE) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index ce89d8885b..265a23dbb5 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -92,7 +92,7 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = { EVT_CALL(InterpPlayerYaw, 90, 1) EVT_WAIT(5) EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = { EVT_END_LOOP EVT_CALL(func_802D2C14, 1) EVT_CALL(SetPlayerPos, LVar0, LVar2, LVar4) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -267,25 +267,25 @@ EvtScript N(EVS_HuffNPuff_Defeat_Flashing) = { EVT_SETF(LVar1, 1) EVT_CHILD_THREAD EVT_LOOP(8) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(LVar0) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_INVISIBLE, TRUE) EVT_WAIT(LVar1) EVT_SUBF(LVar0, 0) EVT_ADDF(LVar1, 0) EVT_END_LOOP EVT_LOOP(0) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(LVar0) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_01, NPC_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_03, NPC_FLAG_INVISIBLE, TRUE) EVT_WAIT(LVar1) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -593,7 +593,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Face), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -604,7 +604,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Body), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -615,7 +615,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -634,7 +634,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -645,7 +645,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -656,7 +656,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -667,7 +667,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -678,7 +678,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -689,7 +689,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -700,7 +700,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -711,7 +711,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -722,7 +722,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -733,7 +733,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -744,7 +744,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -755,7 +755,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -766,7 +766,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -777,7 +777,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), @@ -788,7 +788,7 @@ NpcData N(NpcData_TuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff), .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), diff --git a/src/world/area_flo/flo_22/flo_22_3_npc.c b/src/world/area_flo/flo_22/flo_22_3_npc.c index 7f65b975c6..e59628968a 100644 --- a/src/world/area_flo/flo_22/flo_22_3_npc.c +++ b/src/world/area_flo/flo_22/flo_22_3_npc.c @@ -27,7 +27,7 @@ EvtScript N(EVS_NpcDefeat_Bzzap) = { EVT_THREAD EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_END_THREAD EVT_CALL(DoNpcDefeat) EVT_CASE_EQ(OUTCOME_PLAYER_LOST) @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcDefeat_Dayzee) = { EVT_THREAD EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_END_THREAD EVT_CALL(DoNpcDefeat) EVT_CASE_EQ(OUTCOME_PLAYER_LOST) @@ -109,7 +109,7 @@ NpcData N(NpcData_Bzzap) = { .yaw = 270, .init = &N(EVS_NpcInit_Bzzap), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BZZAP_ANIMS, }; @@ -120,7 +120,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 270, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_22/flo_22_4_well.c b/src/world/area_flo/flo_22/flo_22_4_well.c index 190fb480d6..8f422a596f 100644 --- a/src/world/area_flo/flo_22/flo_22_4_well.c +++ b/src/world/area_flo/flo_22/flo_22_4_well.c @@ -71,7 +71,7 @@ EvtScript N(EVS_OnInteract_Well) = { EVT_SET(GF_FLO22_ThrewBlueBerryDownWell, TRUE) EVT_CALL(MakeItemEntity, ITEM_FLOWER_SAVER_B, -35, 0, 0, ITEM_SPAWN_MODE_KEY, GF_FLO22_Item_FlowerSaverB) EVT_SET(LVar7, LVar0) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_HAS_SHADOW, FALSE) EVT_CALL(SetNpcPos, NPC_Dummy, 35, 0, 0) EVT_CALL(SetNpcJumpscale, NPC_Dummy, EVT_FLOAT(1.0)) @@ -86,7 +86,7 @@ EvtScript N(EVS_OnInteract_Well) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_Dummy, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_HAS_SHADOW, TRUE) EVT_ELSE EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_00DE, 35, 35, 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 51c6c45ff6..e58066d317 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 @@ -163,7 +163,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 90, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GATE_FLOWER_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueGateFlower, @@ -186,7 +186,7 @@ NpcData N(NpcData_Spiny_01) = { } }, .settings = &N(NpcSettings_Spiny), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, }; @@ -208,7 +208,7 @@ NpcData N(NpcData_Spiny_02) = { } }, .settings = &N(NpcSettings_Spiny), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPINY_DROPS, .animations = SPINY_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 b41105cbc2..90bf53992b 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 @@ -163,7 +163,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 90, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GATE_FLOWER_RED_ANIMS, .tattle = MSG_NpcTattle_RedGateFlower, @@ -186,7 +186,7 @@ NpcData N(NpcData_TuffPuff) = { } }, .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -209,7 +209,7 @@ NpcData N(NpcData_Bzzap) = { } }, .settings = &N(NpcSettings_Bzzap), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_hos/hos_00/hos_00_4_npc.c b/src/world/area_hos/hos_00/hos_00_4_npc.c index 6c1315a03f..016b344912 100644 --- a/src/world/area_hos/hos_00/hos_00_4_npc.c +++ b/src/world/area_hos/hos_00/hos_00_4_npc.c @@ -129,7 +129,7 @@ NpcData N(NpcData_Twink) = { .yaw = 90, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, }; @@ -140,7 +140,7 @@ NpcData N(NpcData_FlyingMagikoopa) = { .yaw = 270, .init = &N(EVS_NpcInit_FlyingMagikoopa), .settings = &N(NpcSettings_FlyingMagikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FLYING_MAGIKOOPA_ANIMS, }; 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 035727dfed..413e6734de 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 @@ -544,14 +544,14 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(30) - EVT_CALL(SetNpcFlagBits, NPC_Twink, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Twink, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(10) EVT_ADDF(LVar0, EVT_FLOAT(36.0)) EVT_CALL(SetNpcRotation, NPC_Twink, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, NPC_Twink, NPC_FLAG_40000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Twink, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) EVT_WAIT(120) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) diff --git a/src/world/area_hos/hos_01/hos_01_2_main.c b/src/world/area_hos/hos_01/hos_01_2_main.c index a979492264..f60390e897 100644 --- a/src/world/area_hos/hos_01/hos_01_2_main.c +++ b/src/world/area_hos/hos_01/hos_01_2_main.c @@ -56,7 +56,7 @@ EvtScript N(EVS_EnterStarBeam) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -30, 250, -160) EVT_CALL(SetPanTarget, CAM_DEFAULT, -30, 250, -160) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.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 a9a1c933d0..fc8bf40d24 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 @@ -61,7 +61,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(func_802D2C14, 2) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 30) @@ -74,7 +74,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = { EVT_WAIT(10) EVT_WAIT(1) EVT_CALL(PlayerFaceNpc, NPC_Eldstar, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, 0) EVT_CALL(NpcJump0, NPC_Eldstar, 21, 260, -277, 30) EVT_CALL(EnableModel, MODEL_1, TRUE) @@ -456,7 +456,7 @@ NpcData N(NpcData_StarSpirits)[] = { .pos = { 100.0f, 260.0f, -215.0f }, .yaw = 270, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -465,7 +465,7 @@ NpcData N(NpcData_StarSpirits)[] = { .pos = { -145.0f, 260.0f, -225.0f }, .yaw = 90, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -474,7 +474,7 @@ NpcData N(NpcData_StarSpirits)[] = { .pos = { 20.0f, 260.0f, -45.0f }, .yaw = 270, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -483,7 +483,7 @@ NpcData N(NpcData_StarSpirits)[] = { .pos = { -155.0f, 260.0f, -125.0f }, .yaw = 90, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -492,7 +492,7 @@ NpcData N(NpcData_StarSpirits)[] = { .pos = { 90.0f, 260.0f, -110.0f }, .yaw = 270, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -501,7 +501,7 @@ NpcData N(NpcData_StarSpirits)[] = { .pos = { -75.0f, 260.0f, -290.0f }, .yaw = 90, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, diff --git a/src/world/area_hos/hos_01/hos_01_6_star_way.c b/src/world/area_hos/hos_01/hos_01_6_star_way.c index 1a7336f88c..e0ba98c6a6 100644 --- a/src/world/area_hos/hos_01/hos_01_6_star_way.c +++ b/src/world/area_hos/hos_01/hos_01_6_star_way.c @@ -92,7 +92,7 @@ EvtScript N(EVS_AscendStarBeam) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, 1, 8) 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_PARTNER, -30, 250, -170, 15) EVT_THREAD diff --git a/src/world/area_hos/hos_02/hos_02_5_npc.c b/src/world/area_hos/hos_02/hos_02_5_npc.c index 9badcb68a2..ee5212e161 100644 --- a/src/world/area_hos/hos_02/hos_02_5_npc.c +++ b/src/world/area_hos/hos_02/hos_02_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Ember) = { } }, .settings = &N(NpcSettings_Ember), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = EMBER_DROPS, .animations = EMBER_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -42,7 +42,7 @@ NpcData N(NpcData_Ember_02) = { } }, .settings = &N(NpcSettings_Ember), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = EMBER_DROPS, .animations = EMBER_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -65,7 +65,7 @@ NpcData N(NpcData_Ember_03) = { } }, .settings = &N(NpcSettings_Ember), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = EMBER_DROPS, .animations = EMBER_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, 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 0865c330e0..447e3b2ef9 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 @@ -252,7 +252,7 @@ NpcData N(NpcData_Townsfolk)[] = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_HOS, QUIZ_COUNT_HOS, QUIZ_MAP_HOS_03 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index a90b883799..4f85b64278 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -149,7 +149,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_END_LOOP EVT_CALL(GetPlayerPos, LVar6, LVar7, LVar8) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) @@ -160,7 +160,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar6, LVar7, LVar8, 10) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) @@ -168,7 +168,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) @@ -176,7 +176,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) EVT_CALL(SetNpcJumpscale, NPC_Muskular, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) @@ -184,7 +184,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) @@ -192,14 +192,14 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Klevar, LVar0, LVar1, LVar2, 5) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) @@ -388,7 +388,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -399,7 +399,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -410,7 +410,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -421,7 +421,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -432,7 +432,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -443,7 +443,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), @@ -454,7 +454,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -492,7 +492,7 @@ NpcData N(NpcData_Thieves)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -502,7 +502,7 @@ NpcData N(NpcData_Thieves)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -512,7 +512,7 @@ NpcData N(NpcData_Thieves)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -522,7 +522,7 @@ NpcData N(NpcData_Thieves)[] = { .pos = { 0.0f, 174.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_StarRod), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = STAR_ROD_ANIMS, }, diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index b39c73d5f5..31d284f510 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -1084,7 +1084,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Panic) EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(13)) EVT_END_THREAD EVT_WAIT(20) @@ -1112,7 +1112,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_IdleSad) EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(10)) EVT_END_THREAD EVT_WAIT(20) @@ -1140,7 +1140,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Panic) EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(11)) EVT_END_THREAD EVT_WAIT(20) @@ -1168,7 +1168,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Panic) EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(14)) EVT_END_THREAD EVT_WAIT(20) @@ -1196,7 +1196,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Panic) EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(12)) EVT_END_THREAD EVT_WAIT(20) @@ -1224,7 +1224,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Panic) EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(9)) EVT_END_THREAD EVT_WAIT(20) @@ -1946,7 +1946,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcPaletteSwapping, NPC_Misstar, 0, 1, 25, 12, 4, 18, 0, 0) EVT_CALL(SetNpcPaletteSwapping, NPC_Klevar, 0, 1, 25, 12, 4, 18, 0, 0) EVT_CALL(SetNpcPaletteSwapping, NPC_Kalmar, 0, 1, 25, 12, 4, 18, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_StarRod, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_StarRod, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarStill) EVT_CALL(SetNpcAnimation, NPC_Bowser_Prop, ANIM_WorldBowser_ClownCarPropeller) EVT_CALL(EnableNpcShadow, NPC_Bowser_Body, FALSE) @@ -2408,7 +2408,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Panic) EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(8)) EVT_END_THREAD EVT_WAIT(15) diff --git a/src/world/area_hos/hos_06/hos_06_3_merlow.c b/src/world/area_hos/hos_06/hos_06_3_merlow.c index 8e0dcf0702..2d0dce5a8d 100644 --- a/src/world/area_hos/hos_06/hos_06_3_merlow.c +++ b/src/world/area_hos/hos_06/hos_06_3_merlow.c @@ -259,7 +259,7 @@ NpcData N(NpcData_Merluvlee)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Merluvlee_Passthrough), .settings = &N(NpcSettings_Merluvlee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Merluvlee_Idle, @@ -272,7 +272,7 @@ NpcData N(NpcData_Merluvlee)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Merlow), .settings = &N(NpcSettings_Merlow), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlow_Idle, diff --git a/src/world/area_hos/hos_10/hos_10_2_npc1.c b/src/world/area_hos/hos_10/hos_10_2_npc1.c index 426a985bc7..f06d63ac0e 100644 --- a/src/world/area_hos/hos_10/hos_10_2_npc1.c +++ b/src/world/area_hos/hos_10/hos_10_2_npc1.c @@ -130,7 +130,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = { .idle = ANIM_Peach_A0000, @@ -158,7 +158,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -169,7 +169,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -180,7 +180,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -191,7 +191,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -202,7 +202,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -213,7 +213,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -224,7 +224,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -235,7 +235,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), diff --git a/src/world/area_hos/hos_10/hos_10_3_npc2.c b/src/world/area_hos/hos_10/hos_10_3_npc2.c index 2a677f5af4..324b8e84a8 100644 --- a/src/world/area_hos/hos_10/hos_10_3_npc2.c +++ b/src/world/area_hos/hos_10/hos_10_3_npc2.c @@ -116,7 +116,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -127,7 +127,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -138,7 +138,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -149,7 +149,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -160,7 +160,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -171,7 +171,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -182,7 +182,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -193,7 +193,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), diff --git a/src/world/area_isk/isk_02/isk_02_3_ambush.c b/src/world/area_isk/isk_02/isk_02_3_ambush.c index 7d2e7a048c..b61705d8de 100644 --- a/src/world/area_isk/isk_02/isk_02_3_ambush.c +++ b/src/world/area_isk/isk_02/isk_02_3_ambush.c @@ -67,7 +67,7 @@ EvtScript N(EVS_ManageSarcophagus1) = { EVT_END_IF EVT_END_IF EVT_SET(AF_ISK02_OpeningSarcophagus1, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Pokey_01, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_01, NPC_FLAG_INVISIBLE, FALSE) EVT_SET(LVar0, AF_ISK02_Sarcophagus1Opened) EVT_SET(LVar3, MODEL_g346) EVT_EXEC_WAIT(N(EVS_OpenSarcophagus)) @@ -90,7 +90,7 @@ EvtScript N(EVS_ManageSarcophagus2) = { EVT_END_IF EVT_CALL(MakeItemEntity, ITEM_SPIKE_SHIELD, -133, 1, 500, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ISK02_Item_SpikeShield) EVT_SET(AF_ISK02_OpeningSarcophagus2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Pokey_02, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_02, NPC_FLAG_INVISIBLE, FALSE) EVT_SET(LVar0, AF_ISK02_Sarcophagus2Opened) EVT_SET(LVar3, MODEL_g348) EVT_EXEC_WAIT(N(EVS_OpenSarcophagus)) @@ -112,7 +112,7 @@ EvtScript N(EVS_ManageSarcophagus3) = { EVT_END_IF EVT_END_IF EVT_SET(AF_ISK02_OpeningSarcophagus3, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Pokey_03, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_03, NPC_FLAG_INVISIBLE, FALSE) EVT_SET(LVar0, AF_ISK02_Sarcophagus3Opened) EVT_SET(LVar3, MODEL_g350) EVT_EXEC_WAIT(N(EVS_OpenSarcophagus)) diff --git a/src/world/area_isk/isk_02/isk_02_5_npc.c b/src/world/area_isk/isk_02/isk_02_5_npc.c index efa9405b00..b9774721ea 100644 --- a/src/world/area_isk/isk_02/isk_02_5_npc.c +++ b/src/world/area_isk/isk_02/isk_02_5_npc.c @@ -3,8 +3,8 @@ #include "world/common/enemy/PokeyMummy.inc.c" EvtScript N(EVS_NpcIdle_Pokey_01) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK02_OpeningSarcophagus1, FALSE) EVT_WAIT(1) @@ -12,18 +12,18 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -315, 455, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_02) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK02_OpeningSarcophagus2, FALSE) EVT_WAIT(1) @@ -31,18 +31,18 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -145, 535, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_03) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK02_OpeningSarcophagus3, FALSE) EVT_WAIT(1) @@ -50,10 +50,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 50, 550, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END @@ -98,7 +98,7 @@ NpcData N(NpcData_Pokey_01) = { }, .init = &N(EVS_NpcInit_Pokey_01), .settings = &N(NpcSettings_PokeyMummy), - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; @@ -121,7 +121,7 @@ NpcData N(NpcData_Pokey_02) = { }, .init = &N(EVS_NpcInit_Pokey_02), .settings = &N(NpcSettings_PokeyMummy), - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; @@ -144,7 +144,7 @@ NpcData N(NpcData_Pokey_03) = { }, .init = &N(EVS_NpcInit_Pokey_03), .settings = &N(NpcSettings_PokeyMummy), - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; diff --git a/src/world/area_isk/isk_04/isk_04_5_npc.c b/src/world/area_isk/isk_04/isk_04_5_npc.c index 76359bc7bc..97b2468cf2 100644 --- a/src/world/area_isk/isk_04/isk_04_5_npc.c +++ b/src/world/area_isk/isk_04/isk_04_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_BuzzyBeetle_01) = { } }, .settings = &N(NpcSettings_BuzzyBeetle), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; @@ -41,7 +41,7 @@ NpcData N(NpcData_BuzzyBeetle_02) = { } }, .settings = &N(NpcSettings_BuzzyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 1a2b6f031e..612f74d14e 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_END_IF EVT_CALL(N(func_80241E24_97F8F4)) EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) @@ -261,7 +261,7 @@ EvtScript N(EVS_NpcInit_StoneChomp) = { EVT_END_IF EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_StoneChomp))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_StoneChomp_Override))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -287,7 +287,7 @@ NpcData N(NpcData_StoneChomp) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_StoneChomp), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c index 3b7160fc9d..861c52d369 100644 --- a/src/world/area_isk/isk_07/isk_07_3_npc.c +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -79,60 +79,60 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { }; EvtScript N(EVS_NpcIdle_Pokey_01) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) EVT_WAIT(1) EVT_GOTO(1) EVT_END_IF EVT_CALL(SetNpcYaw, NPC_SELF, 105) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -140, 528, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_02) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) EVT_WAIT(1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 47, 543, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_03) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) EVT_WAIT(1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 227, 489, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END @@ -190,7 +190,7 @@ NpcData N(NpcData_Pokey_01) = { }, .init = &N(EVS_NpcInit_Pokey_01), .settings = &N(NpcSettings_PokeyMummy), - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; @@ -213,7 +213,7 @@ NpcData N(NpcData_Pokey_02) = { }, .init = &N(EVS_NpcInit_Pokey_02), .settings = &N(NpcSettings_PokeyMummy), - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; @@ -236,7 +236,7 @@ NpcData N(NpcData_Pokey_03) = { }, .init = &N(EVS_NpcInit_Pokey_03), .settings = &N(NpcSettings_PokeyMummy), - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/isk_07_7_ambush.c index c690b73ea3..d9b7f6cbd5 100644 --- a/src/world/area_isk/isk_07/isk_07_7_ambush.c +++ b/src/world/area_isk/isk_07/isk_07_7_ambush.c @@ -21,9 +21,9 @@ EvtScript N(EVS_SetupSarcophagi) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) EVT_CALL(SetNpcYaw, NPC_Pokey_01, 105) - EVT_CALL(SetNpcFlagBits, NPC_Pokey_01, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Pokey_02, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Pokey_03, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_01, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_02, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_03, NPC_FLAG_INVISIBLE, FALSE) EVT_THREAD EVT_WAIT(12) EVT_CALL(InterpPlayerYaw, 109, 0) diff --git a/src/world/area_isk/isk_08/isk_08_2_npc.c b/src/world/area_isk/isk_08/isk_08_2_npc.c index fa3e27d492..db2b2f9163 100644 --- a/src/world/area_isk/isk_08/isk_08_2_npc.c +++ b/src/world/area_isk/isk_08/isk_08_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_BuzzyBeetle) = { } }, .settings = &N(NpcSettings_BuzzyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index 9e96b69bae..876a2ef431 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -266,7 +266,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { EVT_SET(GF_ISK13_Defeated_StoneChomp, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(N(DestroyAmbushWorker)) @@ -289,7 +289,7 @@ EvtScript N(EVS_NpcInit_StoneChomp) = { EVT_END_IF EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_StoneChomp))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_StoneChomp_Override))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -315,7 +315,7 @@ NpcData N(NpcData_StoneChomp) = { .initVarCount = 1, .initVar = { .value = -650 }, .settings = &N(NpcSettings_StoneChomp), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000, .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index 3dd6dfeb11..fc334e25d7 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -157,11 +157,11 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(N(DestroyAmbushWorker)) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_StoneChomp_Anim04) EVT_WAIT(18) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) @@ -209,7 +209,7 @@ EvtScript N(EVS_NpcInit_StoneChomp) = { EVT_CALL(SetSelfVar, 1, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_StoneChomp))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_StoneChomp_Override))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -235,7 +235,7 @@ NpcData N(NpcData_StoneChomp) = { .initVarCount = 1, .initVar = { .value = -780 }, .settings = &N(NpcSettings_StoneChomp), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_16/isk_16_2_npc.c b/src/world/area_isk/isk_16/isk_16_2_npc.c index 787044f76d..2d98e2012b 100644 --- a/src/world/area_isk/isk_16/isk_16_2_npc.c +++ b/src/world/area_isk/isk_16/isk_16_2_npc.c @@ -72,7 +72,7 @@ NpcData N(NpcData_Tutankoopa)[] = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Tutankoopa_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Anim01, @@ -98,7 +98,7 @@ NpcData N(NpcData_Tutankoopa)[] = { .pos = { 500.0f, -1300.0f, 316.0f }, .yaw = 230, .settings = &N(NpcSettings_Tutankoopa_02), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Anim01, @@ -127,7 +127,7 @@ NpcData N(NpcData_ChainChomp) = { .yaw = 230, .init = &N(EVS_NpcInit_ChainChomp), .settings = &N(NpcSettings_ChainChomp), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, diff --git a/src/world/area_isk/isk_18/isk_18_2_npc.c b/src/world/area_isk/isk_18/isk_18_2_npc.c index 0e36350102..505d586095 100644 --- a/src/world/area_isk/isk_18/isk_18_2_npc.c +++ b/src/world/area_isk/isk_18/isk_18_2_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_BuzzyBeetle_01) = { .initVarCount = 1, .initVar = { .value = BTL_ISK_1_FORMATION_0E }, .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; @@ -45,7 +45,7 @@ NpcData N(NpcData_BuzzyBeetle_02) = { .initVarCount = 1, .initVar = { .value = BTL_ISK_1_FORMATION_0B }, .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; @@ -67,7 +67,7 @@ NpcData N(NpcData_BuzzyBeetle_03) = { } }, .settings = &N(NpcSettings_BuzzyBeetle), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; diff --git a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c index 274b287632..0663fb6eec 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c +++ b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c @@ -17,9 +17,9 @@ API_CALLABLE(N(func_80240118_90CD58)) { script->functionTemp[1] = 20; } if (script->functionTemp[1] & 1) { - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; } else { - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; } if (script->functionTemp[1] == 15) { sfx_play_sound_at_position(SOUND_DEATH, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z); @@ -61,7 +61,7 @@ NpcData N(NpcData_MontyMole_GroundAmbush)[] = { } }, .settings = &N(NpcSettings_MontyMole_GroundAmbush), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -83,7 +83,7 @@ NpcData N(NpcData_MontyMole_GroundAmbush)[] = { } }, .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, }, @@ -107,7 +107,7 @@ NpcData N(NpcData_MontyMole_WallAmbush)[] = { } }, .settings = &N(NpcSettings_MontyMole_WallAmbush), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -129,7 +129,7 @@ NpcData N(NpcData_MontyMole_WallAmbush)[] = { } }, .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, }, @@ -341,7 +341,7 @@ NpcData N(NpcData_Whacka)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Whacka_01), .settings = &N(NpcSettings_Whacka), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = WHACKA_ANIMS, .tattle = MSG_NpcTattle_Whacka, @@ -352,7 +352,7 @@ NpcData N(NpcData_Whacka)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Whacka_02), .settings = &N(NpcSettings_Whacka), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = WHACKA_ANIMS, .tattle = MSG_NpcTattle_Whacka, diff --git a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c b/src/world/area_iwa/iwa_01/iwa_01_4_npc.c index 61f79a7999..4a8e7a0786 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c +++ b/src/world/area_iwa/iwa_01/iwa_01_4_npc.c @@ -23,7 +23,7 @@ NpcData N(NpcData_MontyMole_WallAmbush)[] = { } }, .settings = &N(NpcSettings_MontyMole_WallAmbush), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -45,7 +45,7 @@ NpcData N(NpcData_MontyMole_WallAmbush)[] = { } }, .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -147,7 +147,7 @@ NpcData N(NpcData_Cleft) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c index 51b0826f55..f191f3ad20 100644 --- a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c +++ b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c @@ -24,7 +24,7 @@ NpcData N(NpcData_Cleft_01) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -47,7 +47,7 @@ NpcData N(NpcData_Cleft_02) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -70,7 +70,7 @@ NpcData N(NpcData_Cleft_03) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -94,7 +94,7 @@ NpcData N(NpcData_MontyMole_01)[] = { } }, .settings = &N(NpcSettings_MontyMole_WallAmbush), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -116,7 +116,7 @@ NpcData N(NpcData_MontyMole_01)[] = { } }, .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c b/src/world/area_iwa/iwa_03/iwa_03_3_npc.c index 13e9df1ae0..4b9dc4e3d5 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c +++ b/src/world/area_iwa/iwa_03/iwa_03_3_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Cleft_01) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Cleft_02) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -66,7 +66,7 @@ NpcData N(NpcData_Cleft_03) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -90,7 +90,7 @@ NpcData N(NpcData_MontyMole)[] = { } }, .settings = &N(NpcSettings_MontyMole_GroundAmbush), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -112,7 +112,7 @@ NpcData N(NpcData_MontyMole)[] = { } }, .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index 72926d8d77..57d52b178e 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -294,7 +294,7 @@ NpcData N(NpcData_Cleft) = { } }, .settings = &N(NpcSettings_Cleft), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -305,7 +305,7 @@ NpcData N(NpcData_Buzzar) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Buzzar), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .heartDrops = STANDARD_HEART_DROPS(3), 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 5ac729688d..0cf5f22bc1 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 @@ -129,7 +129,7 @@ NpcData N(NpcData_TrainToad)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad_01), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_IWA_StationMaster, @@ -140,7 +140,7 @@ NpcData N(NpcData_TrainToad)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrainToad_02), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }, @@ -152,7 +152,7 @@ NpcData N(NpcData_Toad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_IWA_TravelAgent, @@ -165,7 +165,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -176,7 +176,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -187,7 +187,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, @@ -201,7 +201,7 @@ NpcData N(NpcData_Dryite)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite), .settings = &N(NpcSettings_Dryite), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_IWA_StationLoiterer, @@ -212,7 +212,7 @@ NpcData N(NpcData_Dryite)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_IWA_Conservationist, diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/iwa_10_4_train.c index 4302dd5d85..82f676205d 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_train.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_train.c @@ -392,7 +392,7 @@ EvtScript N(EVS_ArriveFromToadTown) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) 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 c27fa6bba7..a7c0b13d69 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 @@ -311,7 +311,7 @@ NpcData N(NpcData_Parakarry) = { .yaw = 0, .init = &N(EVS_NpcInit_Parakarry), .settings = &N(NpcSettings_Parakarry), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = PARAKARRY_ANIMS, .tattle = MSG_NpcTattle_IWA_Parakarry, 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 8df60832e7..f159275126 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 @@ -24,7 +24,7 @@ NpcData N(NpcData_TrainToad) = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; 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 7226613736..9e4821f869 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 @@ -295,7 +295,7 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_WAIT(1) EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) EVT_CALL(NpcMoveTo, NPC_Kolorado_02, LVar0, LVar2, 10) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) @@ -305,7 +305,7 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 290, 20, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 0) EVT_END_IF EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) @@ -410,7 +410,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = { EVT_CALL(DisablePlayerPhysics, FALSE) EVT_RETURN EVT_END_IF - EVT_CALL(EndSpeech, NPC_SELF, 0xFFFFFFFF, 0xFFFFFFFF, 5) + EVT_CALL(EndSpeech, NPC_SELF, -1, -1, 5) EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) EVT_CALL(NpcFacePlayer, NPC_Kolorado_02, 0) EVT_END_IF @@ -420,7 +420,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = { EVT_SET(LVar0, 0) EVT_EXEC(N(D_80242DB0_B232F0)) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) @@ -497,7 +497,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = { }; EvtScript N(EVS_NpcInit_Kolorado_01) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_NO_SPRITE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Still) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) @@ -506,7 +506,7 @@ EvtScript N(EVS_NpcInit_Kolorado_01) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) @@ -521,7 +521,7 @@ EvtScript N(EVS_NpcInit_Kolorado_01) = { }; EvtScript N(EVS_NpcInteract_Kolorado_02) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_0006) EVT_EXEC_WAIT(N(EVS_LetterPrompt_Kolorado)) EVT_EXEC_WAIT(N(EVS_LetterReward_Kolorado)) @@ -645,7 +645,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_01), .settings = &N(NpcSettings_Kolorado_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Whale, @@ -656,7 +656,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_02), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -667,7 +667,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, }, @@ -678,7 +678,7 @@ NpcData N(NpcData_HeartPlant_01) = { .pos = { 455.0f, 0.0f, 115.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -689,7 +689,7 @@ NpcData N(NpcData_HeartPlant_02) = { .pos = { 167.0f, 0.0f, 404.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -700,7 +700,7 @@ NpcData N(NpcData_HeartPlant_03) = { .pos = { 90.0f, 0.0f, 316.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -711,7 +711,7 @@ NpcData N(NpcData_HeartPlant_04) = { .pos = { 424.0f, 0.0f, 182.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -722,7 +722,7 @@ NpcData N(NpcData_HeartPlant_05) = { .pos = { 143.0f, 0.0f, 260.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, 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 f7ec98593b..6d5a88e45a 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 @@ -18,7 +18,7 @@ EvtScript N(EVS_PlayerWatchKolorado) = { EvtScript N(EVS_Kolorado_RunToVillage) = { EVT_EXEC_GET_TID(N(EVS_PlayerWatchKolorado), LVar9) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -142,7 +142,7 @@ EvtScript N(EVS_NpcHit_Kolorado) = { EvtScript N(EVS_NpcInit_Kolorado) = { EVT_IF_LT(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado))) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_Kolorado))) EVT_ELSE @@ -163,10 +163,10 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy_01) = { EVT_SWITCH(LVar0) EVT_CASE_RANGE(LVar3, LVar4) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CASE_DEFAULT EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP @@ -216,7 +216,7 @@ EvtScript N(EVS_NpcDefeat_JungleFuzzyBoss) = { EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_THREAD EVT_WAIT(30) EVT_CALL(GetNpcPos, NPC_Kolorado, LVar3, LVar1, LVar2) @@ -237,7 +237,7 @@ EvtScript N(EVS_NpcDefeat_JungleFuzzyBoss) = { 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, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) EVT_CALL(SetNpcSpeed, NPC_Kolorado, EVT_FLOAT(3.0)) EVT_IF_LT(LVar2, -45) @@ -275,7 +275,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -287,7 +287,7 @@ NpcData N(NpcData_JungleFuzzy_01) = { .yaw = 270, .init = &N(EVS_NpcInit_JungleFuzzy_01), .settings = &N(NpcSettings_JungleFuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; @@ -318,7 +318,7 @@ NpcData N(NpcData_JungleFuzzy_02) = { }, .init = &N(EVS_NpcInit_JungleFuzzy_02), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -342,7 +342,7 @@ NpcData N(NpcData_JungleFuzzy_03) = { }, .init = &N(EVS_NpcInit_JungleFuzzy_02), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -366,7 +366,7 @@ NpcData N(NpcData_JungleFuzzy_04) = { }, .init = &N(EVS_NpcInit_JungleFuzzy_02), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, 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 ec818c47cb..74ceb97346 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 @@ -30,10 +30,10 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_VillageLeader_Talk, ANIM_VillageLeader_Idle, 0, MSG_CH5_0024) EVT_END_IF EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Walk) EVT_CALL(NpcMoveTo, NPC_SELF, 8, -140, 25) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Idle) EVT_WAIT(5) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 25, 15, -150) @@ -46,7 +46,7 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_CALL(PlayerMoveTo, 58, -140, 25) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(func_802D2C14, 1) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Rummage) EVT_WAIT(30) @@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_ELSE EVT_CALL(N(SwitchToPartner), PARTNER_SUSHIE) EVT_CALL(SpeakToPlayer, NPC_PARTNER, -1, -1, 5, MSG_CH5_0029) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_WAIT(15) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar2, LVar3, LVar4) EVT_CALL(MakeLerp, LVar2, 85, 10, EASING_LINEAR) @@ -395,7 +395,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_VillageLeader), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .tattle = MSG_NpcTattle_VillageLeader, @@ -406,7 +406,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Councillor), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = YOSHI_COUNCILLOR_ANIMS, .extraAnimations = N(ExtraAnims_Councillor), @@ -432,7 +432,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Yoshi_01), .settings = &N(NpcSettings_Yoshi_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_RED_ANIMS, .tattle = MSG_NpcTattle_EntranceYoshi, @@ -458,7 +458,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Yoshi_02), .settings = &N(NpcSettings_Yoshi_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshi, @@ -483,7 +483,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Yoshi_03), .settings = &N(NpcSettings_Yoshi_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_PURPLE_ANIMS, .tattle = MSG_NpcTattle_LikeableYoshi, @@ -497,7 +497,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_JAN, QUIZ_COUNT_JAN, QUIZ_MAP_JAN_02 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, 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 9ab57308ea..f610de977b 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 @@ -674,7 +674,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_GIVE_KEY_REWARD(ITEM_MAGICAL_SEED4) EVT_SET(GF_JAN03_Gift_MagicalSeed4, TRUE) EVT_WAIT(20) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_001B) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_001C) @@ -763,7 +763,7 @@ NpcData N(NpcData_VillageLeader) = { .yaw = 270, .init = &N(EVS_NpcInit_VillageLeader), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .extraAnimations = N(ExtraAnims_VillageLeader), @@ -783,7 +783,7 @@ NpcData N(NpcData_Sushie) = { .yaw = 90, .init = &N(EVS_NpcInit_Sushie), .settings = &N(NpcSettings_Sushie), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = SUSHIE_ANIMS, .extraAnimations = N(ExtraAnims_Sushie), @@ -804,7 +804,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), @@ -818,7 +818,7 @@ NpcData N(NpcData_Toad)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_JAN_ToadHouseToad, @@ -829,7 +829,7 @@ NpcData N(NpcData_Toad)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Yoshi_01), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_BLUE_ANIMS, .tattle = MSG_NpcTattle_JAN_ShopOwner, @@ -854,7 +854,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_Yoshi_02), .settings = &N(NpcSettings_Yoshi_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_GREEN_ANIMS, .tattle = MSG_NpcTattle_GenericYoshi, @@ -879,7 +879,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_Yoshi_03), .settings = &N(NpcSettings_Yoshi_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_YELLOW_ANIMS, .tattle = MSG_NpcTattle_FoodLovingYoshi, @@ -907,7 +907,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_YoshiKid_01), .settings = &N(NpcSettings_YoshiKid_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, @@ -933,7 +933,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_YoshiKid_02), .settings = &N(NpcSettings_YoshiKid_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, @@ -959,7 +959,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_YoshiKid_03), .settings = &N(NpcSettings_YoshiKid_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, @@ -985,7 +985,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_YoshiKid_04), .settings = &N(NpcSettings_YoshiKid_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, @@ -1011,7 +1011,7 @@ NpcData N(NpcData_Toad)[] = { }, .init = &N(EVS_NpcInit_YoshiKid_05), .settings = &N(NpcSettings_YoshiKid_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_KID_PURPLE_ANIMS, .tattle = MSG_NpcTattle_PurpleYoshiKid, @@ -1032,7 +1032,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .extraAnimations = N(ExtraAnims_Raven), @@ -1044,7 +1044,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAVEN_ANIMS, }, @@ -1054,7 +1054,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, @@ -1065,7 +1065,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, @@ -1076,7 +1076,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, @@ -1090,7 +1090,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_JAN, QUIZ_COUNT_JAN, QUIZ_MAP_JAN_03 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, 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 index 5cff5dad80..490b0a8048 100644 --- a/src/world/area_jan/jan_04/jan_04_4_npc.c +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -14,7 +14,7 @@ EvtScript N(EVS_ShakeTree_Sushie) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(AF_JAN_08, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Sushie, NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Sushie, NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterB, FALSE) EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterA, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) @@ -51,7 +51,7 @@ EvtScript N(EVS_ShakeTree_Sushie) = { EVT_CALL(SetNpcVar, NPC_Sushie, 0, 10) EVT_UNBIND EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_Sushie, NPC_FLAG_8000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Sushie, NPC_FLAG_IGNORE_ENTITY_COLLISION, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -257,7 +257,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Sushie), .settings = &N(NpcSettings_Sushie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = SUSHIE_ANIMS, }, 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 index 7bff0835e3..e51b12ab13 100644 --- a/src/world/area_jan/jan_05/jan_05_5_npc.c +++ b/src/world/area_jan/jan_05/jan_05_5_npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EvtScript N(EVS_NpcInit_JungleFuzzy) = { EVT_CALL(SetSelfVar, 7, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 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))) @@ -138,17 +138,17 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_SET(LVar2, -27) EVT_END_IF EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_THREAD @@ -257,7 +257,7 @@ NpcData N(NpcData_JungleFuzzy) = { }, .init = &N(EVS_NpcInit_JungleFuzzy), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .extraAnimations = N(ExtraAnims_JungleFuzzy), @@ -281,7 +281,7 @@ NpcData N(NpcData_SpearGuy)[] = { .detectSize = { 100 }, } }, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, SPEAR_GUY_WANDER_NPC_DATA }, SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) @@ -292,7 +292,7 @@ NpcData N(NpcData_HeartPlant) = { .pos = { 430.0f, 0.0f, 205.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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -310,7 +310,7 @@ NpcData N(NpcData_MBush) = { .pos = { 400.0f, 0.0f, -75.0f }, .yaw = 90, .settings = &N(NpcSettings_MBush), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = MBUSH_DROPS, .animations = MBUSH_ANIMS, .tattle = MSG_NpcTattle_MBush, 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 index b6ef939adf..715b8f0065 100644 --- a/src/world/area_jan/jan_06/jan_06_6_npc.c +++ b/src/world/area_jan/jan_06/jan_06_6_npc.c @@ -30,7 +30,7 @@ NpcData N(NpcData_JungleFuzzy) = { } }, .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .extraAnimations = N(ExtraAnims_JungleFuzzy), @@ -71,7 +71,7 @@ NpcData N(NpcData_SpearGuy)[] = { } }, .settings = &N(NpcSettings_SpearGuy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, .extraAnimations = N(ExtraAnims_SpearGuy_Custom), @@ -85,7 +85,7 @@ NpcData N(NpcData_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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -96,7 +96,7 @@ NpcData N(NpcData_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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = HURT_PLANT_DROPS, .animations = HURT_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -107,7 +107,7 @@ NpcData N(NpcData_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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = HURT_PLANT_DROPS, .animations = HURT_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, 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 index 7705b01ff2..c7d635b0fa 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -62,12 +62,12 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_CALL(PlayerMoveTo, -20, 10, 25) @@ -94,7 +94,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -148,10 +148,10 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { 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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_ELSE EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -305,7 +305,7 @@ NpcData N(NpcData_SpearGuy)[] = { } }, .settings = &N(NpcSettings_SpearGuy_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -316,7 +316,7 @@ NpcData N(NpcData_SpearGuy)[] = { .yaw = 0, .init = &N(EVS_NpcInit_SpearGuy_Hitbox), .settings = &N(NpcSettings_SpearGuy_Hitbox), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SPEAR_GUY_ANIMS, }, @@ -329,7 +329,7 @@ NpcData N(NpcData_PutridPiranhas)[] = { .yaw = 90, .init = &N(EVS_NpcInit_PutridPiranha), .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PUTRID_PIRANHA_ANIMS, }, @@ -338,7 +338,7 @@ NpcData N(NpcData_PutridPiranhas)[] = { .pos = { 80.0f, 0.0f, 20.0f }, .yaw = 270, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PUTRID_PIRANHA_ANIMS, }, @@ -350,7 +350,7 @@ NpcData N(NpcData_YoshiKid) = { .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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, 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 index d089b1b524..9bce1e0aa1 100644 --- a/src/world/area_jan/jan_08/jan_08_3_bushes.c +++ b/src/world/area_jan/jan_08/jan_08_3_bushes.c @@ -47,10 +47,10 @@ EvtScript N(EVS_Inspect_FlipBush) = { 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_END_THREAD EVT_CALL(PlayerMoveTo, -340, LVar5, 20) @@ -66,7 +66,7 @@ EvtScript N(EVS_Inspect_FlipBush) = { 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_CALL(SetNpcFlagBits, NPC_YoshiKid, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_LOOP(10) EVT_ADD(LVar3, 9) EVT_CALL(RotateModel, LVar1, LVar3, 0, 1, 0) 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 index d85ca9be1d..de77736360 100644 --- a/src/world/area_jan/jan_08/jan_08_5_npc.c +++ b/src/world/area_jan/jan_08/jan_08_5_npc.c @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -95,7 +95,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Red_Cry) EVT_CALL(SetNpcYaw, NPC_SELF, 90) @@ -123,7 +123,7 @@ EvtScript N(EVS_NpcDefeat_MBush_Copy) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -157,7 +157,7 @@ NpcData N(NpcData_SpearGuy)[] = { .detectSize = { 150 }, } }, - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, SPEAR_GUY_WANDER_NPC_DATA }, SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) @@ -205,7 +205,7 @@ NpcData N(NpcData_YoshiKid) = { .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_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, 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 index a4aa4c93d0..d980c49eca 100644 --- a/src/world/area_jan/jan_09/jan_09_3_npc.c +++ b/src/world/area_jan/jan_09/jan_09_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_SpearGuy)[] = { } }, .settings = &N(NpcSettings_SpearGuy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 index cdc63c42c8..0ebf8f3bec 100644 --- a/src/world/area_jan/jan_10/jan_10_3_npc.c +++ b/src/world/area_jan/jan_10/jan_10_3_npc.c @@ -26,7 +26,7 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EvtScript N(EVS_NpcInit_JungleFuzzy) = { EVT_CALL(SetSelfVar, 7, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 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))) @@ -59,7 +59,7 @@ EvtScript N(EVS_NpcInteract_YoshiKid) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -110,7 +110,7 @@ NpcData N(NpcData_YoshiKid) = { .yaw = 270, .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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, @@ -134,7 +134,7 @@ NpcData N(NpcData_JungleFuzzy) = { }, .init = &N(EVS_NpcInit_JungleFuzzy), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; 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 index 8dc4a07833..60f7f55f03 100644 --- a/src/world/area_jan/jan_11/jan_11_3_npc.c +++ b/src/world/area_jan/jan_11/jan_11_3_npc.c @@ -67,7 +67,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | 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) @@ -126,7 +126,7 @@ NpcData N(NpcData_YoshiKid) = { .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, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, 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 index f1db7d6b77..c2d14a6b28 100644 --- a/src/world/area_jan/jan_12/jan_12_5_npc.c +++ b/src/world/area_jan/jan_12/jan_12_5_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_SpearGuy)[] = { } }, .settings = &N(NpcSettings_SpearGuy_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, }, 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 index faa95117c7..89fba3a4da 100644 --- a/src/world/area_jan/jan_14/jan_14_2_vines.c +++ b/src/world/area_jan/jan_14/jan_14_2_vines.c @@ -46,7 +46,7 @@ EvtScript N(EVS_OnPullVine) = { 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_CALL(SetNpcFlagBits, NPC_JungleFuzzy_01, NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CASE_EQ(VINE_IDX_3) EVT_CALL(GetModelCenter, LVar9) EVT_ADD(LVar2, 15) @@ -56,7 +56,7 @@ EvtScript N(EVS_OnPullVine) = { 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_CALL(SetNpcFlagBits, NPC_JungleFuzzy_02, NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CASE_EQ(VINE_IDX_5) EVT_CALL(GetModelCenter, LVar9) EVT_ADD(LVar2, 15) 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 index 7aafd0e9eb..ba571f53d2 100644 --- a/src/world/area_jan/jan_14/jan_14_4_npc.c +++ b/src/world/area_jan/jan_14/jan_14_4_npc.c @@ -44,7 +44,7 @@ NpcData N(NpcData_JungleFuzzy_01) = { .yaw = 270, .init = &N(EVS_NpcInit_JungleFuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -56,7 +56,7 @@ NpcData N(NpcData_JungleFuzzy_02) = { .yaw = 270, .init = &N(EVS_NpcInit_JungleFuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 index dd22b5bde6..021ef777ac 100644 --- a/src/world/area_jan/jan_15/jan_15_2_npc.c +++ b/src/world/area_jan/jan_15/jan_15_2_npc.c @@ -210,7 +210,7 @@ NpcData N(NpcData_HeartPlant_01) = { .pos = { -183.0f, 0.0f, 47.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -221,7 +221,7 @@ NpcData N(NpcData_HeartPlant_02) = { .pos = { -124.0f, 0.0f, 20.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, 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 index 78658eeb18..6e72f7dfec 100644 --- a/src/world/area_jan/jan_16/jan_16_3_npc.c +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcInit_Raven) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) EVT_CALL(NpcFacePlayer, NPC_SELF, 4) EVT_WAIT(5) @@ -201,7 +201,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 85, 0, 410) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) EVT_RETURN @@ -224,7 +224,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_RaphaelRaven_Idle, @@ -252,7 +252,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -280,7 +280,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -308,7 +308,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -336,7 +336,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -364,7 +364,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, 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 index f8814f78eb..4ab8ce8920 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_UseBasketElevator) = { 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_EQ(LVar0, 0) @@ -176,34 +176,34 @@ EvtScript N(EVS_GatherRavensNearRaphael) = { 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(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Flail) EVT_CALL(NpcJump0, NPC_Raven_04, 222, 284, -13, 15) EVT_RETURN @@ -220,7 +220,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { 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(SetNpcFlagBits, NPC_RaphaelRaven, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -248,7 +248,7 @@ EvtScript N(EVS_NpcInit_RaphaelRaven) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) EVT_CASE_DEFAULT EVT_CALL(RemoveNpc, NPC_SELF) @@ -554,7 +554,7 @@ EvtScript N(EVS_ManageRavens) = { 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(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(N(UnsetCamera0Flag1000)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5)) EVT_SET(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) @@ -578,7 +578,7 @@ EvtScript N(EVS_NpcInit_Raven) = { 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_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_GOTO(30) EVT_CASE_DEFAULT EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o346, COLLIDER_FLAGS_UPPER_MASK) @@ -612,7 +612,7 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { 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(SetNpcFlagBits, NPC_RaphaelRaven, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpNpcYaw, NPC_RaphaelRaven, 270, 0) EVT_END_THREAD EVT_WAIT(15) @@ -681,7 +681,7 @@ EvtScript N(D_8024511C_B8929C) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 150) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) @@ -720,9 +720,9 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(RemoveNpc, NPC_SpearGuy) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C0, 0, 60) EVT_CALL(InterpPlayerYaw, 270, 4) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -859,7 +859,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_GOTO(20) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -953,11 +953,11 @@ EvtScript N(EVS_NpcInteract_Kolorado_Before) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, -300, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 4) @@ -997,7 +997,7 @@ EvtScript N(EVS_NpcHit_Kolorado_HeldCaptive) = { EvtScript N(EVS_NpcInit_Kolorado_HeldCaptive) = { EVT_CALL(SetSelfVar, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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))) @@ -1047,7 +1047,7 @@ EvtScript N(EVS_SyncZiplineDummyNPC2) = { }; EvtScript N(EVS_NpcInit_ZiplineDummy) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.3), 1, EVT_FLOAT(0.3)) EVT_RETURN EVT_END @@ -1064,10 +1064,10 @@ EvtScript N(EVS_NpcIdle_SpearGuy) = { EVT_SWITCH(LVar0) EVT_CASE_RANGE(LVar3, LVar4) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CASE_DEFAULT EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP @@ -1134,7 +1134,7 @@ EvtScript N(EVS_NpcDefeat_SpearGuy) = { 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(SetNpcFlagBits, NPC_Kolorado_01, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -1330,7 +1330,7 @@ EvtScript N(EVS_Scene_Misstar) = { 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_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -1423,7 +1423,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_HeldCaptive), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1434,7 +1434,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_WaitingToExplore), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1445,7 +1445,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1456,7 +1456,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1484,7 +1484,7 @@ NpcData N(NpcData_SpearGuy) = { }, .init = &N(EVS_NpcInit_SpearGuy), .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, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = SPEAR_GUY_ANIMS, }; @@ -1496,7 +1496,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAPHAEL_RAVEN_ANIMS, .tattle = MSG_NpcTattle_RaphaelRaven, @@ -1507,7 +1507,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenA, @@ -1517,7 +1517,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, }, @@ -1526,7 +1526,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, @@ -1536,7 +1536,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, @@ -1546,7 +1546,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, @@ -1559,7 +1559,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; 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 index 3ecf3ad927..6ccb9f36f9 100644 --- a/src/world/area_jan/jan_22/jan_22_5_zipline.c +++ b/src/world/area_jan/jan_22/jan_22_5_zipline.c @@ -107,7 +107,7 @@ EvtScript N(EVS_RideZipline) = { 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, ArrayVar(4)) EVT_SUB(LVar0, 10) EVT_SET(LVar1, ArrayVar(5)) 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 index e34d64c804..cd16d4c6b0 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -228,7 +228,7 @@ EvtScript N(EVS_Raven5_MoveToMeetingPos) = { EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -595,7 +595,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY, .drops = NO_DROPS, .animations = RAPHAEL_RAVEN_ANIMS, .tattle = MSG_NpcTattle_RaphaelRaven, @@ -606,7 +606,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_01), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenA, @@ -617,7 +617,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_02), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, }, @@ -627,7 +627,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_03), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, @@ -638,7 +638,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_04), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, @@ -649,7 +649,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_05), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, diff --git a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c index f84092c2f5..0f91e47573 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c +++ b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c @@ -291,7 +291,7 @@ NpcData N(NpcData_Fuzzipede) = { .pos = { 333.0f, -10.0f, -130.0f }, .yaw = 90, .settings = &N(NpcSettings_Fuzzipede), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzipede_Anim04, diff --git a/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c b/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c index 13dc600ffb..508b23aac5 100644 --- a/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c +++ b/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c @@ -273,7 +273,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, @@ -283,7 +283,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, @@ -307,7 +307,7 @@ NpcData N(NpcData_Characters)[] = { }, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, @@ -317,7 +317,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, }, @@ -327,7 +327,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, }, @@ -337,7 +337,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, }, @@ -347,7 +347,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_RussT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, @@ -374,7 +374,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShiverToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, @@ -401,7 +401,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Penguin_01), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }, @@ -411,7 +411,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, }, @@ -421,7 +421,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_GUARD_BLUE_ANIMS, }, diff --git a/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c b/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c index 0f9971cf49..390769370c 100644 --- a/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c +++ b/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c @@ -235,7 +235,7 @@ NpcData N(NpcData_Peach) = { .pos = { 0.0f, 100.0f, -440.0f }, .yaw = 270, .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -247,7 +247,7 @@ NpcData N(NpcData_SpecialToads)[] = { .pos = { 100.0f, 0.0f, 250.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_MINISTER_ANIMS, .extraAnimations = N(ExtraAnims_Minister), @@ -257,7 +257,7 @@ NpcData N(NpcData_SpecialToads)[] = { .pos = { -200.0f, 0.0f, 260.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_TayceT_Idle, @@ -270,7 +270,7 @@ NpcData N(NpcData_SpecialToads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_RussT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, @@ -298,7 +298,7 @@ NpcData N(NpcData_SpecialToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShiverToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, @@ -328,7 +328,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 180.0f, 0.0f, 80.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldGoombario_Idle, @@ -355,7 +355,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 225.0f, 0.0f, 225.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -382,7 +382,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 270.0f, 0.0f, 115.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBombette_Idle, @@ -409,7 +409,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 325.0f, 10.0f, 175.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, @@ -436,7 +436,7 @@ NpcData N(NpcData_Party)[] = { .pos = { -270.0f, 0.0f, 145.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBow_Idle, @@ -465,7 +465,7 @@ NpcData N(NpcData_Party)[] = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldWatt_Idle, @@ -492,7 +492,7 @@ NpcData N(NpcData_Party)[] = { .pos = { -190.0f, 0.0f, 50.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldSushie_Idle, @@ -519,7 +519,7 @@ NpcData N(NpcData_Party)[] = { .pos = { -320.0f, 0.0f, -60.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, @@ -549,7 +549,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -145.0f, 0.0f, 415.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlon_Idle, @@ -561,7 +561,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -225.0f, 0.0f, 380.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merluvlee_Idle, @@ -573,7 +573,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -175.0f, 0.0f, 330.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlow_Idle, @@ -585,7 +585,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -250.0f, 0.0f, 350.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldMerlee_Idle, @@ -612,7 +612,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -220.0f, 0.0f, 450.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merle_Idle, @@ -642,7 +642,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { -365.0f, 0.0f, -60.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -669,7 +669,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { -340.0f, 0.0f, 100.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, @@ -696,7 +696,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { 170.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, @@ -723,7 +723,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { 140.0f, 0.0f, 50.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Goombaria_Idle, @@ -753,7 +753,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -340.0f, 0.0f, 310.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Yoshi_Blue_Idle, @@ -780,7 +780,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { 225.0f, 0.0f, -80.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Penguin_Idle, @@ -807,7 +807,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -250.0f, 0.0f, -150.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Penguin_Idle, @@ -834,7 +834,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -320.0f, 0.0f, 245.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Dryite_Yellow_Idle, @@ -861,7 +861,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -395.0f, 68.0f, 50.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -891,7 +891,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { 200.0f, 0.0f, 420.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -901,7 +901,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { -120.0f, 0.0f, 205.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -911,7 +911,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { -440.0f, 0.0f, 220.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -921,7 +921,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { 285.0f, 0.0f, 290.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -935,7 +935,7 @@ NpcData N(NpcData_Toadettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -946,7 +946,7 @@ NpcData N(NpcData_Toadettes)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_04), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -956,7 +956,7 @@ NpcData N(NpcData_Toadettes)[] = { .pos = { -190.0f, 0.0f, 160.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -966,7 +966,7 @@ NpcData N(NpcData_Toadettes)[] = { .pos = { 190.0f, 0.0f, 300.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -980,7 +980,7 @@ NpcData N(NpcData_ToadGuards)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -990,7 +990,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { -50.0f, 100.0f, -365.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -1000,7 +1000,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { 225.0f, 0.0f, 125.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -1010,7 +1010,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { -392.0f, 40.0f, -230.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -1020,7 +1020,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { -392.0f, 40.0f, -230.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), diff --git a/src/world/area_kkj/kkj_01/kkj_01_3_npc.c b/src/world/area_kkj/kkj_01/kkj_01_3_npc.c index 3aadf1d5b9..265ccb4313 100644 --- a/src/world/area_kkj/kkj_01/kkj_01_3_npc.c +++ b/src/world/area_kkj/kkj_01/kkj_01_3_npc.c @@ -151,10 +151,10 @@ EvtScript N(EVS_NpcInteract_ToadGuard_02) = { EVT_ELSE EVT_SET(LVar3, 50) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, -245, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_ToadGuard_02, ANIM_ToadGuard_Yellow_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 180, 5) EVT_SET(AF_KKJ_01, TRUE) @@ -293,7 +293,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_ToadMinister), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOAD_MINISTER_ANIMS, }, { @@ -303,7 +303,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Toad_01), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOAD_BLUE_ANIMS, }, { @@ -325,7 +325,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Toad_02), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOAD_GREEN_ANIMS, }, { @@ -349,7 +349,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Toad_03), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOAD_RED_ANIMS, }, { @@ -371,7 +371,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Toadette), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOADETTE_ORANGE_ANIMS, }, { @@ -381,7 +381,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_ToadGuard_01), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOAD_GUARD_RED_ANIMS, }, { @@ -391,7 +391,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_ToadGuard_02), .drops = NO_DROPS, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .animations = TOAD_GUARD_YELLOW_ANIMS, }, { @@ -401,7 +401,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Dryite), .drops = NO_DROPS, .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .animations = DRYITE_YELLOW_ANIMS, }, { @@ -411,7 +411,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Mouser), .drops = NO_DROPS, .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .animations = MOUSER_BLUE_ANIMS, }, { @@ -421,7 +421,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_MayorPenguin), .drops = NO_DROPS, .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .animations = MAYOR_PENGUIN_ANIMS, }, { @@ -431,7 +431,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Koopa), .drops = NO_DROPS, .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .animations = KOOPA_ANIMS, }, }; diff --git a/src/world/area_kkj/kkj_02/kkj_02_3_npc.c b/src/world/area_kkj/kkj_02/kkj_02_3_npc.c index a532ff3127..485593669b 100644 --- a/src/world/area_kkj/kkj_02/kkj_02_3_npc.c +++ b/src/world/area_kkj/kkj_02/kkj_02_3_npc.c @@ -46,7 +46,7 @@ NpcData N(NpcData_Toads)[] = { }, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, @@ -56,7 +56,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, }, diff --git a/src/world/area_kkj/kkj_03/kkj_03_3_npc.c b/src/world/area_kkj/kkj_03/kkj_03_3_npc.c index bfca04ae0a..295cc49217 100644 --- a/src/world/area_kkj/kkj_03/kkj_03_3_npc.c +++ b/src/world/area_kkj/kkj_03/kkj_03_3_npc.c @@ -7,7 +7,7 @@ NpcData N(NpcData_Peach) = { .pos = { 670.0f, 0.0f, -12.0f }, .yaw = 270, .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, }; diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c index f19f574f7b..476c699540 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c +++ b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c @@ -133,7 +133,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -144,7 +144,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c index 9159b35d00..4f147ff451 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c +++ b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c @@ -63,13 +63,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { EVT_IF_EQ(LVar2, 0) EVT_CALL(N(GetPeachDisguise), LVar1) EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_IF_NE(LVar0, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) EVT_SET(LVar2, 1) EVT_END_IF EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -102,13 +102,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_02) = { EVT_IF_EQ(LVar2, 0) EVT_CALL(N(GetPeachDisguise), LVar1) EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_IF_NE(LVar0, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) EVT_SET(LVar2, 1) EVT_END_IF EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -194,7 +194,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -205,7 +205,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c index 688c5d07dc..968dba66fb 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c +++ b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c @@ -244,7 +244,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -255,7 +255,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -266,7 +266,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_03), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -277,7 +277,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_04), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -288,7 +288,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_05), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c index 3543210f37..075f4f23d9 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c +++ b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c @@ -96,7 +96,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { EVT_EXEC(N(EVS_CheckForPeach_Koopatrol_01)) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, kkj_11_ENTRY_1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(WaitForPlayerInputEnabled) EVT_THREAD EVT_CALL(DisablePlayerInput, TRUE) @@ -109,7 +109,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { EVT_CALL(NpcMoveTo, NPC_SELF, 0, -350, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) EVT_CALL(InterpNpcYaw, NPC_SELF, 220, 5) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_LOOP(0) EVT_WAIT(1) @@ -122,7 +122,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { EVT_EXEC(N(EVS_CheckForPeach_Koopatrol_01)) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, kkj_11_ENTRY_4) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(WaitForPlayerInputEnabled) EVT_THREAD EVT_CALL(DisablePlayerInput, TRUE) @@ -135,7 +135,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { EVT_CALL(NpcMoveTo, NPC_SELF, 0, -240, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) EVT_CALL(InterpNpcYaw, NPC_SELF, 220, 5) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_LOOP(0) EVT_WAIT(1) @@ -320,7 +320,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -331,7 +331,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -342,7 +342,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_03), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -353,7 +353,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_04), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c index 410eaf69ab..441aedeeb2 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -79,7 +79,7 @@ EvtScript N(EVS_NpcInteract_Koopatrol_02) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 1050, 0, 0) @@ -150,13 +150,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { EVT_IF_EQ(LVar2, 0) EVT_CALL(N(GetPeachDisguise), LVar1) EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_IF_NE(LVar0, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) EVT_SET(LVar2, 1) EVT_END_IF EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -183,13 +183,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_02) = { EVT_IF_EQ(LVar2, 0) EVT_CALL(N(GetPeachDisguise), LVar1) EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_IF_NE(LVar0, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) EVT_SET(LVar2, 1) EVT_END_IF EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -231,7 +231,7 @@ NpcData N(NpcData_Koopatrol_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -242,7 +242,7 @@ NpcData N(NpcData_Koopatrol_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -252,7 +252,7 @@ NpcData N(NpcData_Koopatrol_01)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), diff --git a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c index 1f947b2e3c..672bbe8967 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c @@ -348,7 +348,7 @@ NpcData N(NpcData_Bowser_Body) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Body), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -360,7 +360,7 @@ NpcData N(NpcData_Bowser_Prop) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Prop), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -372,7 +372,7 @@ NpcData N(NpcData_CaptivePeach) = { .yaw = 270, .init = &N(EVS_NpcInit_CaptivePeach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PEACH_ANIMS, }; diff --git a/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c b/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c index 7682d9218a..21839864dc 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c +++ b/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c @@ -80,7 +80,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Body), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -92,7 +92,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -102,7 +102,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -112,7 +112,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -122,7 +122,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -132,7 +132,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 670.0f, 0.0f, -12.0f }, .yaw = 270, .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, }, diff --git a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c index e3a9364a85..04e5fc8cd8 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c +++ b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c @@ -208,7 +208,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -218,7 +218,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c b/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c index 52e8813b13..d999ef65c0 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c +++ b/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c @@ -30,7 +30,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -40,7 +40,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c b/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c index e6b490d409..5e14727fa8 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c +++ b/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c @@ -31,7 +31,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -41,7 +41,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c b/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c index f9f516c1a5..413c939c08 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c +++ b/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c @@ -45,7 +45,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -55,7 +55,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -65,7 +65,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -75,7 +75,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c index 9386f532ce..185c777017 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c +++ b/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c @@ -41,7 +41,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -51,7 +51,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -61,7 +61,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -71,7 +71,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c index 281458879f..48106d9170 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c @@ -51,7 +51,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -61,7 +61,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -71,7 +71,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -81,7 +81,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -91,7 +91,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -101,7 +101,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), diff --git a/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c b/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c index ea19914b38..478b12bd90 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c +++ b/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c @@ -30,7 +30,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -40,7 +40,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -50,7 +50,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c index cbc03ee5b2..6f73b449b0 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c +++ b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c @@ -195,7 +195,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), @@ -206,7 +206,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -217,7 +217,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -228,7 +228,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_03), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -239,7 +239,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_04), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c index 0972f08742..5418ba42fd 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c +++ b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c @@ -99,14 +99,14 @@ EvtScript N(EVS_WatchForPlayer) = { EVT_LOOP(0) EVT_CALL(N(GetPeachDisguise), LVar1) EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(N(UnkPhysicsFunc), LVar0, 85, 60, 38) EVT_IF_NE(LVar0, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) EVT_RETURN EVT_END_IF EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -192,7 +192,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros_01), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), @@ -203,7 +203,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros_02), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), @@ -214,7 +214,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros_03), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), diff --git a/src/world/area_kkj/kkj_18/kkj_18_3_npc.c b/src/world/area_kkj/kkj_18/kkj_18_3_npc.c index ad11b8b793..3ec8b24044 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_3_npc.c +++ b/src/world/area_kkj/kkj_18/kkj_18_3_npc.c @@ -37,12 +37,12 @@ EvtScript N(EVS_NpcInit_GourmetGuy) = { EVT_END_IF EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_GourmetGuy))) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Knife, ANIM_GourmetGuy_Knife) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_GourmetGuy_Knife, FALSE) EVT_CALL(SetNpcPos, NPC_GourmetGuy_Knife, 60, 40, -15) EVT_CALL(SetNpcYaw, NPC_GourmetGuy_Knife, 270) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Fork, ANIM_GourmetGuy_Fork) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_GourmetGuy_Fork, FALSE) EVT_CALL(SetNpcPos, NPC_GourmetGuy_Fork, 125, 40, -15) EVT_CALL(SetNpcYaw, NPC_GourmetGuy_Fork, 270) @@ -89,7 +89,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -99,7 +99,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -109,7 +109,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -120,7 +120,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_GourmetGuy), .settings = &N(NpcSettings_GourmetGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .extraAnimations = N(ExtraAnims_GourmetGuy), @@ -130,7 +130,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .extraAnimations = N(ExtraAnims_GourmetGuy), @@ -140,7 +140,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .extraAnimations = N(ExtraAnims_GourmetGuy), diff --git a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c index 151b21513d..3ba837a153 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c +++ b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c @@ -194,7 +194,7 @@ EvtScript N(EVS_OpenAndCloseWindow) = { }; EvtScript N(EVS_DropFork) = { - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetNpcPos, NPC_GourmetGuy_Fork, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.05)) EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -8, LVar2, 8) @@ -215,7 +215,7 @@ EvtScript N(EVS_DropFork) = { }; EvtScript N(EVS_DropKnife) = { - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetNpcPos, NPC_GourmetGuy_Knife, LVar0, LVar1, LVar2) EVT_CALL(SetNpcRotation, NPC_GourmetGuy_Knife, 0, 0, -25) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.05)) @@ -297,7 +297,7 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_GourmetGuy, LVar0, 200, LVar2, 15) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Panic) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(20.0)) EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, -45) @@ -527,7 +527,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END_IF - EVT_CALL(SetEnemyFlagBits, NPC_GourmetGuy, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_GourmetGuy, ENEMY_FLAG_CANT_INTERACT, 1) EVT_EXEC_WAIT(N(EVS_GourmetGuy_LovesCake)) EVT_CALL(SetNpcVar, NPC_GourmetGuy, 0, 1) EVT_EXEC(N(EVS_GourmetGuy_RunAround)) diff --git a/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c b/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c index 0238912df2..c3804fa8f9 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c +++ b/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c @@ -34,7 +34,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TayceT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_TayceT_Idle, @@ -46,7 +46,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, diff --git a/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c b/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c index 6dafb841cc..a0e1748cb9 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c +++ b/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c @@ -24,7 +24,7 @@ EvtScript N(EVS_NpcIdle_Twink) = { }; EvtScript N(EVS_NpcInit_Twink) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -42,7 +42,7 @@ NpcData N(NpcData_Twink) = { .yaw = 0, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_CANT_INTERACT, .drops = NO_DROPS, .animations = TWINK_ANIMS, }; diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c index 54ce862746..01aac10d23 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c +++ b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c @@ -702,7 +702,7 @@ EvtScript N(EVS_FocusCam_Table) = { }; EvtScript N(EVS_Twink_FlyToPlayer) = { - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(SetNpcVar, NPC_Twink, 1, 0) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -898,7 +898,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_SET(AF_KKJ_FinishedBakingCake, FALSE) EVT_SET(AF_KKJ19_FailedBakingTask, FALSE) EVT_SET(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(SetNpcVar, NPC_Twink, 1, 0) EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_MIX) // resume mixing @@ -961,7 +961,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_WAIT(20) EVT_THREAD EVT_EXEC_WAIT(N(EVS_Twink_FlyToHighPos)) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) EVT_END_THREAD EVT_SET(LVarA, 1) @@ -984,14 +984,14 @@ EvtScript N(EVS_ManageBaking) = { EVT_SET(LVarA, 1) EVT_THREAD EVT_EXEC_WAIT(N(EVS_Twink_FlyToHighPos)) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) EVT_END_THREAD // wait for peach to tell twink shes done EVT_LABEL(LBL_ADD_SUGAR_EGGS_WAITING) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_IF_EQ(LVarA, 0) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) @@ -1125,14 +1125,14 @@ EvtScript N(EVS_ManageBaking) = { EVT_SET(LVarA, 1) EVT_THREAD EVT_EXEC_WAIT(N(EVS_Twink_FlyToHighPos)) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) EVT_END_THREAD // wait for peach to tell twink shes done EVT_LABEL(LBL_ADD_FLOUR_BUTTER_WAITING) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_IF_EQ(LVarA, 0) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) @@ -1342,7 +1342,7 @@ EvtScript N(EVS_ManageBaking) = { EVT_LABEL(LBL_DECORATE_WAITING) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_IF_EQ(LVarA, 0) - EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c index 4acc676de8..b456e67490 100644 --- a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c +++ b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c @@ -201,7 +201,7 @@ EvtScript N(EVS_MeetToadHouseKeeper) = { EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarA) EVT_CALL(SetPlayerJumpscale, 1) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ToadHouse_DisableStatusMenu)) EVT_IF_NE(LVar4, 0) EVT_EXEC(N(EVS_ToadHouse_Unk2)) @@ -241,7 +241,7 @@ EvtScript N(EVS_MeetToadHouseKeeper) = { EVT_EXEC_GET_TID(N(EVS_ToadHouse_ReturnFromRest), LVar9) EVT_CALL(N(ToadHouse_AwaitScriptComplete), LVar9) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarB) EVT_CALL(N(ToadHouse_ShowStatusMenu)) EVT_RETURN @@ -343,7 +343,7 @@ NpcData N(NpcData_Toad) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KKJ_ToadHouseToad, diff --git a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c index dbaadcd096..4f2d000d4d 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c @@ -173,7 +173,7 @@ NpcData N(NpcData_Bowser_Body) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Body), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, }; @@ -184,7 +184,7 @@ NpcData N(NpcData_Bowser_Prop) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Propeller), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, }; @@ -195,7 +195,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, }; diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c index 88e20af477..e853f36f99 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c +++ b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c @@ -75,11 +75,11 @@ EvtScript N(EVS_Koopatrol_WatchForPeach) = { EVT_LOOP(0) EVT_CALL(N(GetPeachDisguise), LVar1) EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) EVT_RETURN EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -98,7 +98,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { EVT_END_IF EVT_END_LOOP EVT_KILL_THREAD(LVarA) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_RETURN EVT_END }; @@ -135,7 +135,7 @@ NpcData N(NpcData_Kammy)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -146,7 +146,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -157,7 +157,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c index 07ff29bfec..6e049845b6 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -190,7 +190,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, 8) EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 1, 0) - EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_Kammy, -50, 0, -50) EVT_EXEC(N(EVS_OpenAndCloseTowerDoors)) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index 1310aeb12c..be07c92a79 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -198,7 +198,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -210,7 +210,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_BattleKooper_01), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -223,7 +223,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy_Broom), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -251,7 +251,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -281,7 +281,7 @@ NpcData N(NpcData_Twink) = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), diff --git a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c index 26d4094206..fbfd9aa217 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c +++ b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c @@ -241,7 +241,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -253,7 +253,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -266,7 +266,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy_Broom), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -294,7 +294,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -324,7 +324,7 @@ NpcData N(NpcData_Twink) = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -336,7 +336,7 @@ NpcData N(NpcData_Eldstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -348,7 +348,7 @@ NpcData N(NpcData_Mamar) = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -360,7 +360,7 @@ NpcData N(NpcData_Skolar) = { .yaw = 270, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -372,7 +372,7 @@ NpcData N(NpcData_Muskular) = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -384,7 +384,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -396,7 +396,7 @@ NpcData N(NpcData_Klevar) = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -408,7 +408,7 @@ NpcData N(NpcData_Kalmar) = { .yaw = 270, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), diff --git a/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c b/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c index bcaa9e2611..52dd4fc716 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c +++ b/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c @@ -101,7 +101,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_03), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -113,7 +113,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -125,7 +125,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy_Broom), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -154,7 +154,7 @@ NpcData N(NpcData_Twink) = { .yaw = 270, .init = &N(EVS_NpcInit_Twink_02), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -166,7 +166,7 @@ NpcData N(NpcData_StarRod) = { .yaw = 270, .init = &N(EVS_NpcInit_StarRod), .settings = &N(NpcSettings_StarRod), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = STAR_ROD_ANIMS, }; diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index b40507d010..f288c8ca6c 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) EVT_WAIT(5) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5) @@ -291,49 +291,49 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Mamar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Mamar, LVar6, LVar7, LVar8, 5) EVT_END_THREAD EVT_THREAD EVT_WAIT(21) - EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Skolar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Skolar, LVar6, LVar7, LVar8, 5) EVT_END_THREAD EVT_THREAD EVT_WAIT(22) - EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Muskular, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Muskular, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Muskular, LVar6, LVar7, LVar8, 5) EVT_END_THREAD EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Misstar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Misstar, LVar6, LVar7, LVar8, 5) EVT_END_THREAD EVT_THREAD EVT_WAIT(21) - EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Klevar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Klevar, LVar6, LVar7, LVar8, 5) EVT_END_THREAD EVT_THREAD EVT_WAIT(22) - EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Kalmar, LVar6, LVar7, LVar8, 5) EVT_END_THREAD EVT_THREAD EVT_WAIT(23) - EVT_CALL(SetNpcFlagBits, NPC_Twink_01, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Twink_01, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Twink_01, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Twink_01, LVar6, LVar7, LVar8, 5) diff --git a/src/world/area_kkj/kkj_29/kkj_29_2_npc.c b/src/world/area_kkj/kkj_29/kkj_29_2_npc.c index 1ca133d111..fe930f28ba 100644 --- a/src/world/area_kkj/kkj_29/kkj_29_2_npc.c +++ b/src/world/area_kkj/kkj_29/kkj_29_2_npc.c @@ -68,7 +68,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -79,7 +79,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -90,7 +90,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -101,7 +101,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), 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 26f576b062..4ecccc620e 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 @@ -407,7 +407,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Wave, 5, MSG_CH0_0002) EVT_WAIT(15) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) @@ -419,7 +419,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_THREAD EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) - EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Mamar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Mamar, LVar6, LVar7, LVar8, 5) @@ -428,7 +428,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_THREAD EVT_WAIT(21) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap) - EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Skolar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Skolar, LVar6, LVar7, LVar8, 5) @@ -437,7 +437,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_THREAD EVT_WAIT(22) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) - EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Muskular, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Muskular, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Muskular, LVar6, LVar7, LVar8, 5) @@ -446,7 +446,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_THREAD EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Leap) - EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Misstar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Misstar, LVar6, LVar7, LVar8, 5) @@ -455,7 +455,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_THREAD EVT_WAIT(21) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) - EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Klevar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Klevar, LVar6, LVar7, LVar8, 5) @@ -464,7 +464,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_THREAD EVT_WAIT(22) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap) - EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) EVT_CALL(NpcJump0, NPC_Kalmar, LVar6, LVar7, LVar8, 5) @@ -525,7 +525,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_WAIT(60) EVT_CALL(N(func_80240000_8ABF90), 255, 255, 255, 0, 0, 0, 50) EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(EnableNpcShadow, NPC_Goombaria, TRUE) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Walk) diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c index a2066a604b..d377f14fc8 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -112,7 +112,7 @@ NpcData N(NpcData_Goombaria) = { .yaw = 0, .init = &N(EVS_NpcInit_Goombaria), .settings = &N(NpcSettings_Goombaria_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, }; @@ -124,7 +124,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -134,7 +134,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -144,7 +144,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -154,7 +154,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -164,7 +164,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -174,7 +174,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -184,7 +184,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, 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 c02e736007..b3f78f9ed9 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 @@ -22,7 +22,7 @@ BSS u8 oldEnvR, oldEnvG, oldEnvB; #include "world/common/util/ChangeNpcToPartner.inc.c" API_CALLABLE(N(func_80242014_8B2084)) { - if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_1000) { + if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_FALLING) { return ApiStatus_DONE2; } else { return ApiStatus_BLOCK; @@ -423,8 +423,8 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(EnableNpcAI, NPC_Goomama, FALSE) EVT_CALL(SetNpcPos, NPC_Goombario, -95, 0, -86) EVT_CALL(SetNpcPos, NPC_Goombaria, -92, 0, -46) - EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -189, 0, -40) EVT_CALL(SetPanTarget, CAM_DEFAULT, -189, 0, -40) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) @@ -745,12 +745,12 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_THREAD EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) EVT_SET(GB_StoryProgress, STORY_CH0_GOOMBARIO_JOINED_PARTY) EVT_UNBIND - EVT_CALL(SetNpcFlagBits, NPC_Goomama, NPC_FLAG_4, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goomama, NPC_FLAG_INACTIVE, FALSE) EVT_RETURN EVT_END }; @@ -775,7 +775,7 @@ EvtScript N(EVS_KootFavorCheck_Goompa) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_Goompa, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Walk) EVT_CALL(SetNpcSpeed, NPC_Goompa, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_Goompa, 260, -94, 0) @@ -796,7 +796,7 @@ EvtScript N(EVS_KootFavorCheck_Goompa) = { EVT_CALL(NpcMoveTo, NPC_Goompa, 260, -94, 0) EVT_CALL(NpcMoveTo, NPC_Goompa, LVar0, LVar2, 0) EVT_CALL(SetNpcPos, NPC_Goompa, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_004B) EVT_GIVE_KEY_REWARD(ITEM_KOOT_THE_TAPE) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_004C) @@ -815,7 +815,7 @@ API_CALLABLE(N(AddGoompaRenderYaw)) { } EvtScript N(EVS_Goompa_TurnAround) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_LOOP(5) EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(-18.0)) EVT_WAIT(1) @@ -841,7 +841,7 @@ EvtScript N(EVS_Goompa_TurnBack) = { EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(18.0)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) EVT_RETURN EVT_END }; @@ -1177,7 +1177,7 @@ EvtScript N(EVS_NpcInit_Goomama) = { EVT_CASE_LT(STORY_CH0_GOOMBARIO_JOINED_PARTY) EVT_CALL(SetNpcPos, NPC_SELF, 200, 0, 100) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) @@ -1758,7 +1758,7 @@ NpcData N(NpcData_GoombaFamily)[] = { }, .init = &N(EVS_NpcInit_Goompa), .settings = &N(NpcSettings_GoombaFamily_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMPA_ANIMS, .tattle = MSG_NpcTattle_Goompa, @@ -1781,7 +1781,7 @@ NpcData N(NpcData_GoombaFamily)[] = { }, .init = &N(EVS_NpcInit_Goombaria), .settings = &N(NpcSettings_GoombaFamily_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, .tattle = MSG_NpcTattle_Goombaria, @@ -1804,7 +1804,7 @@ NpcData N(NpcData_GoombaFamily)[] = { }, .init = &N(EVS_NpcInit_Goombario), .settings = &N(NpcSettings_GoombaFamily_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMBARIO_ANIMS, }, @@ -1826,7 +1826,7 @@ NpcData N(NpcData_GoombaFamily)[] = { }, .init = &N(EVS_NpcInit_Gooma), .settings = &N(NpcSettings_GoombaFamily_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMA_ANIMS, .tattle = MSG_NpcTattle_Gooma, @@ -1849,7 +1849,7 @@ NpcData N(NpcData_GoombaFamily)[] = { }, .init = &N(EVS_NpcInit_Goompapa), .settings = &N(NpcSettings_GoombaFamily_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMPAPA_ANIMS, .tattle = MSG_NpcTattle_Goompapa, @@ -1874,7 +1874,7 @@ NpcData N(NpcData_Goomama) = { }, .init = &N(EVS_NpcInit_Goomama), .settings = &N(NpcSettings_GoombaFamily_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .tattle = MSG_NpcTattle_Goomama, @@ -1904,7 +1904,7 @@ NpcData N(NpcData_Toad) = { }, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Guard), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KMR_ToadHouseToad, @@ -1951,7 +1951,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_KMR, QUIZ_COUNT_KMR, QUIZ_MAP_KMR_02 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, @@ -1997,7 +1997,7 @@ NpcData N(NpcData_Eldstar_Prologue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -2008,7 +2008,7 @@ NpcData N(NpcData_Eldstar_Prologue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -2177,9 +2177,9 @@ EvtScript N(EVS_NpcInit_Eldstar_Epilogue) = { EVT_CALL(SetNpcPos, NPC_Goombario, 11, 0, 63) EVT_CALL(SetNpcPos, NPC_Goombaria, 84, 0, 69) EVT_CALL(SetNpcPos, NPC_Parakarry, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_GRAVITY, FALSE) @@ -2213,7 +2213,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Eldstar_Epilogue), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -2224,7 +2224,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Parakarry_Epilogue), .settings = &N(NpcSettings_GoombaFamily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, @@ -2251,7 +2251,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Goombario_Epilogue), .settings = &N(NpcSettings_GoombaFamily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GOOMBARIO_ANIMS, }, @@ -2261,7 +2261,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Goombaria_Epilogue), .settings = &N(NpcSettings_GoombaFamily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, }, diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index 995a628220..b3780cdb2b 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -77,8 +77,8 @@ EvtScript N(EVS_MakeNpcsFaceKammy) = { EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(EnableNpcAI, NPC_Goombario, FALSE) EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) @@ -344,8 +344,8 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(BindNpcAI, NPC_Goombario, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_6))) EVT_CALL(N(SetWanderTerritory_6), NPC_Goombaria, 3) EVT_CALL(BindNpcAI, NPC_Goombaria, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_6))) - EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index 9e2a302436..ae14d9b93f 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 @@ -140,7 +140,7 @@ EvtScript N(EVS_NpcHit_Goompa) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcPos, NPC_Goompa, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Goompa))) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goompa))) @@ -169,7 +169,7 @@ NpcData N(NpcData_GoombaFamily) = { .yaw = 45, .init = &N(EVS_NpcInit_Goompa), .settings = &N(NpcSettings_Goompa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 5952002cf8..65a4c7198b 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -246,7 +246,7 @@ NpcSettings N(NpcSettings_Goompa) = { .ai = &N(EVS_NpcAI_Goompa), .aux = &N(EVS_NpcAux_Goompa), .onDefeat = &N(EVS_NpcDefeat_Goompa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION, }; EvtScript N(EVS_NpcInit_JrTroopa) = { @@ -264,7 +264,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 0, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -291,7 +291,7 @@ NpcData N(NpcData_GoombaFamily) = { .pos = { -58.0f, 0.0f, 130.0f }, .yaw = 0, .settings = &N(NpcSettings_Goompa), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .animations = { }, }; 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 4f9a75cb91..23188e95e6 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 @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { 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) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGoomba_Wander))) EVT_CASE_OR_EQ(102) EVT_CASE_OR_EQ(3) @@ -86,7 +86,7 @@ NpcData N(NpcData_Goomba_01) = { } }, .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -109,7 +109,7 @@ NpcData N(NpcData_Goomba_02) = { } }, .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -140,7 +140,7 @@ NpcData N(NpcData_SpikedGoomba) = { }, .init = &N(EVS_NpcInit_SpikedGoomba), .settings = &N(NpcSettings_SpikedGoomba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -163,7 +163,7 @@ NpcData N(NpcData_Paragoomba) = { } }, .settings = &N(NpcSettings_Paragoomba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c index d66cfbfe67..b7c081b2c4 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c +++ b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_SpikedGoomba) = { } }, .settings = &N(NpcSettings_SpikedGoomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, }; @@ -42,7 +42,7 @@ NpcData N(NpcData_Paragoomba) = { } }, .settings = &N(NpcSettings_Paragoomba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, }; diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index 2f7c5d17c4..7461ae2295 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -166,7 +166,7 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EvtScript N(EVS_NpcInit_GoombaBros_Red) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_GoombaBros_Red))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_GoombaBros_Red))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(MV_GoombaBrosDefeated, FALSE) EVT_IF_GE(GB_StoryProgress, STORY_CH0_DEFEATED_GOOMBA_BROS) EVT_CALL(RemoveNpc, NPC_SELF) @@ -197,7 +197,7 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Blue) = { EvtScript N(EVS_NpcInit_GoombaBros_Blue) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_GoombaBros_Blue))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_GoombaBros_Blue))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_IF_GE(GB_StoryProgress, STORY_CH0_DEFEATED_GOOMBA_BROS) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN @@ -225,7 +225,7 @@ NpcData N(NpcData_GoombaBros_Red)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_Red), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = GOOMBA_BROS_RED_ANIMS, }, @@ -247,7 +247,7 @@ NpcData N(NpcData_GoombaBros_Red)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_Blue), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = GOOMBA_BROS_BLUE_ANIMS, }, diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index 0757314ff3..3260c3c666 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Goomba_01) = { } }, .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; @@ -43,7 +43,7 @@ NpcData N(NpcData_Goomba_02) = { } }, .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; @@ -109,11 +109,11 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 25, 23) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_20, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_NO_SHADOW_RAYCAST, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnReadBillboard)), TRIGGER_WALL_PRESS_A, COLLIDER_kan, 1, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goomba_Wander))) EVT_RETURN @@ -145,7 +145,7 @@ NpcData N(NpcData_Goomba_Ambush) = { }, .init = &N(EVS_NpcInit_Goomba_Ambush), .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; @@ -167,7 +167,7 @@ NpcData N(NpcData_Paragoomba) = { } }, .settings = &N(NpcSettings_Paragoomba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, }; diff --git a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c b/src/world/area_kmr/kmr_10/kmr_10_3_npc.c index fbea56b462..3413882ac5 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c +++ b/src/world/area_kmr/kmr_10/kmr_10_3_npc.c @@ -14,7 +14,7 @@ NpcData N(NpcData_Toad) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c index 0be0d19c43..95da3bda3b 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c +++ b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c @@ -288,7 +288,7 @@ NpcSettings N(NpcSettings_Kammy) = { .otherAI = &N(EVS_NpcAuxAI_Kammy), .ai = &N(EVS_NpcAI_Kammy), .aux = &N(EVS_NpcAux_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, }; NpcData N(NpcData_Enemies)[] = { @@ -310,7 +310,7 @@ NpcData N(NpcData_Enemies)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_01), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaBros_Blue_Idle, @@ -349,7 +349,7 @@ NpcData N(NpcData_Enemies)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_02), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaBros_Red_Idle, @@ -388,7 +388,7 @@ NpcData N(NpcData_Enemies)[] = { }, .init = &N(EVS_NpcInit_GoombaKing), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaKing_Idle, @@ -418,7 +418,7 @@ NpcData N(NpcData_Kammy) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .animations = {}, }; diff --git a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c index b7cb1ba6f5..349feb2b53 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c +++ b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c @@ -47,7 +47,7 @@ EvtScript N(EVS_Interact_SwitchBush) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcPos, NPC_BlueGoombaBro, -377, -8, 81) - EVT_CALL(SetNpcFlagBits, NPC_BlueGoombaBro, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_BlueGoombaBro, NPC_FLAG_HAS_NO_SPRITE, TRUE) EVT_EXEC_GET_TID(N(EVS_TetherSwitchToBlueGoomba), LVarB) EVT_CALL(SetNpcJumpscale, NPC_BlueGoombaBro, EVT_FLOAT(2.0)) EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -445, 0, 92, 15) diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index 53ceebbc69..85166c31b0 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -44,7 +44,7 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000 | NPC_FLAG_200000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, TRUE) EVT_WAIT(3) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(9) @@ -72,9 +72,9 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 30, 23) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000 | NPC_FLAG_200000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, FALSE) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnReadBillboard)), TRIGGER_WALL_PRESS_A, COLLIDER_o78, 1, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goomba_Wander))) EVT_RETURN @@ -105,7 +105,7 @@ NpcData N(NpcData_Goomba) = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; 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 1696e10ae5..e943c34a03 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 @@ -291,9 +291,9 @@ EvtScript N(EVS_NpcIdle_Luigi_InBedroom) = { EVT_LABEL(10) EVT_SET(LVar0, MF_Unk_0C) EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_INVISIBLE, FALSE) EVT_ELSE - EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_INVISIBLE, TRUE) EVT_END_IF EVT_WAIT(3) EVT_GOTO(10) @@ -362,7 +362,7 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { EVT_WAIT(5) EVT_CALL(SpeakToPlayer, NPC_Luigi_0, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00EB) EVT_WAIT(3) - EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Run) EVT_CALL(NpcMoveTo, NPC_Luigi_0, -130, -17, 15) EVT_CALL(NpcJump0, NPC_Luigi_0, -145, -54, -45, 10) @@ -374,7 +374,7 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { EVT_END_THREAD EVT_CALL(NpcJump0, NPC_Luigi_0, -145, 30, -45, 20) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(NpcMoveTo, NPC_Luigi_0, 20, -80, 15) EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Idle) EVT_CALL(SetNpcPos, NPC_Luigi_0, 48, 30, -5) @@ -396,11 +396,11 @@ EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { EVT_LABEL(10) EVT_IF_EQ(MF_Unk_0C, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_GT(LVar0, 0) EVT_WAIT(1) @@ -414,7 +414,7 @@ EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 37, -72, 16) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -422,7 +422,7 @@ EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { EVT_CALL(NpcMoveTo, NPC_SELF, 42, -6, 10) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -607,7 +607,7 @@ NpcData N(NpcData_Luigi_0) = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi_0), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_Luigi, @@ -619,7 +619,7 @@ NpcData N(NpcData_Luigi_1) = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi_1), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_Luigi, @@ -695,7 +695,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { EVT_SET(GF_KMR20_ChasedOffShyGuy, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_WAIT(2) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) EVT_RETURN EVT_END @@ -726,7 +726,7 @@ NpcData N(NpcData_ShyGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; diff --git a/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c b/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c index 4b77bde015..cf59e0ecae 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c +++ b/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c @@ -22,14 +22,14 @@ EvtScript N(EVS_SetWallRot_House) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(90) EVT_SET(MF_Unk_0C, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(EnableGroup, MODEL_g60, FALSE) EVT_CALL(EnableGroup, MODEL_g34, FALSE) EVT_CASE_EQ(0) EVT_IF_EQ(MF_Unk_0C, TRUE) EVT_CALL(EnableGroup, MODEL_g72, TRUE) EVT_SET(MF_Unk_0C, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_INVISIBLE, TRUE) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(EnableGroup, MODEL_g60, TRUE) diff --git a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c index 891cb61081..385c7a4d76 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c +++ b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseSpring_Basement) = { EvtScript N(EVS_Luigi_JumpFromBlock) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_100, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_IGNORE_WORLD_COLLISION, 0) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) @@ -81,7 +81,7 @@ EvtScript N(EVS_Luigi_JumpFromBlock) = { EvtScript N(EVS_Luigi_JumpFromHighBlock) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_100, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_IGNORE_WORLD_COLLISION, 0) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) diff --git a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c index 591e3526fa..8a62882353 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c +++ b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c @@ -27,7 +27,7 @@ NpcData N(NpcData_Scenes)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Scenes), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, @@ -54,7 +54,7 @@ NpcData N(NpcData_Scenes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi_Scenes), .settings = &N(NpcSettings_Scenes), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_GRAVITY, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_GRAVITY, .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, diff --git a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c index 967e9bdd44..3e097fe5f7 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c +++ b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c @@ -37,7 +37,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -47,7 +47,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -57,7 +57,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -67,7 +67,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -77,7 +77,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -90,7 +90,7 @@ NpcData N(NpcData_Chapter2)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -100,7 +100,7 @@ NpcData N(NpcData_Chapter2)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Tutankoopa), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Anim01, @@ -127,7 +127,7 @@ NpcData N(NpcData_Chapter2)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ChainChomp), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, @@ -153,7 +153,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, @@ -179,7 +179,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, @@ -205,7 +205,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, @@ -231,7 +231,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, @@ -261,7 +261,7 @@ NpcData N(NpcData_Chapter3)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -271,7 +271,7 @@ NpcData N(NpcData_Chapter3)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldTubba_Anim06, @@ -301,7 +301,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -311,7 +311,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GeneralGuy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_GeneralGuy_Anim02, @@ -338,7 +338,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -348,7 +348,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -361,7 +361,7 @@ NpcData N(NpcData_Chapter5)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -407,7 +407,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -417,7 +417,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Body), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, @@ -444,7 +444,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Face), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, @@ -471,7 +471,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, @@ -498,7 +498,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_TuffPuff_01), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_TuffPuff_Still, @@ -524,7 +524,7 @@ NpcData N(NpcData_Chapter6)[] = { .pos = { 14.0f, 61.0f, 1.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_TuffPuff_Still, @@ -554,7 +554,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, @@ -564,7 +564,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_CrystalKing), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -591,7 +591,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_IceCube), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -618,7 +618,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_IceSphere), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -645,7 +645,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_IceSpike), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -674,7 +674,7 @@ NpcData N(NpcData_Chapter8) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBowser_Idle, diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index d6b01fe59c..bcabf20cee 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -519,7 +519,7 @@ EvtScript N(EVS_Scene_EndOfChapter) = { EvtScript N(EVS_NpcInit_Eldstar_01) = { EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.85), EVT_FLOAT(0.85), EVT_FLOAT(0.85)) EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 20) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_EXEC(N(EVS_Scene_EndOfChapter)) EVT_RETURN @@ -542,7 +542,7 @@ NpcData N(NpcData_Eldstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -552,7 +552,7 @@ NpcData N(NpcData_Eldstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -565,7 +565,7 @@ NpcData N(NpcData_Mamar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -575,7 +575,7 @@ NpcData N(NpcData_Mamar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -588,7 +588,7 @@ NpcData N(NpcData_Skolar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -598,7 +598,7 @@ NpcData N(NpcData_Skolar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -611,7 +611,7 @@ NpcData N(NpcData_Muskular)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -621,7 +621,7 @@ NpcData N(NpcData_Muskular)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -634,7 +634,7 @@ NpcData N(NpcData_Misstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -644,7 +644,7 @@ NpcData N(NpcData_Misstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -657,7 +657,7 @@ NpcData N(NpcData_Klevar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -667,7 +667,7 @@ NpcData N(NpcData_Klevar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -680,7 +680,7 @@ NpcData N(NpcData_Kalmar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, @@ -690,7 +690,7 @@ NpcData N(NpcData_Kalmar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, diff --git a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c b/src/world/area_kmr/kmr_30/kmr_30_2_npc.c index 636879566d..8dd060344f 100644 --- a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c +++ b/src/world/area_kmr/kmr_30/kmr_30_2_npc.c @@ -11,7 +11,7 @@ NpcData N(NpcData_ParadePeach) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_ParadePeach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_ParadePeach_IdleRaisedArms, diff --git a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c index a6d51b6bbd..fbea7d2590 100644 --- a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c +++ b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_BonyBeetle_01) = { } }, .settings = &N(NpcSettings_BonyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, }; @@ -41,7 +41,7 @@ NpcData N(NpcData_BonyBeetle_02) = { } }, .settings = &N(NpcSettings_BonyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, }; diff --git a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c index 8993e24ec3..06935abcac 100644 --- a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c +++ b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c @@ -30,7 +30,7 @@ NpcData N(NpcData_Koopatrol_01) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -54,7 +54,7 @@ NpcData N(NpcData_Koopatrol_02) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -78,7 +78,7 @@ NpcData N(NpcData_BonyBeetle_01) = { } }, .settings = &N(NpcSettings_BonyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BONY_BEETLE_DROPS_ALT, .animations = BONY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -101,7 +101,7 @@ NpcData N(NpcData_BonyBeetle_02) = { } }, .settings = &N(NpcSettings_BonyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -125,7 +125,7 @@ NpcData N(NpcData_Magikoopa_01)[] = { } }, .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), diff --git a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c index b1e698f0ad..d132162941 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c +++ b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Magikoopa)[] = { } }, .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), diff --git a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c index 2d90704d1c..fbf6636774 100644 --- a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c +++ b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c @@ -8,7 +8,7 @@ NpcData N(NpcData_Prisoners)[] = { .pos = { 845.0f, 30.0f, -285.0f }, .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -18,7 +18,7 @@ NpcData N(NpcData_Prisoners)[] = { .pos = { 872.0f, 30.0f, -315.0f }, .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -28,7 +28,7 @@ NpcData N(NpcData_Prisoners)[] = { .pos = { 900.0f, 30.0f, -285.0f }, .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, diff --git a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c index bb397a3205..bb62fe7f1a 100644 --- a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c +++ b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Koopatrol) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -71,7 +71,7 @@ NpcData N(NpcData_HammerBros)[] = { } }, .settings = &N(NpcSettings_HammerBros_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, diff --git a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c index 688e2620c0..41e6c3fb75 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c +++ b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c @@ -51,7 +51,7 @@ NpcData N(NpcData_Koopatrol) = { }, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -68,7 +68,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -79,7 +79,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -90,7 +90,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, diff --git a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c index e20c98722d..8dee6fe453 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c +++ b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_BonyBeetle) = { } }, .settings = &N(NpcSettings_BonyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, }; diff --git a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c index c759d078b0..2fc39f73b4 100644 --- a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c +++ b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_HammerBros)[] = { } }, .settings = &N(NpcSettings_HammerBros_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, diff --git a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c index a379fc17cd..e77b11a760 100644 --- a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c +++ b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c @@ -170,7 +170,7 @@ NpcData N(NpcData_BillBlaster_01)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -192,7 +192,7 @@ NpcData N(NpcData_BillBlaster_01)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -217,7 +217,7 @@ NpcData N(NpcData_BillBlaster_03)[] = { }, .init = &N(EVS_NpcInit_BillBlaster_03), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BOMBSHELL_BLASTER_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -239,7 +239,7 @@ NpcData N(NpcData_BillBlaster_03)[] = { }, .init = &N(EVS_NpcInit_BillBlaster_03), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -264,7 +264,7 @@ NpcData N(NpcData_BillBlaster_05)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BOMBSHELL_BLASTER_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -286,7 +286,7 @@ NpcData N(NpcData_BillBlaster_05)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -311,7 +311,7 @@ NpcData N(NpcData_BillBlaster_07)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BOMBSHELL_BLASTER_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, @@ -333,7 +333,7 @@ NpcData N(NpcData_BillBlaster_07)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, diff --git a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c index 0e650c51d9..0deb8cb678 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c +++ b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c @@ -14,7 +14,7 @@ NpcData N(NpcData_Dummy) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c index 5355941715..669f4f68d8 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c +++ b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c @@ -14,7 +14,7 @@ NpcData N(NpcData_Dummy) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; 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 aa79b3f781..7b2a76e681 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 @@ -293,7 +293,7 @@ NpcData N(NpcData_Guards)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Guards), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -302,7 +302,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 525.0f, 230.0f, -165.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -311,7 +311,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 550.0f, 230.0f, -120.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -320,7 +320,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 505.0f, 230.0f, -120.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, }, diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index 41106118ba..53c03e9f9f 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -194,7 +194,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -205,7 +205,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -216,7 +216,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, @@ -227,7 +227,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadMinister), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_MINISTER_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadMinister, diff --git a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c index 9018bec95d..a9df740081 100644 --- a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c +++ b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Koopatrol_01) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -42,7 +42,7 @@ NpcData N(NpcData_Koopatrol_02) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -65,7 +65,7 @@ NpcData N(NpcData_HammerBros_01)[] = { } }, .settings = &N(NpcSettings_HammerBros_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, diff --git a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c index c85c24c941..495aa1e924 100644 --- a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c +++ b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c @@ -22,7 +22,7 @@ NpcData N(NpcData_Magikoopa_01)[] = { } }, .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), @@ -49,7 +49,7 @@ NpcData N(NpcData_Magikoopa_02)[] = { } }, .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), @@ -75,7 +75,7 @@ NpcData N(NpcData_Koopatrol) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c index c3d580d9e5..31db2b77da 100644 --- a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c +++ b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_HammerBros_01)[] = { } }, .settings = &N(NpcSettings_HammerBros_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, @@ -51,7 +51,7 @@ NpcData N(NpcData_HammerBros_02)[] = { } }, .settings = &N(NpcSettings_HammerBros_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, 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 6a4a102d63..8f4473df33 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 @@ -233,7 +233,7 @@ EvtScript N(EVS_NpcHit_Guardian) = { EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002B) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002C) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(BindNpcAI, NPC_Duplighost, EVT_PTR(N(EVS_NpcAI_Duplighost_Caught))) EVT_END_IF EVT_END_SWITCH @@ -325,7 +325,7 @@ EvtScript N(EVS_NpcInit_Follower) = { EvtScript N(EVS_NpcInit_Guardian) = { EVT_IF_EQ(GF_KPA53_Defeated_PeachImposter, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 765, 0, -30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_IF_EQ(GF_KPA53_Met_PeachImposter, FALSE) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_Guardian_FirstTime))) @@ -346,7 +346,7 @@ NpcData N(NpcData_Imposter)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Follower), .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PEACH_ANIMS, .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, @@ -357,7 +357,7 @@ NpcData N(NpcData_Imposter)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Guardian), .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = PEACH_ANIMS, .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, @@ -368,7 +368,7 @@ NpcData N(NpcData_Imposter)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Duplighost), .settings = &N(NpcSettings_Duplighost), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, diff --git a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c index eb66ab6c05..84013f26c7 100644 --- a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c +++ b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Koopatrol_01) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -42,7 +42,7 @@ NpcData N(NpcData_Koopatrol_02) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c index 4bba502152..369afd6086 100644 --- a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c +++ b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c @@ -113,7 +113,7 @@ EvtScript N(EVS_Starship_Depart) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_ADD(LVar2, 10) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 1) EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) diff --git a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c index 7124434d07..d58d377032 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c +++ b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Koopatrol_01) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -41,7 +41,7 @@ NpcData N(NpcData_Koopatrol_02) = { } }, .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 0579bbd454..6703bfd8bf 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -206,7 +206,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EvtScript N(EVS_NpcInit_Door) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Door))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) EVT_RETURN @@ -219,7 +219,7 @@ NpcData N(NpcData_Door) = { .yaw = 0, .init = &N(EVS_NpcInit_Door), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index c6a1054a6d..0acebd665e 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -1221,7 +1221,7 @@ EvtScript N(EVS_NpcInit_Door) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Door))) EVT_END_IF EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Door))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) EVT_RETURN @@ -1230,7 +1230,7 @@ EvtScript N(EVS_NpcInit_Door) = { EvtScript N(EVS_NpcInit_Goomba) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomba))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_RETURN EVT_END @@ -1238,7 +1238,7 @@ EvtScript N(EVS_NpcInit_Goomba) = { EvtScript N(EVS_NpcInit_ShyGuy) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_RETURN EVT_END @@ -1246,7 +1246,7 @@ EvtScript N(EVS_NpcInit_ShyGuy) = { EvtScript N(EVS_NpcInit_KoopaTroopa) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaTroopa))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_RETURN EVT_END @@ -1254,7 +1254,7 @@ EvtScript N(EVS_NpcInit_KoopaTroopa) = { EvtScript N(EVS_NpcInit_Bobomb) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bobomb))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) EVT_RETURN EVT_END @@ -1272,7 +1272,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Door), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1282,7 +1282,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | 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 = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1292,7 +1292,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | 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 = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1302,7 +1302,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | 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 = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1327,7 +1327,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1349,7 +1349,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1371,7 +1371,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1393,7 +1393,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1415,7 +1415,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1440,7 +1440,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1462,7 +1462,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1484,7 +1484,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1506,7 +1506,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1528,7 +1528,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1553,7 +1553,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1575,7 +1575,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1597,7 +1597,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1619,7 +1619,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1641,7 +1641,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1666,7 +1666,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1688,7 +1688,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1710,7 +1710,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1732,7 +1732,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1754,7 +1754,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1779,7 +1779,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1801,7 +1801,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1823,7 +1823,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1845,7 +1845,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1867,7 +1867,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1892,7 +1892,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1914,7 +1914,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1936,7 +1936,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1958,7 +1958,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1980,7 +1980,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -2005,7 +2005,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2027,7 +2027,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2049,7 +2049,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2071,7 +2071,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2093,7 +2093,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index 7e8e60628a..fd13aada3d 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -480,7 +480,7 @@ EvtScript N(EVS_NpcInit_Door) = { EVT_IF_EQ(GB_KPA83_BowserDoorState, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Door))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Door))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_END_IF @@ -517,7 +517,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -528,7 +528,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -539,7 +539,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -550,7 +550,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -561,7 +561,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -588,7 +588,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Door), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c index 9a9ecb7b7e..78f03beab3 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -159,7 +159,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadHouseToadA, @@ -170,7 +170,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadC, @@ -181,7 +181,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierB, @@ -192,7 +192,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Dryite), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveDryite, @@ -249,7 +249,7 @@ NpcData N(NpcData_Koopatrol) = { }, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c index 332571101f..4b09995b43 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -160,7 +160,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadHouseToadB, @@ -171,7 +171,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadD, @@ -182,7 +182,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierC, @@ -193,7 +193,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptivePenguin, @@ -250,7 +250,7 @@ NpcData N(NpcData_Koopatrol) = { }, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; 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 f10609d9c2..089040c333 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 @@ -146,7 +146,7 @@ NpcData N(NpcData_SpikedGoomba) = { .yaw = 90, .init = &N(EVS_NpcInit_SpikedGoomba), .settings = &N(NpcSettings_SpikedGoomba), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_SpikedGoomba_Idle, diff --git a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c index 64c3010e6b..f204d7760c 100644 --- a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c +++ b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c @@ -51,7 +51,7 @@ NpcData N(NpcPutridPiranha) = { .yaw = 270, .init = &N(EVS_NpcInit_PutridPiranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index a88d1fd550..48b10409a9 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -168,7 +168,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -191,7 +191,7 @@ NpcData N(NpcData_LavaBubble) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, 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 c00033a921..41b83fbece 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 @@ -55,7 +55,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetSelfVar, 0, 1) EVT_THREAD EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) @@ -72,14 +72,14 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Panic, 512, MSG_CH5_00F3) EVT_CALL(SetSelfVar, 0, 0) EVT_WAIT(18) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInteract_Kolorado) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_IF_LT(GB_StoryProgress, STORY_CH5_SMASHED_ULTRA_BLOCK) EVT_IF_EQ(GF_KZN03_SpokeWithKolorado, FALSE) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.3), 0, 350, EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) @@ -107,7 +107,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_CALL(SetSelfVar, 0, 0) EVT_WAIT(18) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_LETTER_CHECK(Kolorado) EVT_RETURN EVT_END @@ -151,7 +151,7 @@ EvtScript N(EVS_SyncZiplineDummyNPC2) = { }; EvtScript N(EVS_NpcInit_ZiplineDummy) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.3), 1, EVT_FLOAT(0.3)) EVT_RETURN EVT_END @@ -164,7 +164,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -175,7 +175,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -186,7 +186,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -210,7 +210,7 @@ NpcData N(NpcData_SpikeTop_01) = { } }, .settings = &N(NpcSettings_SpikeTop), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -233,7 +233,7 @@ NpcData N(NpcData_SpikeTop_02) = { } }, .settings = &N(NpcSettings_SpikeTop), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -256,7 +256,7 @@ NpcData N(NpcData_SpikeTop_03) = { } }, .settings = &N(NpcSettings_SpikeTop), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -280,7 +280,7 @@ NpcData N(NpcData_PutridPiranha)[] = { } }, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 065213f8c4..bc278e3eba 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 @@ -92,7 +92,7 @@ EvtScript N(EVS_RideZipline) = { 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, ArrayVar(4)) EVT_SUB(LVar0, 10) EVT_SET(LVar1, ArrayVar(5)) diff --git a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c index 0d5056e53d..b3ad169bab 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c +++ b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c @@ -15,14 +15,14 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVarB, LVar1) EVT_LOOP(15) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, TRUE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) EVT_SET(LVar0, LVarA) EVT_SET(LVar1, LVarB) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, FALSE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) @@ -116,7 +116,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -124,7 +124,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_03) = { @@ -132,14 +132,14 @@ NpcSettings N(NpcSettings_FireBar_03) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_03), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { .defaultAnim = ANIM_Fire_Brighest_Burn, .height = 12, .radius = 25, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_FireBar_01)[] = { diff --git a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c b/src/world/area_kzn/kzn_07/kzn_07_4_npc.c index dbc7f8ec24..2d07ebdf81 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c +++ b/src/world/area_kzn/kzn_07/kzn_07_4_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_LavaBubble_01) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -43,7 +43,7 @@ NpcData N(NpcData_LavaBubble_02) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c b/src/world/area_kzn/kzn_08/kzn_08_3_npc.c index 6c3754e384..c922757bc6 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c +++ b/src/world/area_kzn/kzn_08/kzn_08_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_PutridPiranha)[] = { } }, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c index 4fb37f7b18..471b88a8a0 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c +++ b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c @@ -86,7 +86,7 @@ EvtScript N(EVS_RideZipline) = { EVT_WAIT(7) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_SET(LVar0, ArrayVar(4)) EVT_SUB(LVar0, 10) EVT_SET(LVar1, ArrayVar(5)) 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 4535160ab9..7fe0f5e400 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 @@ -36,8 +36,8 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(InterruptUsePartner) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 0, 400, EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_CALL(SetSelfVar, 1, 1) EVT_THREAD @@ -58,7 +58,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) EVT_ADD(LVar0, 20) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) EVT_CALL(EnablePartnerAI) @@ -152,7 +152,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(NpcJump0, NPC_SELF, LVar3, 700, LVar5, 5) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_161, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 0) EVT_WAIT(5) @@ -219,7 +219,7 @@ EvtScript N(EVS_SyncZiplineDummyNPC) = { }; EvtScript N(EVS_Dummy_Init) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.3), 1, EVT_FLOAT(0.3)) EVT_RETURN EVT_END @@ -232,7 +232,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_Kolorado_Init), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -243,7 +243,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_Dummy_Init), .settings = &N(NpcSettings_Zipline), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -267,7 +267,7 @@ NpcData N(NpcData_SpikeTop) = { } }, .settings = &N(NpcSettings_SpikeTop), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -291,7 +291,7 @@ NpcData N(NpcData_PutridPiranha)[] = { } }, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c index 30d0aadfb8..a383f4b2b4 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c @@ -16,14 +16,14 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVarB, LVar1) EVT_LOOP(15) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, TRUE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) EVT_SET(LVar0, LVarA) EVT_SET(LVar1, LVarB) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, FALSE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) @@ -117,7 +117,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -125,7 +125,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_03) = { @@ -133,14 +133,14 @@ NpcSettings N(NpcSettings_FireBar_03) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_03), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { .defaultAnim = ANIM_Fire_Brighest_Burn, .height = 12, .radius = 20, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_FireBar_01)[] = { @@ -289,7 +289,7 @@ NpcData N(NpcData_Bubble_01) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -312,7 +312,7 @@ NpcData N(NpcData_Bubble_02) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c index 48822a9477..f34d67bf54 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -84,12 +84,12 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F7, 160, 40) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 290, 0, 30) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(NpcMoveTo, NPC_SELF, 640, 80, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Yell) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00F8) EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_AT_DEAD_END) @@ -139,7 +139,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -163,7 +163,7 @@ NpcData N(NpcData_Piranha)[] = { } }, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -188,7 +188,7 @@ NpcData N(NpcData_SpikeTop) = { } }, .settings = &N(NpcSettings_SpikeTop), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c index b5a7ff6431..7e4a4fbdbb 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c @@ -149,7 +149,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -161,7 +161,7 @@ NpcData N(NpcData_Piranha) = { .yaw = 270, .init = &N(EVS_NpcInit_Piranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index 9f10b3cb88..562bff3a6c 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_Kolorado_Escape) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(60) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 70, 25, 60) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) @@ -619,7 +619,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, 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 280140364d..3578bc541e 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 @@ -181,7 +181,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_LABEL(10) EVT_SWITCH(MV_SceneState) EVT_CASE_EQ(SCENE_STATE_BEGIN) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) @@ -306,7 +306,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 75, -30, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_SWITCH EVT_WAIT(1) EVT_GOTO(10) @@ -479,14 +479,14 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(40) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Panic) EVT_CALL(SetNpcSpeed, NPC_Kolorado, EVT_FLOAT(5.0)) EVT_CALL(NpcMoveTo, NPC_Kolorado, 305, 0, 0) EVT_CALL(RemoveNpc, NPC_Kolorado) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_SELF, 145, 195, -10, 5) EVT_WAIT(5) @@ -531,7 +531,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, 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 581701e325..67c04e75a4 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 @@ -174,8 +174,8 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_EXEC(N(EVS_ControlCamera)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -268,7 +268,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -280,7 +280,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, 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 424628835f..e07c85f717 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 @@ -281,7 +281,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -293,7 +293,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; 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 4eaf29f88f..1de496a430 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 @@ -579,7 +579,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, @@ -607,7 +607,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_05), .settings = &N(NpcSettings_Toad_Wander_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_ShopLoiterer, @@ -632,7 +632,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_06), .settings = &N(NpcSettings_Toad_Patrol_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_NewsEnthusiast, @@ -643,7 +643,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FickleLover), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_FickleLovers, @@ -654,7 +654,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShamelessLover), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_MAC_ShamelessLover, @@ -665,7 +665,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_KrisT), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Eldest, @@ -676,7 +676,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 180, .init = &N(EVS_NpcInit_MissT), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Middle, @@ -687,7 +687,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_FelissaT), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Youngest, @@ -698,7 +698,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DojoSpectator), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, @@ -709,7 +709,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DojoFan), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoFanToad, 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 56099e9c06..bf44a1b772 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 @@ -40,7 +40,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi_Intro), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, @@ -49,7 +49,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, @@ -76,7 +76,7 @@ NpcData N(NpcData_IntroNPCs)[] = { } }, .settings = &N(NpcSettings_Toad_Wander_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_ShopLoiterer, @@ -86,7 +86,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, @@ -97,7 +97,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Chan_Intro), .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, @@ -111,7 +111,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Lee_Intro), .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, 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 db6531fc1d..240bfc25f9 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 @@ -151,7 +151,7 @@ NpcData N(NpcData_Luigi_Epilogue) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi_Epilogue), @@ -185,7 +185,7 @@ NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Goompapa_Epilogue), .settings = &N(NpcSettings_GoombaFamily_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = GOOMPAPA_ANIMS, .extraAnimations = N(ExtraAnims_Goompapa_Epilogue), @@ -197,7 +197,7 @@ NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Goomama_Epilogue), .settings = &N(NpcSettings_GoombaFamily_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .extraAnimations = N(ExtraAnims_Goomama_Epilogue), @@ -209,7 +209,7 @@ NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Gooma_Epilogue), .settings = &N(NpcSettings_GoombaFamily_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = GOOMA_ANIMS, .extraAnimations = N(ExtraAnims_Gooma_Epilogue), @@ -238,7 +238,7 @@ NpcData N(NpcData_ChuckQuizmo_Epilogue)[] = { .yaw = 30, .init = &N(EVS_NpcInit_ChuckQuizmo_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, @@ -267,7 +267,7 @@ NpcData N(NpcData_ChuckQuizmo_Epilogue)[] = { .yaw = 270, .init = &N(EVS_NpcInit_VannaT_Epilogue), .settings = &N(NpcSettings_Toad_Stationary_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_VannaT_Still, @@ -320,7 +320,7 @@ NpcData N(NpcData_DojoMembers_Epilogue)[] = { .yaw = 225, .init = &N(EVS_NpcInit_TheMaster_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = { .idle = ANIM_TheMaster_Idle, @@ -349,7 +349,7 @@ NpcData N(NpcData_DojoMembers_Epilogue)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Chan_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, @@ -363,7 +363,7 @@ NpcData N(NpcData_DojoMembers_Epilogue)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Lee_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, @@ -387,7 +387,7 @@ NpcData N(NpcData_Toad_01_Epilogue)[] = { .yaw = 223, .init = &N(EVS_NpcInit_Toad_01_Epilogue), .settings = &N(NpcSettings_Toad_Stationary_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -405,7 +405,7 @@ NpcData N(NpcData_Toad_01_Epilogue)[] = { .yaw = 43, .init = &N(EVS_NpcInit_HarryT_Epilogue), .settings = &N(NpcSettings_Toad_Stationary_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, 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 f3b8bcfaf6..17dc0cf4e3 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 @@ -45,13 +45,13 @@ EvtScript N(EVS_NpcAI_ShyGuy_03) = { EVT_CALL(SetNpcPos, NPC_ShyGuy_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Toad_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Toad_01, 170, 20, -140) - EVT_CALL(SetNpcFlagBits, NPC_Toad_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Toad_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_Toad_01, EVT_FLOAT(8.0)) EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_HarryT_Run) EVT_CALL(NpcMoveTo, NPC_Toad_01, 430, -373, 0) EVT_CALL(SetNpcPos, NPC_Toad_01, 430, 20, -373) EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_HarryT_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Toad_01, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Toad_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(NpcFacePlayer, NPC_Toad_01, 0) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Toad_01, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Gate_0003) @@ -92,7 +92,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_03) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(GF_MAC00_ShyGuyChasedFromShop, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_03))) EVT_RETURN EVT_END @@ -130,8 +130,8 @@ EvtScript N(EVS_NpcInit_GardenShyGuy1) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mono5, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mono6, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_dummy, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 430, 20, -373) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_ShyGuy_03))) EVT_RETURN @@ -191,7 +191,7 @@ NpcData N(NpcData_ShyGuy_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuyThief), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -201,7 +201,7 @@ NpcData N(NpcData_ShyGuy_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_02), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyGuyShopOwner, @@ -212,7 +212,7 @@ NpcData N(NpcData_ShyGuy_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GardenShyGuy1), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyGuyShopOwner, @@ -225,7 +225,7 @@ NpcData N(NpcData_RussT) = { .yaw = 119, .init = &N(EVS_NpcInit_RussT), .settings = &N(NpcSettings_RussT), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, @@ -255,7 +255,7 @@ NpcData N(NpcData_Toad_01)[] = { .yaw = 223, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -272,7 +272,7 @@ NpcData N(NpcData_Toad_01)[] = { .yaw = 223, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -316,7 +316,7 @@ NpcData N(NpcData_Toad_03)[] = { .yaw = 225, .init = &N(EVS_NpcInit_TheMaster), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_TheMaster_Idle, @@ -345,7 +345,7 @@ NpcData N(NpcData_Toad_03)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Chan), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, @@ -359,7 +359,7 @@ NpcData N(NpcData_Toad_03)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Lee), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, @@ -376,7 +376,7 @@ NpcData N(NpcData_Quizmo_Unused) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_00 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, @@ -389,7 +389,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 133, .init = &N(EVS_NpcInit_WaterfrontDad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_LuckyCastleWorker, @@ -400,7 +400,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 133, .init = &N(EVS_NpcInit_WaterfrontMom), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_MAC_Homemaker, @@ -411,7 +411,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 313, .init = &N(EVS_NpcInit_WaterfrontKid1), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_FriendlyToadKid, @@ -422,7 +422,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 313, .init = &N(EVS_NpcInit_WaterfrontKid2), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_PowerHungryToadKid, @@ -435,7 +435,7 @@ NpcData N(NpcData_PrizeToad) = { .yaw = 90, .init = &N(EVS_NpcInit_TradingToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, diff --git a/src/world/area_mac/mac_00/npc/dojo_members.inc.c b/src/world/area_mac/mac_00/npc/dojo_members.inc.c index f5568f6a10..4ec91c3e47 100644 --- a/src/world/area_mac/mac_00/npc/dojo_members.inc.c +++ b/src/world/area_mac/mac_00/npc/dojo_members.inc.c @@ -39,18 +39,18 @@ EvtScript N(EVS_NpcAI_Chan) = { EVT_CALL(SpeakToNpc, NPC_SELF, ANIM_Chan_Run, ANIM_Chan_Idle, 0, NPC_TheMaster, MSG_MAC_Gate_001E) EVT_WAIT(10) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 348, -364, 20) EVT_CALL(InterpPlayerYaw, 20, 0) EVT_WAIT(20) EVT_CALL(func_802D2C14, 0) - EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Chan_Walk) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_SELF, 380, -400, 30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Chan_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 225, 0) EVT_WAIT(20) @@ -65,9 +65,9 @@ EvtScript N(EVS_NpcDefeat_Chan) = { EVT_CALL(N(ResetBackgroundPostBattle)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Chan_Walk) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_SELF, 310, -390, 30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Chan_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 0) EVT_END_THREAD @@ -107,18 +107,18 @@ EvtScript N(EVS_NpcAI_Lee) = { EVT_CALL(SpeakToNpc, NPC_SELF, ANIM_Lee_Talk, ANIM_Lee_Idle, 0, NPC_TheMaster, MSG_MAC_Gate_0025) EVT_WAIT(10) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 348, -364, 20) EVT_CALL(InterpPlayerYaw, 20, 0) EVT_WAIT(20) EVT_CALL(func_802D2C14, 0) - EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lee_Walk) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_SELF, 380, -400, 30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lee_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 225, 0) EVT_WAIT(20) @@ -133,9 +133,9 @@ EvtScript N(EVS_NpcDefeat_Lee) = { EVT_CALL(N(ResetBackgroundPostBattle)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lee_Walk) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_SELF, 330, -410, 30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lee_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 0) EVT_END_THREAD @@ -295,7 +295,7 @@ EvtScript N(EVS_TheMaster_InteractImpl) = { EVT_END_SWITCH EVT_CALL(ContinueSpeech, NPC_TheMaster, ANIM_TheMaster_Talk, ANIM_TheMaster_Idle, 0, LVar1) EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_THREAD EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 348, -364, 20) @@ -306,7 +306,7 @@ EvtScript N(EVS_TheMaster_InteractImpl) = { EVT_CALL(NpcMoveTo, NPC_SELF, 375, -400, 30) EVT_CALL(InterpNpcYaw, NPC_TheMaster, 225, 0) EVT_WAIT(30) - EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TheMaster, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Dojo))) EVT_WAIT(1) EVT_CALL(N(SetDojoBattle)) 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 0932280f91..3188ca09da 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 @@ -12,7 +12,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi_Intro), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, @@ -21,7 +21,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_RunsHisMouth, @@ -45,7 +45,7 @@ NpcData N(NpcData_IntroNPCs)[] = { } }, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_PrincessFan, @@ -55,7 +55,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_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 ca7794dfa0..1c7bf41fbf 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 @@ -202,7 +202,7 @@ NpcData N(NpcData_Koopas)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), @@ -213,7 +213,7 @@ NpcData N(NpcData_Koopas)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoloradoWife), .settings = &N(NpcSettings_KoloradoWife), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, .extraAnimations = N(ExtraAnims_KoloradoWife), @@ -224,7 +224,7 @@ NpcData N(NpcData_Koopas)[] = { .yaw = 90, .init = &N(EVS_NpcInit_KoopaKoot), .settings = &N(NpcSettings_KoopaKoot), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_KOOT_ANIMS, .extraAnimations = N(ExtraAnims_KoopaKoot), @@ -235,7 +235,7 @@ NpcData N(NpcData_Koopas)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Koopa), .settings = &N(NpcSettings_Koopa), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Koopa), @@ -246,7 +246,7 @@ NpcData N(NpcData_Koopas)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Bobomb), @@ -267,7 +267,7 @@ NpcData N(NpcData_RowfAndRhuff)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rowf), .settings = &N(NpcSettings_Dummy), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, @@ -281,7 +281,7 @@ NpcData N(NpcData_RowfAndRhuff)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rhuff), .settings = &N(NpcSettings_Dummy), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, @@ -305,7 +305,7 @@ NpcData N(NpcData_Dryites)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Dryite_01), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Dryite), @@ -316,7 +316,7 @@ NpcData N(NpcData_Dryites)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite_02), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Dryite), @@ -345,7 +345,7 @@ NpcData N(NpcData_Artists)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Chanterelle), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Chanterelle_Idle, @@ -374,7 +374,7 @@ NpcData N(NpcData_Artists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Poet), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Poet_Idle, @@ -403,7 +403,7 @@ NpcData N(NpcData_Artists)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Composer), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Composer_Idle, 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 647f893580..220c6683dd 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 @@ -523,14 +523,14 @@ EvtScript N(EVS_MerlonBargeOut) = { EvtScript N(D_80250D14_811594) = { EVT_CALL(AwaitPlayerApproach, -130, -110, 150) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(NpcMoveTo, NPC_Merlon, 0, 0, 0) EVT_CALL(NpcMoveTo, NPC_Merlon, 410, 0, 0) EVT_CALL(SetNpcPos, NPC_Merlon, 410, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) - EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100 | NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, FALSE) EVT_RETURN EVT_END }; @@ -775,13 +775,13 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(4.0)) EVT_CALL(NpcMoveTo, NPC_Merlon, -350, -280, 0) EVT_CALL(NpcMoveTo, NPC_Merlon, -230, -270, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 15, EASING_LINEAR) EVT_LOOP(0) @@ -850,7 +850,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_Merlon, -170, -225, 0) @@ -866,7 +866,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_SET(GF_MAC01_Merlon_HeardAboutDream, TRUE) EVT_CALL(InterpNpcYaw, NPC_Merlon, 133, 0) EVT_CALL(SetNpcPos, NPC_Merlon, -337, 20, -360) - EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o335, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o336, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -1052,7 +1052,7 @@ NpcData N(NpcData_Merlon) = { .yaw = 30, .init = &N(EVS_NpcInit_Merlon), .settings = &N(NpcSettings_Merlon), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlon_Idle, @@ -1067,7 +1067,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Red_Idle, @@ -1080,7 +1080,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Black_Idle, @@ -1093,7 +1093,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Yellow_Idle, @@ -1106,7 +1106,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Green_Idle, @@ -1129,7 +1129,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Black_Anim04, @@ -1156,7 +1156,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Red_Anim04, @@ -1183,7 +1183,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, @@ -1210,7 +1210,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, @@ -1239,7 +1239,7 @@ NpcData N(NpcData_Ninji) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .settings = &N(NpcSettings_Ninji), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1916,7 +1916,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_02) = { EVT_SET(GF_MAC01_ChasedShyGuyFromToadHouse, TRUE) EVT_SET(AF_MAC_43, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_02))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -2084,7 +2084,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2108,7 +2108,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_05), .settings = &N(NpcSettings_Toad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2134,7 +2134,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_06), .settings = &N(NpcSettings_Toad_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2160,7 +2160,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_07), .settings = &N(NpcSettings_Toad_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2186,7 +2186,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_08), .settings = &N(NpcSettings_Toad_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2198,7 +2198,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_09), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2210,7 +2210,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 30, .init = &N(EVS_NpcInit_ToadHouseKeeper), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -2222,7 +2222,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Bubulb), .settings = &N(NpcSettings_Bubulb), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .extraAnimations = N(ExtraAnims_Bubulb), @@ -2234,7 +2234,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MinhT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_MinhT_Idle, @@ -2247,7 +2247,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 300, .init = &N(EVS_NpcInit_Postmaster), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, .drops = NO_DROPS, .animations = { .idle = ANIM_Postmaster_Idle, @@ -2312,7 +2312,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_01), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -2322,7 +2322,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_02), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -2332,7 +2332,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GardenShyGuy1), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -2342,7 +2342,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GardenShyGuy2), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -2361,7 +2361,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 270, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), @@ -2375,7 +2375,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_01 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index 8d5616a6af..e774776334 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -118,7 +118,7 @@ EvtScript N(EVS_NpcHit_GardenShyGuy1) = { EVT_END_IF EVT_SET(GF_MAC01_ChasedShyGuysFromGardenA, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_GardenShyGuy_RunAway))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -130,7 +130,7 @@ EvtScript N(EVS_NpcHit_GardenShyGuy2) = { EVT_END_IF EVT_SET(GF_MAC01_ChasedShyGuysFromGardenB, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_GardenShyGuy_RunAway))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -329,7 +329,7 @@ s32 N(ItemList_MagicalSeeds)[] = { }; EvtScript N(EVS_MinhT_PlantSeed) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_MinhT, ANIM_MinhT_Talk, ANIM_MinhT_Idle, 0, LVar4) EVT_WAIT(10) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 266, 27, 373) @@ -394,7 +394,7 @@ EvtScript N(EVS_MinhT_PlantSeed) = { EVT_CALL(NpcJump0, NPC_SELF, 175, 20, 444, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 480, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_IF_EQ(LVar3, 3) EVT_CALL(InterpNpcYaw, NPC_MinhT, 90, 0) EVT_EXEC_WAIT(N(EVS_Scene_FlowerGateAppears)) 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 8e904bc1ba..9066e5e92d 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 @@ -28,16 +28,16 @@ API_CALLABLE(N(RhuffUnravelUpdate)) { if (rugRotAngle == 0) { npc->currentAnim = ANIM_Rowf_Idle; - enemy->flags &= ~ENEMY_FLAG_8000000; + enemy->flags &= ~ENEMY_FLAG_CANT_INTERACT; } else { npc->currentAnim = ANIM_Rowf_Walk; - enemy->flags |= ENEMY_FLAG_8000000; + enemy->flags |= ENEMY_FLAG_CANT_INTERACT; } if (rugRotAngle == -60) { - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; } else { - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; } if (rugRippleAmt != 0) { @@ -725,7 +725,7 @@ NpcData N(NpcData_RowfAndRhuff)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rowf), .settings = &N(NpcSettings_Rowf), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, @@ -739,7 +739,7 @@ NpcData N(NpcData_RowfAndRhuff)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rhuff), .settings = &N(NpcSettings_Rhuff), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, 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 98c68df176..b09a934187 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 @@ -60,7 +60,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TayceT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_TayceT_Idle, @@ -74,7 +74,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FiceT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_FiceT_Idle, @@ -111,7 +111,7 @@ NpcData N(NpcData_TayceT)[] = { }, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_HardWorker, @@ -122,7 +122,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 270, .init = &N(EVS_NpcInit_CookingApprentice), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_CookingApprentice, @@ -133,7 +133,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_CantKeepQuiet, @@ -156,7 +156,7 @@ NpcData N(NpcData_TayceT)[] = { }, .init = &N(EVS_NpcInit_ToadKid), .settings = &N(NpcSettings_Toad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_FickleDreamer, @@ -179,7 +179,7 @@ NpcData N(NpcData_TayceT)[] = { }, .init = &N(EVS_NpcInit_Toad_03), .settings = &N(NpcSettings_Toad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_PrettySmart, @@ -190,7 +190,7 @@ NpcData N(NpcData_TayceT)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_PetBoaster, @@ -225,7 +225,7 @@ NpcData N(NpcData_ShyGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .extraAnimations = N(ExtraAnims_ShyGuy), diff --git a/src/world/area_mac/mac_02/npc/tayce_t.inc.c b/src/world/area_mac/mac_02/npc/tayce_t.inc.c index ae28bdcc69..e0157491f9 100644 --- a/src/world/area_mac/mac_02/npc/tayce_t.inc.c +++ b/src/world/area_mac/mac_02/npc/tayce_t.inc.c @@ -545,7 +545,7 @@ API_CALLABLE(N(TayceT_MakeItemList)) { } EvtScript N(EVS_Scene_TayceTCooking) = { - EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Walk) EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20) EVT_CALL(NpcMoveTo, NPC_TayceT, -220, -425, 30) @@ -560,7 +560,7 @@ EvtScript N(EVS_Scene_TayceTCooking) = { EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20) EVT_CALL(NpcMoveTo, NPC_TayceT, -236, -318, 20) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Idle) - EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c index 30c8c506cc..6df10c7cb5 100644 --- a/src/world/area_mac/mac_03/mac_03_3_train.c +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -419,7 +419,7 @@ EvtScript N(EVS_ArriveFromMtRugged) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -484,7 +484,7 @@ EvtScript N(EVS_DepartForMtRugged) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya3, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_humikiri, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_fumikiri, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetNpcFlagBits, NPC_TrainToad_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_TrainToad_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -425, 70, 0) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) 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 793ba1ac9d..ae97489a47 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 @@ -547,7 +547,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_MODE_0) EVT_SET(GF_MAC03_ShyGuyChasedOff, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -591,7 +591,7 @@ EvtScript N(EVS_NpcIdle_Toad_14) = { EvtScript N(EVS_NpcInit_Toad_14) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad_14))) EVT_RETURN EVT_END @@ -599,7 +599,7 @@ EvtScript N(EVS_NpcInit_Toad_14) = { EvtScript N(EVS_NpcInit_Toad_04) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 420, 20, -170) EVT_RETURN EVT_END @@ -612,7 +612,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad_01), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, @@ -622,7 +622,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { -424.0f, 74.0f, 2.0f }, .yaw = 90, .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, @@ -633,7 +633,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 75, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_TrainLover, @@ -644,7 +644,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_CaringToad, @@ -655,7 +655,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_DesertTraveler, @@ -678,7 +678,7 @@ NpcData N(NpcData_Toads)[] = { }, .init = &N(EVS_NpcInit_ToadKid_01), .settings = &N(NpcSettings_ToadKid_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_TravelFan, @@ -701,7 +701,7 @@ NpcData N(NpcData_Toads)[] = { }, .init = &N(EVS_NpcInit_ToadKid_02), .settings = &N(NpcSettings_ToadKid_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_GoodFriends, @@ -712,7 +712,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_LilOinkFan, @@ -726,7 +726,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -737,7 +737,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -748,7 +748,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, @@ -761,7 +761,7 @@ NpcData N(NpcData_ShyGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, @@ -802,7 +802,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -824,7 +824,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -846,7 +846,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -868,7 +868,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -890,7 +890,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -912,7 +912,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -934,7 +934,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -956,7 +956,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -978,7 +978,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -1000,7 +1000,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -1022,7 +1022,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_14), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, diff --git a/src/world/area_mac/mac_03/mac_03_8_demo.c b/src/world/area_mac/mac_03/mac_03_8_demo.c index 66e256e52f..c45a01acd7 100644 --- a/src/world/area_mac/mac_03/mac_03_8_demo.c +++ b/src/world/area_mac/mac_03/mac_03_8_demo.c @@ -79,7 +79,7 @@ EvtScript N(EVS_DemoDepartForMtRugged) = { EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerPos, -425, 45, 20) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar0, -410) EVT_SET(LVar1, 45) 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 21fb06ffa0..019664c493 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 @@ -189,7 +189,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 230, .init = &N(EVS_NpcInit_HarryT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -206,7 +206,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 133, .init = &N(EVS_NpcInit_NewResident1), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_NewResidentA, @@ -217,7 +217,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 133, .init = &N(EVS_NpcInit_NewResident2), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_NewResidentB, @@ -240,7 +240,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_TalksAlot, @@ -251,7 +251,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_WaryListener, @@ -262,7 +262,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ToadKid_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_CarefreeKids, @@ -273,7 +273,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadKid_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_OutdoorKids, @@ -284,7 +284,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadKid_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyKid, @@ -295,7 +295,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_ToadWhoWalks, @@ -306,7 +306,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_GuideToad, @@ -317,7 +317,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GossipTrio1), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioA, @@ -328,7 +328,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_GossipTrio2), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioB, @@ -339,7 +339,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_GossipTrio3), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioC, @@ -360,7 +360,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TwinkStartCh4), .settings = &N(NpcSettings_Twink), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -370,7 +370,7 @@ NpcData N(NpcData_Chapter4)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, @@ -397,7 +397,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, @@ -450,7 +450,7 @@ NpcData N(NpcData_GoombaFamily)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Goomama), .settings = &N(NpcSettings_GoombaFamily), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .tattle = MSG_NpcTattle_Goomama, @@ -461,7 +461,7 @@ NpcData N(NpcData_GoombaFamily)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Goombaria), .settings = &N(NpcSettings_GoombaFamily), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, .tattle = MSG_NpcTattle_Goombaria, @@ -475,7 +475,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_04 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, 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 cfafd5a2bc..25fcb56c44 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 @@ -42,7 +42,7 @@ NpcData N(NpcData_WishSceneToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_WishingToadKid), .settings = &N(NpcSettings_Toad_Stationary_Wish), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, }, diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c index 31f7e5d16f..20c6d3a898 100644 --- a/src/world/area_mac/mac_04/mac_04_8_entity.c +++ b/src/world/area_mac/mac_04/mac_04_8_entity.c @@ -249,14 +249,14 @@ EvtScript N(EVS_ItemPrompt_StoreroomKey) = { EVT_UNBIND EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0004) - EVT_CALL(SetNpcFlagBits, NPC_HarryT, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_HarryT, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Run) EVT_CALL(NpcMoveTo, NPC_HarryT, 295, -460, 0) EVT_CALL(NpcMoveTo, NPC_HarryT, 230, -480, 0) EVT_CALL(NpcJump0, NPC_HarryT, 200, 30, -524, 0) EVT_CALL(SetNpcPos, NPC_HarryT, 200, 30, -524) EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Idle) - EVT_CALL(SetNpcFlagBits, NPC_HarryT, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HarryT, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0005) EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_mac/mac_04/npc_harry_t.inc.c b/src/world/area_mac/mac_04/npc_harry_t.inc.c index 2b6c2d9ccb..b5404e0654 100644 --- a/src/world/area_mac/mac_04/npc_harry_t.inc.c +++ b/src/world/area_mac/mac_04/npc_harry_t.inc.c @@ -21,7 +21,7 @@ EvtScript N(EVS_NpcInteract_HarryT) = { EVT_CASE_EQ(0) EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0003) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Run) EVT_CALL(NpcMoveTo, NPC_HarryT, 295, -460, 0) EVT_CALL(NpcMoveTo, NPC_HarryT, 230, -480, 0) @@ -37,7 +37,7 @@ EvtScript N(EVS_NpcInteract_HarryT) = { EVT_CALL(InterpNpcYaw, NPC_HarryT, 180, 0) EVT_CALL(PlayerFaceNpc, NPC_HarryT, FALSE) EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0005) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, FALSE) EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) EVT_END_SWITCH EVT_ELSE diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index a155ac205c..e168a38c18 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -126,7 +126,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, -400) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) 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 9c90617141..ed19299f56 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 @@ -66,7 +66,7 @@ EvtScript N(D_80248298_84AE68) = { EvtScript N(D_802483B8_84AF88) = { EVT_WAIT(20) - EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 5, MSG_MAC_Housing_00B3) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) EVT_WAIT(4) diff --git a/src/world/area_mac/mac_05/mac_05_3_main.c b/src/world/area_mac/mac_05/mac_05_3_main.c index a9ddd19888..9449fb502a 100644 --- a/src/world/area_mac/mac_05/mac_05_3_main.c +++ b/src/world/area_mac/mac_05/mac_05_3_main.c @@ -97,7 +97,7 @@ EvtScript N(D_802448C4_856A34) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerPos, -160, -10, 371) EVT_CALL(SetNpcPos, NPC_PARTNER, -160, -10, 371) - EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(InterruptUsePartner) EVT_WAIT(10) @@ -122,7 +122,7 @@ EvtScript N(D_802448C4_856A34) = { EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC_WAIT(EnterWalk) EVT_CALL(SetNpcPos, NPC_Whale, -220, 10, 372) - EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_CANT_INTERACT, 0) EVT_END_SWITCH EVT_RETURN EVT_END 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 5ad72fd63b..664787db1e 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 @@ -575,7 +575,7 @@ EvtScript N(EVS_802496FC) = { EVT_SET(LVar0, 1) EVT_EXEC_GET_TID(N(D_802484F8_85A668), LVarA) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) @@ -627,7 +627,7 @@ EvtScript N(EVS_802496FC) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, FALSE) EVT_SWITCH(GB_StoryProgress) EVT_CASE_RANGE(STORY_CH5_SUSHIE_JOINED_PARTY, STORY_CH5_STAR_SPRIT_DEPARTED) EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) @@ -654,7 +654,7 @@ EvtScript N(D_80249C34_85BDA4) = { EVT_END_THREAD EVT_THREAD EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) @@ -673,7 +673,7 @@ EvtScript N(D_80249D80_85BEF0) = { EVT_CALL(PlayerMoveTo, -310, 372, 20) EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(NpcMoveTo, NPC_PARTNER, -345, 372, 30) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, EVT_FLOAT(1.0)) @@ -701,7 +701,7 @@ API_CALLABLE(N(func_802430B4_855224)) { if (npc_raycast_down_around(npc->collisionChannel, &x, &y, &z, &temp, npc->yaw, npc->collisionRadius) && temp <= 12.0f) { - outVal = D_8010C978; + outVal = NpcHitQueryColliderID; } } evt_set_variable(script, *args++, outVal); @@ -990,7 +990,7 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { EVT_EXEC(N(D_802484F8_85A668)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt9, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) @@ -1049,7 +1049,7 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { EvtScript N(EVS_NpcInit_Toad_01) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) - EVT_CALL(SetNpcFlagBits, NPC_Whale, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Whale, NPC_FLAG_HAS_NO_SPRITE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Whale, NPC_FLAG_HAS_SHADOW, FALSE) EVT_CALL(InterpNpcYaw, NPC_Whale, 270, 0) EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) @@ -1098,7 +1098,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.5)) EVT_CALL(NpcMoveTo, NPC_SELF, -335, 400, 10) @@ -1361,7 +1361,7 @@ EvtScript N(EVS_NpcInit_JrTroopa_01) = { EvtScript N(EVS_NpcInit_JrTroopa_02) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_JrTroopa_02))) EVT_RETURN @@ -1814,7 +1814,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_CALL(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_007C) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_007D) EVT_CALL(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_007E) - EVT_CALL(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_THREAD EVT_CALL(PlayerMoveTo, 167, -513, 20) EVT_CALL(InterpPlayerYaw, 270, 0) @@ -1880,7 +1880,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(10) EVT_CALL(func_802CF56C, 2) - EVT_CALL(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -1920,7 +1920,7 @@ API_CALLABLE(N(func_8024335C_8554CC)) { EvtScript N(D_8024E23C_8603AC) = { EVT_SET(AF_JAN01_TreeDrop_StarPiece, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_CANT_INTERACT, 1) EVT_CALL(InterpNpcYaw, NPC_Chanterelle, 270, 0) EVT_CALL(SetMusicTrack, 0, SONG_POP_DIVA_SONG, 1, 8) EVT_CHILD_THREAD @@ -1942,7 +1942,7 @@ EvtScript N(D_8024E23C_8603AC) = { EVT_END_LOOP EVT_EXEC(N(EVS_802442E8)) EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_CANT_INTERACT, 0) EVT_RETURN EVT_END }; @@ -2065,7 +2065,7 @@ NpcData N(NpcData_Toad_01) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Whale), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_Whale, @@ -2144,7 +2144,7 @@ NpcData N(NpcData_JrTroopa_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa_01), .settings = &N(NpcSettings_JrTroopa_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -2173,7 +2173,7 @@ NpcData N(NpcData_JrTroopa_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa_02), .settings = &N(NpcSettings_JrTroopa_01), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -2205,7 +2205,7 @@ NpcData N(NpcData_Toad_04)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Blue_Idle, @@ -2233,7 +2233,7 @@ NpcData N(NpcData_Toad_04)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_05), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Blue_Idle, @@ -2261,7 +2261,7 @@ NpcData N(NpcData_Toad_04)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_06), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Red_Idle, @@ -2303,7 +2303,7 @@ NpcData N(NpcData_Toad_04)[] = { }, .init = &N(EVS_NpcInit_Toad_07), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Yellow_Idle, @@ -2334,7 +2334,7 @@ NpcData N(NpcData_Bartender)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bartender), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Bartender_Idle, @@ -2362,7 +2362,7 @@ NpcData N(NpcData_Bartender)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Red_Idle, @@ -2390,7 +2390,7 @@ NpcData N(NpcData_Bartender)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Chanterelle), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Chanterelle_Idle, @@ -2418,7 +2418,7 @@ NpcData N(NpcData_Bartender)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ArtistToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Poet_Idle, @@ -2446,7 +2446,7 @@ NpcData N(NpcData_Bartender)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TradeEventToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, @@ -2477,7 +2477,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_05 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, 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 95141c20ef..58cec207a7 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 @@ -278,7 +278,7 @@ API_CALLABLE(N(MakeJrTroopaBubbles)) { } EvtScript N(EVS_NpcInit_Whale) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_NO_SPRITE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, mac_06_ENTRY_0) @@ -299,7 +299,7 @@ EvtScript N(EVS_NpcInit_Whale) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_THREAD @@ -515,7 +515,7 @@ NpcData N(NpcData_Whale) = { .yaw = 270, .init = &N(EVS_NpcInit_Whale), .settings = &N(NpcSettings_Whale), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Kolorado_Idle, @@ -578,7 +578,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_mac/machi/machi_4_goomba_king.c b/src/world/area_mac/machi/machi_4_goomba_king.c index bb744ce925..17ab33ac2d 100644 --- a/src/world/area_mac/machi/machi_4_goomba_king.c +++ b/src/world/area_mac/machi/machi_4_goomba_king.c @@ -39,5 +39,5 @@ NpcSettings N(NpcSettings_GoombaKing) = { .onInteract = &N(EVS_NpcInteract_GoombaKing), .ai = &N(EVS_NpcAI_GoombaKing), .onHit = &N(EVS_NpcHit_GoombaKing), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/machi_5_npc.c index 3b52c16a13..756419afee 100644 --- a/src/world/area_mac/machi/machi_5_npc.c +++ b/src/world/area_mac/machi/machi_5_npc.c @@ -1,6 +1,6 @@ #include "machi.h" -s32 N(GoombariaAnims)[] = { +FollowAnims N(GoombariaAnims) = { ANIM_Goombaria_Walk, ANIM_Goombaria_Jump, ANIM_Goombaria_Fall, @@ -13,13 +13,17 @@ API_CALLABLE(N(func_802401B0_7E7550)) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); if (rand_int(1000) < 500) { - npc_follow_init(npc, NPC_SELF, N(GoombariaAnims), + npc_follow_init(npc, + NPC_SELF, + &N(GoombariaAnims), rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 100); } else { - npc_follow_init(npc, rand_int(3) + NPC_Goompa, N(GoombariaAnims), + npc_follow_init(npc, + rand_int(3) + NPC_Goompa, + &N(GoombariaAnims), rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, @@ -245,7 +249,7 @@ NpcSettings N(NpcSettings_Goompa) = { .otherAI = &N(EVS_NpcAuxAI_Goompa), .onInteract = &N(EVS_NpcInteract_Goompa), .onHit = &N(EVS_NpcHit_Goompa), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000, }; NpcData N(NpcData_05)[] = { diff --git a/src/world/area_mac/machi/machi_6_misstar.c b/src/world/area_mac/machi/machi_6_misstar.c index ac286e1b9e..be2dc6b3c5 100644 --- a/src/world/area_mac/machi/machi_6_misstar.c +++ b/src/world/area_mac/machi/machi_6_misstar.c @@ -102,7 +102,7 @@ NpcSettings N(NpcSettings_Misstar) = { .otherAI = &N(EVS_NpcAuxAI_Misstar), .ai = &N(EVS_NpcAI_Misstar), .aux = &N(EVS_NpcAux_Misstar), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_Misstar) = { diff --git a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c index 3a49872d47..1eb33019c9 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c +++ b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c @@ -171,7 +171,7 @@ NpcData N(NpcData_RedToad) = { .yaw = 90, .init = &N(EVS_NpcInit_RedToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_PlayroomReceptionist, @@ -225,7 +225,7 @@ NpcData N(NpcData_GreenToad) = { }, .init = &N(EVS_NpcInit_GreenToad), .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MGM_PlayroomCustomer, @@ -275,7 +275,7 @@ NpcData N(NpcData_BlueToad) = { }, .init = &N(EVS_NpcInit_BlueToad), .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MGM_BestPlayroomCustomer, diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 39f034dbca..32eaf19a77 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -1019,7 +1019,7 @@ NpcData N(NpcData_Toad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_JumpAttackGuide, diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 2493fc5ac6..6a5e78cde2 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -352,7 +352,7 @@ API_CALLABLE(N(SetBoxContents)) { enemy->varTable[0] = 1; data->box[i].npcID = j; disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; break; } } @@ -366,7 +366,7 @@ API_CALLABLE(N(SetBoxContents)) { enemy->varTable[0] = 1; data->box[i].npcID = j; disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; break; } } @@ -380,7 +380,7 @@ API_CALLABLE(N(SetBoxContents)) { enemy->varTable[0] = 1; data->box[i].npcID = j; disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; break; } } @@ -430,7 +430,7 @@ API_CALLABLE(N(RunMinigame)) { data->box[i].state = BOX_STATE_FUZZY_IDLE; data->box[i].stateTimer = rand_int(210); npc->pos.y = NPC_DISPOSE_POS_Y; - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); // fallthrough case BOX_STATE_FUZZY_IDLE: @@ -547,7 +547,7 @@ API_CALLABLE(N(RunMinigame)) { if (npc->duration <= 0) { data->box[i].state = BOX_STATE_FUZZY_DONE; disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; fx_walking_dust(1, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 1.0f, 0, 0); } break; @@ -559,7 +559,7 @@ API_CALLABLE(N(RunMinigame)) { data->box[i].stateTimer = rand_int(210); npc->pos.y = NPC_DISPOSE_POS_Y; disable_npc_shadow(npc); - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; // fallthrough case BOX_STATE_BOMB_IDLE: data->box[i].stateTimer--; @@ -648,7 +648,7 @@ API_CALLABLE(N(RunMinigame)) { data->stunFlags |= STUN_FLAG_CHANGED; data->box[i].state = BOX_STATE_BOMB_DONE; disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; } break; case BOX_STATE_BOMB_DONE: @@ -901,7 +901,7 @@ API_CALLABLE(N(CleanupGame)) { } enemy = get_enemy(data->box[i].npcID); npc = get_npc_unsafe(enemy->npcID); - if ((npc->flags & NPC_FLAG_2)) { + if ((npc->flags & NPC_FLAG_INVISIBLE)) { continue; } @@ -910,7 +910,7 @@ API_CALLABLE(N(CleanupGame)) { fx_walking_dust(1, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); sfx_play_sound(SOUND_283); } - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); enemy->varTable[0] = 0; } @@ -922,7 +922,7 @@ API_CALLABLE(N(CleanupGame)) { } enemy = get_enemy(data->box[i].npcID); npc = get_npc_unsafe(enemy->npcID); - if ((npc->flags & NPC_FLAG_2)) { + if ((npc->flags & NPC_FLAG_INVISIBLE)) { continue; } @@ -1612,14 +1612,14 @@ EvtScript N(EVS_Toad_GovernGame) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(CreateSignpost)) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 355, 45, -175) EVT_THREAD EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185) EVT_CALL(EnableNpcShadow, NPC_Toad, TRUE) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 358, 5, 189) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_END_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Toad, LVar3, LVar4, LVar5) @@ -1630,7 +1630,7 @@ EvtScript N(EVS_Toad_GovernGame) = { EVT_END_IF EVT_CALL(PlayerMoveTo, 330, 185, LVarA) EVT_CALL(WaitForPlayerMoveToComplete) - EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(5) EVT_CALL(SetSelfVar, 3, 5) EVT_CALL(N(UpdateRecords)) @@ -1770,7 +1770,7 @@ NpcData N(NpcData_GuideToad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1854,7 +1854,7 @@ NpcData N(NpcData_Fuzzy_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1866,7 +1866,7 @@ NpcData N(NpcData_Fuzzy_02) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1878,7 +1878,7 @@ NpcData N(NpcData_Fuzzy_03) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1890,7 +1890,7 @@ NpcData N(NpcData_Fuzzy_04) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1902,7 +1902,7 @@ NpcData N(NpcData_Fuzzy_05) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1914,7 +1914,7 @@ NpcData N(NpcData_Bobomb_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1926,7 +1926,7 @@ NpcData N(NpcData_Bobomb_02) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1938,7 +1938,7 @@ NpcData N(NpcData_Bobomb_03) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1950,7 +1950,7 @@ NpcData N(NpcData_Bobomb_04) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1962,7 +1962,7 @@ NpcData N(NpcData_Bobomb_05) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1975,7 +1975,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1986,7 +1986,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1997,7 +1997,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2008,7 +2008,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2019,7 +2019,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2030,7 +2030,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2041,7 +2041,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2052,7 +2052,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2063,7 +2063,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -2074,7 +2074,7 @@ NpcData N(NpcData_Luigis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, diff --git a/src/world/area_mim/mim_01/mim_01_6_npc.c b/src/world/area_mim/mim_01/mim_01_6_npc.c index 9174a88103..2e7acdbae5 100644 --- a/src/world/area_mim/mim_01/mim_01_6_npc.c +++ b/src/world/area_mim/mim_01/mim_01_6_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_PiranhaPlant)[] = { } }, .settings = &N(NpcSettings_PiranhaPlant), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c index bc42cb9052..0595bf5ba7 100644 --- a/src/world/area_mim/mim_02/mim_02_3_npc.c +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -22,7 +22,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_RETURN EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0007) - EVT_CALL(SetNpcFlagBits, NPC_Oaklie, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Oaklie, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_WAIT(5) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) @@ -162,7 +162,7 @@ NpcData N(NpcData_Oaklie) = { .yaw = 270, .init = &N(EVS_NpcInit_Oaklie), .settings = &N(NpcSettings_Oaklie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = OAKLIE_ANIMS, .tattle = MSG_NpcTattle_Oaklie, diff --git a/src/world/area_mim/mim_04/mim_04_6_npc.c b/src/world/area_mim/mim_04/mim_04_6_npc.c index 3a26bd8611..71c4dc4934 100644 --- a/src/world/area_mim/mim_04/mim_04_6_npc.c +++ b/src/world/area_mim/mim_04/mim_04_6_npc.c @@ -71,7 +71,7 @@ NpcData N(NpcData_Fuzzy) = { } }, .settings = &N(NpcSettings_ForestFuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_05/mim_05_6_npc.c b/src/world/area_mim/mim_05/mim_05_6_npc.c index 83559d557c..6ab8cd30b9 100644 --- a/src/world/area_mim/mim_05/mim_05_6_npc.c +++ b/src/world/area_mim/mim_05/mim_05_6_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_PiranhaPlant_01)[] = { } }, .settings = &N(NpcSettings_PiranhaPlant), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -46,7 +46,7 @@ NpcData N(NpcData_PiranhaPlant_02)[] = { } }, .settings = &N(NpcSettings_PiranhaPlant), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_06/mim_06_6_npc.c b/src/world/area_mim/mim_06/mim_06_6_npc.c index 09c77fdd51..ac5f53222c 100644 --- a/src/world/area_mim/mim_06/mim_06_6_npc.c +++ b/src/world/area_mim/mim_06/mim_06_6_npc.c @@ -72,7 +72,7 @@ NpcData N(NpcData_Fuzzy) = { } }, .settings = &N(NpcSettings_ForestFuzzy_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c index 2857c35d36..1688e979a2 100644 --- a/src/world/area_mim/mim_07/mim_07_6_npc.c +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -236,7 +236,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 0, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_mim/mim_08/mim_08_5_npc.c b/src/world/area_mim/mim_08/mim_08_5_npc.c index 00694dbeb5..7a5148723a 100644 --- a/src/world/area_mim/mim_08/mim_08_5_npc.c +++ b/src/world/area_mim/mim_08/mim_08_5_npc.c @@ -43,7 +43,7 @@ NpcData N(NpcData_Bzzap) = { }, .init = &N(EVS_NpcInit_Bzzap), .settings = &N(NpcSettings_Bzzap), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = BZZAP_ANIMS, }; @@ -66,7 +66,7 @@ NpcData N(NpcData_PiranhaPlant_01)[] = { } }, .settings = &N(NpcSettings_PiranhaPlant), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -92,7 +92,7 @@ NpcData N(NpcData_PiranhaPlant_02)[] = { } }, .settings = &N(NpcSettings_PiranhaPlant), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_09/mim_09_6_npc.c b/src/world/area_mim/mim_09/mim_09_6_npc.c index 6ed1341bbf..b5f3dab35a 100644 --- a/src/world/area_mim/mim_09/mim_09_6_npc.c +++ b/src/world/area_mim/mim_09/mim_09_6_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Fuzzy) = { } }, .settings = &N(NpcSettings_ForestFuzzy_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index b24eb69577..693816e596 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -280,7 +280,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/mim_11_5_npc.c index f450ddb7df..5c41ca36cf 100644 --- a/src/world/area_mim/mim_11/mim_11_5_npc.c +++ b/src/world/area_mim/mim_11/mim_11_5_npc.c @@ -108,7 +108,7 @@ NpcData N(NpcData_Bootler)[] = { .yaw = 135, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_Skolar), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldSkolar_Idle, diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c index 6bbb821c2b..cf560246cf 100644 --- a/src/world/area_mim/mim_12/mim_12_5_gate.c +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -261,7 +261,7 @@ EvtScript N(EVS_FlyDownToGate) = { EvtScript N(EVS_HaveBoosOpenGate) = { EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GateBoo_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, NPC_GateBoo_02) EVT_SET(LVar1, -66) EVT_SET(LVar2, -66) @@ -270,7 +270,7 @@ EvtScript N(EVS_HaveBoosOpenGate) = { EVT_SET(LVar5, 30) EVT_CALL(N(MoveNpcAlongArc)) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GateBoo_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, NPC_GateBoo_01) EVT_SET(LVar1, -135) EVT_SET(LVar2, 59) @@ -284,7 +284,7 @@ EvtScript N(EVS_HaveBoosOpenGate) = { EvtScript N(EVS_HaveBoosCloseGate) = { EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GateBoo_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, NPC_GateBoo_02) EVT_SET(LVar1, -66) EVT_SET(LVar2, -66) @@ -293,7 +293,7 @@ EvtScript N(EVS_HaveBoosCloseGate) = { EVT_SET(LVar5, 30) EVT_CALL(N(MoveNpcAlongArc)) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GateBoo_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, NPC_GateBoo_01) EVT_SET(LVar1, -135) EVT_SET(LVar2, 59) 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 4831b0be1a..6139ce992e 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 @@ -242,7 +242,7 @@ EvtScript N(EVS_MiscFuzzyFlee) = { EvtScript N(EVS_NpcHit_MiscFuzzy1) = { EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_MiscFuzzyFlee))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -278,7 +278,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EvtScript N(EVS_NpcHit_MiscFuzzy2) = { EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_MiscFuzzyFlee))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -441,7 +441,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koover_Crisis), .settings = &N(NpcSettings_Koopa_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_Greeter, @@ -464,7 +464,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_FuzzyWithShell), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -474,7 +474,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KooversShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -496,7 +496,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koopa_02_Crisis), .settings = &N(NpcSettings_KoopaWithoutShell_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_WITHOUT_SHELL_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaA, @@ -507,7 +507,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_02), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -529,7 +529,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koopa_03_Crisis), .settings = &N(NpcSettings_KoopaWithoutShell_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_WITHOUT_SHELL_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaB, @@ -540,7 +540,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_03), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -550,7 +550,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 82, .init = &N(EVS_NpcInit_Bobomb_01_Crisis), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombA, @@ -561,7 +561,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 82, .init = &N(EVS_NpcInit_Bobomb_02_Crisis), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombB, @@ -575,7 +575,7 @@ NpcData N(NpcData_MiscFuzzy1) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy1), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -587,7 +587,7 @@ NpcData N(NpcData_MiscFuzzy2) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy2), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -611,7 +611,7 @@ NpcData N(NpcData_Normal)[] = { }, .init = &N(EVS_NpcInit_Koover_Normal), .settings = &N(NpcSettings_Koopa_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_Greeter, @@ -634,7 +634,7 @@ NpcData N(NpcData_Normal)[] = { }, .init = &N(EVS_NpcInit_Koopa_02_Normal), .settings = &N(NpcSettings_Koopa_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaA, @@ -657,7 +657,7 @@ NpcData N(NpcData_Normal)[] = { }, .init = &N(EVS_NpcInit_Koopa_03_Normal), .settings = &N(NpcSettings_Koopa_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaB, @@ -668,7 +668,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 82, .init = &N(EVS_NpcInit_Bobomb_01_Normal), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombA, @@ -679,7 +679,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 82, .init = &N(EVS_NpcInit_Bobomb_02_Normal), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombB, @@ -690,7 +690,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 262, .init = &N(EVS_NpcInit_Bobomb_03_Normal), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombC, @@ -704,7 +704,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 0, .init = &N(EVS_NpcInit_MortT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_ToadHouseToad, @@ -715,7 +715,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 157, .init = &N(EVS_NpcInit_Koopa_ShopOwner), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_ShopOwner, @@ -726,7 +726,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 262, .init = &N(EVS_NpcInit_RelaxedKoopa), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_RadioLover, @@ -738,7 +738,7 @@ NpcData N(NpcData_Shared)[] = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_NOK, QUIZ_COUNT_NOK, QUIZ_MAP_NOK_01 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, 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 7e812655e8..46a194d010 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -12,7 +12,7 @@ EvtScript N(EVS_Scene_RecoverTreeShell) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_03, SOUND_21A, 0) EVT_CALL(PlayerFaceNpc, NPC_KoopaShell_03, FALSE) EVT_CALL(NpcFaceNpc, NPC_Koopa_03, NPC_KoopaShell_03, 0) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_ADD(LVar0, -1) EVT_ADD(LVar2, -1) EVT_CALL(GetNpcPos, NPC_Koopa_03, LVar0, LVar1, LVar2) @@ -45,7 +45,7 @@ EvtScript N(EVS_Scene_RecoverTreeShell) = { EVT_CALL(NpcJump0, NPC_KoopaShell_03, LVar0, LVar1, LVar2, 30) EVT_CALL(SetNpcPos, NPC_KoopaShell_03, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Koopa_03, ANIM_Koopa_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_03, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_Koopa_03, ANIM_Koopa_Still) EVT_WAIT(4) EVT_CALL(EnableNpcBlur, NPC_KoopaShell_03, TRUE) @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_RecoverBlockShell) = { EVT_CALL(PlaySound, SOUND_21A) EVT_CALL(PlayerFaceNpc, NPC_KoopaShell_02, FALSE) EVT_CALL(NpcFaceNpc, NPC_Koopa_02, NPC_KoopaShell_02, 0) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_ADD(LVar0, -1) EVT_ADD(LVar2, -1) EVT_CALL(GetNpcPos, NPC_Koopa_02, LVar0, LVar1, LVar2) @@ -122,7 +122,7 @@ EvtScript N(EVS_Scene_RecoverBlockShell) = { EVT_CALL(NpcJump0, NPC_KoopaShell_02, LVar0, LVar1, LVar2, 30) EVT_CALL(SetNpcPos, NPC_KoopaShell_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Koopa_02, ANIM_Koopa_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_Koopa_02, ANIM_Koopa_Still) EVT_WAIT(4) EVT_CALL(EnableNpcBlur, NPC_KoopaShell_02, TRUE) @@ -293,12 +293,12 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { EVT_CALL(SetNpcPos, NPC_Koover, LVar0, LVar1, LVar2) EVT_END_IF EVT_CALL(BindNpcInteract, NPC_Koover, 0) - EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar0, 0) EVT_LABEL(0) EVT_IF_EQ(GF_NOK01_RecoveredShellA, TRUE) EVT_CALL(BindNpcInteract, NPC_Koover, EVT_PTR(N(EVS_NpcInteract_Koover_Crisis))) - EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END_IF EVT_CALL(GetNpcPos, NPC_FuzzyWithShell, LVar0, LVar1, LVar2) @@ -412,7 +412,7 @@ EvtScript N(EVS_NpcHit_FuzzyWithShell) = { EVT_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, 4, 0, EVT_FLOAT(-300.0), EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_Koover, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_KoopaWithoutShell_Happy) EVT_CALL(NpcJump0, NPC_Koover, LVar0, 0, LVar2, 15) @@ -443,7 +443,7 @@ EvtScript N(EVS_NpcHit_FuzzyWithShell) = { EVT_CALL(NpcJump0, NPC_KooversShell, LVar0, LVar1, LVar2, 30) EVT_CALL(SetNpcPos, NPC_KooversShell, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Koover, ANIM_Koopa_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Koover, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_Koopa_Still) EVT_WAIT(4) EVT_CALL(EnableNpcBlur, NPC_KooversShell, TRUE) 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 ebbce6c153..39e6ec0cab 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 @@ -86,7 +86,7 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kooper, 0) EVT_CALL(EnablePartnerAI) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_Kooper, 0, 0, -207) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) EVT_WAIT(35) @@ -113,7 +113,7 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_CALL(NpcMoveTo, NPC_Kooper, 25, -130, 10) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) EVT_CALL(NpcFacePlayer, NPC_Kooper, 0) - EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Celebrate, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00B5) EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) @@ -321,7 +321,7 @@ EvtScript N(EVS_MiscFuzzyFlee) = { EvtScript N(EVS_NpcHit_MiscFuzzy1) = { EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_MiscFuzzyFlee))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -361,7 +361,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EvtScript N(EVS_NpcHit_MiscFuzzy2) = { EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_MiscFuzzyFlee))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_RETURN EVT_END }; @@ -398,7 +398,7 @@ EvtScript N(EVS_BreakBlock_DropShell) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaShell_02, SOUND_21A, 0) EVT_CALL(PlayerFaceNpc, NPC_KoopaShell_02, FALSE) EVT_CALL(NpcFaceNpc, NPC_Koopa_02, NPC_KoopaShell_02, 0) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_ADD(LVar0, -1) EVT_ADD(LVar2, -1) EVT_CALL(GetNpcPos, NPC_Koopa_02, LVar0, LVar1, LVar2) @@ -431,7 +431,7 @@ EvtScript N(EVS_BreakBlock_DropShell) = { EVT_CALL(NpcJump0, NPC_KoopaShell_02, LVar0, LVar1, LVar2, 30) EVT_CALL(SetNpcPos, NPC_KoopaShell_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Koopa_02, ANIM_Koopa_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_Koopa_02, ANIM_Koopa_Still) EVT_WAIT(4) EVT_CALL(EnableNpcBlur, NPC_KoopaShell_02, TRUE) @@ -520,7 +520,7 @@ EvtScript N(EVS_KoloradoWife_FetchFromOffice) = { }; EvtScript N(EVS_KoloradoWife_FetchKoopaLegends) = { - EVT_CALL(SetNpcFlagBits, NPC_KoloradoWife, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoloradoWife, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_KoloradoWife, ANIM_KoloradoWife_Talk, ANIM_KoloradoWife_Idle, 0, MSG_CH1_0090) EVT_CALL(SetNpcAnimation, NPC_KoloradoWife, ANIM_KoloradoWife_Walk) EVT_IF_GE(GB_StoryProgress, STORY_CH7_STAR_SPRIT_DEPARTED) @@ -535,7 +535,7 @@ EvtScript N(EVS_KoloradoWife_FetchKoopaLegends) = { EVT_CALL(SpeakToPlayer, NPC_KoloradoWife, ANIM_KoloradoWife_Talk, ANIM_KoloradoWife_Idle, 0, MSG_CH1_0091) EVT_GIVE_KEY_REWARD(ITEM_KOOT_KOOPA_LEGENDS) EVT_CALL(SpeakToPlayer, NPC_KoloradoWife, ANIM_KoloradoWife_Talk, ANIM_KoloradoWife_Idle, 0, MSG_CH1_0092) - EVT_CALL(SetNpcFlagBits, NPC_KoloradoWife, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_KoloradoWife, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -638,7 +638,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koopa_01_Crisis), .settings = &N(NpcSettings_Koopa_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaC, @@ -649,7 +649,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy_Thief), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -659,7 +659,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_01_Crisis), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -683,7 +683,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koopa_02_Crisis), .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_WITHOUT_SHELL_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaD, @@ -694,7 +694,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_02_Crisis), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -715,7 +715,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FuzzyBoss), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -725,7 +725,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 90, .init = &N(EVS_NpcInit_KoopersShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, @@ -737,7 +737,7 @@ NpcData N(NpcData_Fuzzy_01) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy1), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -748,7 +748,7 @@ NpcData N(NpcData_Fuzzy_02) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy2), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -772,7 +772,7 @@ NpcData N(NpcData_Normal)[] = { }, .init = &N(EVS_NpcInit_Koopa_01_Normal), .settings = &N(NpcSettings_Koopa_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaC, @@ -795,7 +795,7 @@ NpcData N(NpcData_Normal)[] = { }, .init = &N(EVS_NpcInit_Koopa_02_Normal), .settings = &N(NpcSettings_Koopa_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaD, @@ -806,7 +806,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Bobomb_01), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = BOBOMB_BLUE_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombD, @@ -817,7 +817,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb_02), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombE, @@ -828,7 +828,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Bobomb_03), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombF, @@ -839,7 +839,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -852,7 +852,7 @@ NpcData N(NpcData_Fuzzy_Later) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy_Later), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -864,7 +864,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaKoot), .settings = &N(NpcSettings_KoopaKoot), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_KOOT_ANIMS, .tattle = MSG_NpcTattle_KoopaKoot, @@ -875,7 +875,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoloradoWife), .settings = &N(NpcSettings_KoloradoWife), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, .tattle = MSG_NpcTattle_KoloradoWife, @@ -886,7 +886,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Koopa_03), .settings = &N(NpcSettings_Koopa), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_SenseOfJustice, @@ -911,7 +911,7 @@ NpcData N(NpcData_Shared)[] = { }, .init = &N(EVS_NpcInit_Koopa_04), .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_PrettyMellow, @@ -993,7 +993,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_NOK, QUIZ_COUNT_NOK, QUIZ_MAP_NOK_02 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_nok/nok_02/npcs_crisis.inc.c b/src/world/area_nok/nok_02/npcs_crisis.inc.c index a73fd53559..b6d8909a33 100644 --- a/src/world/area_nok/nok_02/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_02/npcs_crisis.inc.c @@ -227,10 +227,10 @@ EvtScript N(EVS_FuzzyThief_AvoidCapture) = { EVT_IF_NE(LVar0, 0) EVT_LABEL(1) EVT_CALL(N(ChooseSafeJumpLocation), LVarF, LVarE) - EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) EVT_CALL(NpcJump0, NPC_FuzzyThief, LVarA, 0, LVarB, LVarC) - EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(N(IsPlayerOrKoopaNearby), LVarF, LVarE) EVT_SET(MV_IsPlayerNearbyThief, LVar0) EVT_IF_NE(LVar0, 0) @@ -338,7 +338,7 @@ EvtScript N(EVS_NpcIdle_Koopa_01_Crisis) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_FuzzyThief, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_KoopaShell_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_FuzzyThief, ANIM_Fuzzy_Hurt) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_331, 0) @@ -408,7 +408,7 @@ EvtScript N(EVS_NpcIdle_Koopa_01_Crisis) = { EVT_CALL(NpcJump0, NPC_KoopaShell_01, LVar0, LVar1, LVar2, 30) EVT_CALL(SetNpcPos, NPC_KoopaShell_01, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Koopa_01, ANIM_Koopa_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Koopa_01, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Koopa_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_Koopa_01, ANIM_Koopa_Still) EVT_WAIT(4) EVT_CALL(EnableNpcBlur, NPC_KoopaShell_01, TRUE) @@ -448,7 +448,7 @@ EvtScript N(EVS_NpcInit_Koopa_01_Crisis) = { EVT_IF_EQ(GF_NOK02_RecoveredShellA, TRUE) EVT_RETURN EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_KoopaWithoutShell_CryIdle) EVT_RETURN EVT_END diff --git a/src/world/area_nok/nok_02/npcs_normal.inc.c b/src/world/area_nok/nok_02/npcs_normal.inc.c index a46d34876d..2eb70bac86 100644 --- a/src/world/area_nok/nok_02/npcs_normal.inc.c +++ b/src/world/area_nok/nok_02/npcs_normal.inc.c @@ -77,7 +77,7 @@ EvtScript N(EVS_NpcInit_Koopa_02_Normal) = { }; EvtScript N(EVS_Koopa_03_CircleSprint) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Koopa_Run) EVT_CALL(EnableNpcBlur, NPC_Koopa_03, TRUE) EVT_CALL(GetNpcPointer, NPC_Koopa_03, LVarF) @@ -86,7 +86,7 @@ EvtScript N(EVS_Koopa_03_CircleSprint) = { EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Koopa_Idle) EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; diff --git a/src/world/area_nok/nok_03/nok_03_4_npc.c b/src/world/area_nok/nok_03/nok_03_4_npc.c index 041877eb38..5814b8e0b8 100644 --- a/src/world/area_nok/nok_03/nok_03_4_npc.c +++ b/src/world/area_nok/nok_03/nok_03_4_npc.c @@ -65,7 +65,7 @@ EvtScript N(EVS_NpcIdle_Fuzzy_01) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000017, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.8)) EVT_CALL(NpcJump0, NPC_SELF, -341, 0, 23, 15) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Fuzzy_Wander))) EVT_RETURN EVT_END @@ -83,7 +83,7 @@ EvtScript N(EVS_NpcIdle_Fuzzy_02) = { EVT_SET(LVar1, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 6) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Fuzzy_Wander))) EVT_RETURN EVT_END @@ -143,7 +143,7 @@ NpcData N(NpcData_Fuzzy_01) = { }, .init = &N(EVS_NpcInit_Fuzzy_01), .settings = &N(NpcSettings_Fuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -167,7 +167,7 @@ NpcData N(NpcData_Fuzzy_02) = { }, .init = &N(EVS_NpcInit_Fuzzy_02), .settings = &N(NpcSettings_Fuzzy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -192,7 +192,7 @@ NpcData N(NpcData_FuzzyBoss)[] = { }, .init = &N(EVS_NpcInit_FuzzyBoss), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, }, @@ -202,7 +202,7 @@ NpcData N(NpcData_FuzzyBoss)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopersShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = FUZZY_DROPS, .animations = KOOPER_ANIMS, }, diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 378bea9581..48f6db441a 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -925,7 +925,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(NpcJump0, NPC_KoopersShell, LVar0, LVar1, LVar2, 30) EVT_CALL(SetNpcPos, NPC_KoopersShell, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcSprite, NPC_Kooper, ANIM_WorldKooper_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcSprite, NPC_Kooper, ANIM_WorldKooper_Still) EVT_WAIT(4) EVT_CALL(EnableNpcBlur, NPC_KoopersShell, TRUE) @@ -1499,7 +1499,7 @@ NpcData N(NpcData_Minigame)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopersShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, @@ -1521,7 +1521,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_WrongFuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1543,7 +1543,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_Fuzzy_Aux), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1565,7 +1565,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_Fuzzy_Aux), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1587,7 +1587,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_Fuzzy_Aux), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1597,7 +1597,7 @@ NpcData N(NpcData_Minigame)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Kooper), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, @@ -1621,7 +1621,7 @@ NpcData N(NpcData_Miniboss) = { }, .init = &N(EVS_SetupMinigame), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/nok_11_4_npc.c index bab70065f7..f5aec6121a 100644 --- a/src/world/area_nok/nok_11/nok_11_4_npc.c +++ b/src/world/area_nok/nok_11/nok_11_4_npc.c @@ -199,7 +199,7 @@ EvtScript N(EVS_NpcDefeat_JrTroopa_01) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_END_THREAD EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_JrTroopa_01))) - EVT_CALL(SetNpcFlagBits, NPC_JrTroopa_02, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_JrTroopa_02, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -336,7 +336,7 @@ EvtScript N(EVS_NpcIdle_KentCKoopa_01) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_KentCKoopa_02, ANIM_KentCKoopa_Anim03) EVT_CALL(NpcMoveTo, NPC_KentCKoopa_02, -167, -100, 20) - EVT_CALL(SetNpcFlagBits, NPC_KentCKoopa_02, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_KentCKoopa_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcInteract, NPC_KentCKoopa_02, EVT_PTR(N(EVS_NpcInteract_KentCKoopa_02))) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcAnimation, NPC_KentCKoopa_02, ANIM_KentCKoopa_Anim01) @@ -466,7 +466,7 @@ NpcData N(NpcData_KoopaTroopa) = { } }, .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; @@ -488,7 +488,7 @@ NpcData N(NpcData_Paragoomba) = { } }, .settings = &N(NpcSettings_Paragoomba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, }; @@ -510,7 +510,7 @@ NpcData N(NpcData_SpikedGoomba) = { } }, .settings = &N(NpcSettings_SpikedGoomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, }; @@ -527,7 +527,7 @@ EvtScript N(EVS_NpcInit_JrTroopa_02) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa_02))) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_JrTroopa_02))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -539,7 +539,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa_01), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, @@ -550,7 +550,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa_02), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, @@ -561,7 +561,7 @@ EvtScript N(EVS_NpcInit_KentCKoopa_01) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KentCKoopa_01))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KentCKoopa_01))) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetEntryID, AB_NOK_2) EVT_RETURN EVT_END @@ -569,7 +569,7 @@ EvtScript N(EVS_NpcInit_KentCKoopa_01) = { EvtScript N(EVS_NpcInit_KentCKoopa_02) = { EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KentCKoopa_02))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetEntryID, LVar3) EVT_IF_EQ(LVar3, nok_11_ENTRY_0) EVT_CALL(SetNpcYaw, NPC_SELF, 270) @@ -587,7 +587,7 @@ NpcData N(NpcData_KentCKoopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KentCKoopa_01), .settings = &N(NpcSettings_KentCKoopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KENT_C_KOOPA_ANIMS, }, @@ -597,7 +597,7 @@ NpcData N(NpcData_KentCKoopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KentCKoopa_02), .settings = &N(NpcSettings_KentCKoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KENT_C_KOOPA_ANIMS, .tattle = MSG_NpcTattle_KentCKoopa, diff --git a/src/world/area_nok/nok_12/nok_12_6_npc.c b/src/world/area_nok/nok_12/nok_12_6_npc.c index 85ddd359cf..4404d33174 100644 --- a/src/world/area_nok/nok_12/nok_12_6_npc.c +++ b/src/world/area_nok/nok_12/nok_12_6_npc.c @@ -114,7 +114,7 @@ NpcData N(NpcData_KoopaTroopa_01) = { } }, .settings = &N(NpcSettings_KoopaTroopa_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -138,7 +138,7 @@ NpcData N(NpcData_KoopaTroopa_02) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_02), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -162,7 +162,7 @@ NpcData N(NpcData_KoopaTroopa_02_Demo) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_02_Demo), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -185,7 +185,7 @@ NpcData N(NpcData_Goomba) = { } }, .settings = &N(NpcSettings_Goomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -209,7 +209,7 @@ NpcData N(NpcData_SpikedGoomba) = { }, .init = &N(EVS_NpcInit_SpikedGoomba), .settings = &N(NpcSettings_SpikedGoomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_nok/nok_14/nok_14_5_npc.c b/src/world/area_nok/nok_14/nok_14_5_npc.c index 09a592d116..d7ccbf20a6 100644 --- a/src/world/area_nok/nok_14/nok_14_5_npc.c +++ b/src/world/area_nok/nok_14/nok_14_5_npc.c @@ -18,7 +18,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_40000 | NPC_FLAG_200000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, TRUE) EVT_THREAD EVT_CALL(MakeLerp, 0, 360, 20, EASING_LINEAR) EVT_LABEL(1) @@ -31,7 +31,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6)) EVT_CALL(NpcJump0, NPC_SELF, -650, 75, -30, 20) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_40000 | NPC_FLAG_200000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_KoopaTroopa_Wander))) EVT_RETURN @@ -70,7 +70,7 @@ NpcData N(NpcData_KoopaTroopa_01) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_01), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; @@ -92,7 +92,7 @@ NpcData N(NpcData_ParaTroopa) = { } }, .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; @@ -114,7 +114,7 @@ NpcData N(NpcData_SpikedGoomba) = { } }, .settings = &N(NpcSettings_SpikedGoomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, }; @@ -125,7 +125,7 @@ NpcData N(NpcData_KoopaTroopa_02) = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaTroopa_02), .settings = &N(NpcSettings_KoopaTroopa_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; diff --git a/src/world/area_nok/nok_15/nok_15_4_npc.c b/src/world/area_nok/nok_15/nok_15_4_npc.c index 09cd0faf83..92f5f6ab73 100644 --- a/src/world/area_nok/nok_15/nok_15_4_npc.c +++ b/src/world/area_nok/nok_15/nok_15_4_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_KoopaTroopa) = { } }, .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -44,7 +44,7 @@ NpcData N(NpcData_ParaTroopa) = { } }, .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_obk/obk_01/obk_01_6_npc.c b/src/world/area_obk/obk_01/obk_01_6_npc.c index 1cf79463f0..bf577bfef6 100644 --- a/src/world/area_obk/obk_01/obk_01_6_npc.c +++ b/src/world/area_obk/obk_01/obk_01_6_npc.c @@ -193,7 +193,7 @@ NpcData N(NpcData_JumpScareBoo) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -204,7 +204,7 @@ NpcData N(NpcData_TrafficBoo1) = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -215,7 +215,7 @@ NpcData N(NpcData_TrafficBoo2) = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -239,7 +239,7 @@ NpcData N(NpcData_Boos)[] = { }, .init = &N(EVS_NpcInit_UpstairsBoo), .settings = &N(NpcSettings_Boo_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BooA, @@ -262,7 +262,7 @@ NpcData N(NpcData_Boos)[] = { }, .init = &N(EVS_NpcInit_Franky), .settings = &N(NpcSettings_Boo_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BooB, diff --git a/src/world/area_obk/obk_02/obk_02_3_npc.c b/src/world/area_obk/obk_02/obk_02_3_npc.c index 06e7491d15..7376c2f35f 100644 --- a/src/world/area_obk/obk_02/obk_02_3_npc.c +++ b/src/world/area_obk/obk_02/obk_02_3_npc.c @@ -25,7 +25,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -35,7 +35,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, diff --git a/src/world/area_obk/obk_03/obk_03_6_npc.c b/src/world/area_obk/obk_03/obk_03_6_npc.c index 47c754786c..46241bd37f 100644 --- a/src/world/area_obk/obk_03/obk_03_6_npc.c +++ b/src/world/area_obk/obk_03/obk_03_6_npc.c @@ -55,7 +55,7 @@ NpcData N(NpcData_Igor) = { .yaw = 90, .init = &N(EVS_NpcInit_Igor), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_ShopOwner, diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index f0da826030..60defb5a6c 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -157,7 +157,7 @@ API_CALLABLE(N(InitKeepAwayBoo)) { npc->blur.keepAwayNpc = get_npc_unsafe(NPC_Boo_01); script->functionTemp[2] = script->owner2.npcID * 45; // starting yaw - npc->flags |= NPC_FLAG_40000; + npc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW; script->functionTemp[1] = RING_STATE_0; return ApiStatus_DONE2; } @@ -492,7 +492,7 @@ NpcData N(NpcData_Boo_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -503,7 +503,7 @@ NpcData N(NpcData_KeepAwayBoo1) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -514,7 +514,7 @@ NpcData N(NpcData_KeepAwayBoo2) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -525,7 +525,7 @@ NpcData N(NpcData_KeepAwayBoo3) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo3), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -536,7 +536,7 @@ NpcData N(NpcData_KeepAwayBoo4) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo4), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -547,7 +547,7 @@ NpcData N(NpcData_KeepAwayBoo5) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo5), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -558,7 +558,7 @@ NpcData N(NpcData_KeepAwayBoo6) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo6), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -569,7 +569,7 @@ NpcData N(NpcData_KeepAwayBoo7) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo7), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -580,7 +580,7 @@ NpcData N(NpcData_KeepAwayBoo8) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo8), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -627,7 +627,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_10), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -637,7 +637,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_11), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -649,7 +649,7 @@ NpcData N(NpcData_TutorialBoo) = { .yaw = 0, .init = &N(EVS_NpcInit_TutorialBoo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BootsTutor, diff --git a/src/world/area_obk/obk_04/obk_04_6_game.c b/src/world/area_obk/obk_04/obk_04_6_game.c index 6daeb49040..f2e49f9dbe 100644 --- a/src/world/area_obk/obk_04/obk_04_6_game.c +++ b/src/world/area_obk/obk_04/obk_04_6_game.c @@ -213,7 +213,7 @@ EvtScript N(EVS_BooAppear) = { }; EvtScript N(EVS_BooSpookAndVanish) = { - EVT_CALL(SetNpcFlagBits, LVarA, NPC_FLAG_40000, FALSE) + EVT_CALL(SetNpcFlagBits, LVarA, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) EVT_CALL(NpcFacePlayer, LVarA, 0) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, LVarA, ANIM_Boo_Spook) diff --git a/src/world/area_obk/obk_05/obk_05_5_npc.c b/src/world/area_obk/obk_05/obk_05_5_npc.c index 54783f15fe..a96581338e 100644 --- a/src/world/area_obk/obk_05/obk_05_5_npc.c +++ b/src/world/area_obk/obk_05/obk_05_5_npc.c @@ -25,7 +25,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -35,7 +35,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, diff --git a/src/world/area_obk/obk_07/obk_07_4_fireplace.c b/src/world/area_obk/obk_07/obk_07_4_fireplace.c index 8b01d75df1..a9a67e87d3 100644 --- a/src/world/area_obk/obk_07/obk_07_4_fireplace.c +++ b/src/world/area_obk/obk_07/obk_07_4_fireplace.c @@ -88,9 +88,9 @@ EvtScript N(EVS_Inspect_Fireplace) = { EVT_WAIT(1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 10) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) diff --git a/src/world/area_obk/obk_07/obk_07_5_npc.c b/src/world/area_obk/obk_07/obk_07_5_npc.c index 0f67a44b0d..15ce1888e3 100644 --- a/src/world/area_obk/obk_07/obk_07_5_npc.c +++ b/src/world/area_obk/obk_07/obk_07_5_npc.c @@ -18,7 +18,7 @@ NpcData N(NpcData_TrafficBoo1) = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -35,7 +35,7 @@ NpcData N(NpcData_TrafficBoo2) = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -57,7 +57,7 @@ NpcData N(NpcData_GuardBoo) = { .yaw = 270, .init = &N(EVS_NpcInit_GuardBoo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_GuardingChest, diff --git a/src/world/area_obk/obk_08/obk_08_3_cabinets.c b/src/world/area_obk/obk_08/obk_08_3_cabinets.c index 6b6103ef75..75d8f61144 100644 --- a/src/world/area_obk/obk_08/obk_08_3_cabinets.c +++ b/src/world/area_obk/obk_08/obk_08_3_cabinets.c @@ -56,7 +56,7 @@ EvtScript N(EVS_GetPartnerInUseAnims) = { EvtScript N(EVS_CrushPlayer) = { EVT_THREAD EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_EXEC_WAIT(N(EVS_GetPartnerInUseAnims)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, LVarA) @@ -64,7 +64,7 @@ EvtScript N(EVS_CrushPlayer) = { EVT_EXEC_WAIT(N(EVS_GetPartnerInUseAnims)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, LVarB) EVT_WAIT(15) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_THREAD EVT_CALL(DisablePlayerPhysics, TRUE) diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index 2189728c71..354b0b224b 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -117,7 +117,7 @@ API_CALLABLE(N(func_80240CA0_BD4510)) { npc->blur.keepAwayNpc = get_npc_unsafe(NPC_Boo_01); script->functionTemp[2] = script->owner2.npcID * 45; - npc->flags |= NPC_FLAG_40000; + npc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW; script->functionTemp[1] = RING_STATE_0; return ApiStatus_DONE2; } @@ -452,7 +452,7 @@ NpcData N(NpcData_Boo_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -463,7 +463,7 @@ NpcData N(NpcData_KeepAwayBoo1) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -474,7 +474,7 @@ NpcData N(NpcData_KeepAwayBoo2) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -485,7 +485,7 @@ NpcData N(NpcData_KeepAwayBoo3) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo3), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -496,7 +496,7 @@ NpcData N(NpcData_KeepAwayBoo4) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo4), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -507,7 +507,7 @@ NpcData N(NpcData_KeepAwayBoo5) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo5), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -518,7 +518,7 @@ NpcData N(NpcData_KeepAwayBoo6) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo6), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -529,7 +529,7 @@ NpcData N(NpcData_KeepAwayBoo7) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo7), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -540,7 +540,7 @@ NpcData N(NpcData_KeepAwayBoo8) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo8), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -568,7 +568,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -578,7 +578,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -602,7 +602,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_12), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -612,7 +612,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_13), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, diff --git a/src/world/area_obk/obk_08/obk_08_6_game.c b/src/world/area_obk/obk_08/obk_08_6_game.c index 35601af7b1..64128cd168 100644 --- a/src/world/area_obk/obk_08/obk_08_6_game.c +++ b/src/world/area_obk/obk_08/obk_08_6_game.c @@ -145,7 +145,7 @@ EvtScript N(EVS_TetherItemToNpcWithOffset) = { }; EvtScript N(EVS_BooSpookAndVanish) = { - EVT_CALL(SetNpcFlagBits, LVarA, NPC_FLAG_40000, FALSE) + EVT_CALL(SetNpcFlagBits, LVarA, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) EVT_CALL(NpcFacePlayer, LVarA, 0) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, LVarA, ANIM_Boo_Spook) @@ -380,7 +380,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_ELSE EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(2.0), 0, 0, 0, EVT_FLOAT(450.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_WAIT(30) - EVT_CALL(SetNpcFlagBits, MV_ItemCarrierNpc, NPC_FLAG_40000, FALSE) + EVT_CALL(SetNpcFlagBits, MV_ItemCarrierNpc, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE) EVT_CALL(GetNpcPos, MV_ItemCarrierNpc, LVar3, LVar4, LVar5) EVT_CALL(GetAngleBetweenNPCs, MV_ItemCarrierNpc, NPC_Boo_01, LVar0) EVT_CALL(InterpNpcYaw, MV_ItemCarrierNpc, LVar0, 0) @@ -427,7 +427,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, MV_ItemCarrierNpc, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, MV_ItemCarrierNpc, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_SET(MV_KeepAwayResult, KEEP_AWAY_WAITING) EVT_SET(MV_Unk_02, 0) EVT_CALL(N(GetPlayerPosOutsideKeepAwayRing)) diff --git a/src/world/area_omo/common/ToyTrain.inc.c b/src/world/area_omo/common/ToyTrain.inc.c index 7284a718bc..339e2f9364 100644 --- a/src/world/area_omo/common/ToyTrain.inc.c +++ b/src/world/area_omo/common/ToyTrain.inc.c @@ -327,8 +327,8 @@ EvtScript N(EVS_TrainUnk_C) = { }; EvtScript N(EVS_TrainUnk_D) = { - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_THREAD EVT_USE_BUF(LVar0) EVT_BUF_READ3(LVar1, LVar2, LVar3) @@ -385,8 +385,8 @@ EvtScript N(EVS_TrainUnk_D) = { #ifdef INCLUDE_ALTERNATES EvtScript N(EVS_TrainUnk_AltD) = { - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(AF_OMO_06, FALSE) EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) EVT_IF_LT(LVar2, 50) @@ -451,8 +451,8 @@ EvtScript N(EVS_TrainUnk_AltD) = { EvtScript N(EVS_TrainUnk_E) = { EVT_CALL(StopSound, SOUND_83) EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SETF(LVar0, MV_TrainPos) EVT_SETF(LVar1, MV_TrainUnk_0C) EVT_SETF(LVar2, MV_TrainUnk_0D) @@ -472,7 +472,7 @@ EvtScript N(EVS_TrainUnk_E) = { EVT_CALL(NpcMoveTo, NPC_Conductor, LVar3, LVar4, 0) EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Idle) EVT_CALL(InterpNpcYaw, NPC_Conductor, 270, 15) - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(10) EVT_THREAD @@ -489,7 +489,7 @@ EvtScript N(EVS_TrainUnk_E) = { EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar1, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -498,8 +498,8 @@ EvtScript N(EVS_TrainUnk_E) = { EvtScript N(EVS_TrainUnk_AltE) = { EVT_CALL(StopSound, SOUND_83) EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(AF_OMO_06, TRUE) EVT_SETF(LVar0, MV_TrainPos) EVT_SETF(LVar1, MV_TrainUnk_0C) @@ -512,7 +512,7 @@ EvtScript N(EVS_TrainUnk_AltE) = { EVT_CALL(NpcMoveTo, NPC_Conductor, LVar3, LVar4, 0) EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_SadIdle) EVT_CALL(InterpNpcYaw, NPC_Conductor, 90, 0) - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(10) EVT_THREAD @@ -530,7 +530,7 @@ EvtScript N(EVS_TrainUnk_AltE) = { EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar1, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; diff --git a/src/world/area_omo/omo_01/omo_01_4_npc.c b/src/world/area_omo/omo_01/omo_01_4_npc.c index db91fc7b73..b0995854bc 100644 --- a/src/world/area_omo/omo_01/omo_01_4_npc.c +++ b/src/world/area_omo/omo_01/omo_01_4_npc.c @@ -95,7 +95,7 @@ NpcData N(NpcData_ShyGuy_01) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = RED_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -130,7 +130,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_ShyGuy_02), .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = YELLOW_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -165,7 +165,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_ShyGuy_03), .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = YELLOW_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -200,7 +200,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_ShyGuy_04), .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = BLUE_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -235,7 +235,7 @@ NpcData N(NpcData_ShyGuy_05) = { }, .init = &N(EVS_NpcInit_ShyGuy_05), .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = GREEN_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_omo/omo_02/omo_02_6_npc.c b/src/world/area_omo/omo_02/omo_02_6_npc.c index 65ec28ed0b..3c41e4e8e0 100644 --- a/src/world/area_omo/omo_02/omo_02_6_npc.c +++ b/src/world/area_omo/omo_02/omo_02_6_npc.c @@ -220,7 +220,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) EVT_WAIT(2) EVT_CASE_EQ(CROWD_STATE_RUN_AWAY) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_WORLD_COLLISION, 1) EVT_CALL(GetSelfNpcID, LVar0) EVT_USE_BUF(EVT_PTR(N(CrowdFleeScripts))) EVT_LOOP(LVar0) @@ -289,7 +289,7 @@ NpcData N(NpcData_ShyGuy_Loner) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Loner), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -415,7 +415,7 @@ NpcData N(NpcData_SpyGuy)[] = { } }, .settings = &N(NpcSettings_SpyGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPY_GUY_DROPS, .animations = SPY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_omo/omo_03/omo_03_5_npc.c b/src/world/area_omo/omo_03/omo_03_5_npc.c index 271ca0ac8f..a0a7a4da78 100644 --- a/src/world/area_omo/omo_03/omo_03_5_npc.c +++ b/src/world/area_omo/omo_03/omo_03_5_npc.c @@ -25,13 +25,13 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_IF_EQ(GF_OMO03_LearnedAboutTrainSwitches, FALSE) EVT_IF_EQ(AF_OMO_05, FALSE) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) EVT_LOOP(2) EVT_CALL(NpcJump1, NPC_Conductor, LVar0, LVar1, LVar2, 15) EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(10) EVT_IF_EQ(MF_EitherSwitchPressed, FALSE) @@ -128,7 +128,7 @@ NpcData N(NpcData_TrainToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -139,7 +139,7 @@ NpcData N(NpcData_TrainToads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, diff --git a/src/world/area_omo/omo_03/omo_03_6_train.c b/src/world/area_omo/omo_03/omo_03_6_train.c index 9e21857299..0f81c45c76 100644 --- a/src/world/area_omo/omo_03/omo_03_6_train.c +++ b/src/world/area_omo/omo_03/omo_03_6_train.c @@ -43,13 +43,13 @@ EvtScript N(EVS_80246108) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) EVT_LOOP(2) EVT_CALL(NpcJump1, NPC_Conductor, LVar0, LVar1, LVar2, 15) EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0015) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_omo/omo_04/omo_04_5_npc.c b/src/world/area_omo/omo_04/omo_04_5_npc.c index 85e7b10645..c6e2451b99 100644 --- a/src/world/area_omo/omo_04/omo_04_5_npc.c +++ b/src/world/area_omo/omo_04/omo_04_5_npc.c @@ -95,7 +95,7 @@ NpcData N(NpcData_Goomba) = { .yaw = 270, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Goomba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GOOMBA_ANIMS, }; @@ -106,7 +106,7 @@ NpcData N(NpcData_Clubba) = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = CLUBBA_ANIMS_ALT, }; @@ -173,7 +173,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 90, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_omo/omo_05/omo_05_4_npc.c b/src/world/area_omo/omo_05/omo_05_4_npc.c index a407859c8a..98281507a7 100644 --- a/src/world/area_omo/omo_05/omo_05_4_npc.c +++ b/src/world/area_omo/omo_05/omo_05_4_npc.c @@ -188,7 +188,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Surprise) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetNpcPos, NPC_GourmetGuy_Fork, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.05)) EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, 2, LVar2, 8) @@ -206,7 +206,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(RemoveNpc, NPC_GourmetGuy_Fork) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetNpcPos, NPC_GourmetGuy_Knife, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.05)) EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, 2, LVar2, 8) @@ -288,7 +288,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_384, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Panic) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(20.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 0, 110, 0) EVT_WAIT(20) @@ -378,10 +378,10 @@ EvtScript N(EVS_NpcInit_GourmetGuy) = { EVT_ELSE EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_SitIdle) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Fork, ANIM_GourmetGuy_Fork) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_GourmetGuy_Fork, -285, 50, 90) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Knife, ANIM_GourmetGuy_Knife) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_GourmetGuy_Knife, -210, 50, 90) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GourmetGuy))) EVT_END_IF @@ -396,7 +396,7 @@ NpcData N(NpcData_GourmetGuy)[] = { .yaw = 90, .init = &N(EVS_NpcInit_GourmetGuy), .settings = &N(NpcSettings_GourmetGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, @@ -406,7 +406,7 @@ NpcData N(NpcData_GourmetGuy)[] = { .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, .settings = &N(NpcSettings_GourmetGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, @@ -416,7 +416,7 @@ NpcData N(NpcData_GourmetGuy)[] = { .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, .settings = &N(NpcSettings_GourmetGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, @@ -440,7 +440,7 @@ NpcData N(NpcData_GrooveGuy) = { } }, .settings = &N(NpcSettings_GrooveGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GROOVE_GUY_DROPS_A, .animations = GROOVE_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_omo/omo_06/omo_06_5_npc.c b/src/world/area_omo/omo_06/omo_06_5_npc.c index e34bb1405b..c1bed73991 100644 --- a/src/world/area_omo/omo_06/omo_06_5_npc.c +++ b/src/world/area_omo/omo_06/omo_06_5_npc.c @@ -52,7 +52,7 @@ NpcData N(NpcSettings_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -63,7 +63,7 @@ NpcData N(NpcSettings_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_TOAD_PINK_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, diff --git a/src/world/area_omo/omo_07/omo_07_4_npc.c b/src/world/area_omo/omo_07/omo_07_4_npc.c index 9695763d60..6a2eec763c 100644 --- a/src/world/area_omo/omo_07/omo_07_4_npc.c +++ b/src/world/area_omo/omo_07/omo_07_4_npc.c @@ -171,7 +171,7 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_CASE_EQ(SHYGUY_STATE_FREE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CASE_EQ(SHYGUY_STATE_RUN_TO_DOOR) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_PASSIVE, 0) EVT_CALL(SetNpcPos, NPC_SELF, 800, 0, 75) @@ -255,7 +255,7 @@ EvtScript N(EVS_NpcDefeat_ShyGuy) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_PASSIVE, 1) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, SHYGUY_VAR_STATE, SHYGUY_STATE_RECYCLE) @@ -371,7 +371,7 @@ NpcData N(NpcData_ShyGuy) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -400,7 +400,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -429,7 +429,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -458,7 +458,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -469,7 +469,7 @@ NpcData N(NpcData_Fuzzy) = { .yaw = 270, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, @@ -497,7 +497,7 @@ NpcData N(NpcData_HammerBros) = { .yaw = 270, .init = &N(EVS_NpcInit_HammerBros), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_HammerBros_Anim02, @@ -536,7 +536,7 @@ NpcData N(NpcData_SkyGuy_01) = { } }, .settings = &N(NpcSettings_SkyGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SKY_GUY_DROPS, .animations = SKY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -559,7 +559,7 @@ NpcData N(NpcData_SkyGuy_02) = { } }, .settings = &N(NpcSettings_SkyGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SKY_GUY_DROPS, .animations = SKY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -581,7 +581,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 90, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_omo/omo_08/omo_08_6_npc.c b/src/world/area_omo/omo_08/omo_08_6_npc.c index be45168d52..234018af46 100644 --- a/src/world/area_omo/omo_08/omo_08_6_npc.c +++ b/src/world/area_omo/omo_08/omo_08_6_npc.c @@ -65,7 +65,7 @@ EvtScript N(EVS_NpcAI_BoxedShyGuy) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) @@ -104,7 +104,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -115,7 +115,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -140,7 +140,7 @@ NpcData N(NpcData_ShyGuy_01) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -163,7 +163,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -186,7 +186,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -209,7 +209,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; diff --git a/src/world/area_omo/omo_09/omo_09_7_npc.c b/src/world/area_omo/omo_09/omo_09_7_npc.c index bd1c9e356e..2344652600 100644 --- a/src/world/area_omo/omo_09/omo_09_7_npc.c +++ b/src/world/area_omo/omo_09/omo_09_7_npc.c @@ -177,7 +177,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_Jackpot) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) @@ -215,7 +215,7 @@ NpcData N(NpcData_Pokey) = { .yaw = 270, .init = &N(EVS_NpcInit_Pokey), .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = POKEY_ANIMS, }; @@ -226,7 +226,7 @@ NpcData N(NpcData_Koopatrol) = { .yaw = 270, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -249,7 +249,7 @@ NpcData N(NpcData_ShyGuy_01) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -272,7 +272,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -295,7 +295,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -318,7 +318,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -341,7 +341,7 @@ NpcData N(NpcData_ShyGuy_05) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -362,7 +362,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 90, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -403,7 +403,7 @@ NpcData N(NpcData_ShyGuy_Thief) = { }, .init = &N(EVS_ShyGuy_Thief), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = YELLOW_SHY_GUY_ANIMS, .aiFlags = ENEMY_AI_FLAG_1, @@ -428,7 +428,7 @@ NpcData N(NpcData_SpyGuy)[] = { } }, .settings = &N(NpcSettings_SpyGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPY_GUY_DROPS, .animations = SPY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_omo/omo_10/omo_10_5_npc.c b/src/world/area_omo/omo_10/omo_10_5_npc.c index f6dda6737e..912ee682e4 100644 --- a/src/world/area_omo/omo_10/omo_10_5_npc.c +++ b/src/world/area_omo/omo_10/omo_10_5_npc.c @@ -42,7 +42,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -53,7 +53,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, diff --git a/src/world/area_omo/omo_11/omo_11_5_npc.c b/src/world/area_omo/omo_11/omo_11_5_npc.c index 4e07e825f9..48d852ffe8 100644 --- a/src/world/area_omo/omo_11/omo_11_5_npc.c +++ b/src/world/area_omo/omo_11/omo_11_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_PyroGuy_01) = { } }, .settings = &N(NpcSettings_PyroGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PYRO_GUY_DROPS, .animations = PYRO_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_PyroGuy_02) = { } }, .settings = &N(NpcSettings_PyroGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PYRO_GUY_DROPS, .animations = PYRO_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, 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 d7f5ac48e7..a8a51c3782 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 @@ -222,20 +222,20 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(PlaySound, SOUND_1F5) EVT_SET(AF_OMO_10, FALSE) EVT_LOOP(8) - EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, TRUE) EVT_WAIT(3) - EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(3) EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_LaternTop, ANIM_BigLanternGhost_Anim03) EVT_CALL(SetNpcAnimation, NPC_LaternBottom, ANIM_BigLanternGhost_Anim04) EVT_THREAD EVT_LABEL(10) - EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_INVISIBLE, TRUE) EVT_WAIT(2) - EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(2) EVT_IF_EQ(AF_OMO_10, FALSE) EVT_GOTO(10) @@ -250,7 +250,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_SET(LVar2, -50) EVT_END_IF EVT_CALL(func_802D2C14, 1) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, LVar1, 0, 0) EVT_CALL(PlayerFaceNpc, NPC_LaternTop, 3) @@ -264,9 +264,9 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_Watt, LVar0, 6, LVar2) EVT_LOOP(7) - EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -331,7 +331,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(NpcFacePlayer, NPC_PARTNER, 3) EVT_CALL(EnablePartnerAI) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Watt, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Watt, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_Watt, LVar7, LVar8, LVar9) EVT_CALL(GetAngleToPlayer, NPC_Watt, LVar0) EVT_IF_LT(LVar0, 180) @@ -590,7 +590,7 @@ EvtScript N(EVS_NpcInit_LanternBottom) = { EVT_RETURN EVT_END_SWITCH EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_Scene_ReleaseWatt))) - EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -628,7 +628,7 @@ NpcData N(NpcData_BigLanternGhost) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BigLanternGhost), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), @@ -689,7 +689,7 @@ NpcData N(NpcData_LanternBottom) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Watt), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT, .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), 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 6004f75390..6dc7231cef 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 @@ -149,7 +149,7 @@ EvtScript N(EVS_NpcIdle_AntiGuy) = { EVT_END_IF EVT_GOTO(0) EVT_ELSE - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Black_Anim02) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_IF_LT(LVar2, -60) @@ -169,7 +169,7 @@ EvtScript N(EVS_NpcIdle_AntiGuy) = { EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, -100, 0) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Black_Anim15) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_LABEL(9) EVT_WAIT(1) EVT_GOTO(9) @@ -214,7 +214,7 @@ NpcData N(NpcData_AntiGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_AntiGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, @@ -254,7 +254,7 @@ NpcData N(NpcData_ShyGuy) = { } }, .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SHY_GUY_DROPS, .animations = YELLOW_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -277,7 +277,7 @@ NpcData N(NpcData_GrooveGuy) = { } }, .settings = &N(NpcSettings_GrooveGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GROOVE_GUY_DROPS_B, .animations = GROOVE_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_omo/omo_14/omo_14_3_npc.c b/src/world/area_omo/omo_14/omo_14_3_npc.c index 1ab6fd4dcf..f898f1ab58 100644 --- a/src/world/area_omo/omo_14/omo_14_3_npc.c +++ b/src/world/area_omo/omo_14/omo_14_3_npc.c @@ -11,7 +11,7 @@ API_CALLABLE(N(SurroundPlayer)) { f32 dist = dist2D(npc->pos.x, npc->pos.z, goalPosX, goalPosZ); if (npc->moveSpeed < dist) { - if (npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) { + if (npc->flags & NPC_FLAG_COLLDING_WITH_WORLD) { if (npc->yaw < 180.0f) { npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f; } else { @@ -45,7 +45,7 @@ API_CALLABLE(N(SimpleMoveNPC)) { f32 z = evt_get_float_variable(script, *args++); if (npc->moveSpeed < dist2D(npc->pos.x, npc->pos.z, x, z)) { - if (npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) { + if (npc->flags & NPC_FLAG_COLLDING_WITH_WORLD) { if (npc->yaw < 180.0f) { npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f; } else { @@ -387,7 +387,7 @@ NpcData N(NpcData_ShyGuy_Loner) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Loner), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -399,7 +399,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -409,7 +409,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -419,7 +419,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -429,7 +429,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -439,7 +439,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -449,7 +449,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -459,7 +459,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -469,7 +469,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -479,7 +479,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -489,7 +489,7 @@ NpcData N(NpcData_ShyGuy_Crowd)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_Crowd), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, diff --git a/src/world/area_omo/omo_15/omo_15_3_npc.c b/src/world/area_omo/omo_15/omo_15_3_npc.c index 8eba6d6312..78db657dfc 100644 --- a/src/world/area_omo/omo_15/omo_15_3_npc.c +++ b/src/world/area_omo/omo_15/omo_15_3_npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_MeetingGeneralGuy) = { EVT_CALL(InterruptUsePartner) EVT_WAIT(30) EVT_CALL(func_802D2C14, 1) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_WAIT(45) EVT_CALL(func_802D2C14, 0) EVT_END_IF @@ -445,7 +445,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GeneralGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = { .idle = ANIM_GeneralGuy_Anim02, @@ -472,7 +472,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -482,7 +482,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -492,7 +492,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -502,7 +502,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -512,7 +512,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -522,7 +522,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -532,7 +532,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -542,7 +542,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -552,7 +552,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, diff --git a/src/world/area_omo/omo_16/omo_16_3_npc.c b/src/world/area_omo/omo_16/omo_16_3_npc.c index 0635fd3ca4..c84c2f82f9 100644 --- a/src/world/area_omo/omo_16/omo_16_3_npc.c +++ b/src/world/area_omo/omo_16/omo_16_3_npc.c @@ -7,7 +7,7 @@ NpcData N(NpcData_TrainToad) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; diff --git a/src/world/area_omo/omo_17/omo_17_4_npc.c b/src/world/area_omo/omo_17/omo_17_4_npc.c index fbc7733f9b..f862d7cd5e 100644 --- a/src/world/area_omo/omo_17/omo_17_4_npc.c +++ b/src/world/area_omo/omo_17/omo_17_4_npc.c @@ -28,7 +28,7 @@ NpcSettings N(NpcSettings_Conductor) = { .otherAI = &N(EVS_NpcAuxAI_Conductor), .onInteract = &N(EVS_NpcInteract_Conductor), .ai = &N(EVS_NpcAI_Conductor), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_Conductor) = { @@ -59,7 +59,7 @@ NpcData N(NpcData_SpyGuy)[] = { } }, .settings = &N(NpcSettings_SpyGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPY_GUY_DROPS, .animations = SPY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -86,7 +86,7 @@ NpcData N(NpcData_PyroGuy) = { } }, .settings = &N(NpcSettings_PyroGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PYRO_GUY_DROPS, .animations = PYRO_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -109,7 +109,7 @@ NpcData N(NpcData_GrooveGuy) = { } }, .settings = &N(NpcSettings_GrooveGuy), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GROOVE_GUY_DROPS_B, .animations = GROOVE_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c b/src/world/area_osr/osr_00/osr_00_3_npc_intro.c index 4f5ad3a6d0..5303e10140 100644 --- a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c +++ b/src/world/area_osr/osr_00/osr_00_3_npc_intro.c @@ -7,7 +7,7 @@ NpcData N(NpcData_Luigi) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }; 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 392d72fc77..0d338200a4 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 @@ -223,7 +223,7 @@ NpcData N(NpcData_Yoshis)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LeaderYoshi), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .extraAnimations = N(ExtraAnims_YoshiLeader), @@ -235,7 +235,7 @@ NpcData N(NpcData_Yoshis)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Yoshi), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Yoshi), @@ -247,7 +247,7 @@ NpcData N(NpcData_Yoshis)[] = { .yaw = 270, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_YoshiKid), @@ -283,7 +283,7 @@ NpcData N(NpcData_Penguins)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorPenguin), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_MayorPenguin), @@ -295,7 +295,7 @@ NpcData N(NpcData_Penguins)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorPenguinWife), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, .extraAnimations = N(ExtraAnims_MayorPenguinWife), @@ -307,7 +307,7 @@ NpcData N(NpcData_Penguins)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Penguin_01), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_Penguin), @@ -318,7 +318,7 @@ NpcData N(NpcData_Penguins)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_Penguin), @@ -346,7 +346,7 @@ NpcData N(NpcData_Mousers)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Moustafa), .settings = &N(NpcSettings_Mouser), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSTAFA_ANIMS, .extraAnimations = N(ExtraAnims_Moustafa), @@ -358,7 +358,7 @@ NpcData N(NpcData_Mousers)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Mouser), .settings = &N(NpcSettings_Mouser), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, .extraAnimations = N(ExtraAnims_Mouser), @@ -418,7 +418,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -429,7 +429,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ToadGuard_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -440,7 +440,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), 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 4a4f419475..3d0ddec015 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 @@ -105,7 +105,7 @@ NpcData N(NpcData_Toad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_OSR_LovesToClean, diff --git a/src/world/area_osr/osr_02/osr_02_3_npc.c b/src/world/area_osr/osr_02/osr_02_3_npc.c index 3821049059..0c8872d047 100644 --- a/src/world/area_osr/osr_02/osr_02_3_npc.c +++ b/src/world/area_osr/osr_02/osr_02_3_npc.c @@ -29,7 +29,7 @@ Vec3f N(FlightPath_TwinkDepart)[] = { }; EvtScript N(EVS_StarSpirit_FlyAway) = { - EVT_CALL(SetNpcFlagBits, LVar4, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, LVar4, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(30) EVT_CALL(GetNpcPos, LVar4, LVar0, LVar1, LVar2) @@ -534,7 +534,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -545,7 +545,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -556,7 +556,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -567,7 +567,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -578,7 +578,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -589,7 +589,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -600,7 +600,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -611,7 +611,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -622,7 +622,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), @@ -633,7 +633,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_StarRod), .settings = &N(NpcSettings_StarRod), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = STAR_ROD_ANIMS, }, diff --git a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c b/src/world/area_osr/osr_02/osr_02_4_npc_peach.c index 569b56fca6..57b9413c03 100644 --- a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c +++ b/src/world/area_osr/osr_02/osr_02_4_npc_peach.c @@ -79,7 +79,7 @@ NpcData N(NpcData_Clubba) = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), diff --git a/src/world/area_osr/osr_03/osr_03_2_npc.c b/src/world/area_osr/osr_03/osr_03_2_npc.c index 176d09d1cb..81145bec8f 100644 --- a/src/world/area_osr/osr_03/osr_03_2_npc.c +++ b/src/world/area_osr/osr_03/osr_03_2_npc.c @@ -26,7 +26,7 @@ NpcData N(NpcData_Kammy) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), 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 cd90bbbffe..b541945eb5 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 @@ -116,7 +116,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldKalmar_Talk, ANIM_WorldKalmar_Idle, 512, MSG_CH7_016F) - EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) @@ -183,7 +183,7 @@ NpcData N(NpcData_Kalmar) = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }; diff --git a/src/world/area_pra/pra_04/pra_04_4_npc.c b/src/world/area_pra/pra_04/pra_04_4_npc.c index 90c40dad30..4bb3b1ea92 100644 --- a/src/world/area_pra/pra_04/pra_04_4_npc.c +++ b/src/world/area_pra/pra_04/pra_04_4_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Swoopula) = { } }, .settings = &N(NpcSettings_Swoopula), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, }; 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 836e05a2c5..24711df220 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 @@ -140,12 +140,12 @@ EvtScript N(EVS_FocusCam_OnPlayer) = { EvtScript N(EVS_Imposter_Unmask) = { EVT_CALL(N(ChangeNpcCollisionRadius)) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, LVar3, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, LVar5) EVT_CALL(GetNpcPos, LVar3, LVar0, LVar1, LVar2) EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, LVar3, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, LVar4, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_SMOKE_BURST, 0) EVT_CALL(MakeLerp, 0, 2880, 40, EASING_QUADRATIC_OUT) @@ -237,7 +237,7 @@ EvtScript N(EVS_RevealEveryImposter) = { }; EvtScript N(EVS_Imposter_ChaseDownPlayer) = { - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, LVar3, ANIM_WorldBombette_Run) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 30) @@ -262,7 +262,7 @@ EvtScript N(EVS_Imposter_CarryPlayerBack) = { EvtScript N(EVS_Imposter_ReturnToStation) = { EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 20) EVT_CALL(SetNpcAnimation, LVar3, ANIM_WorldBombette_Idle) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpNpcYaw, LVar3, 90, 0) EVT_RETURN EVT_END @@ -398,7 +398,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(25) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 386, 0, 93) EVT_CALL(SetPanTarget, CAM_DEFAULT, 386, 0, 93) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) @@ -412,10 +412,10 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_SET(LVar1, 350) EVT_SET(LVar2, 150) EVT_SET(LVar3, 90) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ImposterFallFromCeiling)) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(5) EVT_THREAD @@ -423,10 +423,10 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_SET(LVar1, 280) EVT_SET(LVar2, 150) EVT_SET(LVar3, 100) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ImposterFallFromCeiling)) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(5) EVT_THREAD @@ -434,10 +434,10 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_SET(LVar1, 420) EVT_SET(LVar2, 150) EVT_SET(LVar3, 60) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ImposterFallFromCeiling)) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(5) EVT_THREAD @@ -445,20 +445,20 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_SET(LVar1, 385) EVT_SET(LVar2, 150) EVT_SET(LVar3, 120) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ImposterFallFromCeiling)) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_WAIT(5) EVT_SET(LVar0, NPC_Bombette_03) EVT_SET(LVar1, 315) EVT_SET(LVar2, 150) EVT_SET(LVar3, 55) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ImposterFallFromCeiling)) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(30) EVT_CALL(GetNpcPos, NPC_Bombette_01, LVar0, LVar1, LVar2) EVT_SETF(LVarA, EVT_FLOAT(3.0)) @@ -526,7 +526,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(GetNpcPos, NPC_Bombette_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_Bombette_01, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVarA) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_LE(LVarA, 180) @@ -535,7 +535,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_ADD(LVar0, -20) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Walk) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH7_014F) @@ -555,7 +555,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Idle) EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) @@ -644,7 +644,7 @@ EvtScript N(EVS_NpcDefeat_Duplighost_05) = { EVT_CALL(GetNpcPos, NPC_Bombette_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_Bombette_01, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) @@ -686,7 +686,7 @@ EvtScript N(EVS_NpcInteract_Bombette_05) = { EvtScript N(EVS_NpcInit_Duplighost_05) = { EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Duplighost_05))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_EXEC(N(EVS_ManageImpostersScene)) EVT_RETURN EVT_END @@ -695,7 +695,7 @@ EvtScript N(EVS_NpcInit_Duplighost_05) = { EvtScript N(EVS_NpcInit_Bombette_01) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bombette_01))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -703,7 +703,7 @@ EvtScript N(EVS_NpcInit_Bombette_01) = { EvtScript N(EVS_NpcInit_Bombette_02) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bombette_02))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -711,7 +711,7 @@ EvtScript N(EVS_NpcInit_Bombette_02) = { EvtScript N(EVS_NpcInit_Bombette_03) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bombette_03))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -719,7 +719,7 @@ EvtScript N(EVS_NpcInit_Bombette_03) = { EvtScript N(EVS_NpcInit_Bombette_04) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bombette_04))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -727,31 +727,31 @@ EvtScript N(EVS_NpcInit_Bombette_04) = { EvtScript N(EVS_NpcInit_Bombette_05) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bombette_05))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_Duplighost_01) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_Duplighost_02) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_Duplighost_03) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_Duplighost_04) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -816,7 +816,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_01), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -826,7 +826,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_02), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -836,7 +836,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_03), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -846,7 +846,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_04), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -856,7 +856,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_05), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -965,7 +965,7 @@ EvtScript N(EVS_NpcIdle_TargetBombette_05) = { EvtScript N(EVS_NpcInit_TargetBombette_01) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetBombette_01))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetBombette_01))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -973,7 +973,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_01) = { EvtScript N(EVS_NpcInit_TargetBombette_02) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetBombette_02))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetBombette_02))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -981,7 +981,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_02) = { EvtScript N(EVS_NpcInit_TargetBombette_03) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetBombette_03))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetBombette_03))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -989,7 +989,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_03) = { EvtScript N(EVS_NpcInit_TargetBombette_04) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetBombette_04))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetBombette_04))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -997,7 +997,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_04) = { EvtScript N(EVS_NpcInit_TargetBombette_05) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetBombette_05))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetBombette_05))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1009,7 +1009,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_01), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1019,7 +1019,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_02), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1029,7 +1029,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_03), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1039,7 +1039,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_04), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1049,7 +1049,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_05), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, diff --git a/src/world/area_pra/pra_10/pra_10_3_npc.c b/src/world/area_pra/pra_10/pra_10_3_npc.c index a83b97214f..e086856d10 100644 --- a/src/world/area_pra/pra_10/pra_10_3_npc.c +++ b/src/world/area_pra/pra_10/pra_10_3_npc.c @@ -26,7 +26,7 @@ NpcData N(NpcData_Swoopula_01) = { }, .init = &N(EVS_NpcInit_Swoopula), .settings = &N(NpcSettings_Swoopula), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, }; @@ -49,7 +49,7 @@ NpcData N(NpcData_Swoopula_02) = { }, .init = &N(EVS_NpcInit_Swoopula), .settings = &N(NpcSettings_Swoopula), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, }; 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 fe4bc0aa45..37627ac543 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 @@ -100,12 +100,12 @@ EvtScript N(EVS_Scene_ImpostersCaught) = { EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_Duplighost_01, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_01, SOUND_SMOKE_BURST, 0) - EVT_CALL(SetNpcFlagBits, NPC_Duplighost_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Duplighost_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar4, 2) EVT_CALL(SetNpcYaw, NPC_Duplighost_01, 90) EVT_EXEC_WAIT(N(EVS_ImposterSpin)) EVT_CALL(SetNpcAnimation, NPC_Duplighost_01, ANIM_Duplighost_Anim04) - EVT_CALL(SetNpcFlagBits, NPC_Duplighost_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Duplighost_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Duplighost_01, 430, -70, 15) EVT_END_THREAD EVT_THREAD @@ -114,13 +114,13 @@ EvtScript N(EVS_Scene_ImpostersCaught) = { EVT_CALL(SetNpcPos, NPC_FakeBombette, 389, 0, -61) EVT_CALL(SetNpcPos, NPC_Duplighost_02, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_Duplighost_02, SOUND_SMOKE_BURST, 0) - EVT_CALL(SetNpcFlagBits, NPC_FakeBombette, NPC_FLAG_100 | NPC_FLAG_1000000, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Duplighost_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_FakeBombette, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_HAS_NO_SPRITE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Duplighost_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_SET(LVar4, 3) EVT_CALL(SetNpcYaw, NPC_Duplighost_02, 90) EVT_EXEC_WAIT(N(EVS_ImposterSpin)) EVT_CALL(SetNpcAnimation, NPC_Duplighost_02, ANIM_Duplighost_Anim04) - EVT_CALL(SetNpcFlagBits, NPC_Duplighost_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Duplighost_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Duplighost_02, 420, -70, 15) EVT_END_THREAD EVT_WAIT(35) @@ -225,7 +225,7 @@ NpcData N(NpcData_FakeMario) = { .yaw = 90, .init = &N(EVS_NpcInit_FakeMario), .settings = &N(NpcSettings_Player), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }; @@ -237,7 +237,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeBombette), .settings = &N(NpcSettings_Player), - .flags = ENEMY_FLAG_4 | 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 = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -247,7 +247,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Duplighost_01), .settings = &N(NpcSettings_Player), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -257,7 +257,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Duplighost_02), .settings = &N(NpcSettings_Player), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, diff --git a/src/world/area_pra/pra_18/pra_18_3_npc.c b/src/world/area_pra/pra_18/pra_18_3_npc.c index 8e7e1891ec..4c86d2a796 100644 --- a/src/world/area_pra/pra_18/pra_18_3_npc.c +++ b/src/world/area_pra/pra_18/pra_18_3_npc.c @@ -339,7 +339,7 @@ NpcData N(NpcData_Clubba_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_01), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -349,7 +349,7 @@ NpcData N(NpcData_Clubba_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_01_Aux), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -362,7 +362,7 @@ NpcData N(NpcData_Clubba_02)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_02), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -372,7 +372,7 @@ NpcData N(NpcData_Clubba_02)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_02_Aux), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -385,7 +385,7 @@ NpcData N(NpcData_Clubba_03)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_03), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -395,7 +395,7 @@ NpcData N(NpcData_Clubba_03)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_03_Aux), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, 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 1d66202e7a..1a7bb35863 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 @@ -250,12 +250,12 @@ EvtScript N(EVS_FocusCam_OnPlayer) = { EvtScript N(EVS_Imposter_Unmask) = { EVT_CALL(N(ChangeNpcCollisionRadius)) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, LVar3, LVar6, LVar7, 0, LVar5) EVT_CALL(GetNpcPos, LVar3, LVar0, LVar1, LVar2) EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, LVar3, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, LVar4, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_SMOKE_BURST, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 8 * 360, 40, EASING_QUADRATIC_OUT) @@ -343,7 +343,7 @@ EvtScript N(EVS_RevealEveryImposter) = { }; EvtScript N(EVS_Imposter_ChaseDownPlayer) = { - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, LVar3, LVar4) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 30) @@ -368,7 +368,7 @@ EvtScript N(EVS_Imposter_CarryPlayerBack) = { EvtScript N(EVS_Imposter_ReturnToStation) = { EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 20) EVT_CALL(SetNpcAnimation, LVar3, LVar4) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpNpcYaw, LVar3, 90, 0) EVT_RETURN EVT_END @@ -544,11 +544,11 @@ EvtScript N(EVS_Example_UseKooper) = { EvtScript N(EVS_Imposter_BurstFromWall) = { EVT_CALL(SetNpcPos, LVar3, 533, 0, 77) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, LVar3, EVT_FLOAT(6.0)) EVT_CALL(SetNpcAnimation, LVar3, LVar4) EVT_CALL(NpcMoveTo, LVar3, LVar0, LVar2, 0) - EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, LVar3, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, LVar3, LVar5) EVT_CALL(InterpNpcYaw, LVar3, 90, 0) EVT_RETURN @@ -621,7 +621,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_IF_LT(LVar3, LVar0) EVT_GOTO(21) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) @@ -758,7 +758,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_FakeKooper, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVarA) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_LE(LVarA, 180) @@ -767,12 +767,12 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_ADD(LVar0, -50) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldKooper_Walk) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldKooper_Idle) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0166) EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) @@ -871,7 +871,7 @@ EvtScript N(EVS_Scene_DefeatMiniboss) = { EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_FakeKooper, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) @@ -913,7 +913,7 @@ EvtScript N(EVS_NpcInteract_FakeKolorado) = { EvtScript N(EVS_NpcInit_Duplighost_Controller) = { EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_Scene_DefeatMiniboss))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_EXEC(N(EVS_ManageImpostersScene)) EVT_RETURN EVT_END @@ -922,7 +922,7 @@ EvtScript N(EVS_NpcInit_Duplighost_Controller) = { EvtScript N(EVS_NpcInit_FakeKooper) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeKooper))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -930,7 +930,7 @@ EvtScript N(EVS_NpcInit_FakeKooper) = { EvtScript N(EVS_NpcInit_FakeGoompa) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeGoompa))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -938,7 +938,7 @@ EvtScript N(EVS_NpcInit_FakeGoompa) = { EvtScript N(EVS_NpcInit_FakeLuigi) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeLuigi))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -946,7 +946,7 @@ EvtScript N(EVS_NpcInit_FakeLuigi) = { EvtScript N(EVS_NpcInit_FakeKoopaKoot) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeKoopaKoot))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; @@ -954,13 +954,13 @@ EvtScript N(EVS_NpcInit_FakeKoopaKoot) = { EvtScript N(EVS_NpcInit_FakeKolorado) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FakeKolorado))) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_ExamplePlayer) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mario_10002) EVT_MALLOC_ARRAY(16, LVarA) EVT_CALL(N(CreateExamplePlayerRenderer)) @@ -969,7 +969,7 @@ EvtScript N(EVS_NpcInit_ExamplePlayer) = { }; EvtScript N(EVS_NpcInit_ExampleKooper) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1150,7 +1150,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ExamplePlayer), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1178,7 +1178,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ExampleKooper), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1208,7 +1208,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Goompa), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1236,7 +1236,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Luigi), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1264,7 +1264,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_KoopaKoot), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1292,7 +1292,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Kolorado), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1320,7 +1320,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Controller), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1447,7 +1447,7 @@ EvtScript N(EVS_NpcHit_TargetKolorado) = { EvtScript N(EVS_NpcInit_TargetKooper) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetKooper))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetKooper))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1455,7 +1455,7 @@ EvtScript N(EVS_NpcInit_TargetKooper) = { EvtScript N(EVS_NpcInit_TargetGoompa) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetGoompa))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetGoompa))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1463,7 +1463,7 @@ EvtScript N(EVS_NpcInit_TargetGoompa) = { EvtScript N(EVS_NpcInit_TargetLuigi) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetLuigi))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetLuigi))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1471,7 +1471,7 @@ EvtScript N(EVS_NpcInit_TargetLuigi) = { EvtScript N(EVS_NpcInit_TargetKoopaKoot) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetKoopaKoot))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetKoopaKoot))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1479,7 +1479,7 @@ EvtScript N(EVS_NpcInit_TargetKoopaKoot) = { EvtScript N(EVS_NpcInit_TargetKolorado) = { EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TargetKolorado))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TargetKolorado))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_RETURN EVT_END }; @@ -1491,7 +1491,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetKooper), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1518,7 +1518,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetGoompa), .settings = &N(NpcSettings_Goompa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, @@ -1546,7 +1546,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetLuigi), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi), @@ -1557,7 +1557,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetKoopaKoot), .settings = &N(NpcSettings_KoopaKoot), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaKoot_Idle, @@ -1585,7 +1585,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetKolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), 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 0bb878a440..9e1a30a784 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 @@ -219,7 +219,7 @@ EvtScript N(EVS_NpcInit_CrystalKing) = { EVT_EXEC(N(EVS_RespawnStarCard)) EVT_CASE_GT(STORY_CH7_DEFEATED_CRYSTAL_KING) EVT_END_SWITCH - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) EVT_CALL(SetNpcYaw, NPC_CrystalKing_01, 270) EVT_RETURN @@ -243,7 +243,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .yaw = 90, .init = &N(EVS_NpcInit_CrystalKing_Aux), .settings = &N(NpcSettings_CrystalKing), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, @@ -252,7 +252,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_CrystalKing), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, @@ -262,7 +262,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, @@ -272,7 +272,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .yaw = 90, .init = &N(EVS_NpcInit_CrystalKing), .settings = &N(NpcSettings_CrystalKing), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, diff --git a/src/world/area_pra/pra_35/pra_35_3_npc.c b/src/world/area_pra/pra_35/pra_35_3_npc.c index cf1dfd64d7..6d82517ccd 100644 --- a/src/world/area_pra/pra_35/pra_35_3_npc.c +++ b/src/world/area_pra/pra_35/pra_35_3_npc.c @@ -33,7 +33,7 @@ NpcData N(NpcData_Clubba)[] = { }, .init = &N(EVS_NpcInit_EnableReflection), .settings = &N(NpcSettings_FrostClubba_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -61,7 +61,7 @@ NpcData N(NpcData_Duplighost) = { }, .init = &N(EVS_NpcInit_EnableReflection), .settings = &N(NpcSettings_Duplighost_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = DUPLIGHOST_DROPS, .animations = DUPLIGHOST_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_pra/pra_36/pra_36_3_npc.c b/src/world/area_pra/pra_36/pra_36_3_npc.c index bdedc55b96..0d4f5d5ef1 100644 --- a/src/world/area_pra/pra_36/pra_36_3_npc.c +++ b/src/world/area_pra/pra_36/pra_36_3_npc.c @@ -26,7 +26,7 @@ NpcData N(NpcData_Duplighost) = { }, .init = &N(EVS_NpcInit_Duplighost), .settings = &N(NpcSettings_Duplighost_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = DUPLIGHOST_DROPS, .animations = DUPLIGHOST_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_pra/pra_37/pra_37_3_npc.c b/src/world/area_pra/pra_37/pra_37_3_npc.c index cb5d48f481..0f632b5311 100644 --- a/src/world/area_pra/pra_37/pra_37_3_npc.c +++ b/src/world/area_pra/pra_37/pra_37_3_npc.c @@ -28,7 +28,7 @@ NpcData N(NpcData_FrostClubba)[] = { }, .init = &N(EVS_NpcInit_FrostClubba), .settings = &N(NpcSettings_FrostClubba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_pra/pra_38/pra_38_3_npc.c b/src/world/area_pra/pra_38/pra_38_3_npc.c index 528b65e70b..6661e9e5ae 100644 --- a/src/world/area_pra/pra_38/pra_38_3_npc.c +++ b/src/world/area_pra/pra_38/pra_38_3_npc.c @@ -26,7 +26,7 @@ NpcData N(NpcData_Swoopula_01) = { }, .init = &N(EVS_NpcInit_Swoopula), .settings = &N(NpcSettings_Swoopula), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -50,7 +50,7 @@ NpcData N(NpcData_Swoopula_02) = { }, .init = &N(EVS_NpcInit_Swoopula), .settings = &N(NpcSettings_Swoopula), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_pra/pra_39/pra_39_3_npc.c b/src/world/area_pra/pra_39/pra_39_3_npc.c index 889cdde17c..b9d8c8c465 100644 --- a/src/world/area_pra/pra_39/pra_39_3_npc.c +++ b/src/world/area_pra/pra_39/pra_39_3_npc.c @@ -27,7 +27,7 @@ NpcData N(NpcData_Duplighost) = { }, .init = &N(EVS_NpcInit_Duplighost), .settings = &N(NpcSettings_Duplighost_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = DUPLIGHOST_DROPS, .animations = DUPLIGHOST_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_sam/sam_01/sam_01_2_main.c b/src/world/area_sam/sam_01/sam_01_2_main.c index 4651b1c491..5de4c5fd6c 100644 --- a/src/world/area_sam/sam_01/sam_01_2_main.c +++ b/src/world/area_sam/sam_01/sam_01_2_main.c @@ -51,7 +51,7 @@ EvtScript N(EVS_SetupHerringway) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_Walk) EVT_CALL(NpcMoveTo, NPC_Herringway, -265, 275, 20) EVT_EXEC(N(EVS_OpenAndCloseMayorsDoor)) @@ -62,7 +62,7 @@ EvtScript N(EVS_SetupHerringway) = { EVT_CALL(NpcMoveTo, NPC_Herringway, -228, 91, 20) EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Herringway_Idle) EVT_CALL(InterpNpcYaw, NPC_Herringway, 270, 0) - EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_SET(GB_StoryProgress, STORY_CH7_HERRINGWAY_AT_MAYORS_HOUSE) EVT_CALL(BindNpcInteract, NPC_Herringway, EVT_PTR(N(EVS_NpcInteract_Herringway))) diff --git a/src/world/area_sam/sam_01/sam_01_3_rooms.c b/src/world/area_sam/sam_01/sam_01_3_rooms.c index 1ca865b4b9..5b0700ee46 100644 --- a/src/world/area_sam/sam_01/sam_01_3_rooms.c +++ b/src/world/area_sam/sam_01/sam_01_3_rooms.c @@ -78,13 +78,13 @@ EvtScript N(EVS_RoomListener_MayorOffice) = { EVT_IF_EQ(GB_StoryProgress, STORY_CH7_HERRINGWAY_AT_MAYORS_HOUSE) EVT_THREAD EVT_CALL(BindNpcInteract, NPC_Herringway, 0) - EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Penguin_Walk) EVT_CALL(SetNpcSpeed, NPC_Herringway, EVT_FLOAT(1.5)) EVT_CALL(NpcMoveTo, NPC_Herringway, -252, -55, 0) EVT_CALL(SetNpcAnimation, NPC_Herringway, ANIM_Penguin_Idle) - EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcInteract, NPC_Herringway, EVT_PTR(N(EVS_NpcInteract_Herringway))) EVT_END_THREAD EVT_END_IF 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 4b1c5a17da..d71f569bae 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 @@ -108,7 +108,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = { EVT_SET(MV_PlayerLeftOfMayor, 1) EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_003A) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MayorPenguin_Walk) EVT_CALL(NpcMoveTo, NPC_SELF, -338, -247, 20) EVT_CALL(PlaySoundAtCollider, COLLIDER_yana, SOUND_1CF, 0) @@ -159,7 +159,7 @@ EvtScript N(EVS_NpcInteract_MayorPenguin) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_003D) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_SET(GB_StoryProgress, STORY_CH7_GOT_SNOWMAN_BUCKET) EVT_CASE_LT(STORY_CH7_UNLOCKED_SHIVER_MOUNTAIN) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_003E) @@ -384,10 +384,10 @@ EvtScript N(EVS_NpcInteract_Penguin_04) = { }; EvtScript N(EVS_PenguinCrowd_Leave) = { - EVT_CALL(SetNpcFlagBits, NPC_Penguin_05, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Penguin_06, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Penguin_07, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Penguin_08, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Penguin_05, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Penguin_06, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Penguin_07, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Penguin_08, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(BindNpcInteract, NPC_Penguin_05, 0) EVT_CALL(BindNpcInteract, NPC_Penguin_06, 0) EVT_CALL(BindNpcInteract, NPC_Penguin_07, 0) @@ -527,7 +527,7 @@ EvtScript N(EVS_NpcInit_PenguinPatrol) = { EvtScript N(EVS_NpcInit_Herringway) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH7_SPOKE_WITH_HERRINGWAY) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CASE_LT(STORY_CH7_HERRINGWAY_AT_MAYORS_HOUSE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -537,7 +537,7 @@ EvtScript N(EVS_NpcInit_Herringway) = { EVT_CALL(SetNpcPos, NPC_SELF, -228, 0, 91) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) EVT_CASE_GE(STORY_CH7_MAYOR_MURDER_SOLVED) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_END_SWITCH EVT_RETURN @@ -618,7 +618,7 @@ EvtScript N(EVS_NpcInit_Penguin_08) = { EvtScript N(EVS_NpcInit_Penguin_09) = { EVT_IF_LT(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_SOLVED) - EVT_CALL(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_Penguin_09, FALSE) EVT_CALL(SetNpcPos, NPC_Penguin_09, -325, 0, -240) EVT_END_IF @@ -633,7 +633,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorPenguin), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .tattle = MSG_NpcTattle_MayorPenguin, @@ -644,7 +644,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorDummy), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .tattle = MSG_NpcTattle_MayorPenguin, @@ -655,7 +655,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorPenguinWife), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, .tattle = MSG_NpcTattle_MayorPenguinWife, @@ -700,7 +700,7 @@ NpcData N(NpcData_MayorPenguin)[] = { }, .init = &N(EVS_NpcInit_Penguin_01), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GossipPenguin, @@ -723,7 +723,7 @@ NpcData N(NpcData_MayorPenguin)[] = { }, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_FriendlyPenguin, @@ -746,7 +746,7 @@ NpcData N(NpcData_MayorPenguin)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_CheerfulPenguin, @@ -757,7 +757,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_04), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, @@ -771,7 +771,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Penguin_05), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_RumorLovingPenguins, @@ -782,7 +782,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Penguin_06), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NotAdventurous, @@ -793,7 +793,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Penguin_07), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, @@ -804,7 +804,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_08), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, @@ -829,7 +829,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_01 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, 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 169be0fda7..05ecafd3c7 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 @@ -75,8 +75,8 @@ EvtScript N(EVS_CloseMayorsOfficeDoor) = { EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(InterruptUsePartner) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguinWife, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguinWife, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -329,8 +329,8 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(InterpNpcYaw, NPC_Penguin_07, 180, 0) EVT_CALL(SetNpcPos, NPC_Penguin_08, -120, 0, 30) EVT_CALL(InterpNpcYaw, NPC_Penguin_08, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguinWife, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguinWife, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_SET(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_MYSTERY) EVT_SET(GB_SAM11_FrozenPondDamage, 0) @@ -572,10 +572,10 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_MayorPenguin, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Walk) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_MayorPenguin, -320, -258, 0) EVT_CALL(InterpNpcYaw, NPC_MayorPenguin, 180, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) @@ -626,7 +626,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToNpc, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, NPC_Herringway, MSG_CH7_002D) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Give) @@ -655,7 +655,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(SetNpcSpeed, NPC_MayorPenguin, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Walk) EVT_CALL(NpcMoveTo, NPC_MayorPenguin, -249, -109, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) @@ -673,13 +673,13 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -210, -80, 0) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -250, -10, 0) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_EXEC_WAIT(N(EVS_OpenMayorsOfficeDoor)) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -250, 50, 0) @@ -711,10 +711,10 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_WAIT(1) EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0034) - EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, NPC_PenguinPatrol, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_Herringway, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Herringway, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(EnableNpcShadow, NPC_Herringway, FALSE) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) 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 24eebbe34d..50b6a2f401 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 @@ -410,7 +410,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_04), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_CorroboratesRumors, @@ -433,7 +433,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_05), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_EasyGoing, @@ -456,7 +456,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_06), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NeverLeavesTown, @@ -467,7 +467,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_07), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_VisitedTheDojo, @@ -481,7 +481,7 @@ NpcData N(NpcData_MysteryOnly)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_RumorLovingPenguins, @@ -504,7 +504,7 @@ NpcData N(NpcData_MysteryOnly)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NotAdventurous, @@ -518,7 +518,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_02 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_sam/sam_03/sam_03_3_npc1.c b/src/world/area_sam/sam_03/sam_03_3_npc1.c index 753f7c4901..f649292896 100644 --- a/src/world/area_sam/sam_03/sam_03_3_npc1.c +++ b/src/world/area_sam/sam_03/sam_03_3_npc1.c @@ -110,7 +110,7 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = { EVT_CALL(SetNpcPos, NPC_JrTroopa_Hitbox, LVar0, LVar1, LVar2) EVT_CALL(SetNpcCollisionSize, NPC_JrTroopa, 26, 24) EVT_CALL(SetNpcCollisionSize, NPC_JrTroopa_Hitbox, 26, 24) - EVT_CALL(SetNpcFlagBits, NPC_JrTroopa_Hitbox, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_JrTroopa_Hitbox, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_JrTroopa))) EVT_CALL(BindNpcHit, NPC_JrTroopa_Hitbox, EVT_PTR(N(EVS_NpcHit_JrTroopaHitbox))) EVT_EXEC(N(EVS_SetupMusic)) @@ -151,7 +151,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, @@ -162,7 +162,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopaHitbox), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, diff --git a/src/world/area_sam/sam_03/sam_03_4_npc2.c b/src/world/area_sam/sam_03/sam_03_4_npc2.c index b3b51d1a47..74c4ef5c5c 100644 --- a/src/world/area_sam/sam_03/sam_03_4_npc2.c +++ b/src/world/area_sam/sam_03/sam_03_4_npc2.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Gulpit_01)[] = { } }, .settings = &N(NpcSettings_Gulpit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .extraAnimations = N(ExtraAnims_Gulpit), @@ -47,7 +47,7 @@ NpcData N(NpcData_Gulpit_02)[] = { } }, .settings = &N(NpcSettings_Gulpit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .extraAnimations = N(ExtraAnims_Gulpit), diff --git a/src/world/area_sam/sam_04/sam_04_3_snowmen.c b/src/world/area_sam/sam_04/sam_04_3_snowmen.c index 89b866341b..be5b00838c 100644 --- a/src/world/area_sam/sam_04/sam_04_3_snowmen.c +++ b/src/world/area_sam/sam_04/sam_04_3_snowmen.c @@ -153,12 +153,12 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_011D, 160, 40) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_01, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_02, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_03, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_04, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_05, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_06, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_05, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_06, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_WAIT(1) EVT_THREAD EVT_WAIT(22) @@ -306,12 +306,12 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o78) EVT_CALL(UpdateColliderTransform, COLLIDER_o79) EVT_CALL(UpdateColliderTransform, COLLIDER_o80) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_01, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_02, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_03, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_04, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_05, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Snowman_06, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_05, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Snowman_06, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcInteract, NPC_Snowman_01, NULL) EVT_CALL(BindNpcInteract, NPC_Snowman_02, NULL) EVT_CALL(BindNpcInteract, NPC_Snowman_03, NULL) 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 5d7eae2446..3fd50996d4 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 @@ -161,7 +161,7 @@ EvtScript N(EVS_NpcInit_Snowman_01) = { EVT_END_IF EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Snowman_01))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Snowman_01))) -EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) +EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -170,7 +170,7 @@ EVT_END EvtScript N(EVS_NpcInit_Snowman_02) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Snowman_02))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Snowman_02))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -179,7 +179,7 @@ EvtScript N(EVS_NpcInit_Snowman_02) = { EvtScript N(EVS_NpcInit_Snowman_03) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Snowman_03))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Snowman_03))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -188,7 +188,7 @@ EvtScript N(EVS_NpcInit_Snowman_03) = { EvtScript N(EVS_NpcInit_Snowman_04) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Snowman_04))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Snowman_04))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -197,7 +197,7 @@ EvtScript N(EVS_NpcInit_Snowman_04) = { EvtScript N(EVS_NpcInit_Snowman_05) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Snowman_05))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Snowman_05))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -206,14 +206,14 @@ EvtScript N(EVS_NpcInit_Snowman_05) = { EvtScript N(EVS_NpcInit_Snowman_06) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Snowman_06))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Snowman_06))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_Dummy) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END @@ -294,7 +294,7 @@ NpcData N(NpcData_Dummy) = { .yaw = 0, .init = &N(EVS_NpcInit_Dummy), .settings = &N(NpcSettings_Snowman), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }; diff --git a/src/world/area_sam/sam_05/sam_05_4_npc.c b/src/world/area_sam/sam_05/sam_05_4_npc.c index c333f8cb1f..c47e2c1dfa 100644 --- a/src/world/area_sam/sam_05/sam_05_4_npc.c +++ b/src/world/area_sam/sam_05/sam_05_4_npc.c @@ -168,7 +168,7 @@ NpcData N(NpcData_Monstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Monstar), .settings = &N(NpcSettings_Monstar), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = { .idle = ANIM_Monstar_Idle1, @@ -206,7 +206,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -217,7 +217,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -228,7 +228,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -239,7 +239,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -250,7 +250,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -261,7 +261,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -272,7 +272,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -283,7 +283,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -294,7 +294,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -305,7 +305,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -316,7 +316,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -327,7 +327,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -338,7 +338,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -349,7 +349,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -360,7 +360,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -371,7 +371,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -396,7 +396,7 @@ NpcData N(NpcData_Gulpit)[] = { } }, .settings = &N(NpcSettings_Gulpit), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .extraAnimations = N(ExtraAnims_Gulpit), @@ -423,7 +423,7 @@ NpcData N(NpcData_FrostPiranha_01)[] = { } }, .settings = &N(NpcSettings_FrostPiranha), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .extraAnimations = N(ExtraAnims_FrostPiranha), @@ -450,7 +450,7 @@ NpcData N(NpcData_FrostPiranha_02)[] = { } }, .settings = &N(NpcSettings_FrostPiranha), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .extraAnimations = N(ExtraAnims_FrostPiranha), 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 cfa02a86eb..649b957f7e 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 @@ -196,7 +196,7 @@ EvtScript N(EVS_Scene_Merle_Greeting) = { EVT_SET(MF_MerleReady, FALSE) EVT_THREAD EVT_CALL(BindNpcInteract, NPC_Merle, 0) - EVT_CALL(SetNpcFlagBits, NPC_Merle, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Merle, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk) EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_Merle, -78, 287, 0) @@ -446,7 +446,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(BindNpcInteract, NPC_Merle, EVT_PTR(N(EVS_NpcInteract_Merle))) - EVT_CALL(SetNpcFlagBits, NPC_Merle, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Merle, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -922,7 +922,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ShiverToad_01), .settings = &N(NpcSettings_ShiverToad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Red_Idle, @@ -962,7 +962,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_ShiverToad_02), .settings = &N(NpcSettings_ShiverToad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Blue_Idle, @@ -990,7 +990,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShiverToad_03), .settings = &N(NpcSettings_ShiverToad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, @@ -1030,7 +1030,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_Ninji_01), .settings = &N(NpcSettings_Ninji_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1070,7 +1070,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_Ninji_02), .settings = &N(NpcSettings_Ninji_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1098,7 +1098,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Ninji_03), .settings = &N(NpcSettings_Ninji_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1126,7 +1126,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Ninji_04), .settings = &N(NpcSettings_Ninji_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1232,7 +1232,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShiverToad_04), .settings = &N(NpcSettings_ShiverToad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Red_Idle, diff --git a/src/world/area_sam/sam_07/sam_07_5_npc.c b/src/world/area_sam/sam_07/sam_07_5_npc.c index 887e3660d7..499e966560 100644 --- a/src/world/area_sam/sam_07/sam_07_5_npc.c +++ b/src/world/area_sam/sam_07/sam_07_5_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Gulpit)[] = { } }, .settings = &N(NpcSettings_Gulpit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -47,7 +47,7 @@ NpcData N(NpcData_FrostPiranha_01)[] = { } }, .settings = &N(NpcSettings_FrostPiranha), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -73,7 +73,7 @@ NpcData N(NpcData_FrostPiranha_02)[] = { } }, .settings = &N(NpcSettings_FrostPiranha), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 a092d73af9..932a9b3697 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 @@ -65,7 +65,7 @@ EvtScript N(EVS_NpcDefeat_Duplighost) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) - EVT_CALL(SetNpcFlagBits, NPC_Duplighost, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Duplighost, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_Duplighost, EVT_FLOAT(3.0)) EVT_CALL(SetNpcJumpscale, NPC_Duplighost, EVT_FLOAT(1.5)) EVT_CALL(SetNpcAnimation, NPC_Duplighost, ANIM_Duplighost_Anim04) @@ -218,7 +218,7 @@ EvtScript N(EVS_NpcIdle_TrueKooperB) = { }; EvtScript N(EVS_NpcInit_TrueKooperB) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_PASSIVE, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TrueKooperB))) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_TrueKooperB))) @@ -240,7 +240,7 @@ EvtScript N(EVS_NpcIdle_FakeKooperB) = { }; EvtScript N(EVS_NpcInit_FakeKooperB) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_PASSIVE, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_FakeKooperB))) EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_FakeKooperB))) @@ -258,7 +258,7 @@ NpcData N(NpcData_Hittable)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrueKooperB), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -285,7 +285,7 @@ NpcData N(NpcData_Hittable)[] = { .yaw = 0, .init = &N(EVS_NpcInit_FakeKooperB), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -326,7 +326,7 @@ NpcData N(NpcData_FrostClubba)[] = { } }, .settings = &N(NpcSettings_FrostClubba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 491259b0d5..ece6b3f035 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 @@ -55,9 +55,9 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar2, LVar3, LVar4) EVT_CALL(GetPlayerPos, LVar5, LVar6, LVar7) @@ -87,7 +87,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_WAIT(70) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Idle) EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Idle) EVT_CALL(InterpNpcYaw, NPC_Kooper_01A, 270, 0) @@ -184,8 +184,8 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_0128) EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE) EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_0129) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_UNBIND @@ -266,8 +266,8 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Kooper_02A, ANIM_WorldKooper_TalkHappy, ANIM_WorldKooper_Idle, 0, MSG_CH7_012F) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Kooper_02A, LVar3, LVar4, LVar5) EVT_CALL(GetAngleBetweenNPCs, NPC_Kooper_01A, NPC_Kooper_02A, LVar9) @@ -492,8 +492,8 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { EVT_CALL(PlayerFaceNpc, NPC_Kooper_01A, FALSE) EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_0129) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_02A, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_RETURN @@ -539,7 +539,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = { EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(40.0), LVar0) EVT_CALL(SetNpcSpeed, NPC_Kooper_01A, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Run) - EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper_01A, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Kooper_01A, LVar1, LVar3, 0) EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Idle) EVT_SET(MF_KooperDoneMoving, TRUE) @@ -565,7 +565,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(GetNpcYaw, NPC_Kooper_01A, LVar0) EVT_CALL(SetNpcYaw, NPC_PARTNER, LVar0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2 | NPC_FLAG_4, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE | NPC_FLAG_INACTIVE, FALSE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) EVT_CALL(EnablePartnerAI) EVT_CALL(SetNpcVar, NPC_Duplighost, 0, 1) diff --git a/src/world/area_sam/sam_10/sam_10_5_npc.c b/src/world/area_sam/sam_10/sam_10_5_npc.c index 5ffea95c99..10a6adaab4 100644 --- a/src/world/area_sam/sam_10/sam_10_5_npc.c +++ b/src/world/area_sam/sam_10/sam_10_5_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Clubba)[] = { } }, .settings = &N(NpcSettings_FrostClubba_Wander), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, 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 dfe57ada33..a6993b6f42 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 @@ -186,12 +186,12 @@ EvtScript N(EVS_NpcInteract_Herringway) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Herringway_Walk) EVT_CALL(NpcMoveTo, NPC_SELF, -235, -355, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Herringway_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00D1) EVT_WAIT(15) @@ -458,7 +458,7 @@ EvtScript N(EVS_NpcInit_Herringway) = { EVT_CASE_LT(STORY_CH7_SPOKE_WITH_HERRINGWAY) EVT_CALL(SetNpcPos, NPC_SELF, -110, 150, -323) EVT_CASE_LT(STORY_CH7_MAYOR_MURDER_SOLVED) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CASE_GE(STORY_CH7_MAYOR_MURDER_SOLVED) EVT_CALL(SetNpcPos, NPC_SELF, -110, 150, -323) @@ -548,7 +548,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_PenguinPatrol), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_PATROL_ANIMS, .tattle = MSG_NpcTattle_SAM_Patrol, @@ -592,7 +592,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_05), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_HerringwayLoiterer, @@ -615,7 +615,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_06), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_TimidPenguin, @@ -641,7 +641,7 @@ NpcData N(NpcData_PondPenginsBefore)[] = { }, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_SnowMaster, @@ -664,7 +664,7 @@ NpcData N(NpcData_PondPenginsBefore)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Skater, @@ -690,7 +690,7 @@ NpcData N(NpcData_PondPenginsAfter)[] = { }, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_SnowMaster, @@ -713,7 +713,7 @@ NpcData N(NpcData_PondPenginsAfter)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Skater, @@ -727,7 +727,7 @@ NpcData N(NpcData_Tourists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -738,7 +738,7 @@ NpcData N(NpcData_Tourists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -749,7 +749,7 @@ NpcData N(NpcData_Tourists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, @@ -958,11 +958,11 @@ EvtScript N(EVS_NpcInit_Kolorado) = { EVT_CALL(SetNpcPos, NPC_Kolorado, 120, 0, 70) EVT_CALL(SetNpcPos, NPC_Archeologist_01, 120, 0, 70) EVT_CALL(SetNpcPos, NPC_Archeologist_02, 120, 0, 70) - EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Archeologist_01, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Archeologist_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Archeologist_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Archeologist_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_GRAVITY, FALSE) @@ -988,7 +988,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, }, @@ -998,7 +998,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, }, @@ -1008,7 +1008,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, }, @@ -1018,7 +1018,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1045,7 +1045,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, @@ -1075,7 +1075,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_11 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/sam_11_6_pond.c index 921646412d..4969802dd9 100644 --- a/src/world/area_sam/sam_11/sam_11_6_pond.c +++ b/src/world/area_sam/sam_11/sam_11_6_pond.c @@ -78,7 +78,7 @@ API_CALLABLE(N(GetBombetteExplodeGround)) { if (npc_raycast_down_around(partner->collisionChannel, &x, &y, &z, &depth, partner->yaw, partner->collisionRadius) && depth <= 12.0f) { - colliderID = D_8010C978; + colliderID = NpcHitQueryColliderID; } } evt_set_variable(script, *args++, colliderID); @@ -139,7 +139,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_389, 0) EVT_CALL(EnableModel, MODEL_ice01, FALSE) EVT_CALL(EnableModel, MODEL_ice02, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Run) EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar7, LVar8, LVar9) EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(9.0)) @@ -153,7 +153,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -207, 110, 0) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar7, LVar9, 0) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100 | NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_CASE_EQ(2) EVT_CALL(DisablePlayerInput, TRUE) @@ -165,7 +165,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_WAIT(10) EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_397, 0) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Run) EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar7, LVar8, LVar9) EVT_CALL(SetNpcSpeed, NPC_PenguinPatrol, EVT_FLOAT(9.0)) @@ -177,7 +177,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) EVT_CALL(PlayerFaceNpc, NPC_PenguinPatrol, FALSE) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_00B7) - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) @@ -227,7 +227,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(PlayerJump1, -680, 50, 0, 30) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) - EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_100 | NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, FALSE) EVT_WAIT(15) EVT_SET(GB_SAM11_FrozenPondDamage, 0) EVT_CALL(GotoMap, EVT_PTR("sam_02"), sam_02_ENTRY_3) diff --git a/src/world/area_sam/sam_12/sam_12_3_npc.c b/src/world/area_sam/sam_12/sam_12_3_npc.c index 7e3269c3e3..1b7d65c687 100644 --- a/src/world/area_sam/sam_12/sam_12_3_npc.c +++ b/src/world/area_sam/sam_12/sam_12_3_npc.c @@ -16,7 +16,7 @@ NpcData N(NpcData_Merlar) = { .yaw = 180, .init = &N(EVS_NpcInit_Merlar), .settings = &N(NpcSettings_Merlar), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = MERLAR_ANIMS, }; diff --git a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c index 49f64dfa77..6b5d5806b4 100644 --- a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c +++ b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, 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 96e8ebe840..297647c306 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 @@ -121,7 +121,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00ED) - EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) @@ -257,7 +257,7 @@ NpcData N(NpcData_Mamar) = { .yaw = 0, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }; @@ -268,7 +268,7 @@ NpcData N(NpcData_TradingToad) = { .yaw = 90, .init = &N(EVS_NpcInit_TradingToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, diff --git a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c index b9acd25ac3..e722f22080 100644 --- a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c +++ b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -65,7 +65,7 @@ NpcData N(NpcData_Pokey_03) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -88,7 +88,7 @@ NpcData N(NpcData_Pokey_04) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c index 0f998cc57e..395758593c 100644 --- a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c +++ b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c index b469fc7969..079de1c2d2 100644 --- a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c +++ b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -65,7 +65,7 @@ NpcData N(NpcData_Pokey_03) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -88,7 +88,7 @@ NpcData N(NpcData_Pokey_04) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -111,7 +111,7 @@ NpcData N(NpcData_Pokey_05) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -134,7 +134,7 @@ NpcData N(NpcData_Pokey_06) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -157,7 +157,7 @@ NpcData N(NpcData_Pokey_07) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -180,7 +180,7 @@ NpcData N(NpcData_Pokey_08) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -203,7 +203,7 @@ NpcData N(NpcData_Pokey_09) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -226,7 +226,7 @@ NpcData N(NpcData_Pokey_10) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c index ddfba33bc2..22d22ebf29 100644 --- a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c +++ b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c index 9b033c8750..8f27035916 100644 --- a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c +++ b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c index f19f45c00f..65e0d45315 100644 --- a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c +++ b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -65,7 +65,7 @@ NpcData N(NpcData_Pokey_03) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c index 3c70183ac7..bb7b5d223f 100644 --- a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c +++ b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -66,7 +66,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c index c77e2142f0..7442ff8da4 100644 --- a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c +++ b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c index 8ba5957c01..e0e0b17e58 100644 --- a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c +++ b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c index 16715ab855..4ababe7472 100644 --- a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c +++ b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit_01) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Bandit_02) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c index 6fdf8be248..6d9ec4692d 100644 --- a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c +++ b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c @@ -43,7 +43,7 @@ NpcData N(NpcData_Pokey) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c index c3a8c4f20e..823d0d4ab2 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c +++ b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c @@ -300,7 +300,7 @@ NpcData N(NpcData_Archeologist_02)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_SBK_Kolorado, @@ -323,7 +323,7 @@ NpcData N(NpcData_Archeologist_02)[] = { }, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Archeologist_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, .tattle = MSG_NpcTattle_SBK_ExcavatorA, @@ -346,7 +346,7 @@ NpcData N(NpcData_Archeologist_02)[] = { }, .init = &N(EVS_NpcInit_Archeologist_02), .settings = &N(NpcSettings_Archeologist_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, .tattle = MSG_NpcTattle_SBK_ExcavatorB, diff --git a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c index b85db5625c..4398f63f7f 100644 --- a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c +++ b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c index 640fc457c4..d6ada24938 100644 --- a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c +++ b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -66,7 +66,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c index 7a3a77562a..953dfe2fc9 100644 --- a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c +++ b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c @@ -84,7 +84,7 @@ NpcData N(NpcData_Nomadimouse)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Nomadimouse), .settings = &N(NpcSettings_Nomadimouse), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Nomadimouse_Idle, @@ -112,7 +112,7 @@ NpcData N(NpcData_Nomadimouse)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Sack), .settings = &N(NpcSettings_Nomadimouse), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { .idle = ANIM_Nomadimouse_Idle, diff --git a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c index 3a84c55e51..8d50922835 100644 --- a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c +++ b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c index 5181609f17..35152d7aa5 100644 --- a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c +++ b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit_01) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Bandit_02) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c index 597ed55c5e..9cbb81e3a3 100644 --- a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c +++ b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit_01) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Bandit_02) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c index 6e6c4b6f74..2b957d0ab7 100644 --- a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c +++ b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -66,7 +66,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c index 059e74a30d..ff57ab9fac 100644 --- a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c +++ b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_Pokey) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -43,7 +43,7 @@ NpcData N(NpcData_Bandit) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c index bf31cb21d9..18e3ded1e1 100644 --- a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c +++ b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -65,7 +65,7 @@ NpcData N(NpcData_Pokey_03) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c index e53954566d..962cd9b4b5 100644 --- a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c +++ b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c index fc7aa73e89..0b251153e1 100644 --- a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c +++ b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c index 9cd3299780..0e9f468898 100644 --- a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c +++ b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -65,7 +65,7 @@ NpcData N(NpcData_Pokey_03) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c index c145c1a3da..af1cf01c0c 100644 --- a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c +++ b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Pokey_01) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Pokey_02) = { } }, .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c index 0220730ff9..50191c0dd8 100644 --- a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c +++ b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Bandit_01) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -42,7 +42,7 @@ NpcData N(NpcData_Bandit_02) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -65,7 +65,7 @@ NpcData N(NpcData_Bandit_03) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -88,7 +88,7 @@ NpcData N(NpcData_Bandit_04) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -111,7 +111,7 @@ NpcData N(NpcData_Bandit_05) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -134,7 +134,7 @@ NpcData N(NpcData_Bandit_06) = { } }, .settings = &N(NpcSettings_Bandit), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/tik_01_5_npc.c index 22731faaca..9c0ba8d8cc 100644 --- a/src/world/area_tik/tik_01/tik_01_5_npc.c +++ b/src/world/area_tik/tik_01/tik_01_5_npc.c @@ -93,7 +93,7 @@ NpcData N(NpcData_Blooper) = { .yaw = 90, .init = &N(EVS_NpcInit_Blooper), .settings = &N(NpcSettings_Blooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/tik_02_5_npc.c index dadc81ee53..65f46a7f37 100644 --- a/src/world/area_tik/tik_02/tik_02_5_npc.c +++ b/src/world/area_tik/tik_02/tik_02_5_npc.c @@ -111,7 +111,7 @@ NpcData N(NpcData_Blooper) = { .yaw = 90, .init = &N(EVS_NpcInit_Blooper), .settings = &N(NpcSettings_Blooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_04/tik_04_5_npc.c b/src/world/area_tik/tik_04/tik_04_5_npc.c index 34e6aa68e2..1a787396b8 100644 --- a/src/world/area_tik/tik_04/tik_04_5_npc.c +++ b/src/world/area_tik/tik_04/tik_04_5_npc.c @@ -22,7 +22,7 @@ EvtScript N(EVS_NpcIdle_SpikedGloomba) = { EVT_GOTO(100) EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Run) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_20, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_NO_SHADOW_RAYCAST, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, 2) EVT_CALL(GetSelfNpcID, LVar0) @@ -62,7 +62,7 @@ NpcData N(NpcData_SpikedGloomba_01) = { }, .init = &N(EVS_NpcInit_SpikedGloomba), .settings = &N(NpcSettings_SpikedGloomba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; @@ -85,7 +85,7 @@ NpcData N(NpcData_SpikedGloomba_02) = { }, .init = &N(EVS_NpcInit_SpikedGloomba), .settings = &N(NpcSettings_SpikedGloomba_Wander), - .flags = ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_05/tik_05_5_npc.c b/src/world/area_tik/tik_05/tik_05_5_npc.c index 75edeceb2e..bfa8c55eea 100644 --- a/src/world/area_tik/tik_05/tik_05_5_npc.c +++ b/src/world/area_tik/tik_05/tik_05_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_SpikedGloomba_01) = { } }, .settings = &N(NpcSettings_SpikedGloomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; @@ -41,7 +41,7 @@ NpcData N(NpcData_SpikedGloomba_02) = { } }, .settings = &N(NpcSettings_SpikedGloomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_07/tik_07_6_npc.c b/src/world/area_tik/tik_07/tik_07_6_npc.c index d81a97acc7..3efb530707 100644 --- a/src/world/area_tik/tik_07/tik_07_6_npc.c +++ b/src/world/area_tik/tik_07/tik_07_6_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Paragloomba_01) = { } }, .settings = &N(NpcSettings_Paragloomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARAGLOOMBA_DROPS, .animations = PARAGLOOMBA_ANIMS, }; @@ -41,7 +41,7 @@ NpcData N(NpcData_Paragloomba_02) = { } }, .settings = &N(NpcSettings_Paragloomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARAGLOOMBA_DROPS, .animations = PARAGLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/tik_08_5_npc.c index 9c3e72de7f..d69badb1f8 100644 --- a/src/world/area_tik/tik_08/tik_08_5_npc.c +++ b/src/world/area_tik/tik_08/tik_08_5_npc.c @@ -110,7 +110,7 @@ NpcData N(NpcData_Blooper) = { .yaw = 90, .init = &N(EVS_NpcInit_Blooper), .settings = &N(NpcSettings_Blooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_09/tik_09_5_npc.c b/src/world/area_tik/tik_09/tik_09_5_npc.c index da9b379b3d..50388614c8 100644 --- a/src/world/area_tik/tik_09/tik_09_5_npc.c +++ b/src/world/area_tik/tik_09/tik_09_5_npc.c @@ -67,7 +67,7 @@ NpcData N(NpcData_KoopaTroopa_01) = { }, .init = &N(EVS_NpcInit_DarkTroopa), .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -91,7 +91,7 @@ NpcData N(NpcData_KoopaTroopa_02) = { }, .init = &N(EVS_NpcInit_DarkTroopa), .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -115,7 +115,7 @@ NpcData N(NpcData_KoopaTroopa_03) = { }, .init = &N(EVS_NpcInit_DarkTroopa), .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_tik/tik_12/tik_12_5_npc.c b/src/world/area_tik/tik_12/tik_12_5_npc.c index dc95e7e4fd..f5985f9f7a 100644 --- a/src/world/area_tik/tik_12/tik_12_5_npc.c +++ b/src/world/area_tik/tik_12/tik_12_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_BuzzyBeetle) = { } }, .settings = &N(NpcSettings_BuzzyBeetle), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = TIK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_tik/tik_15/tik_15_5_npc.c b/src/world/area_tik/tik_15/tik_15_5_npc.c index 2e6916cb82..0af4ce755d 100644 --- a/src/world/area_tik/tik_15/tik_15_5_npc.c +++ b/src/world/area_tik/tik_15/tik_15_5_npc.c @@ -132,7 +132,7 @@ NpcData N(NpcData_RipCheato) = { .yaw = 270, .init = &N(EVS_NpcInit_RipCheato), .settings = &N(NpcSettings_RipCheato), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_RipCheato_Idle, diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c index 31b36bacb4..0700ef33a8 100644 --- a/src/world/area_tik/tik_18/tik_18_4_npc.c +++ b/src/world/area_tik/tik_18/tik_18_4_npc.c @@ -68,7 +68,7 @@ NpcData N(NpcData_Gloomba) = { } }, .settings = &N(NpcSettings_Gloomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = GLOOMBA_DROPS, .animations = GLOOMBA_ANIMS, }; @@ -91,7 +91,7 @@ NpcData N(NpcData_SpikedGloomba) = { }, .init = &N(EVS_NpcInit_SpikedGloomba), .settings = &N(NpcSettings_SpikedGloomba_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_20/tik_20_3_npc.c b/src/world/area_tik/tik_20/tik_20_3_npc.c index bcf02627a1..a34451aaff 100644 --- a/src/world/area_tik/tik_20/tik_20_3_npc.c +++ b/src/world/area_tik/tik_20/tik_20_3_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_DarkTroopa_01) = { } }, .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -42,7 +42,7 @@ NpcData N(NpcData_DarkTroopa_02) = { } }, .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_tik/tik_23/tik_23_4_npc.c b/src/world/area_tik/tik_23/tik_23_4_npc.c index c5c89feb12..30af032467 100644 --- a/src/world/area_tik/tik_23/tik_23_4_npc.c +++ b/src/world/area_tik/tik_23/tik_23_4_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_Spiny_01) = { } }, .settings = &N(NpcSettings_Spiny), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -42,7 +42,7 @@ NpcData N(NpcData_Spiny_02) = { } }, .settings = &N(NpcSettings_Spiny), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -65,7 +65,7 @@ NpcData N(NpcData_Spiny_03) = { } }, .settings = &N(NpcSettings_Spiny), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_tik/tik_24/tik_24_5_npc.c b/src/world/area_tik/tik_24/tik_24_5_npc.c index 0df22c2888..718fd03a72 100644 --- a/src/world/area_tik/tik_24/tik_24_5_npc.c +++ b/src/world/area_tik/tik_24/tik_24_5_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_DarkTroopa_01) = { } }, .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -42,7 +42,7 @@ NpcData N(NpcData_DarkTroopa_02) = { } }, .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 3b36c3ba23..217e41deb4 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -24,9 +24,9 @@ NpcSettings N(NpcSettings_KoopaBros) = { #include "world/common/npc/StarSpirit.inc.c" EvtScript N(EVS_NpcIdle_KoopaBros) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(AwaitPlayerApproach, -580, 276, 50) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 100, 10, EASING_COS_IN_OUT) @@ -232,7 +232,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0113) - EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/trd_01_3_npc.c index d554c30f40..2e3f56846a 100644 --- a/src/world/area_trd/trd_01/trd_01_3_npc.c +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -162,7 +162,7 @@ NpcData N(NpcData_KoopaTroopa_01) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_01), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -186,7 +186,7 @@ NpcData N(NpcData_KoopaTroopa_02) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_02), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -210,7 +210,7 @@ NpcData N(NpcData_KoopaTroopa_03) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_02), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -233,7 +233,7 @@ NpcData N(NpcData_Bobomb) = { } }, .settings = &N(NpcSettings_Bobomb_Guard), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_trd/trd_02/trd_02_3_npc.c b/src/world/area_trd/trd_02/trd_02_3_npc.c index 9fb4c219b6..d1498d6d26 100644 --- a/src/world/area_trd/trd_02/trd_02_3_npc.c +++ b/src/world/area_trd/trd_02/trd_02_3_npc.c @@ -21,7 +21,7 @@ NpcData N(NpcData_Bobomb_01) = { } }, .settings = &N(NpcSettings_Bobomb_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -44,7 +44,7 @@ NpcData N(NpcData_Bobomb_02) = { } }, .settings = &N(NpcSettings_Bobomb_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -69,7 +69,7 @@ NpcData N(NpcData_KoopaTroopa) = { } }, .settings = &N(NpcSettings_KoopaTroopa_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index dd827ae7c3..ec17ee53c5 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -186,7 +186,7 @@ NpcData N(NpcData_KoopaBros) = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, @@ -226,7 +226,7 @@ NpcData N(NpcData_KoopaTroopa_01) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_01), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -250,7 +250,7 @@ NpcData N(NpcData_KoopaTroopa_02) = { }, .init = &N(EVS_NpcInit_KoopaTroopa_02), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -273,7 +273,7 @@ NpcData N(NpcData_KoopaTroopa_03) = { } }, .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/trd_04_3_npc.c index 409db237ac..97eda75991 100644 --- a/src/world/area_trd/trd_04/trd_04_3_npc.c +++ b/src/world/area_trd/trd_04/trd_04_3_npc.c @@ -47,7 +47,7 @@ NpcData N(NpcData_KoopaTroopa_Wander) = { } }, .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -73,7 +73,7 @@ NpcData N(NpcData_KoopaTroopa_Patrol) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa_Patrol), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -96,7 +96,7 @@ NpcData N(NpcData_ParaTroopa) = { } }, .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, 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 adde977767..36fcf35cf9 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 @@ -208,7 +208,7 @@ NpcData N(NpcData_KoopaBros)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, @@ -235,7 +235,7 @@ NpcData N(NpcData_KoopaBros)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c index 870a9b493b..722780e115 100644 --- a/src/world/area_trd/trd_06/trd_06_1_main.c +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_EnterMap) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) EVT_EXEC(N(EVS_Scene_ImprisonedKoopaBros)) EVT_END_SWITCH @@ -65,17 +65,17 @@ EvtScript N(EVS_BombWall_Cell) = { EVT_IF_LT(LVar0, 110) EVT_IF_LT(LVar2, 140) EVT_WAIT(25) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_04, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 110, 140, 0) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Bobomb_04, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_04, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_IF EVT_END_IF EVT_END_THREAD diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 8c5e1bd3fb..445dda9246 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -295,13 +295,13 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_CALL(InterpPlayerYaw, 270, 1) EVT_CALL(SetPlayerPos, 0, 300, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, 0, 300, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INACTIVE, TRUE) EVT_WAIT(30) EVT_CALL(N(InitializeFallingSprite)) EVT_EXEC_WAIT(N(EVS_PlayerFalling)) EVT_CALL(InterpNpcYaw, NPC_Bombette, 90, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4 | NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INACTIVE | NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_EXEC_WAIT(N(EVS_PartnerFalling)) EVT_CALL(InterpNpcYaw, NPC_Bombette, 270, 0) EVT_WAIT(20) @@ -309,7 +309,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_CALL(SpeakToPlayer, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00D8) EVT_CALL(N(EnableFallingAnimation)) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(N(DeleteFallingSprite)) EVT_THREAD EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) 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 b6b965878f..ff7f2f6a75 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 @@ -90,11 +90,11 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_END_IF EVT_END_IF EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DE) EVT_CALL(N(ChangeNpcToPartner), NPC_Bombette, PARTNER_BOMBETTE) EVT_SET(GB_StoryProgress, STORY_CH1_BOMBETTE_JOINED_PARTY) @@ -158,9 +158,9 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_CALL(SetNpcAnimation, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run) EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) - EVT_CALL(SetNpcFlagBits, NPC_Jailer_KoopaTroopa, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_01, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Jailer_KoopaTroopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_THREAD EVT_CALL(NpcMoveTo, NPC_Jailer_KoopaTroopa, -237, 0, 0) EVT_END_THREAD @@ -344,7 +344,7 @@ NpcData N(NpcData_Bombette) = { .yaw = 0, .init = &N(EVS_NpcInit_Bombette), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBombette_Idle, diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c index 8c7c92c15b..9be808ffb5 100644 --- a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c +++ b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c @@ -64,7 +64,7 @@ NpcData N(NpcData_KoopaBros)[] = { } }, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, }, @@ -85,7 +85,7 @@ NpcData N(NpcData_KoopaBros)[] = { } }, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -106,7 +106,7 @@ NpcData N(NpcData_KoopaBros)[] = { } }, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, }, @@ -127,7 +127,7 @@ NpcData N(NpcData_KoopaBros)[] = { } }, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, }, diff --git a/src/world/area_trd/trd_07/trd_07_2_npc.c b/src/world/area_trd/trd_07/trd_07_2_npc.c index 4c95d95016..307059945d 100644 --- a/src/world/area_trd/trd_07/trd_07_2_npc.c +++ b/src/world/area_trd/trd_07/trd_07_2_npc.c @@ -55,7 +55,7 @@ NpcData N(NpcData_KoopaTroopa) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; @@ -78,7 +78,7 @@ NpcData N(NpcData_ParaTroopa_01) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; @@ -101,7 +101,7 @@ NpcData N(NpcData_ParaTroopa_02) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c index 49803883b9..53c9b789ea 100644 --- a/src/world/area_trd/trd_08/trd_08_3_npc.c +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -14,14 +14,14 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVarB, LVar1) EVT_LOOP(15) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, TRUE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) EVT_SET(LVar0, LVarA) EVT_SET(LVar1, LVarB) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, FALSE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) @@ -110,7 +110,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .radius = 20, .otherAI = &N(EVS_NpcAuxAI_00), .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -119,7 +119,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .radius = 20, .otherAI = &N(EVS_NpcAuxAI_00), .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { @@ -127,7 +127,7 @@ NpcSettings N(NpcSettings_FireBar_Extra) = { .height = 12, .radius = 20, .otherAI = &N(EVS_NpcAuxAI_00), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_00)[] = { diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index 4abdc263f9..f4f91ae3a0 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -25,7 +25,7 @@ API_CALLABLE(N(func_80240000_9BD660)) { } EvtScript N(EVS_NpcAuxAI_BillBlaster) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 1) EVT_RETURN EVT_END }; @@ -389,12 +389,12 @@ EvtScript N(EVS_NpcAI_BillBlaster) = { }; EvtScript N(EVS_NpcAI_BulletBill) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 1) EVT_LABEL(1) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SelfEnemyOverrideSyncPos, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_LABEL(2) EVT_CALL(GetSelfVar, 0, LVar0) @@ -405,7 +405,7 @@ EvtScript N(EVS_NpcAI_BulletBill) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Anim04) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SelfEnemyOverrideSyncPos, 1) EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetNpcYaw, LVar0, LVar4) @@ -451,7 +451,7 @@ EvtScript N(EVS_NpcDefeat_BulletBill) = { EVT_CASE_EQ(OUTCOME_PLAYER_WON) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_BulletBill))) EVT_END_THREAD @@ -470,7 +470,7 @@ NpcSettings N(NpcSettings_KoopaBros_Red) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Red), .ai = &N(EVS_NpcAI_KoopaBros_Red), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, }; NpcSettings N(NpcSettings_KoopaBros_Black) = { @@ -480,7 +480,7 @@ NpcSettings N(NpcSettings_KoopaBros_Black) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Black), .ai = &N(EVS_NpcAI_KoopaBros_Black), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, }; NpcSettings N(NpcSettings_KoopaBros_Yellow) = { @@ -490,7 +490,7 @@ NpcSettings N(NpcSettings_KoopaBros_Yellow) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Yellow), .ai = &N(EVS_NpcAI_KoopaBros_Yellow), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, }; NpcSettings N(NpcSettings_KoopaBros_Green) = { @@ -500,7 +500,7 @@ NpcSettings N(NpcSettings_KoopaBros_Green) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Green), .ai = &N(EVS_NpcAI_KoopaBros_Green), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, }; NpcSettings N(NpcSettings_BillBlaster) = { @@ -561,7 +561,7 @@ NpcData N(NpcData_BillBlasters)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = BILL_BLASTER_ANIMS, }, @@ -582,7 +582,7 @@ NpcData N(NpcData_BillBlasters)[] = { } }, .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = BILL_BLASTER_DROPS, .animations = BILL_BLASTER_ANIMS, }, @@ -603,7 +603,7 @@ NpcData N(NpcData_BillBlasters)[] = { } }, .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = BILL_BLASTER_ANIMS, }, @@ -710,7 +710,7 @@ NpcData N(NpcData_BulletBill_Demo1) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -760,7 +760,7 @@ NpcData N(NpcData_BulletBill_Demo2) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -810,7 +810,7 @@ NpcData N(NpcData_BulletBill_Demo3) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -860,7 +860,7 @@ NpcData N(NpcData_BulletBill_Demo4) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -910,7 +910,7 @@ NpcData N(NpcData_BulletBill_Demo5) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index f1f69bc863..2eab89c500 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -81,7 +81,7 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 0, 0, 10) EVT_WAIT(30) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_HAS_SHADOW, FALSE) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, NPC_DISPOSE_LOCATION) @@ -125,7 +125,7 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_HAS_SHADOW, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_INTERLUDE, 0, 8) EVT_CALL(GetBattleOutcome, LVar0) @@ -293,7 +293,7 @@ NpcSettings N(NpcSettings_KoopaBros_01) = { .onHit = &N(EVS_NpcHit_KoopaBros_01), .aux = &N(EVS_NpcAux_KoopaBros_01), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_01), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_KoopaBros_02) = { @@ -306,7 +306,7 @@ NpcSettings N(NpcSettings_KoopaBros_02) = { .onHit = &N(EVS_NpcHit_KoopaBros_02), .aux = &N(EVS_NpcAux_KoopaBros_02), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_02), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_KoopaBros_03) = { @@ -319,7 +319,7 @@ NpcSettings N(NpcSettings_KoopaBros_03) = { .onHit = &N(EVS_NpcHit_KoopaBros_03), .aux = &N(EVS_NpcAux_KoopaBros_03), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_03), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_KoopaBros_04) = { @@ -332,7 +332,7 @@ NpcSettings N(NpcSettings_KoopaBros_04) = { .onHit = &N(EVS_NpcHit_KoopaBros_04), .aux = &N(EVS_NpcAux_KoopaBros_04), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_04), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_KoopaBros_01)[] = { @@ -341,7 +341,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Black_Anim04, @@ -367,7 +367,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_02), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Red_Anim04, @@ -393,7 +393,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_03), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, @@ -419,7 +419,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_04), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, diff --git a/src/world/area_tst/tst_04/tst_04_4_npc.c b/src/world/area_tst/tst_04/tst_04_4_npc.c index bc408b039e..b4c37f20b5 100644 --- a/src/world/area_tst/tst_04/tst_04_4_npc.c +++ b/src/world/area_tst/tst_04/tst_04_4_npc.c @@ -7,7 +7,7 @@ API_CALLABLE(N(DisableOwnerShadow)) { EvtScript N(EVS_NpcAuxAI_Goompa) = { EVT_CALL(N(DisableOwnerShadow)) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_RETURN EVT_END }; diff --git a/src/world/common/atomic/ToadHouse.data.inc.c b/src/world/common/atomic/ToadHouse.data.inc.c index 3ebb6e1eab..e9f0430179 100644 --- a/src/world/common/atomic/ToadHouse.data.inc.c +++ b/src/world/common/atomic/ToadHouse.data.inc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarA) EVT_CALL(SetPlayerJumpscale, 1) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ToadHouse_DisableStatusMenu)) EVT_IF_NE(LVar4, 0) EVT_EXEC(N(EVS_ToadHouse_Unk2)) @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { EVT_WAIT(105) EVT_EXEC_WAIT(N(EVS_ToadHouse_ReturnFromRest)) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarB) EVT_CALL(N(ToadHouse_ShowStatusMenu)) EVT_RETURN diff --git a/src/world/common/atomic/ToadHouseHos.data.inc.c b/src/world/common/atomic/ToadHouseHos.data.inc.c index 861448cebb..106f5a741b 100644 --- a/src/world/common/atomic/ToadHouseHos.data.inc.c +++ b/src/world/common/atomic/ToadHouseHos.data.inc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_StarMan_Talk, ANIM_StarMan_Idle, 0, LVarA) EVT_CALL(SetPlayerJumpscale, 1) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(ToadHouse_DisableStatusMenu)) EVT_IF_NE(LVar4, 0) EVT_EXEC(N(8024AC8C)) @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { EVT_WAIT(105) EVT_EXEC_WAIT(N(EVS_ToadHouse_ReturnFromRest)) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_StarMan_Talk, ANIM_StarMan_Idle, 0, LVarB) EVT_CALL(N(ToadHouse_ShowStatusMenu)) EVT_RETURN diff --git a/src/world/common/complete/LetterDelivery.inc.c b/src/world/common/complete/LetterDelivery.inc.c index 5ca8df952d..8e0f38776e 100644 --- a/src/world/common/complete/LetterDelivery.inc.c +++ b/src/world/common/complete/LetterDelivery.inc.c @@ -94,7 +94,7 @@ EvtScript N(EVS_LetterDelivery_ItemPrompt) = { EVT_CALL(GetAngleBetweenNPCs, LVar9, NPC_PARTNER, LVarB) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) EVT_CALL(GetNpcPos, LVar9, LVar6, LVar7, LVar8) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_IF_LE(LVarB, 180) EVT_ADD(LVar6, 20) EVT_ELSE @@ -114,7 +114,7 @@ EvtScript N(EVS_LetterDelivery_ItemPrompt) = { EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Idle) EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 0) EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) EVT_WAIT(5) EVT_END_SWITCH diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 4ba51fb9a7..5ed47de945 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -986,8 +986,8 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_EXEC_GET_TID(N(EVS_Quizmo_SetCharacterPositons), LVar1) EVT_CALL(ContinueSpeech, -1, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000B) @@ -1162,7 +1162,7 @@ EvtScript N(EVS_Quizmo_NPC_OtherAI) = { EVT_IF_EQ(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_NO_SPRITE, FALSE) EVT_CALL(SetNpcSprite, -1, ANIM_ChuckQuizmo_Idle) EVT_CALL(N(Quizmo_RenderInit)) EVT_RETURN @@ -1209,11 +1209,11 @@ NpcSettings N(NpcSettings_ChuckQuizmo) = { .otherAI = &N(EVS_Quizmo_NPC_OtherAI), .onInteract = &N(EVS_Quizmo_NPC_Interact), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .level = 99, }; -// alternate (unused?) variant of quizmo with AI and ENEMY_FLAG_100 unset +// alternate (unused?) variant of quizmo with AI and ENEMY_FLAG_IGNORE_WORLD_COLLISION unset NpcSettings N(Quizmo_AltNpcSettings) = { .defaultAnim = ANIM_ChuckQuizmo_Idle, .height = 35, @@ -1222,7 +1222,7 @@ NpcSettings N(Quizmo_AltNpcSettings) = { .onInteract = &N(EVS_Quizmo_NPC_Interact), .ai = &N(EVS_Quizmo_Npc_AI), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .level = 99, .actionFlags = 16, }; diff --git a/src/world/common/enemy/BombshellBill.h b/src/world/common/enemy/BombshellBill.h index f47ed90bc0..349cf4026f 100644 --- a/src/world/common/enemy/BombshellBill.h +++ b/src/world/common/enemy/BombshellBill.h @@ -69,7 +69,7 @@ .settings = &N(NpcSettings_BulletBill), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000 | ENEMY_FLAG_200000, \ + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, \ .drops = BOMBSHELL_BILL_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/BulletBill.h b/src/world/common/enemy/BulletBill.h index 66a99bb93c..1c8474e84d 100644 --- a/src/world/common/enemy/BulletBill.h +++ b/src/world/common/enemy/BulletBill.h @@ -67,7 +67,7 @@ .settings = &N(NpcSettings_BulletBill), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 270, \ - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, \ + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_80000, \ .initVarCount = 1, \ .initVar = { .value = 0 }, \ .drops = BULLET_BILL_DROPS, \ diff --git a/src/world/common/enemy/Clubba.h b/src/world/common/enemy/Clubba.h index fb78cdc04c..4c1a86213d 100644 --- a/src/world/common/enemy/Clubba.h +++ b/src/world/common/enemy/Clubba.h @@ -61,7 +61,7 @@ .settings = &N(NpcSettings_Clubba_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = CLUBBA_ANIMS, \ .extraAnimations = N(ExtraAnims_Clubba_Hitbox), \ diff --git a/src/world/common/enemy/DryBones.h b/src/world/common/enemy/DryBones.h index 56535a9afa..70a19307c3 100644 --- a/src/world/common/enemy/DryBones.h +++ b/src/world/common/enemy/DryBones.h @@ -40,7 +40,7 @@ .settings = &N(NpcSettings_ThrownBone), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/FlyingMagikoopa.h b/src/world/common/enemy/FlyingMagikoopa.h index 68bff3fb95..3a9c7f0c91 100644 --- a/src/world/common/enemy/FlyingMagikoopa.h +++ b/src/world/common/enemy/FlyingMagikoopa.h @@ -44,7 +44,7 @@ .settings = &N(NpcSettings_FlyingMagikoopa_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = { \ .idle = ANIM_FlyingMagikoopa_Anim00, \ diff --git a/src/world/common/enemy/FrostClubba.h b/src/world/common/enemy/FrostClubba.h index 91d0613440..c899615149 100644 --- a/src/world/common/enemy/FrostClubba.h +++ b/src/world/common/enemy/FrostClubba.h @@ -40,7 +40,7 @@ .settings = &N(NpcSettings_FrostClubba_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = FROST_CLUBBA_ANIMS, \ .extraAnimations = N(ExtraAnims_FrostClubba_Hitbox), \ diff --git a/src/world/common/enemy/FrostPiranha.h b/src/world/common/enemy/FrostPiranha.h index 8804b24f1a..b94f7e2342 100644 --- a/src/world/common/enemy/FrostPiranha.h +++ b/src/world/common/enemy/FrostPiranha.h @@ -41,7 +41,7 @@ .settings = &N(NpcSettings_FrostPiranha_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = FROST_PIRANHA_ANIMS, \ .extraAnimations = N(ExtraAnims_FrostPiranha_Hitbox), \ diff --git a/src/world/common/enemy/Gulpit.h b/src/world/common/enemy/Gulpit.h index 6ab51dc85a..9ebeee2ea5 100644 --- a/src/world/common/enemy/Gulpit.h +++ b/src/world/common/enemy/Gulpit.h @@ -41,7 +41,7 @@ .settings = &N(NpcSettings_Gulpit_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = GULPIT_ANIMS, \ .extraAnimations = N(ExtraAnims_Gulpit_Hitbox), \ diff --git a/src/world/common/enemy/HammerBros.h b/src/world/common/enemy/HammerBros.h index 602a0764ba..682bc9d190 100644 --- a/src/world/common/enemy/HammerBros.h +++ b/src/world/common/enemy/HammerBros.h @@ -41,7 +41,7 @@ .settings = &N(NpcSettings_HammerBros_Hammer), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/HeartPlant.inc.c b/src/world/common/enemy/HeartPlant.inc.c index 5b7ba95344..aa5349e4c6 100644 --- a/src/world/common/enemy/HeartPlant.inc.c +++ b/src/world/common/enemy/HeartPlant.inc.c @@ -50,7 +50,7 @@ NpcSettings N(NpcSettings_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, \ + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, \ .drops = NO_DROPS, \ .animations = HEART_PLANT_ANIMS, \ .tattle = MSG_NpcTattle_HeartPlant, \ diff --git a/src/world/common/enemy/HurtPlant.inc.c b/src/world/common/enemy/HurtPlant.inc.c index b3a102779a..49fc066ac4 100644 --- a/src/world/common/enemy/HurtPlant.inc.c +++ b/src/world/common/enemy/HurtPlant.inc.c @@ -68,7 +68,7 @@ AnimID N(ExtraAnims_HurtPlant)[] = { #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, \ + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, \ .drops = HURT_PLANT_DROPS, \ .animations = HURT_PLANT_ANIMS, \ .extraAnimations = N(ExtraAnims_HurtPlant), \ diff --git a/src/world/common/enemy/MBush.inc.c b/src/world/common/enemy/MBush.inc.c index c2cd2638a4..91e3c146a4 100644 --- a/src/world/common/enemy/MBush.inc.c +++ b/src/world/common/enemy/MBush.inc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcAI_MBush) = { EVT_WAIT(6) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcDefeat_MBush) = { 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(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, 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) @@ -96,7 +96,7 @@ NpcSettings N(NpcSettings_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, \ + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | 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/Magikoopa.h b/src/world/common/enemy/Magikoopa.h index 37708c1424..84a886d5e9 100644 --- a/src/world/common/enemy/Magikoopa.h +++ b/src/world/common/enemy/Magikoopa.h @@ -44,7 +44,7 @@ .settings = &N(NpcSettings_Magikoopa_GroundHitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = { \ .idle = ANIM_Magikoopa_Anim00, \ diff --git a/src/world/common/enemy/MontyMole_GroundAmbush.inc.c b/src/world/common/enemy/MontyMole_GroundAmbush.inc.c index 07fe4df944..68fbd06151 100644 --- a/src/world/common/enemy/MontyMole_GroundAmbush.inc.c +++ b/src/world/common/enemy/MontyMole_GroundAmbush.inc.c @@ -2,7 +2,7 @@ EvtScript N(EVS_NpcAuxAI_MontyMole_GroundAmbush) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 30) @@ -53,7 +53,7 @@ EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { EVT_ADD(LVar2, 30) EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, FALSE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MontyMole_Anim0E) EVT_CALL(GetNpcPos, NPC_SELF, LVar4, LVar5, LVar6) @@ -64,7 +64,7 @@ EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { EVT_CALL(SetNpcPos, LVar0, NPC_DISPOSE_LOCATION) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_MontyMole_GroundAmbush))) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/MontyMole_StoneThrower.inc.c b/src/world/common/enemy/MontyMole_StoneThrower.inc.c index 7e71669951..cddcf8cf1e 100644 --- a/src/world/common/enemy/MontyMole_StoneThrower.inc.c +++ b/src/world/common/enemy/MontyMole_StoneThrower.inc.c @@ -34,7 +34,7 @@ MobileAISettings N(AISettings_MontyMole_StoneThrower) = { }; EvtScript N(EVS_NpcAI_MontyMole_StoneThrower) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_200000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_200000, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_LABEL(0) EVT_CALL(RandInt, 15, LVar0) @@ -83,7 +83,7 @@ EvtScript N(EVS_NpcHit_MontyMole_Stone) = { EVT_RETURN EVT_END_IF EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcHit_MontyMole_Stone_DoNothing))) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetOwnerEncounterTrigger, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) @@ -125,7 +125,7 @@ NpcSettings N(NpcSettings_MontyMole_Stone) = { .settings = &N(NpcSettings_MontyMole_Stone), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/MontyMole_WallAmbush.inc.c b/src/world/common/enemy/MontyMole_WallAmbush.inc.c index 15c3a4cb01..2d3c992cf4 100644 --- a/src/world/common/enemy/MontyMole_WallAmbush.inc.c +++ b/src/world/common/enemy/MontyMole_WallAmbush.inc.c @@ -2,7 +2,7 @@ EvtScript N(EVS_NpcAuxAI_MontyMole_WallAmbush) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 50) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcAuxAI_MontyMole_WallAmbush) = { }; EvtScript N(EVS_NpcAuxAI_MontyMole_WallAmbush_Hole) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 50) @@ -55,7 +55,7 @@ EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { EVT_ADD(LVar3, 50) EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3) EVT_WAIT(1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INACTIVE, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MontyMole_Anim0E) @@ -68,7 +68,7 @@ EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) EVT_END_IF EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_MontyMole_WallAmbush))) EVT_RETURN diff --git a/src/world/common/enemy/PiranhaPlant.h b/src/world/common/enemy/PiranhaPlant.h index 347e422f0a..759a3b450b 100644 --- a/src/world/common/enemy/PiranhaPlant.h +++ b/src/world/common/enemy/PiranhaPlant.h @@ -40,7 +40,7 @@ .settings = &N(NpcSettings_PiranhaPlant_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = { \ .idle = ANIM_SmallPiranha_Anim01, \ diff --git a/src/world/common/enemy/PutridPiranha.h b/src/world/common/enemy/PutridPiranha.h index c2997f608c..f611e9ad35 100644 --- a/src/world/common/enemy/PutridPiranha.h +++ b/src/world/common/enemy/PutridPiranha.h @@ -41,7 +41,7 @@ .settings = &N(NpcSettings_PutridPiranha_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = PUTRID_PIRANHA_ANIMS, \ } diff --git a/src/world/common/enemy/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c index 9cd81e3cdc..661bf0222a 100644 --- a/src/world/common/enemy/Sentinel.inc.c +++ b/src/world/common/enemy/Sentinel.inc.c @@ -4,8 +4,8 @@ #include "world/common/enemy/ai/SentinelAI.inc.c" EvtScript N(EVS_NpcAuxAI_Sentinel) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_DONT_UPDATE_SHADOW_Y | NPC_FLAG_JUMPING, TRUE) EVT_RETURN EVT_END }; diff --git a/src/world/common/enemy/SpearGuy.h b/src/world/common/enemy/SpearGuy.h index 4eea35a90c..5281597b47 100644 --- a/src/world/common/enemy/SpearGuy.h +++ b/src/world/common/enemy/SpearGuy.h @@ -40,7 +40,7 @@ .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, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .animations = SPEAR_GUY_ANIMS, \ .extraAnimations = N(ExtraAnims_SpearGuy_Hitbox), \ diff --git a/src/world/common/enemy/SpyGuy.h b/src/world/common/enemy/SpyGuy.h index 2ca82af5bf..fa8dcdb4bd 100644 --- a/src/world/common/enemy/SpyGuy.h +++ b/src/world/common/enemy/SpyGuy.h @@ -64,7 +64,7 @@ .settings = &N(NpcSettings_SpyGuyRock), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ .drops = NO_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/StoneChomp.inc.c b/src/world/common/enemy/StoneChomp.inc.c index acdfa61dc7..f4f39061fb 100644 --- a/src/world/common/enemy/StoneChomp.inc.c +++ b/src/world/common/enemy/StoneChomp.inc.c @@ -15,8 +15,8 @@ API_CALLABLE(N(StoneChompFXA)) { blurData = heap_malloc(8 * sizeof(*blurData)); npc->blur.chomp = blurData; - bp.flags = NPC_FLAG_8000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION - | NPC_FLAG_8 | NPC_FLAG_2; + bp.flags = NPC_FLAG_IGNORE_ENTITY_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION + | NPC_FLAG_8 | NPC_FLAG_INVISIBLE; bp.initialAnim = ANIM_StoneChomp_Anim02; bp.onUpdate = NULL; bp.onRender = NULL; @@ -54,7 +54,7 @@ API_CALLABLE(N(StoneChompFXB)) { posZ = ownerNpc->pos.z; add_vec2D_polar(&posX, &posZ, ownerNpc->collisionRadius * 0.3f, clamp_angle(ownerNpc->renderYaw + 180.0f)); - if (ownerNpc->flags & NPC_FLAG_2) { + if (ownerNpc->flags & NPC_FLAG_INVISIBLE) { for (i = 0; i < 8; i++, blurData++) { childNpc = blurData->npc; childNpc->pos.x = posX; diff --git a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c index ad55daee25..cae8d4858e 100644 --- a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c +++ b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c @@ -1,9 +1,6 @@ #include "common.h" #include "npc.h" #include "effects.h" -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif void N(AvoidPlayerAI_ChaseInit)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; @@ -160,11 +157,7 @@ void N(AvoidPlayerAI_LosePlayer)(Evt* script, MobileAISettings* npcAISettings, E } API_CALLABLE(N(AvoidPlayerAI_Main)) { - #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; diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index 95893dcd79..e08bd441bc 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -50,8 +50,8 @@ API_CALLABLE(N(BulletBillAI_Main)) { script->AI_TEMP_STATE = AI_STATE_BULLET_INIT; npc->duration = 0; enemy->aiFlags |= ENEMY_AI_FLAG_8; - enemy->flags |= ENEMY_FLAG_200000; - npc->flags |= NPC_FLAG_40000; + enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; + npc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW; enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_NONE; enemy->AI_VAR_BULLET_BLASTER = -1; } @@ -70,8 +70,8 @@ API_CALLABLE(N(BulletBillAI_Main)) { npc->pos.z = NPC_DISPOSE_POS_Z; npc->rotation.y = 0.0f; npc->duration = 0; - npc->flags |= NPC_FLAG_2; - npc->flags &= ~NPC_FLAG_LOCK_ANIMS; + npc->flags |= NPC_FLAG_INVISIBLE; + npc->flags &= ~NPC_FLAG_DONT_UPDATE_SHADOW_Y; disable_npc_shadow(npc); enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_NONE; script->AI_TEMP_STATE = AI_STATE_BULLET_READY; @@ -82,7 +82,7 @@ API_CALLABLE(N(BulletBillAI_Main)) { } enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_ACTIVE; blasterNpc = get_npc_unsafe(get_enemy(enemy->AI_VAR_BULLET_BLASTER)->npcID); - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; npc->pos.x = blasterNpc->pos.x; npc->pos.y = blasterNpc->pos.y + 11.0; npc->pos.z = blasterNpc->pos.z + 1.0; @@ -97,7 +97,7 @@ API_CALLABLE(N(BulletBillAI_Main)) { } npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_CHASE]; npc->duration = 300; - npc->flags |= (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_LOCK_ANIMS); + npc->flags |= (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_DONT_UPDATE_SHADOW_Y); enable_npc_shadow(npc); script->AI_TEMP_STATE = AI_STATE_BULLET_FIRED; // fallthrough @@ -163,7 +163,7 @@ API_CALLABLE(N(BillBlasterAI_Main)) { script->AI_TEMP_STATE = AI_STATE_BLASTER_INIT; npc->duration = 30; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - enemy->flags |= ENEMY_FLAG_200000; + enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; disable_npc_shadow(npc); } diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index d6ae05159e..143816d300 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -168,7 +168,7 @@ void N(CleftAI_RevUp)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolu enemy->unk_10.x = npc->pos.x; enemy->unk_10.y = npc->pos.y; enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; + enemy->hitboxIsActive = TRUE; npc->moveSpeed = aiSettings->chaseSpeed; npc->duration = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed + 0.9; @@ -210,7 +210,7 @@ void N(CleftAI_Tackle)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } if (phi_s1) { script->AI_TEMP_STATE = AI_STATE_CLEFT_FIND_PLAYER_INIT; - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; } } diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index d9a937c9d2..91152ecc78 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -10,9 +10,6 @@ #include "common.h" #include "npc.h" #include "effects.h" -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif f32 N(FlyingAI_JumpVels)[] = { 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, @@ -305,7 +302,7 @@ void N(FlyingAI_ChaseInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetec enemy->unk_10.x = npc->pos.x; enemy->unk_10.y = npc->pos.y; enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; + enemy->hitboxIsActive = TRUE; } } @@ -341,7 +338,7 @@ void N(FlyingAI_LosePlayer)(Evt* script, MobileAISettings* aiSettings, EnemyDete if (npc->jumpVelocity >= 0.0) { npc->pos.y += npc->jumpVelocity; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_HIT]; - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; if (!(npc->flags & NPC_FLAG_8)) { posX = npc->pos.x; posY = npc->pos.y; @@ -435,11 +432,7 @@ void N(FlyingAI_Init)(Npc* npc, Enemy* enemy, Evt* script, MobileAISettings* aiS } API_CALLABLE(N(FlyingAI_Main)) { - #ifdef _DEAD_H_ - DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; - #else Enemy* enemy = script->owner1.enemy; - #endif Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; diff --git a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index 2f0e9d1aa6..65f2e8d4a2 100644 --- a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -297,7 +297,7 @@ API_CALLABLE(N(FlyingMagikoopaAI_Main)) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; npc->flags |= NPC_FLAG_200000; - enemy->flags |= ENEMY_FLAG_200000; + enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; enemy->varTable[1] = npc->pos.y * 100.0; enemy->varTable[0] = 0; enemy->varTable[2] = 0; diff --git a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c index 754e959354..79e147c347 100644 --- a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c @@ -1,9 +1,6 @@ #include "common.h" #include "npc.h" #include "effects.h" -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif // This AI is used by: // - Lava Bubble @@ -95,11 +92,7 @@ void N(FlyingNoAttackAI_20)(Evt* script, MobileAISettings* aiSettings, EnemyDete } API_CALLABLE(N(FlyingNoAttackAI_Main)) { - #ifdef _DEAD_H_ - DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; - #else Enemy* enemy = script->owner1.enemy; - #endif Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; diff --git a/src/world/common/enemy/ai/GrooveGuyAI.inc.c b/src/world/common/enemy/ai/GrooveGuyAI.inc.c index 502a188a07..e0c0eb223e 100644 --- a/src/world/common/enemy/ai/GrooveGuyAI.inc.c +++ b/src/world/common/enemy/ai/GrooveGuyAI.inc.c @@ -103,11 +103,11 @@ API_CALLABLE(N(GrooveGuyAI_Main)) { if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->functionTemp[0] = 12; } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; hitDepth = 100.0f; posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/GuardAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c index 7dcae0af43..a63daed12a 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -224,9 +224,9 @@ API_CALLABLE(N(GuardAI_Main)) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 15; enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } } diff --git a/src/world/common/enemy/ai/HoppingAI.inc.c b/src/world/common/enemy/ai/HoppingAI.inc.c index 329af9c57f..ef3b98abd3 100644 --- a/src/world/common/enemy/ai/HoppingAI.inc.c +++ b/src/world/common/enemy/ai/HoppingAI.inc.c @@ -246,9 +246,9 @@ API_CALLABLE(N(HoppingAI_Main)) { npc->flags |= NPC_FLAG_8; enemy->aiFlags |= (ENEMY_AI_FLAG_8 | ENEMY_AI_FLAG_10); - if (enemy->flags & ENEMY_FLAG_40000000) { + if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } } diff --git a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c index bc8edf2f31..51be133b33 100644 --- a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c @@ -31,7 +31,7 @@ API_CALLABLE(N(KoopaPatrolAI_Main)) { if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { npc->duration = 0; script->functionTemp[0] = 0; - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; npc->flags &= ~NPC_FLAG_JUMPING; npc->collisionHeight = enemy->varTable[6]; @@ -53,9 +53,9 @@ API_CALLABLE(N(KoopaPatrolAI_Main)) { 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_SUSPEND; - } else if (enemy->flags & ENEMY_FLAG_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAG_40000000; + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { + script->functionTemp[0] = AI_STATE_CHASE_INIT; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } } diff --git a/src/world/common/enemy/ai/LakituAI.inc.c b/src/world/common/enemy/ai/LakituAI.inc.c index 6e432bce52..66b2e8ccc2 100644 --- a/src/world/common/enemy/ai/LakituAI.inc.c +++ b/src/world/common/enemy/ai/LakituAI.inc.c @@ -156,16 +156,8 @@ void N(LakituAI_Loiter)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVo } } -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif - s32 N(LakituAI_Main)(Evt* script, s32 isInitialCall) { - #ifdef _DEAD_H_ - DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; - #else Enemy* enemy = script->owner1.enemy; - #endif Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index efca6a7e01..d6206b2943 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -8,7 +8,7 @@ typedef struct MagikoopaTeleportAnim { u8 alpha; } MagikoopaTeleportAnim; -#define ENEMY_FLAG_COMBINATION (ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | \ +#define ENEMY_FLAG_COMBINATION (ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | \ ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_100000) extern MagikoopaTeleportAnim N(MagikoopaAI_TeleportAnim)[]; @@ -22,7 +22,7 @@ void N(MagikoopaAI_00)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol npc->duration--; if (npc->duration <= 0) { npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; npc->duration = 0; script->AI_TEMP_STATE = 1; } @@ -46,7 +46,7 @@ void N(MagikoopaAI_01)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol npc->scale.x = 1.0f; npc->scale.y = 1.0f; npc->scale.z = 1.0f; - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; script->AI_TEMP_STATE = 5; } } @@ -81,7 +81,7 @@ void N(MagikoopaAI_10)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol enemy->varTable[0] = 1; npc->currentAnim = enemy->animList[8]; npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; npc->scale.x = 0.1f; npc->scale.y = 0.1f; npc->scale.z = 0.1f; @@ -252,7 +252,7 @@ API_CALLABLE(N(MagikoopaAI_Main)) { npc->currentAnim = enemy->animList[0]; npc->flags &= ~NPC_FLAG_JUMPING; npc->flags |= NPC_FLAG_200000; - enemy->flags |= ENEMY_FLAG_200000; + enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; npc->duration = 0; if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; diff --git a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c index 01ebe562f0..49612446d6 100644 --- a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c @@ -51,9 +51,9 @@ API_CALLABLE(N(MagikoopaAI_SpellMain)) { 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; - enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | - ENEMY_FLAG_200000 | ENEMY_FLAG_40; + npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_INVISIBLE; + enemy->flags |= ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | + ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_PROJECTILE; npc1->scale.x = 0.4f; npc1->scale.y = 0.4f; if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { @@ -84,7 +84,7 @@ API_CALLABLE(N(MagikoopaAI_SpellMain)) { npc1->pos.x = sp20Ptr->pos.x; npc1->pos.y = npc2->pos.y + enemy->varTable[1]; npc1->pos.z = sp20Ptr->pos.z; - enemy->unk_07 = 1; + enemy->hitboxIsActive = TRUE; enemy->unk_10.x = npc1->pos.x; enemy->unk_10.y = npc1->pos.y; enemy->unk_10.z = npc1->pos.z; diff --git a/src/world/common/enemy/ai/MeleeHitbox.inc.c b/src/world/common/enemy/ai/MeleeHitbox.inc.c index 5dae1672c6..b10b1f235a 100644 --- a/src/world/common/enemy/ai/MeleeHitbox.inc.c +++ b/src/world/common/enemy/ai/MeleeHitbox.inc.c @@ -4,10 +4,6 @@ #include "common.h" #include "effects.h" -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif - void N(MeleeHitbox_30)(Evt* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -102,11 +98,7 @@ s32 N(MeleeHitbox_CanSeePlayer)(Evt* script) { } API_CALLABLE(N(MeleeHitbox_Main)) { - #ifdef _DEAD_H_ - DeadEnemy* hitboxEnemy = (DeadEnemy*)script->owner1.enemy; - #else Enemy* hitboxEnemy = script->owner1.enemy; - #endif Npc* hitboxNpc = get_npc_unsafe(hitboxEnemy->npcID); Enemy* baseEnemy; Npc* baseNpc; @@ -123,8 +115,8 @@ API_CALLABLE(N(MeleeHitbox_Main)) { if (isInitialCall || (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->functionTemp[0] = 0; hitboxNpc->duration = 0; - hitboxNpc->flags |= (NPC_FLAG_2 | NPC_FLAG_100); - hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000; + hitboxNpc->flags |= (NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION); + hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER; hitboxNpc->pos.x = NPC_DISPOSE_POS_X; hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; @@ -137,7 +129,7 @@ API_CALLABLE(N(MeleeHitbox_Main)) { case 0: baseEnemy = get_enemy(hitboxEnemy->npcID - 1); baseNpc = get_npc_unsafe(baseEnemy->npcID); - hitboxEnemy->unk_07 = 1; + hitboxEnemy->hitboxIsActive = TRUE; if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_ACTIVE) { if (hitboxEnemy->AI_VAR_HITNPC_SOUND != 0) { ai_enemy_play_sound(baseNpc, hitboxEnemy->AI_VAR_HITNPC_SOUND, 0); @@ -156,7 +148,7 @@ API_CALLABLE(N(MeleeHitbox_Main)) { hitboxEnemy->unk_10.z = hitboxNpc->pos.z; hitboxNpc->yaw = atan2(hitboxNpc->pos.x, hitboxNpc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - hitboxEnemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); + hitboxEnemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); hitboxNpc->duration = 0; script->functionTemp[0] = 1; } @@ -166,21 +158,21 @@ API_CALLABLE(N(MeleeHitbox_Main)) { get_npc_unsafe(baseEnemy->npcID); hitboxNpc->duration++; if (hitboxNpc->duration >= hitboxEnemy->AI_VAR_HITNPC_4) { - hitboxEnemy->unk_07 = 0; + hitboxEnemy->hitboxIsActive = FALSE; } if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_POST) { - hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000; + hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER; hitboxNpc->pos.x = NPC_DISPOSE_POS_X; hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; - hitboxEnemy->unk_07 = 1; + hitboxEnemy->hitboxIsActive = TRUE; script->functionTemp[0] = 0; } break; } #ifdef _DEAD_H_ - if (hitboxEnemy->unk_07 != 0) { + if (hitboxEnemy->hitboxIsActive != 0) { hitboxEnemy->unk_114 = 7.0f; hitboxEnemy->unk_118 = 1.0f; } diff --git a/src/world/common/enemy/ai/MontyMoleAI.inc.c b/src/world/common/enemy/ai/MontyMoleAI.inc.c index 1b780cfb23..c347b64c42 100644 --- a/src/world/common/enemy/ai/MontyMoleAI.inc.c +++ b/src/world/common/enemy/ai/MontyMoleAI.inc.c @@ -75,7 +75,7 @@ static void N(MontyMoleAI_Init)(Evt* script, MobileAISettings* aiSettings, Enemy npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; } enemy->flags |= MONTY_MOLE_UNK_NPC_FLAGS; - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; script->functionTemp[1] = 0; script->AI_TEMP_STATE = AI_STATE_MOLE_WANDER; } @@ -100,7 +100,7 @@ static void N(MontyMoleAI_Wander)(Evt* script, MobileAISettings* aiSettings, Ene if (npc_raycast_down_sides(0, &dummyNpc.pos.x, &dummyNpc.pos.y, &dummyNpc.pos.z, &hitDepth) && (hitDepth < 5.0f)) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } - if (npc->flags & NPC_FLAG_4000) { + if (npc->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD) { script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; } if (aiSettings->playerSearchInterval >= 0) { @@ -114,7 +114,7 @@ static void N(MontyMoleAI_Wander)(Evt* script, MobileAISettings* aiSettings, Ene } script->functionTemp[1]--; } - if (!(npc->flags & (NPC_FLAG_8 | NPC_FLAG_1000))) { + if (!(npc->flags & (NPC_FLAG_8 | NPC_FLAG_FALLING))) { npc->homePos.x = npc->pos.x; npc->homePos.z = npc->pos.z; } @@ -128,7 +128,7 @@ static void N(MontyMoleAI_PreSurface)(Evt* script, MobileAISettings* aiSettings, Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; ai_enemy_play_sound(npc, SOUND_BURROW_SURFACE, 0); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); npc->currentAnim = ANIM_MontyMole_Anim10; // emerge from ground @@ -220,7 +220,7 @@ static void N(MontyMoleAI_Burrow)(Evt* script, MobileAISettings* aiSettings, Ene enemy->flags |= MONTY_MOLE_UNK_NPC_FLAGS; } if (npc->duration <= 0) { - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; } } diff --git a/src/world/common/enemy/ai/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c index de62a2f85c..b0af4fd981 100644 --- a/src/world/common/enemy/ai/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -27,7 +27,7 @@ void N(ParatroopaAI_Windup)(Evt* script, MobileAISettings* aiSettings, EnemyDete enemy->unk_10.x = npc->pos.x; enemy->unk_10.y = npc->pos.y; enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; + enemy->hitboxIsActive = TRUE; ai_enemy_play_sound(npc, SOUND_UNUSED_2C1, 0); yawTemp = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); @@ -46,7 +46,7 @@ void N(ParatroopaAI_Dive)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (npc->duration <= 0) { - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; npc->jumpScale = 0.3f; npc->jumpVelocity = 0.0f; npc->moveSpeed = 3.0f; diff --git a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c index 5c0ffacfd0..9da6ecc893 100644 --- a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c @@ -4,19 +4,11 @@ #include "common.h" #include "npc.h" -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif - // prerequisites #include "world/common/enemy/ai/States_PatrolAI.inc.c" API_CALLABLE(N(PatrolNoAttackAI_Main)) { - #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; @@ -59,9 +51,9 @@ API_CALLABLE(N(PatrolNoAttackAI_Main)) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 0; enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c index ea9cf967d9..b1b2513351 100644 --- a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c +++ b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c @@ -58,7 +58,7 @@ void N(PiranhaPlantAI_10)(Evt* script, MobileAISettings* aiSettings, EnemyDetect 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); + ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); } if (npc->duration == 0) { @@ -225,7 +225,7 @@ void N(PiranhaPlantAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetect 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); + enemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); } if (npc->duration == 0) { npc->currentAnim = enemy->animList[10]; @@ -285,15 +285,11 @@ void N(PiranhaPlantAI_LosePlayer)(Evt *script, MobileAISettings* aiSettings, Ene #include "npc.h" #ifdef _DEAD_H_ -void func_8004D8E0(DeadEnemy*); +void func_8004D8E0(Enemy*); #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; diff --git a/src/world/common/enemy/ai/ProjectileHitbox.inc.c b/src/world/common/enemy/ai/ProjectileHitbox.inc.c index 5bf9a2bba3..6d8c50e544 100644 --- a/src/world/common/enemy/ai/ProjectileHitbox.inc.c +++ b/src/world/common/enemy/ai/ProjectileHitbox.inc.c @@ -152,13 +152,13 @@ API_CALLABLE(N(ProjectileAI_Main)) { 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; + npc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; enemy->varTable[0] = 0; - 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; + enemy->flags |= ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_HAMMER | + ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | + ENEMY_FLAG_100000 | ENEMY_FLAG_PROJECTILE; if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } @@ -168,7 +168,7 @@ API_CALLABLE(N(ProjectileAI_Main)) { default: return 0; case 0: - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); enemy->varTable[0] = 0; script->functionTemp[0] = 1; @@ -183,7 +183,7 @@ API_CALLABLE(N(ProjectileAI_Main)) { npc->pos.z = npc2->pos.z; add_vec2D_polar(&npc->pos.x, &npc->pos.z, enemy->varTable[3], 270.0f - npc2->renderYaw); npc->pos.y = npc2->pos.y + enemy->varTable[2]; - enemy->unk_07 = vt0; + enemy->hitboxIsActive = vt0; enemy->unk_10.x = npc->pos.x; enemy->unk_10.y = npc->pos.y; enemy->unk_10.z = npc->pos.z; @@ -195,10 +195,10 @@ API_CALLABLE(N(ProjectileAI_Main)) { npc->jumpVelocity = aiSettings->alertRadius; npc->jumpScale = aiSettings->alertOffsetDist; npc->moveToPos.y = npc2->pos.y; - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; enable_npc_shadow(npc); npc->flags |= NPC_FLAG_JUMPING; - enemy->flags &= ~(ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + enemy->flags &= ~(ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH); npc->duration = 90; script->functionTemp[0] = 2; @@ -253,10 +253,10 @@ API_CALLABLE(N(ProjectileAI_Main)) { npc->pos.y = NPC_DISPOSE_POS_Y; npc->pos.z = NPC_DISPOSE_POS_Z; npc->jumpVelocity = 0.0f; - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; - enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + enemy->flags |= ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH; script->functionTemp[0] = 0; } @@ -357,10 +357,10 @@ API_CALLABLE(N(ProjectileAI_Reflect)) { npc->pos.x = NPC_DISPOSE_POS_X; npc->pos.y = NPC_DISPOSE_POS_Y; npc->pos.z = NPC_DISPOSE_POS_Z; - npc->flags |= NPC_FLAG_2; + npc->flags |= NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; - enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + enemy->flags |= ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH; script->functionTemp[0] = 0; evt_set_variable(script, LVar0, 1); diff --git a/src/world/common/enemy/ai/RangedAttackAI.inc.c b/src/world/common/enemy/ai/RangedAttackAI.inc.c index fe49c478a8..05f0565fda 100644 --- a/src/world/common/enemy/ai/RangedAttackAI.inc.c +++ b/src/world/common/enemy/ai/RangedAttackAI.inc.c @@ -47,11 +47,11 @@ API_CALLABLE(N(RangedAttackAI_Main)) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 0; enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index cddb4df3b9..c637157f6d 100644 --- a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -98,9 +98,9 @@ API_CALLABLE(N(ShyGuyPatrolAI_Main)) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c index 8e9e7b382e..887e7f51b4 100644 --- a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c @@ -95,11 +95,11 @@ API_CALLABLE(N(ShyGuyWanderAI_Main)) { if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->functionTemp[0] = 12; } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; hitDepth = 100.0f; posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/SpinyAI.inc.c b/src/world/common/enemy/ai/SpinyAI.inc.c index a22d4568fc..ba1e791c52 100644 --- a/src/world/common/enemy/ai/SpinyAI.inc.c +++ b/src/world/common/enemy/ai/SpinyAI.inc.c @@ -9,11 +9,7 @@ #include "world/common/enemy/ai/TackleAI.inc.c" API_CALLABLE(N(SpinyAI_Main)) { - #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; @@ -50,7 +46,7 @@ API_CALLABLE(N(SpinyAI_Main)) { npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; npc->flags &= ~NPC_FLAG_JUMPING; - enemy->flags |= ENEMY_FLAG_200000; + enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; enemy->varTable[10] = 0; @@ -132,7 +128,7 @@ API_CALLABLE(N(SpinyAI_Main)) { npc->pos.z = npc2->pos.z + 1.0; npc->rotation.y = 0.0f; npc->flags |= NPC_FLAG_8; - npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_INVISIBLE; npc->flags &= ~NPC_FLAG_GRAVITY; npc->renderYaw = 0.0f; npc->currentAnim = ANIM_Spiny_Anim18; @@ -189,7 +185,7 @@ API_CALLABLE(N(SpinyAI_Main)) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - npc->flags |= NPC_FLAG_40000; + npc->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW; npc->flags &= ~NPC_FLAG_JUMPING; npc->jumpVelocity = 0.0f; npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); @@ -205,7 +201,7 @@ API_CALLABLE(N(SpinyAI_Main)) { case 103: npc->duration--; if (npc->duration <= 0) { - npc->flags &= ~NPC_FLAG_40000; + npc->flags &= ~NPC_FLAG_IGNORE_CAMERA_FOR_YAW; npc->currentAnim = ANIM_Spiny_Anim01; script->AI_TEMP_STATE = 0; } @@ -215,7 +211,7 @@ API_CALLABLE(N(SpinyAI_Main)) { npc->pos.x = NPC_DISPOSE_POS_X; npc->pos.y = NPC_DISPOSE_POS_Y; npc->pos.z = NPC_DISPOSE_POS_Z; - npc->flags |= NPC_FLAG_8 | NPC_FLAG_2; + npc->flags |= NPC_FLAG_8 | NPC_FLAG_INVISIBLE; npc->flags &= ~NPC_FLAG_GRAVITY; script->AI_TEMP_STATE = 111; case 111: diff --git a/src/world/common/enemy/ai/States_TackleAI.inc.c b/src/world/common/enemy/ai/States_TackleAI.inc.c index 235339e843..89440854b9 100644 --- a/src/world/common/enemy/ai/States_TackleAI.inc.c +++ b/src/world/common/enemy/ai/States_TackleAI.inc.c @@ -52,7 +52,7 @@ void N(UnkNpcAIFunc12)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol enemy->unk_10.x = npc->pos.x; enemy->unk_10.y = npc->pos.y; enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; + enemy->hitboxIsActive = TRUE; } f1 = npc->pos.x; @@ -65,7 +65,7 @@ void N(UnkNpcAIFunc12)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } if ((npc->duration <= 0) || (--npc->duration <= 0) || (temp != 0)) { - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; npc->currentAnim = enemy->animList[10]; npc->duration = 0; script->functionTemp[0] = 15; diff --git a/src/world/common/enemy/ai/StoneChompAI.inc.c b/src/world/common/enemy/ai/StoneChompAI.inc.c index 1708793213..7a39c818fd 100644 --- a/src/world/common/enemy/ai/StoneChompAI.inc.c +++ b/src/world/common/enemy/ai/StoneChompAI.inc.c @@ -41,9 +41,9 @@ API_CALLABLE(N(StoneChompAI_Main)) { npc->flags |= NPC_FLAG_8; script->functionTemp[1] = 0; script->AI_TEMP_STATE = AI_STATE_HOP_INIT; - if (enemy->flags & ENEMY_FLAG_40000000) { + if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } } diff --git a/src/world/common/enemy/ai/TackleAI.inc.c b/src/world/common/enemy/ai/TackleAI.inc.c index c343cff360..f658630107 100644 --- a/src/world/common/enemy/ai/TackleAI.inc.c +++ b/src/world/common/enemy/ai/TackleAI.inc.c @@ -12,11 +12,7 @@ #include "world/common/enemy/ai/States_TackleAI.inc.c" API_CALLABLE(N(TackleAI_Main)) { - #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; @@ -50,7 +46,7 @@ API_CALLABLE(N(TackleAI_Main)) { if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = 0; npc->duration = 0; - enemy->unk_07 = 0; + enemy->hitboxIsActive = FALSE; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; npc->flags &= ~NPC_FLAG_JUMPING; npc->collisionHeight = enemy->varTable[6]; @@ -71,9 +67,9 @@ API_CALLABLE(N(TackleAI_Main)) { 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_SUSPEND; - } else if (enemy->flags & ENEMY_FLAG_40000000) { + } else if (enemy->flags & ENEMY_FLAG_BEGIN_WITH_CHASING) { script->AI_TEMP_STATE = 12; - enemy->flags &= ~ENEMY_FLAG_40000000; + enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; } } diff --git a/src/world/common/enemy/ai/WanderMeleeAI.inc.c b/src/world/common/enemy/ai/WanderMeleeAI.inc.c index 85bb32a4ef..246de7350f 100644 --- a/src/world/common/enemy/ai/WanderMeleeAI.inc.c +++ b/src/world/common/enemy/ai/WanderMeleeAI.inc.c @@ -14,11 +14,7 @@ #include "world/common/enemy/ai/MeleeHitbox.inc.c" ApiStatus N(WanderMeleeAI_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; diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index 75749eafa8..0c5f090856 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -144,7 +144,7 @@ EvtScript N(EVS_Pipe_EnterVertical) = { 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(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) EVT_END_THREAD diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 4dc953c782..f896d96c1f 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -483,7 +483,7 @@ EvtScript N(SuperBlock_OnHit) = { EVT_CALL(N(SuperBlock_SetOverride40)) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(N(SuperBlock_StartGlowEffect), SUPER_BLOCK_MAPVAR, LVar9) EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, LVarC) EVT_CALL(N(SuperBlock_CountEligiblePartners)) diff --git a/src/world/common/todo/AwaitPlayerNearNpc.inc.c b/src/world/common/todo/AwaitPlayerNearNpc.inc.c index c687d35878..c00cbb6150 100644 --- a/src/world/common/todo/AwaitPlayerNearNpc.inc.c +++ b/src/world/common/todo/AwaitPlayerNearNpc.inc.c @@ -30,7 +30,7 @@ API_CALLABLE(N(func_802408B4_97BEE4)) { npc->verticalRenderOffset = 0; } - if (npc->flags & NPC_FLAG_1000) { + if (npc->flags & NPC_FLAG_FALLING) { currentEncounter->encounterList[enemy->encounterIndex]->battle = enemy->varTable[0]; return ApiStatus_DONE2; } diff --git a/src/world/common/todo/CheckPartnerFlags1000.inc.c b/src/world/common/todo/CheckPartnerFlags1000.inc.c index edc5e3500a..952b66d49a 100644 --- a/src/world/common/todo/CheckPartnerFlags1000.inc.c +++ b/src/world/common/todo/CheckPartnerFlags1000.inc.c @@ -2,7 +2,7 @@ #include "npc.h" API_CALLABLE(N(CheckPartnerFlags1000)) { - if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_1000) { + if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_FALLING) { return ApiStatus_DONE2; } else { return ApiStatus_BLOCK; diff --git a/src/world/common/util/ChangeNpcToPartner.inc.c b/src/world/common/util/ChangeNpcToPartner.inc.c index 8f44ad3805..792bdbf577 100644 --- a/src/world/common/util/ChangeNpcToPartner.inc.c +++ b/src/world/common/util/ChangeNpcToPartner.inc.c @@ -40,7 +40,7 @@ API_CALLABLE(N(ChangeNpcToPartner)) { break; case 3: set_npc_yaw(get_npc_safe(NPC_PARTNER), npc->yaw); - npc->flags &= ~NPC_FLAG_4; + npc->flags &= ~NPC_FLAG_INACTIVE; disable_npc_shadow(npc); npc->pos.y = NPC_DISPOSE_POS_Y; return ApiStatus_DONE2; diff --git a/src/world/dead/area_flo/flo_00/flo_00.h b/src/world/dead/area_flo/flo_00/flo_00.h index d0bfba5102..36ac1972e3 100644 --- a/src/world/dead/area_flo/flo_00/flo_00.h +++ b/src/world/dead/area_flo/flo_00/flo_00.h @@ -3,7 +3,6 @@ #include "dead.h" #include "common.h" #include "message_ids.h" -#include "dead_structs.h" #include "../flo.h" #include "mapfs/flo_00_shape.h" diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index 1b995c24d7..2adbff5fbc 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -199,7 +199,7 @@ EvtScript N(EVS_NpcInit_Wisterwood) = { EVT_CALL(EnableGroup, MODEL_tuta, FALSE) EVT_CALL(EnableGroup, MODEL_g54, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 50, 70, -230) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_IF_LT(GB_StoryProgress, STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) EVT_EXEC(N(EVS_Wisterwood_Introduction)) @@ -518,7 +518,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Klevar, ANIM_WorldKlevar_Talk, ANIM_WorldKlevar_Idle, SPEECH_FLAG_200, MSG_CH6_00DA) - EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_40000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) @@ -624,7 +624,7 @@ NpcData N(NpcData_Wisterwood) = { .yaw = 270, .init = &N(EVS_NpcInit_Wisterwood), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, }; @@ -650,7 +650,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_01), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbA, @@ -675,7 +675,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_02), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_PURPLE_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbB, @@ -700,7 +700,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_03), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_GREEN_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbC, @@ -725,7 +725,7 @@ NpcData N(NpcData_Bubulbs)[] = { }, .init = &N(EVS_NpcInit_Bubulb_04), .settings = &N(NpcSettings_Bubulb_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = BUBULB_YELLOW_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbD, @@ -738,7 +738,7 @@ NpcData N(NpcData_Tolielup) = { .yaw = 90, .init = &N(EVS_NpcInit_Tolielup), .settings = &N(NpcSettings_Tolielup), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = TOLIELUP_ANIMS, .tattle = MSG_NpcTattle_Tolielup, @@ -750,7 +750,7 @@ NpcData N(NpcData_Klevar) = { .yaw = 0, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }; @@ -761,7 +761,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 270, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, diff --git a/src/world/dead/area_flo/flo_03/flo_03.h b/src/world/dead/area_flo/flo_03/flo_03.h index 184c702c04..7ad2ef40e9 100644 --- a/src/world/dead/area_flo/flo_03/flo_03.h +++ b/src/world/dead/area_flo/flo_03/flo_03.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" 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 082454d5ef..0a6d007d06 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 @@ -394,7 +394,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_01, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_01, TRUE) @@ -407,7 +407,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) @@ -428,14 +428,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_01, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_01, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 30, LVar0) EVT_ADD(LVar0, 60) EVT_SET(MV_NextBurrowTime_Mole_01, LVar0) @@ -473,7 +473,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_02, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_02, TRUE) @@ -486,7 +486,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) @@ -507,14 +507,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_02, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_02, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 35, LVar0) EVT_ADD(LVar0, 55) EVT_SET(MV_NextBurrowTime_Mole_02, LVar0) @@ -552,7 +552,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_03, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_03, TRUE) @@ -565,7 +565,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) @@ -586,14 +586,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_03, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_03, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 40, LVar0) EVT_ADD(LVar0, 50) EVT_SET(MV_NextBurrowTime_Mole_03, LVar0) @@ -631,7 +631,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_END_IF EVT_IF_EQ(LV_ShouldBurrow, TRUE) EVT_IF_EQ(AF_FLO_IsUnderground_Mole_04, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1) EVT_WAIT(1) EVT_SET(AF_FLO_IsUnderground_Mole_04, TRUE) @@ -644,7 +644,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_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_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) @@ -665,14 +665,14 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_MontyMole_04, LVar1, LVar2, LVar3) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_SET(AF_FLO_IsUnderground_Mole_04, FALSE) EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) EVT_CALL(RandInt, 45, LVar0) EVT_ADD(LVar0, 45) EVT_SET(MV_NextBurrowTime_Mole_04, LVar0) @@ -786,7 +786,7 @@ NpcData N(NpcData_Petunia) = { .yaw = 270, .init = &N(EVS_NpcInit_Petunia), .settings = &N(NpcSettings_Petunia), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Petunia_Idle, @@ -815,7 +815,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 90, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Dayzee_Anim01, @@ -843,7 +843,7 @@ NpcData N(NpcData_MontyMole_01) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_01), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -871,7 +871,7 @@ NpcData N(NpcData_MontyMole_02) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_02), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -899,7 +899,7 @@ NpcData N(NpcData_MontyMole_03) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_03), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -927,7 +927,7 @@ NpcData N(NpcData_MontyMole_04) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_04), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, diff --git a/src/world/dead/area_flo/flo_07/flo_07.h b/src/world/dead/area_flo/flo_07/flo_07.h index 3bc459057a..80e8cb5800 100644 --- a/src/world/dead/area_flo/flo_07/flo_07.h +++ b/src/world/dead/area_flo/flo_07/flo_07.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c index 894325b579..8e2ae843f4 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c @@ -237,7 +237,7 @@ NpcData N(NpcData_Posie) = { .yaw = 90, .init = &N(EVS_NpcInit_Posie), .settings = &N(NpcSettings_Posie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = POSIE_ANIMS, .tattle = MSG_NpcTattle_Posie, diff --git a/src/world/dead/area_flo/flo_08/flo_08.h b/src/world/dead/area_flo/flo_08/flo_08.h index 0ebdb72d7f..560f50094d 100644 --- a/src/world/dead/area_flo/flo_08/flo_08.h +++ b/src/world/dead/area_flo/flo_08/flo_08.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" 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 c9df3d763c..81175c8ab2 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 @@ -163,7 +163,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowGateFlower, @@ -186,7 +186,7 @@ NpcData N(NpcData_Dayzee_01) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -209,7 +209,7 @@ NpcData N(NpcData_Dayzee_02) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -232,7 +232,7 @@ NpcData N(NpcData_Dayzee_03) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -255,7 +255,7 @@ NpcData N(NpcData_Dayzee_04) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -278,7 +278,7 @@ NpcData N(NpcData_Dayzee_05) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -301,7 +301,7 @@ NpcData N(NpcData_Dayzee_06) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -324,7 +324,7 @@ NpcData N(NpcData_Dayzee_07) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -340,10 +340,10 @@ EvtScript N(EVS_NpcInit_AmazyDayzee) = { EVT_END_IF EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 30) - EVT_CALL(SetNpcFlagBits, NPC_Dayzee_02, NPC_FLAG_2 | NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dayzee_02, NPC_FLAG_INVISIBLE | NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_Dayzee_02, NPC_DISPOSE_LOCATION) EVT_ELSE - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_4, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_INACTIVE, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_END_THREAD @@ -369,7 +369,7 @@ NpcData N(NpcData_AmazyDayzee) = { }, .init = &N(EVS_NpcInit_AmazyDayzee), .settings = &N(NpcSettings_AmazyDayzee), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = AMAZY_DAYZEE_DROPS, .animations = AMAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_09/flo_09.h b/src/world/dead/area_flo/flo_09/flo_09.h index 2a2a1ca278..c19da83f1c 100644 --- a/src/world/dead/area_flo/flo_09/flo_09.h +++ b/src/world/dead/area_flo/flo_09/flo_09.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c b/src/world/dead/area_flo/flo_09/flo_09_5_npc.c index c18a555dba..e547bcf86c 100644 --- a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c +++ b/src/world/dead/area_flo/flo_09/flo_09_5_npc.c @@ -27,7 +27,7 @@ EvtScript N(EVS_NpcAI_Bzzap_02) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(25) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_END_SWITCH @@ -75,7 +75,7 @@ NpcData N(NpcData_Dayzee_01) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -98,7 +98,7 @@ NpcData N(NpcData_Dayzee_02) = { } }, .settings = &N(NpcSettings_CrazyDayzee), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -121,7 +121,7 @@ NpcData N(NpcData_Bzzap_01) = { } }, .settings = &N(NpcSettings_Bzzap), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -145,7 +145,7 @@ NpcData N(NpcData_Bzzap_02) = { }, .init = &N(EVS_NpcInit_Bzzap_02), .settings = &N(NpcSettings_Bzzap_02), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_10/flo_10.h b/src/world/dead/area_flo/flo_10/flo_10.h index ed00fce8fa..fbbde9ab8a 100644 --- a/src/world/dead/area_flo/flo_10/flo_10.h +++ b/src/world/dead/area_flo/flo_10/flo_10.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" @@ -11,7 +10,7 @@ #include "mapfs/flo_10_hit.h" enum { - NPC_Lily = 0, + NPC_Lily = 0, }; #define NAMESPACE dead_flo_10 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 f01ba866f0..53c6277c98 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 @@ -95,10 +95,10 @@ EvtScript N(EVS_MovePlayerToTalk) = { EVT_ELSE EVT_ADD(LVar0, 40) EVT_END_IF - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, LVar0, LVar5, 15) EVT_CALL(PlayerFaceNpc, NPC_Lily, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_THREAD EVT_END_SWITCH EVT_RETURN @@ -204,7 +204,7 @@ NpcData N(NpcData_Lily) = { .yaw = 270, .init = &N(EVS_NpcInit_Lily), .settings = &N(NpcSettings_Lily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = LILY_ANIMS, .tattle = MSG_NpcTattle_Lily, diff --git a/src/world/dead/area_flo/flo_11/flo_11.h b/src/world/dead/area_flo/flo_11/flo_11.h index 2a77c0df8f..db7dd80769 100644 --- a/src/world/dead/area_flo/flo_11/flo_11.h +++ b/src/world/dead/area_flo/flo_11/flo_11.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c index e17e67e427..e8d9507d90 100644 --- a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c @@ -375,7 +375,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, @@ -385,7 +385,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, diff --git a/src/world/dead/area_flo/flo_12/flo_12.h b/src/world/dead/area_flo/flo_12/flo_12.h index 0c3d0978e5..02b2008d0e 100644 --- a/src/world/dead/area_flo/flo_12/flo_12.h +++ b/src/world/dead/area_flo/flo_12/flo_12.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c index 9942a86641..48a607047c 100644 --- a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c @@ -37,9 +37,9 @@ EvtScript N(EVS_Scene_SunReturns) = { EvtScript N(EVS_PlayerApproachRosie) = { EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, -5, 20, 20) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(PlayerFaceNpc, NPC_Rosie, TRUE) EVT_RETURN EVT_END @@ -47,11 +47,11 @@ EvtScript N(EVS_PlayerApproachRosie) = { EvtScript N(EVS_PlayerApproachRosieAndItem) = { EVT_WAIT(10) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, -5, 20, 20) - EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_100, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Rosie, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(PlayerFaceNpc, NPC_Rosie, TRUE) EVT_RETURN EVT_END @@ -76,7 +76,7 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_CASE_EQ(1) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Rosie_Talk, ANIM_Rosie_Idle, 5, MSG_CH6_008E) EVT_END_SWITCH - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_TakeOut) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) @@ -163,23 +163,23 @@ EvtScript N(EVS_NpcInit_Rosie) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 35) EVT_CALL(SetNpcPos, NPC_Dummy, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_HAS_SHADOW, TRUE) EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH6_GOT_CRYSTAL_BERRY) EVT_IF_EQ(GF_FLO12_Met_Rosie, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_SET(LVarA, LVar0) EVT_END_IF EVT_CASE_LT(STORY_CH6_GOT_WATER_STONE) - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_SET(LVarA, LVar0) EVT_CASE_DEFAULT - EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Dummy, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) EVT_CALL(MakeItemEntity, ITEM_CRYSTAL_BERRY, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_SET(LVarA, LVar0) @@ -195,7 +195,7 @@ NpcData N(NpcData_Rosie)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rosie), .settings = &N(NpcSettings_Rosie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = ROSIE_ANIMS, .tattle = MSG_NpcTattle_Rosie, @@ -205,7 +205,7 @@ NpcData N(NpcData_Rosie)[] = { .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = ROSIE_ANIMS, }, diff --git a/src/world/dead/area_flo/flo_13/flo_13.h b/src/world/dead/area_flo/flo_13/flo_13.h index 59a325ad0f..0876ca8055 100644 --- a/src/world/dead/area_flo/flo_13/flo_13.h +++ b/src/world/dead/area_flo/flo_13/flo_13.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c index ec8e740303..fcd1db97e0 100644 --- a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c @@ -313,7 +313,7 @@ EvtScript N(EVS_Lakilulu_FlyAway) = { EVT_THREAD EVT_CALL(N(PlayLakiluluFlightSounds), 55) EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakilulu, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakilulu, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_EXEC_GET_TID(N(EVS_Laklilulu_ManageYaw), LVar9) EVT_CALL(LoadPath, 55, EVT_PTR(N(FlightPath_LakiluluDeparts)), ARRAY_COUNT(N(FlightPath_LakiluluDeparts)), EASING_LINEAR) EVT_LABEL(20) @@ -599,7 +599,7 @@ NpcData N(NpcData_Lakilester) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilester), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, @@ -627,7 +627,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -656,7 +656,7 @@ NpcData N(NpcData_Lakilulu_Spiny) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu_Spiny), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -696,7 +696,7 @@ NpcData N(NpcData_Lakitu_01) = { }, .init = &N(EVS_NpcInit_Lakitu), .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -720,7 +720,7 @@ NpcData N(NpcData_Lakitu_02) = { }, .init = &N(EVS_NpcInit_Lakitu), .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -744,7 +744,7 @@ NpcData N(NpcData_Spiny_01) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -768,7 +768,7 @@ NpcData N(NpcData_Spiny_02) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -792,7 +792,7 @@ NpcData N(NpcData_Spiny_03) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -816,7 +816,7 @@ NpcData N(NpcData_Spiny_04) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -840,7 +840,7 @@ NpcData N(NpcData_Spiny_05) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -864,7 +864,7 @@ NpcData N(NpcData_Spiny_06) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_14/flo_14.h b/src/world/dead/area_flo/flo_14/flo_14.h index 30ac74b0ba..18c276846b 100644 --- a/src/world/dead/area_flo/flo_14/flo_14.h +++ b/src/world/dead/area_flo/flo_14/flo_14.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c index a8d0612257..2936558de7 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c @@ -117,7 +117,7 @@ EvtScript N(EVS_RideBigBubble) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetModelCenter, MODEL_o167) EVT_THREAD EVT_ADD(LVar2, -10) diff --git a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c b/src/world/dead/area_flo/flo_14/flo_14_4_npc.c index 7b7b175364..7703c76cc8 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c +++ b/src/world/dead/area_flo/flo_14/flo_14_4_npc.c @@ -40,9 +40,9 @@ EvtScript N(EVS_NpcInteract_BubbleFlower) = { EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 0, MSG_CH6_0061) EVT_SET(AF_FLO_BlowingBigBubble, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(PlayerMoveTo, 555, 110, 20) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(func_802CF56C, 2) EVT_WAIT(5) @@ -84,7 +84,7 @@ NpcData N(NpcData_BubbleFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_BubbleFlower), .settings = &N(NpcSettings_BubbleFlower), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_BubblePlant, @@ -107,7 +107,7 @@ NpcData N(NpcData_Bzzap) = { } }, .settings = &N(NpcSettings_Bzzap), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_15/flo_15.h b/src/world/dead/area_flo/flo_15/flo_15.h index 8778109054..afa24deda1 100644 --- a/src/world/dead/area_flo/flo_15/flo_15.h +++ b/src/world/dead/area_flo/flo_15/flo_15.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c index 9c35933a99..d60aa8ca19 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c @@ -126,7 +126,7 @@ EvtScript N(EVS_Sun_DescendFromSky) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_KILL_THREAD(LVar9) - EVT_CALL(SetNpcFlagBits, NPC_Sun_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Sun_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetNpcPos, NPC_Sun_01, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Sun_01, LVar0, 450, LVar2, 30) EVT_CALL(DisablePlayerInput, FALSE) @@ -204,7 +204,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_01), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, @@ -215,7 +215,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_02), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_8000, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, diff --git a/src/world/dead/area_flo/flo_16/flo_16.h b/src/world/dead/area_flo/flo_16/flo_16.h index 1fa02b2341..b321b68178 100644 --- a/src/world/dead/area_flo/flo_16/flo_16.h +++ b/src/world/dead/area_flo/flo_16/flo_16.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c b/src/world/dead/area_flo/flo_16/flo_16_5_npc.c index 04709ed2fc..fecc471f68 100644 --- a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c +++ b/src/world/dead/area_flo/flo_16/flo_16_5_npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_TuffPuff_01) = { } }, .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -43,7 +43,7 @@ NpcData N(NpcData_TuffPuff_02) = { } }, .settings = &N(NpcSettings_TuffPuff), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_17/flo_17.h b/src/world/dead/area_flo/flo_17/flo_17.h index 25239d6092..0e47a1b8ca 100644 --- a/src/world/dead/area_flo/flo_17/flo_17.h +++ b/src/world/dead/area_flo/flo_17/flo_17.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c b/src/world/dead/area_flo/flo_17/flo_17_4_npc.c index 195b67b9a7..72d0cd5df8 100644 --- a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c +++ b/src/world/dead/area_flo/flo_17/flo_17_4_npc.c @@ -23,7 +23,7 @@ NpcData N(NpcData_Lakitu_01) = { } }, .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -46,7 +46,7 @@ NpcData N(NpcData_Lakitu_02) = { } }, .settings = &N(NpcSettings_Lakitu_SpinySpawner), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -69,7 +69,7 @@ NpcData N(NpcData_Spiny_01) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -92,7 +92,7 @@ NpcData N(NpcData_Spiny_02) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -115,7 +115,7 @@ NpcData N(NpcData_Spiny_03) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -138,7 +138,7 @@ NpcData N(NpcData_Spiny_04) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_18/flo_18.h b/src/world/dead/area_flo/flo_18/flo_18.h index bc972a4516..102096a36b 100644 --- a/src/world/dead/area_flo/flo_18/flo_18.h +++ b/src/world/dead/area_flo/flo_18/flo_18.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index 39c0c9a947..382720fa55 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_19E, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) EVT_LOOP(0) @@ -104,7 +104,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_WAIT(15) EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_19F, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR) EVT_LOOP(0) @@ -117,7 +117,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_02, 270, 0) EVT_CALL(LoadPath, 70, EVT_PTR(N(RetreatPath_Lakitu_02)), ARRAY_COUNT(N(RetreatPath_Lakitu_02)), EASING_LINEAR) EVT_LOOP(0) @@ -130,7 +130,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_19F, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0) EVT_CALL(LoadPath, 80, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR) EVT_LOOP(0) @@ -158,15 +158,15 @@ EvtScript N(EVS_ChargeAtPlayer) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_GT(LVar2, -61) EVT_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Lakitu_01, LVar0, 55, LVar3) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Lakitu_02, LVar0, 55, LVar3) EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(NpcMoveTo, NPC_Lakitu_03, LVar0, 55, LVar3) EVT_END_CHILD_THREAD EVT_WAIT(LVar4) @@ -338,7 +338,7 @@ EvtScript N(EVS_GenericHitReaction) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-6.0)) EVT_EXEC_WAIT(N(EVS_ReactionFacePlayer)) EVT_SWITCH(AB_FLO_GuardedMachineHitCount) @@ -604,7 +604,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -615,7 +615,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -626,7 +626,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_03), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -637,7 +637,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Magikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -648,7 +648,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_FlyingMagikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, diff --git a/src/world/dead/area_flo/flo_19/flo_19.h b/src/world/dead/area_flo/flo_19/flo_19.h index a91c2a1b1c..1d88c5767a 100644 --- a/src/world/dead/area_flo/flo_19/flo_19.h +++ b/src/world/dead/area_flo/flo_19/flo_19.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c index 86fd0aa3bf..71f96d327e 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c @@ -108,7 +108,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o108, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o122, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetCamType, CAM_DEFAULT, 1, FALSE) diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11.h b/src/world/dead/area_kzn/kzn_11/kzn_11.h index 4fe331a272..2d2ea0e530 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11.h +++ b/src/world/dead/area_kzn/kzn_11/kzn_11.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c index 624d127030..e080aa99e7 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c @@ -16,14 +16,14 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_SET(LVarB, LVar1) EVT_LOOP(15) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, TRUE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) EVT_SET(LVar0, LVarA) EVT_SET(LVar1, LVarB) EVT_LOOP(LVar1) - EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_INVISIBLE, FALSE) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_WAIT(1) @@ -117,7 +117,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -125,7 +125,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_03) = { @@ -133,14 +133,14 @@ NpcSettings N(NpcSettings_FireBar_03) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_03), - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { .defaultAnim = ANIM_Fire_Brighest_Burn, .height = 12, .radius = 20, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, }; NpcData N(NpcData_FireBar_01)[] = { @@ -289,7 +289,7 @@ NpcData N(NpcData_Bubble_01) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -312,7 +312,7 @@ NpcData N(NpcData_Bubble_02) = { } }, .settings = &N(NpcSettings_LavaBubble), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17.h b/src/world/dead/area_kzn/kzn_17/kzn_17.h index e1a0b426ec..84f6fc8b2a 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17.h +++ b/src/world/dead/area_kzn/kzn_17/kzn_17.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c index ef3235e002..e57f29841b 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c @@ -84,12 +84,12 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F7, 160, 40) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 290, 0, 30) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(NpcMoveTo, NPC_SELF, 640, 80, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Yell) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00F8) EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_AT_DEAD_END) @@ -139,7 +139,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -163,7 +163,7 @@ NpcData N(NpcData_Piranha)[] = { } }, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -188,7 +188,7 @@ NpcData N(NpcData_SpikeTop) = { } }, .settings = &N(NpcSettings_SpikeTop), - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18.h b/src/world/dead/area_kzn/kzn_18/kzn_18.h index 94cb3ef1cb..d88bffef16 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18.h +++ b/src/world/dead/area_kzn/kzn_18/kzn_18.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c index b5a7ff6431..7e4a4fbdbb 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c @@ -149,7 +149,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -161,7 +161,7 @@ NpcData N(NpcData_Piranha) = { .yaw = 270, .init = &N(EVS_NpcInit_Piranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19.h b/src/world/dead/area_kzn/kzn_19/kzn_19.h index 57ab6ebb14..dccddaf51e 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19.h +++ b/src/world/dead/area_kzn/kzn_19/kzn_19.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index a668f2bd7c..c6ce912b1a 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -404,7 +404,7 @@ EvtScript N(EVS_Kolorado_Escape) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(60) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 70, 25, 60) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) @@ -993,7 +993,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20.h b/src/world/dead/area_kzn/kzn_20/kzn_20.h index d11e5b544d..08ad5fa270 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20.h +++ b/src/world/dead/area_kzn/kzn_20/kzn_20.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" 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 280140364d..3578bc541e 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 @@ -181,7 +181,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_LABEL(10) EVT_SWITCH(MV_SceneState) EVT_CASE_EQ(SCENE_STATE_BEGIN) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) @@ -306,7 +306,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 75, -30, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_END_SWITCH EVT_WAIT(1) EVT_GOTO(10) @@ -479,14 +479,14 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(40) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Panic) EVT_CALL(SetNpcSpeed, NPC_Kolorado, EVT_FLOAT(5.0)) EVT_CALL(NpcMoveTo, NPC_Kolorado, 305, 0, 0) EVT_CALL(RemoveNpc, NPC_Kolorado) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_SELF, 145, 195, -10, 5) EVT_WAIT(5) @@ -531,7 +531,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22.h b/src/world/dead/area_kzn/kzn_22/kzn_22.h index 335f164e55..32844270af 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22.h +++ b/src/world/dead/area_kzn/kzn_22/kzn_22.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" 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 581701e325..67c04e75a4 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 @@ -174,8 +174,8 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_EXEC(N(EVS_ControlCamera)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -268,7 +268,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -280,7 +280,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23.h b/src/world/dead/area_kzn/kzn_23/kzn_23.h index 67eec30893..c1427055d8 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23.h +++ b/src/world/dead/area_kzn/kzn_23/kzn_23.h @@ -2,7 +2,6 @@ #include "dead.h" #include "common.h" -#include "dead_structs.h" #include "message_ids.h" #include "map.h" 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 424628835f..e07c85f717 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 @@ -281,7 +281,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -293,7 +293,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index ebede7a870..9078cc1701 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -47,13 +47,13 @@ void func_802BD100_317E50(Npc* npc) { } if (!(angle >= 360.0f)) { - if (D_8010C978 >= 0 && (D_8010C978 & COLLISION_WITH_ENTITY_BIT) != 0) { - entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); + if (NpcHitQueryColliderID >= 0 && (NpcHitQueryColliderID & COLLISION_WITH_ENTITY_BIT) != 0) { + entity_interacts_with_current_partner(NpcHitQueryColliderID & ~COLLISION_WITH_ENTITY_BIT); } } } else { - if (D_8010C978 >= 0 && (D_8010C978 & COLLISION_WITH_ENTITY_BIT) != 0) { - entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); + if (NpcHitQueryColliderID >= 0 && (NpcHitQueryColliderID & COLLISION_WITH_ENTITY_BIT) != 0) { + entity_interacts_with_current_partner(NpcHitQueryColliderID & ~COLLISION_WITH_ENTITY_BIT); } } } @@ -116,7 +116,7 @@ ApiStatus func_802BD338_318088(Evt* script, s32 isInitialCall) { BombetteTweesterPhysicsPtr->angularVelocity = 6.0f; BombetteTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; BombetteTweesterPhysicsPtr->countdown = 120; - bombette->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + bombette->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; bombette->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(BombetteTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -226,7 +226,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { switch (evt->functionTemp[0]) { case 20: - if ((playerStatus->inputEnabledCounter != 0) || (playerStatus->flags & PS_FLAG_JUMPING) || !(npc->flags & NPC_FLAG_1000)) { + if ((playerStatus->inputEnabledCounter != 0) || (playerStatus->flags & PS_FLAG_JUMPING) || !(npc->flags & NPC_FLAG_FALLING)) { return ApiStatus_DONE2; } disable_player_input(); @@ -304,7 +304,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { npc->jumpVelocity = 0.0f; D_802BE938 = 0; npc->flags |= NPC_FLAG_GRAVITY; - npc->flags &= ~NPC_FLAG_100; + npc->flags &= ~NPC_FLAG_IGNORE_PLAYER_COLLISION; npc->moveSpeed = 1.0f; evt->functionTemp[0] = 2; evt->functionTemp[1] = 50; @@ -314,7 +314,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { break; } if (evt->functionTemp[1] < 45) { - if (!(npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) && (D_802BE938 == 0)) { + if (!(npc->flags & NPC_FLAG_COLLDING_WITH_WORLD) && (D_802BE938 == 0)) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); func_8003D660(npc, 0); } else { @@ -325,7 +325,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { y = npc->pos.y + 14.0f; z = npc->pos.z; hitDepth = 16.0f; - if ((npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, npc->yaw, npc->collisionRadius) != 0) && (((u32) ((get_collider_flags(D_8010C978) & 0xFF) - 2)) < 2U)) { + if ((npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, npc->yaw, npc->collisionRadius) != 0) && (((u32) ((get_collider_flags(NpcHitQueryColliderID) & 0xFF) - 2)) < 2U)) { if (playerStatus->actionState == ACTION_STATE_IDLE) { suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); } @@ -353,7 +353,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { D_802BE92C = 0; } npc_do_other_npc_collision(npc); - if (npc->flags & NPC_FLAG_SIMPLIFIED_PHYSICS) { + if (npc->flags & NPC_FLAG_COLLIDING_WITH_NPC) { if (D_802BE92C != 0) { D_802BE92C = 0; enable_player_input(); diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index ccbc57c319..ce7564c2a7 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -69,7 +69,7 @@ ApiStatus BowUpdate(Evt* script, s32 isInitialCall) { BowTweesterPhysicsPtr->angularVelocity = 6.0f; BowTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; BowTweesterPhysicsPtr->countdown = 120; - bow->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + bow->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; bow->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(BowTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -358,7 +358,7 @@ void func_802BDDF0_324740(Npc* bow) { } playerStatus->flags &= ~(PS_FLAG_HAZARD_INVINCIBILITY | PS_FLAG_JUMPING); - bow->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_2); + bow->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_INVISIBLE); D_802BE0C4 = FALSE; actionState = ACTION_STATE_IDLE; @@ -404,6 +404,6 @@ void world_bow_pre_battle(Npc* bow) { partnerActionStatus->partnerActionState = 0; partnerActionStatus->actingPartner = 0; D_802BE0C0 = FALSE; - bow->flags &= ~NPC_FLAG_2; + bow->flags &= ~NPC_FLAG_INVISIBLE; } } diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index fe73e4bfb1..c04004b13f 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -137,7 +137,7 @@ s32 func_802BD1D0_3170F0(Evt* script, s32 isInitialCall) { GoombarioTweesterPhysicsPtr->angularVelocity = 6.0f; GoombarioTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; GoombarioTweesterPhysicsPtr->countdown = 120; - npc->flags |= NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_40000; + npc->flags |= NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW; npc->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(GoombarioTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -213,7 +213,7 @@ s32 world_goombario_can_pause(Npc* goombario) { return FALSE; } - if ((goombario->flags & (NPC_FLAG_1000 | NPC_FLAG_JUMPING)) != NPC_FLAG_1000) { + if ((goombario->flags & (NPC_FLAG_FALLING | NPC_FLAG_JUMPING)) != NPC_FLAG_FALLING) { return new_var = 0; do { } while (new_var); // why though } @@ -247,7 +247,7 @@ ApiStatus func_802BD5D8_3174F8(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 40: - if (!(goombario->flags & NPC_FLAG_1000) || playerStatus->inputEnabledCounter != 0) { + if (!(goombario->flags & NPC_FLAG_FALLING) || playerStatus->inputEnabledCounter != 0) { script->varTable[0] = -1; return ApiStatus_DONE2; } diff --git a/src/world/partner/goompa.c b/src/world/partner/goompa.c index 06b84e9608..6de07da868 100644 --- a/src/world/partner/goompa.c +++ b/src/world/partner/goompa.c @@ -60,7 +60,7 @@ ApiStatus func_802BD14C_324A5C(Evt* script, s32 isInitialCall) { GoompaTweesterPhysicsPtr->angularVelocity = 6.0f; GoompaTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; GoompaTweesterPhysicsPtr->countdown = 120; - goompa->flags |= NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_40000; + goompa->flags |= NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW; goompa->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(GoompaTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 7138f1d502..1ad532d723 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -2,8 +2,6 @@ #include "../src/world/partners.h" #include "sprite/npc/WorldKooper.h" -extern s16 D_8010C97A; - s32 entity_interacts_with_current_partner(s32); s32 test_item_entity_position(f32, f32, f32, f32); s32 npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length); @@ -26,20 +24,20 @@ BSS s32 D_802BEC7C; s32 D_802BEB40_31CB60 = 0; s32 func_802BD100_31B120(Npc* npc) { - if (D_8010C978 < 0) { + if (NpcHitQueryColliderID < 0) { return 0; } - if (!(D_8010C978 & COLLISION_WITH_ENTITY_BIT)) { + if (!(NpcHitQueryColliderID & COLLISION_WITH_ENTITY_BIT)) { return 0; } - return entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); + return entity_interacts_with_current_partner(NpcHitQueryColliderID & ~COLLISION_WITH_ENTITY_BIT); } void func_802BD144_31B164(Npc* kooper) { - if (D_8010C978 >= 0 && D_8010C978 & COLLISION_WITH_ENTITY_BIT) { - entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); + if (NpcHitQueryColliderID >= 0 && NpcHitQueryColliderID & COLLISION_WITH_ENTITY_BIT) { + entity_interacts_with_current_partner(NpcHitQueryColliderID & ~COLLISION_WITH_ENTITY_BIT); } } @@ -114,7 +112,7 @@ ApiStatus KooperUpdate(Evt* script, s32 isInitialCall) { KooperTweesterPhysicsPtr->angularVelocity = 6.0f; KooperTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; KooperTweesterPhysicsPtr->countdown = 120; - kooper->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + kooper->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; kooper->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(KooperTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -224,14 +222,14 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { case 20: if (playerStatus->inputEnabledCounter == 0) { if (playerStatus->timeInAir == 0) { - if (kooper->flags & NPC_FLAG_1000) { + if (kooper->flags & NPC_FLAG_FALLING) { disable_player_input(); script->functionTemp[2] = playerStatus->inputEnabledCounter; D_802BEC64 = 1; D_802BEB40_31CB60 = 0; D_802BEC6C = 0; kooper->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING | NPC_FLAG_8); - kooper->flags |= (NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION); + kooper->flags |= (NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION); partnerActionStatus->actingPartner = PARTNER_KOOPER; partnerActionStatus->partnerActionState = PARTNER_ACTION_KOOPER_1; D_802BEC58 = func_800EF4E0(); @@ -326,7 +324,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { temp_f20_3 = sp2C; if ((npc_raycast_up(0x10000, &sp20, &sp24, &sp28, &sp2C) != 0) && (sp2C < temp_f20_3)) { - collisionStatus->currentCeiling = D_8010C97A; + collisionStatus->currentCeiling = NpcHitQueryColliderID; playerStatus->position.y = sp24 - playerStatus->colliderHeight; func_802BD144_31B164(kooper); } @@ -411,7 +409,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { npc_do_other_npc_collision(kooper); - if (!(kooper->flags & NPC_FLAG_SIMPLIFIED_PHYSICS)) { + if (!(kooper->flags & NPC_FLAG_COLLIDING_WITH_NPC)) { if (func_802BD17C_31B19C(kooper) != 0) { sfx_play_sound_at_npc(SOUND_286, SOUND_SPACE_MODE_0, NPC_PARTNER); temp_f20_3 = sin_deg(kooper->yaw); @@ -503,7 +501,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { } if (script->functionTemp[0] == 7) { - kooper->flags |= NPC_FLAG_100; + kooper->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; //TODO: make if statement less bad if (((u8)playerStatus->actionState - 0x15) < 2U) { script->functionTemp[0] = 0; @@ -572,7 +570,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { } D_802BEB40_31CB60 = 0; - kooper->flags |= NPC_FLAG_100; + kooper->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; kooper->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_IGNORE_WORLD_COLLISION); partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index cee4e3538c..9c20c742eb 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -3,8 +3,6 @@ #include "effects.h" #include "sprite/npc/WorldLakilester.h" -extern s16 D_8010C97A; - BSS s32 D_802BFF00; BSS s32 D_802BFF04; BSS s32 D_802BFF08; @@ -112,7 +110,7 @@ ApiStatus func_802BD2D4_320E24(Evt* script, s32 isInitialCall) { LakilesterTweesterPhysicsPtr->angularVelocity = 6.0f; LakilesterTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; LakilesterTweesterPhysicsPtr->countdown = 120; - lakilester->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + lakilester->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; lakilester->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(LakilesterTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -279,12 +277,12 @@ void func_802BDA90_3215E0(Npc* lakilester) { f32 z = lakilester->pos.z; if (npc_test_move_complex_with_slipping(lakilester->collisionChannel, &x, &y, &z, 0.0f, temp_f0, lakilester->collisionHeight, temp_f20)) { - lakilester->flags |= (NPC_FLAG_4000 | NPC_FLAG_NO_PROJECT_SHADOW); - lakilester->currentWall = D_8010C97A; + lakilester->flags |= (NPC_FLAG_COLLDING_FORWARD_WITH_WORLD | NPC_FLAG_COLLDING_WITH_WORLD); + lakilester->currentWall = NpcHitQueryColliderID; lakilester->pos.x = x; lakilester->pos.z = z; } else { - lakilester->flags &= ~(NPC_FLAG_4000 | NPC_FLAG_NO_PROJECT_SHADOW); + lakilester->flags &= ~(NPC_FLAG_COLLDING_FORWARD_WITH_WORLD | NPC_FLAG_COLLDING_WITH_WORLD); } temp_f0 = clamp_angle(lakilester->yaw + 45.0f); @@ -295,9 +293,9 @@ void func_802BDA90_3215E0(Npc* lakilester) { if (npc_test_move_taller_with_slipping(lakilester->collisionChannel, &x, &y, &z, 0.0f, temp_f0, lakilester->collisionHeight, temp_f20)) { lakilester->pos.x = x; lakilester->pos.z = z; - lakilester->flags |= NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags |= NPC_FLAG_COLLDING_WITH_WORLD; } else { - lakilester->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } temp_f0 = clamp_angle(lakilester->yaw - 45.0f); @@ -308,9 +306,9 @@ void func_802BDA90_3215E0(Npc* lakilester) { if (npc_test_move_taller_with_slipping(lakilester->collisionChannel, &x, &y, &z, 0.0f, temp_f0, lakilester->collisionHeight, temp_f20)) { lakilester->pos.x = x; lakilester->pos.z = z; - lakilester->flags |= NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags |= NPC_FLAG_COLLDING_WITH_WORLD; } else { - lakilester->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } temp_f0 = clamp_angle(lakilester->yaw + 45.0f + 180.0f); @@ -319,11 +317,11 @@ void func_802BDA90_3215E0(Npc* lakilester) { z = lakilester->pos.z; if (npc_test_move_simple_with_slipping(lakilester->collisionChannel, &x, &y, &z, 0.0f, temp_f0, lakilester->collisionHeight, temp_f20)) { - lakilester->flags |= NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags |= NPC_FLAG_COLLDING_WITH_WORLD; lakilester->pos.x = x; lakilester->pos.z = z; } else { - lakilester->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } temp_f0 = clamp_angle(lakilester->yaw - 45.0f + 180.0f); @@ -332,11 +330,11 @@ void func_802BDA90_3215E0(Npc* lakilester) { z = lakilester->pos.z; if (npc_test_move_simple_with_slipping(lakilester->collisionChannel, &x, &y, &z, 0.0f, temp_f0, lakilester->collisionHeight, temp_f20)) { - lakilester->flags |= NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags |= NPC_FLAG_COLLDING_WITH_WORLD; lakilester->pos.x = x; lakilester->pos.z = z; } else { - lakilester->flags &= ~NPC_FLAG_NO_PROJECT_SHADOW; + lakilester->flags &= ~NPC_FLAG_COLLDING_WITH_WORLD; } } @@ -393,7 +391,7 @@ void func_802BDDD8_321928(Npc* npc) { if (npc_test_move_taller_with_slipping(npc->collisionChannel, &x, &y, &z, npc->collisionRadius, npc->yaw, npc->collisionHeight, npc->collisionRadius) != 0) { - collisionStatus->currentInspect = (partnerActionStatus->pressedButtons & BUTTON_A) ? D_8010C97A : -1; + collisionStatus->currentInspect = (partnerActionStatus->pressedButtons & BUTTON_A) ? NpcHitQueryColliderID : NO_COLLIDER; } if (moveSpeed != 0.0f) { @@ -406,14 +404,14 @@ void func_802BDDD8_321928(Npc* npc) { npc->collisionHeight, npc->collisionRadius) != 0) { if (D_802BFF10) { - collisionStatus->pushingAgainstWall = D_8010C97A; + collisionStatus->pushingAgainstWall = NpcHitQueryColliderID; } npc->pos.x += (x - npc->pos.x) / 5.0f; npc->pos.z += (z - npc->pos.z) / 5.0f; } else { npc_move_heading(npc, npc->moveSpeed, yaw); if (D_802BFF10) { - collisionStatus->pushingAgainstWall = -1; + collisionStatus->pushingAgainstWall = NO_COLLIDER; } } @@ -513,9 +511,9 @@ void func_802BDDD8_321928(Npc* npc) { return; } - collisionStatus->currentFloor = -1; + collisionStatus->currentFloor = NO_COLLIDER; playerStatus->timeInAir++; - npc->currentFloor = -1; + npc->currentFloor = NO_COLLIDER; npc->jumpScale += 1.8; if (npc->jumpScale > 12.0f) { @@ -584,13 +582,13 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { partnerActionStatus->partnerAction_unk_1 = 0; playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8); - npc->flags |= NPC_FLAG_100; + npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; set_action_state(ACTION_STATE_RIDE); suggest_player_anim_setUnkFlag(ANIM_Mario_8000E); npc->currentAnim = ANIM_WorldLakilester_Walk; D_802BFF0C = 1; npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8); - npc->flags |= (NPC_FLAG_100 | NPC_FLAG_400000); + npc->flags |= (NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_TOUCHES_GROUND); partnerActionStatus->actingPartner = PARTNER_LAKILESTER; partnerActionStatus->partnerActionState = PARTNER_ACTION_LAKILESTER_1; gGameStatusPtr->keepUsingPartnerOnMapChange = 0; @@ -678,7 +676,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } npc->flags &= ~NPC_FLAG_8; - npc->flags |= (NPC_FLAG_400000 | NPC_FLAG_100); + npc->flags |= (NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_IGNORE_PLAYER_COLLISION); set_action_state(ACTION_STATE_RIDE); D_802BFF0C = 1; func_800EF4E0(); @@ -871,7 +869,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { if (D_802BFF14 == 10) { D_802BFF0C = 0; - npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_400000 | NPC_FLAG_8); + npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_8); if (D_802BFF08 != 0) { D_802BFF08 = 0; @@ -903,7 +901,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } if (D_802BFF14 == 11) { - npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_400000 | NPC_FLAG_8); + npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_8); partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; @@ -1158,7 +1156,7 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) { playerStatus->flags |= PS_FLAG_FACE_FORWARDS; func_802BFB44_323694(2.0f); gGameStatusPtr->keepUsingPartnerOnMapChange = 1; - npc->flags |= NPC_FLAG_100; + npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; npc->moveSpeed = *temp_s0_2; npc->jumpScale = 0.0f; D_802BFF10 = 0; diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 9eeff3a610..de25bb64bd 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -71,7 +71,7 @@ ApiStatus ParakarryUpdate(Evt* script, s32 isInitialCall) { ParakarryTweesterPhysicsPtr->angularVelocity = 6.0f; ParakarryTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; ParakarryTweesterPhysicsPtr->countdown = 120; - parakarry->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + parakarry->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; parakarry->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(ParakarryTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -186,8 +186,8 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { return ApiStatus_DONE2; } D_802BEBC0_31CBE0 = 0x28; - parakarry->flags &= ~NPC_FLAG_4000; - parakarry->flags |= NPC_FLAG_NO_PROJECT_SHADOW; + parakarry->flags &= ~NPC_FLAG_COLLDING_FORWARD_WITH_WORLD; + parakarry->flags |= NPC_FLAG_COLLDING_WITH_WORLD; } else { partnerActionStatus->partnerAction_unk_1 = 0; set_action_state(ACTION_STATE_RIDE); @@ -197,8 +197,8 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { parakarry->currentAnim = ANIM_WorldParakarry_CarryLight; partnerActionStatus->actingPartner = PARTNER_PARAKARRY; partnerActionStatus->partnerActionState = PARTNER_ACTION_PARAKARRY_HOVER; - parakarry->flags &= ~NPC_FLAG_4000; - parakarry->flags |= NPC_FLAG_NO_PROJECT_SHADOW; + parakarry->flags &= ~NPC_FLAG_COLLDING_FORWARD_WITH_WORLD; + parakarry->flags |= NPC_FLAG_COLLDING_WITH_WORLD; } } else { return ApiStatus_DONE2; @@ -376,7 +376,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { z = playerStatus->position.z; sp2C = playerStatus->colliderHeight * 0.5f; if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &sp2C, parakarry->yaw, parakarry->collisionRadius)) { - s32 surfaceType = get_collider_flags(D_8010C978) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; + s32 surfaceType = get_collider_flags(NpcHitQueryColliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) { playerStatus->hazardType = HAZARD_TYPE_SPIKES; D_802BEBC0_31CBE0 = 0x15; @@ -386,7 +386,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { playerStatus->position.y += (y - playerStatus->position.y) * 0.25f; parakarry->pos.y = playerStatus->position.y + 32.0f; } - if (!(parakarry->flags & NPC_FLAG_4000)) { + if (!(parakarry->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) { gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; @@ -497,7 +497,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; - if (!(parakarry->flags & NPC_FLAG_4000)) { + if (!(parakarry->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) { parakarry->duration++; if (!(parakarry->planarFlyDist < 100.0f)) { D_802BEBC4 = 5; diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index a83876237d..b564f378d4 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -5,8 +5,6 @@ #include "sprite/npc/WorldSushie.h" #include "sprite.h" -extern s16 D_8010C97A; - BSS f32 OriginalPlayerY; BSS s32 bss_802BFEE4; BSS s32 bss_802BFEE8; @@ -84,9 +82,9 @@ void func_802BD368_31E0D8(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 sp20 = 200.0f; if (npc_raycast_down_around(arg0, &arg1, &arg2, &arg3, &sp20, arg4, arg5) == 0) { - collisionStatus->currentFloor = -1; + collisionStatus->currentFloor = NO_COLLIDER; } else { - collisionStatus->currentFloor = D_8010C97A; + collisionStatus->currentFloor = NpcHitQueryColliderID; OriginalPlayerY = arg2; } } @@ -185,8 +183,8 @@ void func_802BD414_31E184(Npc* npc) { if (npc_test_move_taller_with_slipping(npc->collisionChannel, &x, &y, &z, npc->moveSpeed, sp20, sp3C, npc->collisionRadius) != 0) { - collisionStatus->pushingAgainstWall = D_8010C978; - if ((get_collider_flags(D_8010C978) & COLLIDER_FLAGS_SURFACE_TYPE_MASK) == SURFACE_TYPE_DOCK_WALL) { + collisionStatus->pushingAgainstWall = NpcHitQueryColliderID; + if ((get_collider_flags(NpcHitQueryColliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK) == SURFACE_TYPE_DOCK_WALL) { bss_802BFEF0++; } else { bss_802BFEF0 = 0; @@ -373,7 +371,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { bss_802BFEEC = 1; npc->flags |= NPC_FLAG_8; npc->flags &= ~NPC_FLAG_GRAVITY; - npc->flags |= NPC_FLAG_100; + npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); disable_player_shadow(); disable_npc_shadow(npc); @@ -554,9 +552,9 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { t = npc_test_move_taller_with_slipping(npc->collisionChannel, &x, &y, &z, 10.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius); if (t != 0) { - collisionStatus->pushingAgainstWall = npc->currentWall = D_8010C97A; + collisionStatus->pushingAgainstWall = npc->currentWall = NpcHitQueryColliderID; } else { - collisionStatus->pushingAgainstWall = -1; + collisionStatus->pushingAgainstWall = NO_COLLIDER; } if (npc->currentWall < 0 || npc->currentWall & COLLISION_WITH_ENTITY_BIT) { @@ -744,7 +742,7 @@ ApiStatus SushieUpdate(Evt* script, s32 isInitialCall) { SushieTweesterPhysicsPtr->angularVelocity = 6.0f; SushieTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; SushieTweesterPhysicsPtr->countdown = 120; - sushie->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + sushie->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; sushie->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(SushieTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -879,7 +877,7 @@ s32 func_802BFAB8_320828(Evt* script, s32 isInitialCall) { partnerNPC->moveToPos.x = partnerNPC->pos.x; partnerNPC->moveToPos.y = partnerNPC->pos.y; partnerNPC->moveToPos.z = partnerNPC->pos.z; - partnerNPC->flags |= NPC_FLAG_100 | NPC_FLAG_8; + partnerNPC->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_8; partnerNPC->flags &= ~NPC_FLAG_GRAVITY; disable_npc_shadow(partnerNPC); disable_player_shadow(); diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c index bbcd1884d0..3aaa4ce0a2 100644 --- a/src/world/partner/watt.c +++ b/src/world/partner/watt.c @@ -19,7 +19,7 @@ BSS s32 D_802BE314; BSS TweesterPhysics WattTweesterPhysics; void func_802BD100_31CC70(Npc* npc) { - if (!(npc->flags & NPC_FLAG_2)) { + if (!(npc->flags & NPC_FLAG_INVISIBLE)) { if (WattStaticEffect == NULL) { WattStaticEffect = fx_static_status(0, npc->pos.x, npc->pos.y + 13.0f, npc->pos.z, 0.9f, 5, 0); } @@ -136,7 +136,7 @@ ApiStatus WattUpdate(Evt* script, s32 isInitialCall) { WattTweesterPhysicsPtr->angularVelocity = 6.0f; WattTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; WattTweesterPhysicsPtr->countdown = 120; - watt->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; + watt->flags |= NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8; watt->flags &= ~NPC_FLAG_GRAVITY; case 1: sin_cos_rad(DEG_TO_RAD(WattTweesterPhysicsPtr->angle), &sinAngle, &cosAngle); @@ -279,7 +279,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { if (gGameStatusPtr->keepUsingPartnerOnMapChange) { playerStatus->animFlags |= PA_FLAG_USING_WATT; D_802BE30C = 1; - npc->flags |= NPC_FLAG_100 | NPC_FLAG_8; + npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_8; npc->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); gGameStatusPtr->keepUsingPartnerOnMapChange = 0; partnerActionStatus->partnerActionState = PARTNER_ACTION_USE; @@ -460,7 +460,7 @@ ApiStatus func_802BDE88_31D9F8(Evt* script, s32 isInitialCall) { move_player(script->functionTemp[1], playerStatus->heading, script->varTableF[5]); world_watt_sync_held_position(); watt->flags &= ~NPC_FLAG_GRAVITY; - watt->flags |= NPC_FLAG_100; + watt->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; playerStatus->animFlags |= (PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT); gGameStatusPtr->keepUsingPartnerOnMapChange = 1; wattActionStatus->partnerActionState = PARTNER_ACTION_WATT_SHINE; diff --git a/src/world/partners.c b/src/world/partners.c index 345dd99cd3..6e0a845a46 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -574,11 +574,11 @@ s32 partner_is_flying(void) { } void func_800EA5B8(Npc* partner) { - partner->flags &= ~(NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_4000 | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_1000 | + partner->flags &= ~(NPC_FLAG_COLLIDING_WITH_NPC | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD | NPC_FLAG_COLLDING_WITH_WORLD | NPC_FLAG_FALLING | NPC_FLAG_JUMPING); } -void partnercreate_npc_impl(void) { +void create_partner_npc(void) { WorldPartner* partnerEntry = &wPartners[wCurrentPartnerId]; Npc** partnerNpcPtr = &wPartnerNpc; WorldPartner** partner = &wPartner; @@ -590,7 +590,7 @@ void partnercreate_npc_impl(void) { blueprintPtr = &blueprint; dma_copy(partnerEntry->dmaStart, partnerEntry->dmaEnd, partnerEntry->dmaDest); - blueprint.flags = NPC_FLAG_PARTICLE | NPC_FLAG_100; + blueprint.flags = NPC_FLAG_PARTNER | NPC_FLAG_IGNORE_PLAYER_COLLISION; blueprint.initialAnim = (*partner)->idle; blueprint.onUpdate = NULL; blueprint.onRender = NULL; @@ -685,7 +685,7 @@ void _use_partner_ability(void) { set_time_freeze_mode(TIME_FREEZE_NORMAL); partner_free_npc(); playerData->currentPartner = wCurrentPartnerId = NextPartnerID; - partnercreate_npc_impl(); + create_partner_npc(); sfx_play_sound(SOUND_E); wPartner->init(wPartnerNpc); PartnerCommandState += 1; @@ -721,7 +721,7 @@ void _use_partner_ability(void) { case 1: partner_free_npc(); playerData->currentPartner = wCurrentPartnerId = NextPartnerID; - partnercreate_npc_impl(); + create_partner_npc(); wPartnerNpc->pos.x = wSavedPartnerPosX; wPartnerNpc->pos.y = wSavedPartnerPosY; wPartnerNpc->pos.z = wSavedPartnerPosZ; @@ -781,7 +781,7 @@ void _use_partner_ability(void) { case 0: // create the new partner disable_player_input(); playerData->currentPartner = wCurrentPartnerId = NextPartnerID; - partnercreate_npc_impl(); + create_partner_npc(); wPartner->init(wPartnerNpc); PartnerCommandState += 1; // fall through @@ -811,7 +811,7 @@ void _use_partner_ability(void) { case 0: disable_player_input(); playerData->currentPartner = wCurrentPartnerId = NextPartnerID; - partnercreate_npc_impl(); + create_partner_npc(); wPartnerNpc->pos.x = wSavedPartnerPosX; wPartnerNpc->pos.y = wSavedPartnerPosY; wPartnerNpc->pos.z = wSavedPartnerPosZ; @@ -1014,7 +1014,7 @@ void partner_reset_data(void) { if (wCurrentPartnerId == PARTNER_NONE) { NextPartnerCommand = PARTNER_CMD_INIT; } else { - partnercreate_npc_impl(); + create_partner_npc(); wPartnerNpc->scale.x = 1.0f; wPartnerNpc->scale.y = 1.0f; wPartnerNpc->scale.z = 1.0f; @@ -1161,7 +1161,7 @@ void partner_walking_enable(Npc* partner, s32 val) { func_800EA5B8(partner); partner->collisionChannel = COLLISION_CHANNEL_10000; partner->jumpVelocity = 0.0f; - partner->flags |= NPC_FLAG_400000 | NPC_FLAG_GRAVITY | NPC_FLAG_100; + partner->flags |= NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_PLAYER_COLLISION; partner->jumpScale = 1.8f; } @@ -1252,7 +1252,7 @@ void partner_walking_follow_player(Npc* partner) { partner->moveSpeed = 4.0f; } partner->currentAnim = gPartnerAnimations[wCurrentPartnerId].run; - if (!(partner->flags & NPC_FLAG_1000)) { + if (!(partner->flags & NPC_FLAG_FALLING)) { partner->currentAnim = gPartnerAnimations[wCurrentPartnerId].fall; } while (TRUE) { @@ -1300,14 +1300,14 @@ void partner_walking_follow_player(Npc* partner) { break; } - if ((partner->flags & NPC_FLAG_1000) && currentSnapshot->isJumping) { + if ((partner->flags & NPC_FLAG_FALLING) && currentSnapshot->isJumping) { wPartnerFollowState = 1; break; } } } - if (!(partner->flags & NPC_FLAG_1000)) { + if (!(partner->flags & NPC_FLAG_FALLING)) { partner->moveSpeed *= 0.5f; } partner->yaw = yaw; @@ -1321,7 +1321,7 @@ void partner_walking_follow_player(Npc* partner) { surfaceType = get_collider_flags(partner->currentFloor); if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA || - (partner->flags & (NPC_FLAG_1000 | NPC_FLAG_4000)) == (NPC_FLAG_1000 | NPC_FLAG_4000)) { + (partner->flags & (NPC_FLAG_FALLING | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) == (NPC_FLAG_FALLING | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) { if (!func_800EA4B0(partner->currentWall)) { D_8010CFBC++; if (D_8010CFBC >= 40) { @@ -1482,7 +1482,7 @@ void partner_walking_follow_player(Npc* partner) { if (distance > 2.0f) { partner->yaw = yaw; partner->currentAnim = gPartnerAnimations[wCurrentPartnerId].run; - if (!(partner->flags & NPC_FLAG_4000)) { + if (!(partner->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) { D_800F803A = 0; } else { D_800F803A++; @@ -1520,7 +1520,7 @@ void partner_walking_follow_player(Npc* partner) { z = partner->pos.z; y = partner->pos.y + partner->collisionHeight; if (npc_raycast_down_around(partner->collisionChannel, &x, &y, &z, &distance, partner->yaw, partner->collisionRadius) != 0) { - s32 surfaceType = get_collider_flags(D_8010C978); + s32 surfaceType = get_collider_flags(NpcHitQueryColliderID); if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) { partner->yaw = clamp_angle(yaw + 180.0f); npc_move_heading(partner, partner->moveSpeed, partner->yaw); @@ -1532,7 +1532,7 @@ void partner_walking_follow_player(Npc* partner) { } else if (playerStatus->actionState == ACTION_STATE_TALK) { D_8010CFCA = 0; } - } else if (!func_800EA4B0(D_8010C978)) { + } else if (!func_800EA4B0(NpcHitQueryColliderID)) { D_8010CFCA = 2; } } @@ -1541,7 +1541,7 @@ void partner_walking_follow_player(Npc* partner) { } distance = dist2D(partner->pos.x, partner->pos.z, playerStatus->position.x, playerStatus->position.z); if (distance <= wPartnerTetherDistance) { - if (!func_800EA4B0(D_8010C978)) { + if (!func_800EA4B0(NpcHitQueryColliderID)) { D_8010CFCA = 2; } } else { @@ -1663,7 +1663,7 @@ void partner_walking_follow_player(Npc* partner) { partner_move_to_goal(partner, FALSE); break; case 40: - if (partner->flags & NPC_FLAG_1000) { + if (partner->flags & NPC_FLAG_FALLING) { if (func_800EA4B0(partner->currentFloor)) { wPartnerFollowState = 50; partner->currentAnim = gPartnerAnimations[wCurrentPartnerId].idle; @@ -1751,7 +1751,7 @@ void partner_flying_enable(Npc* partner, s32 val) { partner->currentAnim = gPartnerAnimations[wCurrentPartnerId].idle; func_800EA5B8(partner); partner->collisionChannel = COLLISION_CHANNEL_10000; - partner->flags |= NPC_FLAG_100; + partner->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; partner->flags &= ~NPC_FLAG_GRAVITY; } @@ -2063,7 +2063,7 @@ void partner_flying_follow_player(Npc* partner) { if (distance > 2.0f) { partner->yaw = yaw; partner->currentAnim = gPartnerAnimations[wCurrentPartnerId].run; - if (!(partner->flags & NPC_FLAG_4000)) { + if (!(partner->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) { D_800F803A = 0; } else { D_800F803A++; @@ -2185,7 +2185,7 @@ void partner_flying_follow_player(Npc* partner) { s32 partner_init_put_away(Npc* partner) { partner->collisionChannel = COLLISION_CHANNEL_10000; wPartnerFollowState = 0; - partner->flags |= NPC_FLAG_100; + partner->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; return wPartnerFollowState; } @@ -2261,7 +2261,7 @@ s32 partner_put_away(Npc* partner) { s32 partner_init_get_out(Npc* npc) { npc->collisionChannel = COLLISION_CHANNEL_10000; wPartnerFollowState = 0; - npc->flags |= NPC_FLAG_100; + npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; return wPartnerFollowState; } @@ -2298,7 +2298,7 @@ s32 partner_get_out(Npc* partner) { hitDepth = 1000.0f; if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, partner->yaw, partner->collisionRadius)) { // @bug? collider flags not properly masked with COLLIDER_FLAG_SURFACE_TYPE - s32 surfaceType = get_collider_flags(D_8010C978); + s32 surfaceType = get_collider_flags(NpcHitQueryColliderID); if ((surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) || (hitDepth > 100.0f)) { moveToX = playerStatus->position.x; @@ -2548,7 +2548,7 @@ void partner_move_to_goal(Npc* partner, s32 isFlying) { if (wPartnerMoveTime != 0) { wPartnerMoveTime--; if (!isFlying) { - if (!(partner->flags & NPC_FLAG_1000)) { + if (!(partner->flags & NPC_FLAG_FALLING)) { partner->pos.y = playerStatus->position.y; } if (partner->jumpVelocity != 0.0f) { diff --git a/ver/jp/asm/nonmatchings/npc/npc_get_render_yaw.s b/ver/jp/asm/nonmatchings/npc/npc_get_render_yaw.s deleted file mode 100644 index 4b8339b2d0..0000000000 --- a/ver/jp/asm/nonmatchings/npc/npc_get_render_yaw.s +++ /dev/null @@ -1,154 +0,0 @@ -.set noat /* allow manual use of $at */ -.set noreorder /* don't insert nops after branches */ - -glabel npc_get_render_yaw -/* 14E64 80039A64 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 14E68 80039A68 AFB10014 */ sw $s1, 0x14($sp) -/* 14E6C 80039A6C 0080882D */ daddu $s1, $a0, $zero -/* 14E70 80039A70 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* 14E74 80039A74 8463A614 */ lh $v1, %lo(gCurrentCamID)($v1) -/* 14E78 80039A78 3C04800B */ lui $a0, %hi(gCameras) -/* 14E7C 80039A7C 24841D60 */ addiu $a0, $a0, %lo(gCameras) -/* 14E80 80039A80 AFBF0018 */ sw $ra, 0x18($sp) -/* 14E84 80039A84 AFB00010 */ sw $s0, 0x10($sp) -/* 14E88 80039A88 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 14E8C 80039A8C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 14E90 80039A90 00031080 */ sll $v0, $v1, 2 -/* 14E94 80039A94 00431021 */ addu $v0, $v0, $v1 -/* 14E98 80039A98 00021080 */ sll $v0, $v0, 2 -/* 14E9C 80039A9C 00431023 */ subu $v0, $v0, $v1 -/* 14EA0 80039AA0 000218C0 */ sll $v1, $v0, 3 -/* 14EA4 80039AA4 00431021 */ addu $v0, $v0, $v1 -/* 14EA8 80039AA8 000210C0 */ sll $v0, $v0, 3 -/* 14EAC 80039AAC 3C03800A */ lui $v1, %hi(gOverrideFlags) -/* 14EB0 80039AB0 8C63A630 */ lw $v1, %lo(gOverrideFlags)($v1) -/* 14EB4 80039AB4 3063C000 */ andi $v1, $v1, 0xC000 -/* 14EB8 80039AB8 1460006C */ bnez $v1, .LJP_80039C6C -/* 14EBC 80039ABC 00441021 */ addu $v0, $v0, $a0 -/* 14EC0 80039AC0 C456006C */ lwc1 $f22, 0x6C($v0) -/* 14EC4 80039AC4 C62E000C */ lwc1 $f14, 0xC($s1) -/* 14EC8 80039AC8 0C00A6FA */ jal get_clamped_angle_diff -/* 14ECC 80039ACC 4600B306 */ mov.s $f12, $f22 -/* 14ED0 80039AD0 3C01C0A0 */ lui $at, (0xC0A00000 >> 16) -/* 14ED4 80039AD4 44811000 */ mtc1 $at, $f2 -/* 14ED8 80039AD8 46000306 */ mov.s $f12, $f0 -/* 14EDC 80039ADC 4602603C */ c.lt.s $f12, $f2 -/* 14EE0 80039AE0 00000000 */ nop -/* 14EE4 80039AE4 4500000B */ bc1f .LJP_80039B14 -/* 14EE8 80039AE8 00000000 */ nop -/* 14EEC 80039AEC 3C01C32F */ lui $at, (0xC32F0000 >> 16) -/* 14EF0 80039AF0 44810000 */ mtc1 $at, $f0 -/* 14EF4 80039AF4 00000000 */ nop -/* 14EF8 80039AF8 460C003C */ c.lt.s $f0, $f12 -/* 14EFC 80039AFC 00000000 */ nop -/* 14F00 80039B00 45000004 */ bc1f .LJP_80039B14 -/* 14F04 80039B04 0000802D */ daddu $s0, $zero, $zero -/* 14F08 80039B08 44806000 */ mtc1 $zero, $f12 -/* 14F0C 80039B0C 0800E6DC */ j .LJP_80039B70 -/* 14F10 80039B10 00000000 */ nop -.LJP_80039B14: -/* 14F14 80039B14 3C0140A0 */ lui $at, (0x40A00000 >> 16) -/* 14F18 80039B18 44810000 */ mtc1 $at, $f0 -/* 14F1C 80039B1C 00000000 */ nop -/* 14F20 80039B20 460C003C */ c.lt.s $f0, $f12 -/* 14F24 80039B24 00000000 */ nop -/* 14F28 80039B28 4500000C */ bc1f .LJP_80039B5C -/* 14F2C 80039B2C 00000000 */ nop -/* 14F30 80039B30 3C01432F */ lui $at, (0x432F0000 >> 16) -/* 14F34 80039B34 44810000 */ mtc1 $at, $f0 -/* 14F38 80039B38 00000000 */ nop -/* 14F3C 80039B3C 4600603C */ c.lt.s $f12, $f0 -/* 14F40 80039B40 00000000 */ nop -/* 14F44 80039B44 45000005 */ bc1f .LJP_80039B5C -/* 14F48 80039B48 24100001 */ addiu $s0, $zero, 0x1 -/* 14F4C 80039B4C 3C014334 */ lui $at, (0x43340000 >> 16) -/* 14F50 80039B50 44816000 */ mtc1 $at, $f12 -/* 14F54 80039B54 0800E6DC */ j .LJP_80039B70 -/* 14F58 80039B58 00000000 */ nop -.LJP_80039B5C: -/* 14F5C 80039B5C 8622008A */ lh $v0, 0x8A($s1) -/* 14F60 80039B60 24100002 */ addiu $s0, $zero, 0x2 -/* 14F64 80039B64 44826000 */ mtc1 $v0, $f12 -/* 14F68 80039B68 00000000 */ nop -/* 14F6C 80039B6C 46806320 */ cvt.s.w $f12, $f12 -.LJP_80039B70: -/* 14F70 80039B70 0C00A6B9 */ jal clamp_angle -/* 14F74 80039B74 00000000 */ nop -/* 14F78 80039B78 46000506 */ mov.s $f20, $f0 -/* 14F7C 80039B7C 4600A10D */ trunc.w.s $f4, $f20 -/* 14F80 80039B80 44022000 */ mfc1 $v0, $f4 -/* 14F84 80039B84 00000000 */ nop -/* 14F88 80039B88 A622008A */ sh $v0, 0x8A($s1) -/* 14F8C 80039B8C 8E220000 */ lw $v0, 0x0($s1) -/* 14F90 80039B90 3C030004 */ lui $v1, (0x40000 >> 16) -/* 14F94 80039B94 00431024 */ and $v0, $v0, $v1 -/* 14F98 80039B98 14400034 */ bnez $v0, .LJP_80039C6C -/* 14F9C 80039B9C 00000000 */ nop -/* 14FA0 80039BA0 86220088 */ lh $v0, 0x88($s1) -/* 14FA4 80039BA4 10500016 */ beq $v0, $s0, .LJP_80039C00 -/* 14FA8 80039BA8 24020002 */ addiu $v0, $zero, 0x2 -/* 14FAC 80039BAC 12020014 */ beq $s0, $v0, .LJP_80039C00 -/* 14FB0 80039BB0 00000000 */ nop -/* 14FB4 80039BB4 12000003 */ beqz $s0, .LJP_80039BC4 -/* 14FB8 80039BB8 A6300088 */ sh $s0, 0x88($s1) -/* 14FBC 80039BBC 0800E6F2 */ j .LJP_80039BC8 -/* 14FC0 80039BC0 240200B4 */ addiu $v0, $zero, 0xB4 -.LJP_80039BC4: -/* 14FC4 80039BC4 2402FF4C */ addiu $v0, $zero, -0xB4 -.LJP_80039BC8: -/* 14FC8 80039BC8 A622008C */ sh $v0, 0x8C($s1) -/* 14FCC 80039BCC C62E000C */ lwc1 $f14, 0xC($s1) -/* 14FD0 80039BD0 0C00A6FA */ jal get_clamped_angle_diff -/* 14FD4 80039BD4 4600B306 */ mov.s $f12, $f22 -/* 14FD8 80039BD8 3C0142B4 */ lui $at, (0x42B40000 >> 16) -/* 14FDC 80039BDC 44811000 */ mtc1 $at, $f2 -/* 14FE0 80039BE0 46000005 */ abs.s $f0, $f0 -/* 14FE4 80039BE4 4600103E */ c.le.s $f2, $f0 -/* 14FE8 80039BE8 00000000 */ nop -/* 14FEC 80039BEC 45000004 */ bc1f .LJP_80039C00 -/* 14FF0 80039BF0 00000000 */ nop -/* 14FF4 80039BF4 9622008C */ lhu $v0, 0x8C($s1) -/* 14FF8 80039BF8 00021023 */ negu $v0, $v0 -/* 14FFC 80039BFC A622008C */ sh $v0, 0x8C($s1) -.LJP_80039C00: -/* 15000 80039C00 8623008C */ lh $v1, 0x8C($s1) -/* 15004 80039C04 10600009 */ beqz $v1, .LJP_80039C2C -/* 15008 80039C08 9622008C */ lhu $v0, 0x8C($s1) -/* 1500C 80039C0C 04610002 */ bgez $v1, .LJP_80039C18 -/* 15010 80039C10 24420014 */ addiu $v0, $v0, 0x14 -/* 15014 80039C14 A622008C */ sh $v0, 0x8C($s1) -.LJP_80039C18: -/* 15018 80039C18 8622008C */ lh $v0, 0x8C($s1) -/* 1501C 80039C1C 9623008C */ lhu $v1, 0x8C($s1) -/* 15020 80039C20 18400002 */ blez $v0, .LJP_80039C2C -/* 15024 80039C24 2462FFEC */ addiu $v0, $v1, -0x14 -/* 15028 80039C28 A622008C */ sh $v0, 0x8C($s1) -.LJP_80039C2C: -/* 1502C 80039C2C 8E220000 */ lw $v0, 0x0($s1) -/* 15030 80039C30 3C030020 */ lui $v1, (0x200000 >> 16) -/* 15034 80039C34 00431024 */ and $v0, $v0, $v1 -/* 15038 80039C38 54400001 */ bnel $v0, $zero, .LJP_80039C40 -/* 1503C 80039C3C A620008C */ sh $zero, 0x8C($s1) -.LJP_80039C40: -/* 15040 80039C40 8622008C */ lh $v0, 0x8C($s1) -/* 15044 80039C44 44826000 */ mtc1 $v0, $f12 -/* 15048 80039C48 00000000 */ nop -/* 1504C 80039C4C 46806320 */ cvt.s.w $f12, $f12 -/* 15050 80039C50 0C00A6B9 */ jal clamp_angle -/* 15054 80039C54 46146300 */ add.s $f12, $f12, $f20 -/* 15058 80039C58 0C00A6B9 */ jal clamp_angle -/* 1505C 80039C5C 46160301 */ sub.s $f12, $f0, $f22 -/* 15060 80039C60 46000506 */ mov.s $f20, $f0 -/* 15064 80039C64 0800E71C */ j .LJP_80039C70 -/* 15068 80039C68 E6340034 */ swc1 $f20, 0x34($s1) -.LJP_80039C6C: -/* 1506C 80039C6C C6340034 */ lwc1 $f20, 0x34($s1) -.LJP_80039C70: -/* 15070 80039C70 4600A006 */ mov.s $f0, $f20 -/* 15074 80039C74 8FBF0018 */ lw $ra, 0x18($sp) -/* 15078 80039C78 8FB10014 */ lw $s1, 0x14($sp) -/* 1507C 80039C7C 8FB00010 */ lw $s0, 0x10($sp) -/* 15080 80039C80 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 15084 80039C84 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 15088 80039C88 03E00008 */ jr $ra -/* 1508C 80039C8C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index 1424eeaa95..fd83f50ae6 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -143,8 +143,7 @@ HES_Danger = 0x80108BA4; HES_MoveDiamond = 0x801094C8; HES_MoveDiamondDisabled = 0x80109568; wPartnerNpc = 0x8010CAF0; -D_8010C978 = 0x8010CB38; -D_8010C97A = 0x8010CB3A; +NpcHitQueryColliderID = 0x8010CB38; gPartnerActionStatus = 0x08010ED70; gPlayerStatus = 0x8010F188; gPlayerData = 0x8010F450; @@ -290,7 +289,7 @@ bgm_reset_max_volume = 0x8014FD20; bgm_pop_battle_song = 0x8014FF1C; bgm_push_battle_song = 0x8014FFA8; bgm_set_battle_song = 0x8015003C; -D_8014B7F0 = 0x801508A0; +gLastRenderTaskCount = 0x801508A0; D_8014C248 = 0x801512F8; gBackgroundFogModePtr = 0x80156350; gWindows = 0x8015ECD0; diff --git a/ver/us/asm/bss2.s b/ver/us/asm/bss2.s index 950c240c77..fae319824e 100644 --- a/ver/us/asm/bss2.s +++ b/ver/us/asm/bss2.s @@ -73,11 +73,8 @@ dlabel D_8010C970 dlabel D_8010C974 .space 4 -dlabel D_8010C978 -.space 2 - -dlabel D_8010C97A -.space 2 +dlabel NpcHitQueryColliderID +.space 4 dlabel JumpedOnSwitchZ .space 4 diff --git a/ver/us/asm/nonmatchings/npc/npc_get_render_yaw.s b/ver/us/asm/nonmatchings/npc/npc_get_render_yaw.s deleted file mode 100644 index 5097c9062c..0000000000 --- a/ver/us/asm/nonmatchings/npc/npc_get_render_yaw.s +++ /dev/null @@ -1,154 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_get_render_yaw -/* 151A4 80039DA4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 151A8 80039DA8 AFB10014 */ sw $s1, 0x14($sp) -/* 151AC 80039DAC 0080882D */ daddu $s1, $a0, $zero -/* 151B0 80039DB0 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* 151B4 80039DB4 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* 151B8 80039DB8 3C04800B */ lui $a0, %hi(gCameras) -/* 151BC 80039DBC 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 151C0 80039DC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 151C4 80039DC4 AFB00010 */ sw $s0, 0x10($sp) -/* 151C8 80039DC8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 151CC 80039DCC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 151D0 80039DD0 00031080 */ sll $v0, $v1, 2 -/* 151D4 80039DD4 00431021 */ addu $v0, $v0, $v1 -/* 151D8 80039DD8 00021080 */ sll $v0, $v0, 2 -/* 151DC 80039DDC 00431023 */ subu $v0, $v0, $v1 -/* 151E0 80039DE0 000218C0 */ sll $v1, $v0, 3 -/* 151E4 80039DE4 00431021 */ addu $v0, $v0, $v1 -/* 151E8 80039DE8 000210C0 */ sll $v0, $v0, 3 -/* 151EC 80039DEC 3C03800A */ lui $v1, %hi(gOverrideFlags) -/* 151F0 80039DF0 8C63A650 */ lw $v1, %lo(gOverrideFlags)($v1) -/* 151F4 80039DF4 3063C000 */ andi $v1, $v1, 0xc000 -/* 151F8 80039DF8 1460006C */ bnez $v1, .L80039FAC -/* 151FC 80039DFC 00441021 */ addu $v0, $v0, $a0 -/* 15200 80039E00 C456006C */ lwc1 $f22, 0x6c($v0) -/* 15204 80039E04 C62E000C */ lwc1 $f14, 0xc($s1) -/* 15208 80039E08 0C00A70A */ jal get_clamped_angle_diff -/* 1520C 80039E0C 4600B306 */ mov.s $f12, $f22 -/* 15210 80039E10 3C01C0A0 */ lui $at, 0xc0a0 -/* 15214 80039E14 44811000 */ mtc1 $at, $f2 -/* 15218 80039E18 46000306 */ mov.s $f12, $f0 -/* 1521C 80039E1C 4602603C */ c.lt.s $f12, $f2 -/* 15220 80039E20 00000000 */ nop -/* 15224 80039E24 4500000B */ bc1f .L80039E54 -/* 15228 80039E28 00000000 */ nop -/* 1522C 80039E2C 3C01C32F */ lui $at, 0xc32f -/* 15230 80039E30 44810000 */ mtc1 $at, $f0 -/* 15234 80039E34 00000000 */ nop -/* 15238 80039E38 460C003C */ c.lt.s $f0, $f12 -/* 1523C 80039E3C 00000000 */ nop -/* 15240 80039E40 45000004 */ bc1f .L80039E54 -/* 15244 80039E44 0000802D */ daddu $s0, $zero, $zero -/* 15248 80039E48 44806000 */ mtc1 $zero, $f12 -/* 1524C 80039E4C 0800E7AC */ j .L80039EB0 -/* 15250 80039E50 00000000 */ nop -.L80039E54: -/* 15254 80039E54 3C0140A0 */ lui $at, 0x40a0 -/* 15258 80039E58 44810000 */ mtc1 $at, $f0 -/* 1525C 80039E5C 00000000 */ nop -/* 15260 80039E60 460C003C */ c.lt.s $f0, $f12 -/* 15264 80039E64 00000000 */ nop -/* 15268 80039E68 4500000C */ bc1f .L80039E9C -/* 1526C 80039E6C 00000000 */ nop -/* 15270 80039E70 3C01432F */ lui $at, 0x432f -/* 15274 80039E74 44810000 */ mtc1 $at, $f0 -/* 15278 80039E78 00000000 */ nop -/* 1527C 80039E7C 4600603C */ c.lt.s $f12, $f0 -/* 15280 80039E80 00000000 */ nop -/* 15284 80039E84 45000005 */ bc1f .L80039E9C -/* 15288 80039E88 24100001 */ addiu $s0, $zero, 1 -/* 1528C 80039E8C 3C014334 */ lui $at, 0x4334 -/* 15290 80039E90 44816000 */ mtc1 $at, $f12 -/* 15294 80039E94 0800E7AC */ j .L80039EB0 -/* 15298 80039E98 00000000 */ nop -.L80039E9C: -/* 1529C 80039E9C 8622008A */ lh $v0, 0x8a($s1) -/* 152A0 80039EA0 24100002 */ addiu $s0, $zero, 2 -/* 152A4 80039EA4 44826000 */ mtc1 $v0, $f12 -/* 152A8 80039EA8 00000000 */ nop -/* 152AC 80039EAC 46806320 */ cvt.s.w $f12, $f12 -.L80039EB0: -/* 152B0 80039EB0 0C00A6C9 */ jal clamp_angle -/* 152B4 80039EB4 00000000 */ nop -/* 152B8 80039EB8 46000506 */ mov.s $f20, $f0 -/* 152BC 80039EBC 4600A10D */ trunc.w.s $f4, $f20 -/* 152C0 80039EC0 44022000 */ mfc1 $v0, $f4 -/* 152C4 80039EC4 00000000 */ nop -/* 152C8 80039EC8 A622008A */ sh $v0, 0x8a($s1) -/* 152CC 80039ECC 8E220000 */ lw $v0, ($s1) -/* 152D0 80039ED0 3C030004 */ lui $v1, 4 -/* 152D4 80039ED4 00431024 */ and $v0, $v0, $v1 -/* 152D8 80039ED8 14400034 */ bnez $v0, .L80039FAC -/* 152DC 80039EDC 00000000 */ nop -/* 152E0 80039EE0 86220088 */ lh $v0, 0x88($s1) -/* 152E4 80039EE4 10500016 */ beq $v0, $s0, .L80039F40 -/* 152E8 80039EE8 24020002 */ addiu $v0, $zero, 2 -/* 152EC 80039EEC 12020014 */ beq $s0, $v0, .L80039F40 -/* 152F0 80039EF0 00000000 */ nop -/* 152F4 80039EF4 12000003 */ beqz $s0, .L80039F04 -/* 152F8 80039EF8 A6300088 */ sh $s0, 0x88($s1) -/* 152FC 80039EFC 0800E7C2 */ j .L80039F08 -/* 15300 80039F00 240200B4 */ addiu $v0, $zero, 0xb4 -.L80039F04: -/* 15304 80039F04 2402FF4C */ addiu $v0, $zero, -0xb4 -.L80039F08: -/* 15308 80039F08 A622008C */ sh $v0, 0x8c($s1) -/* 1530C 80039F0C C62E000C */ lwc1 $f14, 0xc($s1) -/* 15310 80039F10 0C00A70A */ jal get_clamped_angle_diff -/* 15314 80039F14 4600B306 */ mov.s $f12, $f22 -/* 15318 80039F18 3C0142B4 */ lui $at, 0x42b4 -/* 1531C 80039F1C 44811000 */ mtc1 $at, $f2 -/* 15320 80039F20 46000005 */ abs.s $f0, $f0 -/* 15324 80039F24 4600103E */ c.le.s $f2, $f0 -/* 15328 80039F28 00000000 */ nop -/* 1532C 80039F2C 45000004 */ bc1f .L80039F40 -/* 15330 80039F30 00000000 */ nop -/* 15334 80039F34 9622008C */ lhu $v0, 0x8c($s1) -/* 15338 80039F38 00021023 */ negu $v0, $v0 -/* 1533C 80039F3C A622008C */ sh $v0, 0x8c($s1) -.L80039F40: -/* 15340 80039F40 8623008C */ lh $v1, 0x8c($s1) -/* 15344 80039F44 10600009 */ beqz $v1, .L80039F6C -/* 15348 80039F48 9622008C */ lhu $v0, 0x8c($s1) -/* 1534C 80039F4C 04610002 */ bgez $v1, .L80039F58 -/* 15350 80039F50 24420014 */ addiu $v0, $v0, 0x14 -/* 15354 80039F54 A622008C */ sh $v0, 0x8c($s1) -.L80039F58: -/* 15358 80039F58 8622008C */ lh $v0, 0x8c($s1) -/* 1535C 80039F5C 9623008C */ lhu $v1, 0x8c($s1) -/* 15360 80039F60 18400002 */ blez $v0, .L80039F6C -/* 15364 80039F64 2462FFEC */ addiu $v0, $v1, -0x14 -/* 15368 80039F68 A622008C */ sh $v0, 0x8c($s1) -.L80039F6C: -/* 1536C 80039F6C 8E220000 */ lw $v0, ($s1) -/* 15370 80039F70 3C030020 */ lui $v1, 0x20 -/* 15374 80039F74 00431024 */ and $v0, $v0, $v1 -/* 15378 80039F78 54400001 */ bnel $v0, $zero, .L80039F80 -/* 1537C 80039F7C A620008C */ sh $zero, 0x8c($s1) -.L80039F80: -/* 15380 80039F80 8622008C */ lh $v0, 0x8c($s1) -/* 15384 80039F84 44826000 */ mtc1 $v0, $f12 -/* 15388 80039F88 00000000 */ nop -/* 1538C 80039F8C 46806320 */ cvt.s.w $f12, $f12 -/* 15390 80039F90 0C00A6C9 */ jal clamp_angle -/* 15394 80039F94 46146300 */ add.s $f12, $f12, $f20 -/* 15398 80039F98 0C00A6C9 */ jal clamp_angle -/* 1539C 80039F9C 46160301 */ sub.s $f12, $f0, $f22 -/* 153A0 80039FA0 46000506 */ mov.s $f20, $f0 -/* 153A4 80039FA4 0800E7EC */ j .L80039FB0 -/* 153A8 80039FA8 E6340034 */ swc1 $f20, 0x34($s1) -.L80039FAC: -/* 153AC 80039FAC C6340034 */ lwc1 $f20, 0x34($s1) -.L80039FB0: -/* 153B0 80039FB0 4600A006 */ mov.s $f0, $f20 -/* 153B4 80039FB4 8FBF0018 */ lw $ra, 0x18($sp) -/* 153B8 80039FB8 8FB10014 */ lw $s1, 0x14($sp) -/* 153BC 80039FBC 8FB00010 */ lw $s0, 0x10($sp) -/* 153C0 80039FC0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 153C4 80039FC4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 153C8 80039FC8 03E00008 */ jr $ra -/* 153CC 80039FCC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 7c126a39e0..3f8f8aaad0 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2967,7 +2967,7 @@ world_partner_can_player_pause_default = 0x800EA524; // type:func rom:0x839D4 func_800EA52C = 0x800EA52C; // type:func rom:0x839DC partner_is_flying = 0x800EA5A4; // type:func rom:0x83A54 func_800EA5B8 = 0x800EA5B8; // type:func rom:0x83A68 -partnercreate_npc_impl = 0x800EA5D0; // type:func rom:0x83A80 +create_partner_npc = 0x800EA5D0; // type:func rom:0x83A80 partner_free_npc = 0x800EA6A8; // type:func rom:0x83B58 switch_to_partner = 0x800EB168; // type:func rom:0x84618 partner_init_after_battle = 0x800EB200; // type:func rom:0x846B0 @@ -3818,8 +3818,7 @@ D_8010C968 = 0x8010C968; // type:data rom:0xA5E18 PeachDisguiseNpcIndex = 0x8010C96C; // type:data rom:0xA5E1C D_8010C970 = 0x8010C970; // type:data rom:0xA5E20 D_8010C974 = 0x8010C974; // type:data rom:0xA5E24 -D_8010C978 = 0x8010C978; // type:data rom:0xA5E28 -D_8010C97A = 0x8010C97A; // type:data rom:0xA5E2A +NpcHitQueryColliderID = 0x8010C978; // type:data rom:0xA5E28 JumpedOnSwitchZ = 0x8010C97C; // type:data rom:0xA5E2C D_8010C980 = 0x8010C980; // type:data rom:0xA5E30 D_8010C984 = 0x8010C984; // type:data rom:0xA5E34 @@ -4519,7 +4518,7 @@ D_8014B766 = 0x8014B766; // type:data rom:0xE1E66 D_8014B767 = 0x8014B767; // type:data rom:0xE1E67 mdl_RDPIdentity = 0x8014B768; // type:data rom:0xE1E68 depthFloatLookupTable = 0x8014B7A8; // type:data rom:0xE1EA8 -D_8014B7F0 = 0x8014B7F0; // type:data rom:0xE1EF0 +gLastRenderTaskCount = 0x8014B7F0; // type:data rom:0xE1EF0 D_8014B7F8 = 0x8014B7F8; // type:data rom:0xE1EF8 D_8014B820 = 0x8014B820; // type:data rom:0xE1F20 D_8014B848 = 0x8014B848; // type:data rom:0xE1F48 @@ -6905,7 +6904,7 @@ show_foreground_models = 0x80267D28; // type:func rom:0x196608 NAMESPACE_StartRumbleWithParams = 0x80267D9C; // type:func rom:0x19667C start_rumble_type = 0x80267DF4; // type:func rom:0x1966D4 LoadItemScript = 0x80267ED0; // type:func rom:0x1967B0 -LoadFreeItemScript = 0x8026801C; // type:func rom:0x1968FC +LoadMysteryItemScript = 0x8026801C; // type:func rom:0x1968FC LoadMoveScript = 0x80268130; // type:func rom:0x196A10 LoadActionCommand = 0x802681C0; // type:func rom:0x196AA0 adjust_action_command_difficulty = 0x80268224; // type:func rom:0x196B04 @@ -25991,8 +25990,7 @@ D_8010C968 = 0x8010C968; // type:data PeachDisguiseNpcIndex = 0x8010C96C; // type:data D_8010C970 = 0x8010C970; // type:data D_8010C974 = 0x8010C974; // type:data -D_8010C978 = 0x8010C978; // type:data -D_8010C97A = 0x8010C97A; // type:data +NpcHitQueryColliderID = 0x8010C978; // type:data JumpedOnSwitchZ = 0x8010C97C; // type:data D_8010C980 = 0x8010C980; // type:data D_8010C984 = 0x8010C984; // type:data