From be4bb17dee21f983bb6fe198154d44c44f02c5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Fa=C3=9Fbender?= <31699028+Brotenko@users.noreply.github.com> Date: Thu, 11 Nov 2021 05:30:59 +0100 Subject: [PATCH] Update flags and enums in enums.h (#525) * prepare enums.h * update enums.h * add commits to enums.h * resolve enum and flag issues with enums.h * delete artifacts * resolve issue with soundid enum * :P * setup first few parameterised flag enums * add flags to npc.h related structs * add flags to npc.h related structs * create enums for several common structs * . * resolve issue with enum sizes * resolve issue with enum sizes * resolve issue with enum sizes * parameterise entity and event related flags * update enums.h * add commits to enums.h * resolve enum and flag issues with enums.h * delete artifacts * resolve issue with soundid enum * :P * setup first few parameterised flag enums * add flags to npc.h related structs * add flags to npc.h related structs * create enums for several common structs * . * resolve issue with enum sizes * resolve issue with enum sizes * resolve issue with enum sizes * parameterise entity and event related flags * . * Update 190B20.c * Update enums.h --- include/enums.h | 4063 +++++++++++------ include/npc.h | 4 +- src/104730.c | 6 +- src/163400.c | 60 +- src/168590.c | 2 +- src/16F740.c | 8 +- src/17FEB0.c | 4 +- src/181810.c | 8 +- src/182B30.c | 6 +- src/18C790.c | 23 +- src/190B20.c | 30 +- src/197F40.c | 18 +- src/1A5830.c | 66 +- src/1a1f0_len_5390.c | 12 +- src/23680.c | 4 +- src/77480.c | 14 +- src/7E9D0.c | 14 +- src/7bb60_len_41b0.c | 6 +- src/80850_len_3060.c | 2 +- src/B4580.c | 40 +- src/C50A0.c | 20 +- src/EF2680.c | 2 +- src/a5dd0_len_114e0.c | 154 +- src/battle/area_kkj/6DBDA0.c | 2 +- src/battle/area_kmr_part_1/actor/goomba.c | 6 +- src/battle/area_kmr_part_1/actor/paragoomba.c | 24 +- .../area_kmr_part_1/actor/spiked_goomba.c | 6 +- src/battle/item/pow_block.c | 2 +- src/battle/item/repel_gel.c | 2 +- src/battle/item/sleepy_sheep.c | 4 +- src/battle/item/strange_cake.c | 2 +- src/battle/item/thunder_bolt.c | 2 +- src/battle/item/thunder_rage.c | 2 +- src/battle/partner/bow.c | 2 +- src/battle/partner/goombario.c | 4 +- src/battle/partner/kooper.c | 2 +- src/battle/partner/parakarry.c | 2 +- src/battle/partner/watt.c | 4 +- src/battle/star/chill_out/7900D0.c | 8 +- src/battle/star/up_and_away/7952E0.c | 2 +- src/e0b30_len_b80.c | 32 +- src/effects.c | 26 +- src/encounter_api.c | 4 +- src/entity.c | 34 +- src/entity/Block.c | 12 +- src/entity/Chest.c | 10 +- src/entity/HeartBlock.c | 4 +- src/entity/ItemBlock.c | 36 +- src/entity/Signpost.c | 6 +- src/entity/Switch.c | 2 +- src/entity/jan_iwa/E2D730.c | 4 +- src/entity/sbk_omo/E307C0.c | 2 +- src/evt/evt.c | 4 +- src/evt/fa4c0_len_3bf0.c | 2 +- src/evt/map_api.c | 54 +- src/evt/npc_api.c | 2 +- src/evt/script_list.c | 2 +- src/npc.c | 14 +- src/pause/135EE0.c | 8 +- src/state_battle.c | 2 +- src/state_file_select.c | 2 +- src/trigger.c | 2 +- src/world/action/hammer.c | 2 +- src/world/action/idle.c | 10 +- src/world/action/jump.c | 24 +- src/world/action/super_boots.c | 2 +- src/world/action/ultra_boots.c | 2 +- src/world/action/use_spinning_flower.c | 4 +- src/world/action/walk.c | 10 +- src/world/area_arn/arn_02/events.c | 6 +- src/world/area_arn/arn_03/events.c | 24 +- src/world/area_arn/arn_04/events.c | 12 +- src/world/area_arn/arn_05/events.c | 24 +- src/world/area_arn/arn_07/events.c | 28 +- src/world/area_arn/arn_08/events.c | 4 +- src/world/area_arn/arn_09/events.c | 2 +- src/world/area_arn/arn_10/events.c | 4 +- src/world/area_arn/arn_11/events.c | 2 +- src/world/area_arn/arn_12/events.c | 4 +- src/world/area_arn/arn_13/events.c | 4 +- src/world/area_dgb/dgb_00/BFA100.c | 14 +- src/world/area_dgb/dgb_01/BFD9A0.c | 20 +- src/world/area_dgb/dgb_02/C2EBA0.c | 8 +- src/world/area_dgb/dgb_03/C31730.c | 18 +- src/world/area_dgb/dgb_04/C36530.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 8 +- src/world/area_dgb/dgb_06/C3D080.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 4 +- src/world/area_dgb/dgb_08/C3FDB0.c | 26 +- src/world/area_dgb/dgb_09/C46BE0.c | 10 +- src/world/area_dgb/dgb_15/C4F510.c | 8 +- src/world/area_dgb/dgb_16/C52540.c | 26 +- src/world/area_dgb/dgb_18/C55F40.c | 8 +- src/world/area_dro/dro_01/95B7E0.c | 36 +- src/world/area_dro/dro_02/9694C0.c | 28 +- src/world/area_flo/flo_00/C9DF60.c | 26 +- src/world/area_flo/flo_03/CA72E0.c | 12 +- src/world/area_flo/flo_07/CAC5D0.c | 2 +- src/world/area_flo/flo_08/CAFAC0.c | 18 +- src/world/area_flo/flo_09/CB50E0.c | 8 +- src/world/area_flo/flo_10/CB9280.c | 2 +- src/world/area_flo/flo_11/CBDCD0.c | 4 +- src/world/area_flo/flo_12/CC0E70.c | 4 +- src/world/area_flo/flo_13/CC3850.c | 28 +- src/world/area_flo/flo_14/CCBE20.c | 4 +- src/world/area_flo/flo_15/CD06C0.c | 4 +- src/world/area_flo/flo_16/CD2C80.c | 4 +- src/world/area_flo/flo_17/CD7350.c | 18 +- src/world/area_flo/flo_18/CDC6A0.c | 10 +- src/world/area_flo/flo_21/CE6700.c | 36 +- src/world/area_flo/flo_22/CEC240.c | 4 +- src/world/area_flo/flo_23/CEE2A0.c | 10 +- src/world/area_flo/flo_25/CF2C10.c | 6 +- src/world/area_jan/jan_22/B84180.c | 4 +- src/world/area_kkj/kkj_00/ABB340.c | 4 +- src/world/area_kkj/kkj_01/AC5170.c | 4 +- src/world/area_kmr/kmr_03/8C8140.c | 4 +- src/world/area_kmr/kmr_12/events.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 4 +- src/world/area_kpa/kpa_95/A8CB60.c | 4 +- src/world/area_mac/mac_00/7ED280.c | 4 +- src/world/area_mgm/mgm_00/E0E7A0.c | 4 +- src/world/area_nok/nok_12/9FAD60.c | 4 +- src/world/area_omo/omo_07/DBD2B0.c | 4 +- src/world/area_omo/omo_09/DCD6B0.c | 4 +- src/world/area_pra/pra_35/D8D270.c | 4 +- src/world/area_sbk/sbk_00/9292B0.c | 4 +- src/world/area_sbk/sbk_01/929AD0.c | 4 +- src/world/area_trd/trd_02/9A10C0.c | 4 +- src/world/area_trd/trd_04/9A88A0.c | 4 +- src/world/area_tst/tst_04/B1B570.c | 2 +- src/world/area_tst/tst_11/B1CA50.c | 4 +- src/world/common/SetEntityFlags100000.inc.c | 2 +- src/world/common/UnkFunc31.inc.c | 6 +- src/world/common/UnkFunc7.inc.c | 6 +- src/world/common/UnkNpcAIFunc15.inc.c | 2 +- .../common/UnkNpcDurationFlagFunc3.inc.c | 2 +- src/world/common/foliage.inc.c | 4 +- src/world/common/reflection.inc.c | 2 +- src/world/partners.c | 2 +- src/world/script_api/7E0E80.c | 14 +- tools/__init__.py | 0 tools/star_rod_enum_to_decomp.py | 117 + tools/update_evts.py | 2 +- 144 files changed, 3471 insertions(+), 2252 deletions(-) create mode 100644 tools/__init__.py create mode 100755 tools/star_rod_enum_to_decomp.py diff --git a/include/enums.h b/include/enums.h index 8caa35ff9f..95f15436d9 100644 --- a/include/enums.h +++ b/include/enums.h @@ -5,999 +5,995 @@ #include "types.h" enum StoryProgress { - STORY_INTRO = -128, - - STORY_CH0_WAKE_UP, - STORY_CH0_MET_INNKEEPER, - STORY_UNUSED_FFFFFF83, - STORY_CH0_MET_GOOMPA, - STORY_CH0_GATE_CRUSHED, - STORY_CH0_FELL_OFF_CLIFF, - STORY_CH0_GOOMPA_JOINED_PARTY, - STORY_CH0_LOOKING_FOR_HAMMER, - STORY_CH0_FOUND_HAMMER, - STORY_CH0_DEFEATED_JR_TROOPA, - STORY_CH0_LEFT_THE_PLAYGROUND, - STORY_UNUSED_FFFFFF8C, - STORY_CH0_GOOMBARIO_JOINED_PARTY, - STORY_CH0_SMASHED_GATE_BLOCK, - STORY_CH0_DEFEATED_GOOMBA_BROS, - STORY_CH0_DEFEATED_GOOMBA_KING, - STORY_CH0_FOUND_GATEHOUSE_SWITCH, - STORY_CH0_HIT_GATEHOUSE_SWITCH, - STORY_CH0_OPENED_BRIDGE_TO_TOAD_TOWN, - STORY_CH0_KAMMY_RETURNED_TO_BOWSER, - STORY_CH0_ARRIVED_AT_TOAD_TOWN, - STORY_CH0_MET_STAR_SPIRITS, - STORY_CH0_BEGAN_PEACH_MISSION, - STORY_CH0_TWINK_GAVE_LUCKY_STAR, - STORY_CH0_RETURNED_TO_TOAD_TOWN, - - STORY_CH1_SPOKE_WITH_MERLIN, - STORY_CH1_TOLD_MERLIN_ABOUT_DARK_TOADS, - STORY_CH1_MERLIN_REVEALED_KOOPA_BROS, - STORY_CH1_KNOCKED_SWITCH_FROM_TREE, - STORY_CH1_MADE_FIRST_BRIDGE, - STORY_CH1_ARRIVED_AT_KOOPA_VILLAGE, - STORY_CH1_PROMISED_TO_HELP_KOOPER, - STORY_CH1_FUZZY_THIEF_LEFT_TOWN, - STORY_CH1_FUZZY_THIEF_RAN_AWAY, - STORY_CH1_FUZZY_THIEF_HID_IN_TREE, - STORY_CH1_KOOPER_JOINED_PARTY, - STORY_CH1_MADE_SECOND_BRIDGE, - STORY_CH1_ARRIVED_AT_KOOPA_FORTRESS, - STORY_CH1_SPOTTED_BY_KOOPA_BROS, - STORY_CH1_KOOPA_BROS_HID_KEY, - STORY_CH1_DEFEATED_BASEMENT_GUARD, - STORY_CH1_LOWERED_FIRST_STAIRS, - STORY_CH1_KOOPA_BROS_SET_TRAP, - STORY_CH1_MARIO_ACTIVATED_TRAP, - STORY_CH1_BOMBETTE_JOINED_PARTY, - STORY_CH1_DEFEATED_DUNGEON_GUARDS, - STORY_CH1_LOWERED_SECOND_STAIRS, - STORY_CH1_RAISED_SUBMERGED_STAIRS, - STORY_CH1_KOOPA_BROS_FIRING_BLASTERS, - STORY_CH1_DEFEATED_KOOPA_BROS, - STORY_CH1_STAR_SPIRIT_RESCUED, - STORY_CH1_BEGAN_PEACH_MISSION, - STORY_CH1_STAR_SPRIT_DEPARTED, - STORY_CH1_DEFEATED_JR_TROOPA, - STORY_CH1_RETURNED_TO_TOAD_TOWN, - - STORY_CH2_ARRIVED_AT_MT_RUGGED, - STORY_CH2_SPOKE_WITH_PARAKARRY, - STORY_CH2_PARAKARRY_JOINED_PARTY, - STORY_CH2_ARRIVED_AT_DRY_DRY_DESERT, - STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST, - STORY_CH2_SHADY_MOUSE_LEFT_SHOP, - STORY_CH2_SPOKE_WITH_SHEEK, - STORY_CH2_SHADY_MOUSE_ENTERED_SHOP, - STORY_CH2_BOUGHT_SECRET_ITEMS, - STORY_CH2_GOT_PULSE_STONE, - STORY_CH2_UNCOVERED_DRY_DRY_RUINS, - STORY_CH2_DRAINED_FIRST_SAND_ROOM, - STORY_CH2_DRAINED_SECOND_SAND_ROOM, - STORY_CH2_GOT_SUPER_HAMMER, - STORY_CH2_DRAINED_THIRD_SAND_ROOM, - STORY_CH2_SOLVED_ARTIFACT_PUZZLE, - STORY_CH2_DEFEATED_TUTANKOOPA, - STORY_CH2_STAR_SPIRIT_RESCUED, - STORY_CH2_BEGAN_PEACH_MISSION, - STORY_CH2_STAR_SPRIT_DEPARTED, - STORY_UNUSED_FFFFFFCC, - - STORY_CH3_SAW_BOO_ENTER_FOREST, - STORY_CH3_INVITED_TO_BOOS_MANSION, - STORY_CH3_ALLOWED_INTO_FOREVER_FOREST, - STORY_CH3_ARRIVED_AT_BOOS_MANSION, - STORY_CH3_OPENED_BOOS_MANSION_GATE, - STORY_CH3_ENTERED_BOOS_MANSION, - STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE, - STORY_CH3_GOT_RECORD, - STORY_CH3_PLAYED_THE_RECORD, - STORY_CH3_GOT_WEIGHT, - STORY_CH3_WEIGHED_DOWN_CHANDELIER, - STORY_CH3_GOT_SUPER_BOOTS, - STORY_CH3_HIT_HUGE_BLUE_SWITCH, - STORY_CH3_GOT_BOO_PORTRAIT, - STORY_CH3_RESTORED_BOO_PORTRAIT, - STORY_CH3_BOW_JOINED_PARTY, - STORY_CH3_UNLOCKED_GUSTY_GULCH, - STORY_CH3_ARRIVED_AT_GHOST_TOWN, - STORY_CH3_SAW_TUBBA_EAT_BOO, - STORY_CH3_ARRIVED_AT_TUBBAS_MANOR, - STORY_UNUSED_FFFFFFE1, - STORY_CH3_TUBBA_BEGAN_NAPPING, - STORY_CH3_TUBBA_WOKE_UP, - STORY_CH3_TUBBA_SMASHED_THE_BRIDGES, - STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL, - STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER, - STORY_CH3_ESCAPED_TUBBAS_MANOR, - STORY_CH3_UNLOCKED_WINDY_MILL, - STORY_CH3_WENT_DOWN_THE_WELL, - STORY_CH3_HEART_FLED_FIRST_TUNNEL, - STORY_UNUSED_FFFFFFEB, - STORY_UNUSED_FFFFFFEC, - STORY_CH3_HEART_FLED_SECOND_TUNNEL, - STORY_CH3_HEART_ESCAPED_WELL, - STORY_CH3_HEART_ESCAPED_WINDY_MILL, - STORY_CH3_DEFEATED_TUBBA_BLUBBA, - STORY_CH3_STAR_SPIRIT_RESCUED, - STORY_CH3_BEGAN_PEACH_MISSION, - STORY_CH3_STAR_SPRIT_DEPARTED, - - STORY_CH4_FRYING_PAN_STOLEN, - STORY_CH4_MET_WITH_TWINK, - STORY_CH4_FOUND_HIDDEN_DOOR, - STORY_CH4_ENTERED_THE_TOY_BOX, - STORY_CH4_GOT_STOREROOM_KEY, - STORY_CH4_RETURNED_STOREROOM_KEY, - STORY_CH4_GOT_TOY_TRAIN, - STORY_CH4_RETURNED_TOY_TRAIN, - STORY_CH4_GOT_FRYING_PAN, - STORY_CH4_GOT_TAYCE_TS_CAKE, - STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY, - STORY_CH4_PULLED_SWITCH_SWITCH, - STORY_CH4_SOLVED_COLOR_PUZZLE, - STORY_CH4_DEFEATED_LANTERN_GHOST, - STORY_CH4_WATT_JOINED_PARTY, - STORY_CH4_OPENED_GENERAL_GUY_ROOM, - STORY_CH4_DEFEATED_GENERAL_GUY, - STORY_CH4_STAR_SPIRIT_RESCUED, - STORY_CH4_BEGAN_PEACH_MISSION, - STORY_CH4_STAR_SPRIT_DEPARTED, - - STORY_CH5_WHALE_MOUTH_OPEN, - STORY_CH5_ENTERED_WHALE, - STORY_CH5_DEFEATED_FUZZIPEDE, - STORY_CH5_REACHED_LAVA_LAVA_ISLAND, - STORY_CH5_KOLORADO_ESCAPED_FUZZIES, - STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS, - STORY_CH5_YOSHI_CHILDREN_ARE_MISSING, - STORY_CH5_SUSHIE_JOINED_PARTY, - STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED, - STORY_CH5_GOT_JADE_RAVEN, - STORY_CH5_MOVED_RAVEN_STATUE, - STORY_CH5_DEFEATED_PIRANHAS_MINIBOSS, - STORY_CH5_REACHED_RAFAELS_TREE, - STORY_CH5_RAFAEL_LEFT_NEST, - STORY_CH5_RAFAEL_MOVED_ROOT, - STORY_CH5_RAFAEL_WAITING_FOR_MARIO, - STORY_CH5_ZIP_LINE_READY, - STORY_CH5_ENTERED_MT_LAVA_LAVA, - STORY_CH5_KOLORADO_FELL_IN_LAVA, - STORY_CH5_LAVA_STREAM_BLOCKED, - STORY_CH5_GOT_ULTRA_HAMMER, - STORY_CH5_SMASHED_ULTRA_BLOCK, - STORY_CH5_KOLORADO_FELL_IN_PIT, - STORY_CH5_KOLORADO_AT_DEAD_END, - STORY_CH5_HIDDEN_PASSAGE_OPEN, - STORY_CH5_KOLORADO_RAN_AHEAD, - STORY_CH5_KOLORADO_IN_TREASURE_ROOM, - STORY_CH5_DEFEATED_LAVA_PIRANHA, - STORY_CH5_MT_LAVA_LAVA_ERUPTING, - STORY_CH5_OPENED_ESCAPE_ROUTE, - STORY_CH5_BEGAN_PEACH_MISSION, - STORY_CH5_STAR_SPRIT_DEPARTED, - STORY_CH5_TRADED_VASE_FOR_SEED, - STORY_CH5_RETURNED_TO_TOAD_TOWN, - - STORY_CH6_FLOWER_GATE_OPEN, - STORY_CH6_ARRIVED_AT_FLOWER_FIELDS, - STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES, - STORY_CH6_GOT_MAGICAL_BEAN, - STORY_CH6_GOT_FERTILE_SOIL, - STORY_CH6_GOT_CRYSTAL_BERRY, - STORY_CH6_GOT_WATER_STONE, - STORY_CH6_FILLED_SPRING_WITH_WATER, - STORY_CH6_SPOKE_WITH_THE_SUN, - STORY_CH6_LAKILESTER_JOINED_PARTY, - STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS, - STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE, - STORY_CH6_WISTERWOOD_GAVE_HINT, - STORY_CH6_GREW_MAGIC_BEANSTALK, - STORY_CH6_DEFEATED_HUFF_N_PUFF, - STORY_CH6_STAR_SPIRIT_RESCUED, - STORY_CH6_BEGAN_PEACH_MISSION, - STORY_CH6_STAR_SPRIT_DEPARTED, - STORY_CH6_RETURNED_TO_TOAD_TOWN, - - STORY_CH7_INVITED_TO_STARBORN_VALLEY, - STORY_CH7_ARRIVED_AT_SHIVER_CITY, - STORY_CH7_MAYOR_MURDER_MYSTERY, - STORY_CH7_SHATTERED_FROZEN_POND, - STORY_CH7_SPOKE_WITH_HERRINGWAY, - STORY_CH7_HERRINGWAY_AT_MAYORS_HOUSE, - STORY_CH7_MAYOR_MURDER_SOLVED, - STORY_CH7_DEFEATED_JR_TROOPA, - STORY_CH7_DEFEATED_MONSTAR, - STORY_CH7_ARRIVED_AT_STARBORN_VALLEY, - STORY_CH7_MERLE_APOLOGIZED, - STORY_CH7_GOT_SNOWMAN_SCARF, - STORY_CH7_GOT_SNOWMAN_BUCKET, - STORY_CH7_UNLOCKED_SHIVER_MOUNTAIN, - STORY_CH7_DEFEATED_FIRST_DUPLIGHOST, - STORY_CH7_GOT_STAR_STONE, - STORY_CH7_RAISED_FROZEN_STAIRS, - STORY_CH7_ARRIVED_AT_CRYSTAL_PALACE, - STORY_CH7_DEFEATED_MIRROR_DUPLIGHOSTS, - STORY_CH7_DEFEATED_BOMBETTE_DUPLIGHOSTS, - STORY_CH7_DEFEATED_CLUBBAS, - STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS, - STORY_CH7_EXTENDED_PALACE_BRIDGE, - STORY_CH7_FOUND_HIDDEN_ROOM_UNDER_STATUE, - STORY_CH7_SOLVED_ALBINO_DINO_PUZZLE, - STORY_CH7_DEFEATED_CRYSTAL_KING, - STORY_CH7_STAR_SPIRIT_RESCUED, - STORY_CH7_BEGAN_PEACH_MISSION, - STORY_CH7_STAR_SPRIT_DEPARTED, - - STORY_CH8_OPENED_PATH_TO_STAR_WAY, - STORY_CH8_REACHED_STAR_HAVEN, - STORY_CH8_STAR_SHIP_ACTIVATED, - STORY_UNUSED_5D, - STORY_CH8_REACHED_BOWSERS_CASTLE, - STORY_CH8_REACHED_PEACHS_CASTLE, - - STORY_EPILOGUE, + STORY_INTRO = -128, + STORY_CH0_WAKE_UP = -127, + STORY_CH0_MET_INNKEEPER = -126, + STORY_UNUSED_FFFFFF83 = -125, + STORY_CH0_MET_GOOMPA = -124, + STORY_CH0_GATE_CRUSHED = -123, + STORY_CH0_FELL_OFF_CLIFF = -122, + STORY_CH0_GOOMPA_JOINED_PARTY = -121, + STORY_CH0_LOOKING_FOR_HAMMER = -120, + STORY_CH0_FOUND_HAMMER = -119, + STORY_CH0_DEFEATED_JR_TROOPA = -118, + STORY_CH0_LEFT_THE_PLAYGROUND = -117, + STORY_UNUSED_FFFFFF8C = -116, + STORY_CH0_GOOMBARIO_JOINED_PARTY = -115, + STORY_CH0_SMASHED_GATE_BLOCK = -114, + STORY_CH0_DEFEATED_GOOMBA_BROS = -113, + STORY_CH0_DEFEATED_GOOMBA_KING = -112, + STORY_CH0_FOUND_GATEHOUSE_SWITCH = -111, + STORY_CH0_HIT_GATEHOUSE_SWITCH = -110, + STORY_CH0_OPENED_BRIDGE_TO_TOAD_TOWN = -109, + STORY_CH0_KAMMY_RETURNED_TO_BOWSER = -108, + STORY_CH0_ARRIVED_AT_TOAD_TOWN = -107, + STORY_CH0_MET_STAR_SPIRITS = -106, + STORY_CH0_BEGAN_PEACH_MISSION = -105, + STORY_CH0_TWINK_GAVE_LUCKY_STAR = -104, + STORY_CH0_RETURNED_TO_TOAD_TOWN = -103, + STORY_CH1_SPOKE_WITH_MERLIN = -102, + STORY_CH1_TOLD_MERLIN_ABOUT_DARK_TOADS = -101, + STORY_CH1_MERLIN_REVEALED_KOOPA_BROS = -100, + STORY_CH1_KNOCKED_SWITCH_FROM_TREE = -99, + STORY_CH1_MADE_FIRST_BRIDGE = -98, + STORY_CH1_ARRIVED_AT_KOOPA_VILLAGE = -97, + STORY_CH1_PROMISED_TO_HELP_KOOPER = -96, + STORY_CH1_FUZZY_THIEF_LEFT_TOWN = -95, + STORY_CH1_FUZZY_THIEF_RAN_AWAY = -94, + STORY_CH1_FUZZY_THIEF_HID_IN_TREE = -93, + STORY_CH1_KOOPER_JOINED_PARTY = -92, + STORY_CH1_MADE_SECOND_BRIDGE = -91, + STORY_CH1_ARRIVED_AT_KOOPA_FORTRESS = -90, + STORY_CH1_SPOTTED_BY_KOOPA_BROS = -89, + STORY_CH1_KOOPA_BROS_HID_KEY = -88, + STORY_CH1_DEFEATED_BASEMENT_GUARD = -87, + STORY_CH1_LOWERED_FIRST_STAIRS = -86, + STORY_CH1_KOOPA_BROS_SET_TRAP = -85, + STORY_CH1_MARIO_ACTIVATED_TRAP = -84, + STORY_CH1_BOMBETTE_JOINED_PARTY = -83, + STORY_CH1_DEFEATED_DUNGEON_GUARDS = -82, + STORY_CH1_LOWERED_SECOND_STAIRS = -81, + STORY_CH1_RAISED_SUBMERGED_STAIRS = -80, + STORY_CH1_KOOPA_BROS_FIRING_BLASTERS = -79, + STORY_CH1_DEFEATED_KOOPA_BROS = -78, + STORY_CH1_STAR_SPIRIT_RESCUED = -77, + STORY_CH1_BEGAN_PEACH_MISSION = -76, + STORY_CH1_STAR_SPRIT_DEPARTED = -75, + STORY_CH1_DEFEATED_JR_TROOPA = -74, + STORY_CH1_RETURNED_TO_TOAD_TOWN = -73, + STORY_CH2_ARRIVED_AT_MT_RUGGED = -72, + STORY_CH2_SPOKE_WITH_PARAKARRY = -71, + STORY_CH2_PARAKARRY_JOINED_PARTY = -70, + STORY_CH2_ARRIVED_AT_DRY_DRY_DESERT = -69, + STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST = -68, + STORY_CH2_SHADY_MOUSE_LEFT_SHOP = -67, + STORY_CH2_SPOKE_WITH_SHEEK = -66, + STORY_CH2_SHADY_MOUSE_ENTERED_SHOP = -65, + STORY_CH2_BOUGHT_SECRET_ITEMS = -64, + STORY_CH2_GOT_PULSE_STONE = -63, + STORY_CH2_UNCOVERED_DRY_DRY_RUINS = -62, + STORY_CH2_DRAINED_FIRST_SAND_ROOM = -61, + STORY_CH2_DRAINED_SECOND_SAND_ROOM = -60, + STORY_CH2_GOT_SUPER_HAMMER = -59, + STORY_CH2_DRAINED_THIRD_SAND_ROOM = -58, + STORY_CH2_SOLVED_ARTIFACT_PUZZLE = -57, + STORY_CH2_DEFEATED_TUTANKOOPA = -56, + STORY_CH2_STAR_SPIRIT_RESCUED = -55, + STORY_CH2_BEGAN_PEACH_MISSION = -54, + STORY_CH2_STAR_SPRIT_DEPARTED = -53, + STORY_UNUSED_FFFFFFCC = -52, + STORY_CH3_SAW_BOO_ENTER_FOREST = -51, + STORY_CH3_INVITED_TO_BOOS_MANSION = -50, + STORY_CH3_ALLOWED_INTO_FOREVER_FOREST = -49, + STORY_CH3_ARRIVED_AT_BOOS_MANSION = -48, + STORY_CH3_OPENED_BOOS_MANSION_GATE = -47, + STORY_CH3_ENTERED_BOOS_MANSION = -46, + STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE = -45, + STORY_CH3_GOT_RECORD = -44, + STORY_CH3_PLAYED_THE_RECORD = -43, + STORY_CH3_GOT_WEIGHT = -42, + STORY_CH3_WEIGHED_DOWN_CHANDELIER = -41, + STORY_CH3_GOT_SUPER_BOOTS = -40, + STORY_CH3_HIT_HUGE_BLUE_SWITCH = -39, + STORY_CH3_GOT_BOO_PORTRAIT = -38, + STORY_CH3_RESTORED_BOO_PORTRAIT = -37, + STORY_CH3_BOW_JOINED_PARTY = -36, + STORY_CH3_UNLOCKED_GUSTY_GULCH = -35, + STORY_CH3_ARRIVED_AT_GHOST_TOWN = -34, + STORY_CH3_SAW_TUBBA_EAT_BOO = -33, + STORY_CH3_ARRIVED_AT_TUBBAS_MANOR = -32, + STORY_UNUSED_FFFFFFE1 = -31, + STORY_CH3_TUBBA_BEGAN_NAPPING = -30, + STORY_CH3_TUBBA_WOKE_UP = -29, + STORY_CH3_TUBBA_SMASHED_THE_BRIDGES = -28, + STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL = -27, + STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER = -26, + STORY_CH3_ESCAPED_TUBBAS_MANOR = -25, + STORY_CH3_UNLOCKED_WINDY_MILL = -24, + STORY_CH3_WENT_DOWN_THE_WELL = -23, + STORY_CH3_HEART_FLED_FIRST_TUNNEL = -22, + STORY_UNUSED_FFFFFFEB = -21, + STORY_UNUSED_FFFFFFEC = -20, + STORY_CH3_HEART_FLED_SECOND_TUNNEL = -19, + STORY_CH3_HEART_ESCAPED_WELL = -18, + STORY_CH3_HEART_ESCAPED_WINDY_MILL = -17, + STORY_CH3_DEFEATED_TUBBA_BLUBBA = -16, + STORY_CH3_STAR_SPIRIT_RESCUED = -15, + STORY_CH3_BEGAN_PEACH_MISSION = -14, + STORY_CH3_STAR_SPRIT_DEPARTED = -13, + STORY_CH4_FRYING_PAN_STOLEN = -12, + STORY_CH4_MET_WITH_TWINK = -11, + STORY_CH4_FOUND_HIDDEN_DOOR = -10, + STORY_CH4_ENTERED_THE_TOY_BOX = -9, + STORY_CH4_GOT_STOREROOM_KEY = -8, + STORY_CH4_RETURNED_STOREROOM_KEY = -7, + STORY_CH4_GOT_TOY_TRAIN = -6, + STORY_CH4_RETURNED_TOY_TRAIN = -5, + STORY_CH4_GOT_FRYING_PAN = -4, + STORY_CH4_GOT_TAYCE_TS_CAKE = -3, + STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY = -2, + STORY_CH4_PULLED_SWITCH_SWITCH = -1, + STORY_CH4_SOLVED_COLOR_PUZZLE = 0, + STORY_CH4_DEFEATED_LANTERN_GHOST = 1, + STORY_CH4_WATT_JOINED_PARTY = 2, + STORY_CH4_OPENED_GENERAL_GUY_ROOM = 3, + STORY_CH4_DEFEATED_GENERAL_GUY = 4, + STORY_CH4_STAR_SPIRIT_RESCUED = 5, + STORY_CH4_BEGAN_PEACH_MISSION = 6, + STORY_CH4_STAR_SPRIT_DEPARTED = 7, + STORY_CH5_WHALE_MOUTH_OPEN = 8, + STORY_CH5_ENTERED_WHALE = 9, + STORY_CH5_DEFEATED_FUZZIPEDE = 10, + STORY_CH5_REACHED_LAVA_LAVA_ISLAND = 11, + STORY_CH5_KOLORADO_ESCAPED_FUZZIES = 12, + STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS = 13, + STORY_CH5_YOSHI_CHILDREN_ARE_MISSING = 14, + STORY_CH5_SUSHIE_JOINED_PARTY = 15, + STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED = 16, + STORY_CH5_GOT_JADE_RAVEN = 17, + STORY_CH5_MOVED_RAVEN_STATUE = 18, + STORY_CH5_DEFEATED_PIRANHAS_MINIBOSS = 19, + STORY_CH5_REACHED_RAFAELS_TREE = 20, + STORY_CH5_RAFAEL_LEFT_NEST = 21, + STORY_CH5_RAFAEL_MOVED_ROOT = 22, + STORY_CH5_RAFAEL_WAITING_FOR_MARIO = 23, + STORY_CH5_ZIP_LINE_READY = 24, + STORY_CH5_ENTERED_MT_LAVA_LAVA = 25, + STORY_CH5_KOLORADO_FELL_IN_LAVA = 26, + STORY_CH5_LAVA_STREAM_BLOCKED = 27, + STORY_CH5_GOT_ULTRA_HAMMER = 28, + STORY_CH5_SMASHED_ULTRA_BLOCK = 29, + STORY_CH5_KOLORADO_FELL_IN_PIT = 30, + STORY_CH5_KOLORADO_AT_DEAD_END = 31, + STORY_CH5_HIDDEN_PASSAGE_OPEN = 32, + STORY_CH5_KOLORADO_RAN_AHEAD = 33, + STORY_CH5_KOLORADO_IN_TREASURE_ROOM = 34, + STORY_CH5_DEFEATED_LAVA_PIRANHA = 35, + STORY_CH5_MT_LAVA_LAVA_ERUPTING = 36, + STORY_CH5_OPENED_ESCAPE_ROUTE = 37, + STORY_CH5_BEGAN_PEACH_MISSION = 38, + STORY_CH5_STAR_SPRIT_DEPARTED = 39, + STORY_CH5_TRADED_VASE_FOR_SEED = 40, + STORY_CH5_RETURNED_TO_TOAD_TOWN = 41, + STORY_CH6_FLOWER_GATE_OPEN = 42, + STORY_CH6_ARRIVED_AT_FLOWER_FIELDS = 43, + STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES = 44, + STORY_CH6_GOT_MAGICAL_BEAN = 45, + STORY_CH6_GOT_FERTILE_SOIL = 46, + STORY_CH6_GOT_CRYSTAL_BERRY = 47, + STORY_CH6_GOT_WATER_STONE = 48, + STORY_CH6_FILLED_SPRING_WITH_WATER = 49, + STORY_CH6_SPOKE_WITH_THE_SUN = 50, + STORY_CH6_LAKILESTER_JOINED_PARTY = 51, + STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS = 52, + STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE = 53, + STORY_CH6_WISTERWOOD_GAVE_HINT = 54, + STORY_CH6_GREW_MAGIC_BEANSTALK = 55, + STORY_CH6_DEFEATED_HUFF_N_PUFF = 56, + STORY_CH6_STAR_SPIRIT_RESCUED = 57, + STORY_CH6_BEGAN_PEACH_MISSION = 58, + STORY_CH6_STAR_SPRIT_DEPARTED = 59, + STORY_CH6_RETURNED_TO_TOAD_TOWN = 60, + STORY_CH7_INVITED_TO_STARBORN_VALLEY = 61, + STORY_CH7_ARRIVED_AT_SHIVER_CITY = 62, + STORY_CH7_MAYOR_MURDER_MYSTERY = 63, + STORY_CH7_SHATTERED_FROZEN_POND = 64, + STORY_CH7_SPOKE_WITH_HERRINGWAY = 65, + STORY_CH7_HERRINGWAY_AT_MAYORS_HOUSE = 66, + STORY_CH7_MAYOR_MURDER_SOLVED = 67, + STORY_CH7_DEFEATED_JR_TROOPA = 68, + STORY_CH7_DEFEATED_MONSTAR = 69, + STORY_CH7_ARRIVED_AT_STARBORN_VALLEY = 70, + STORY_CH7_MERLE_APOLOGIZED = 71, + STORY_CH7_GOT_SNOWMAN_SCARF = 72, + STORY_CH7_GOT_SNOWMAN_BUCKET = 73, + STORY_CH7_UNLOCKED_SHIVER_MOUNTAIN = 74, + STORY_CH7_DEFEATED_FIRST_DUPLIGHOST = 75, + STORY_CH7_GOT_STAR_STONE = 76, + STORY_CH7_RAISED_FROZEN_STAIRS = 77, + STORY_CH7_ARRIVED_AT_CRYSTAL_PALACE = 78, + STORY_CH7_DEFEATED_MIRROR_DUPLIGHOSTS = 79, + STORY_CH7_DEFEATED_BOMBETTE_DUPLIGHOSTS = 80, + STORY_CH7_DEFEATED_CLUBBAS = 81, + STORY_CH7_DEFEATED_KOOPER_DUPLIGHOSTS = 82, + STORY_CH7_EXTENDED_PALACE_BRIDGE = 83, + STORY_CH7_FOUND_HIDDEN_ROOM_UNDER_STATUE = 84, + STORY_CH7_SOLVED_ALBINO_DINO_PUZZLE = 85, + STORY_CH7_DEFEATED_CRYSTAL_KING = 86, + STORY_CH7_STAR_SPIRIT_RESCUED = 87, + STORY_CH7_BEGAN_PEACH_MISSION = 88, + STORY_CH7_STAR_SPRIT_DEPARTED = 89, + STORY_CH8_OPENED_PATH_TO_STAR_WAY = 90, + STORY_CH8_REACHED_STAR_HAVEN = 91, + STORY_CH8_STAR_SHIP_ACTIVATED = 92, + STORY_UNUSED_0000005D = 93, + STORY_CH8_REACHED_BOWSERS_CASTLE = 94, + STORY_CH8_REACHED_PEACHS_CASTLE = 95, + STORY_EPILOGUE = 96, }; enum EncounterTriggers { - ENCOUNTER_TRIGGER_NONE = 1, - ENCOUNTER_TRIGGER_JUMP, - ENCOUNTER_TRIGGER_SPIN, - ENCOUNTER_TRIGGER_HAMMER, - ENCOUNTER_TRIGGER_CONVERSATION, - ENCOUNTER_TRIGGER_PARTNER, + ENCOUNTER_TRIGGER_NONE = 1, + ENCOUNTER_TRIGGER_JUMP = 2, + ENCOUNTER_TRIGGER_SPIN = 3, + ENCOUNTER_TRIGGER_HAMMER = 4, + ENCOUNTER_TRIGGER_CONVERSATION = 5, + ENCOUNTER_TRIGGER_PARTNER = 6, }; enum SongIDs { - SONG_TOAD_TOWN = 0, - SONG_UNUSED_1, - SONG_NORMAL_BATTLE, - SONG_SPECIAL_BATTLE, - SONG_JR_TROOPA_BATTLE, - SONG_FINAL_BOWSER_BATTLE, - SONG_UNUSED_6, - SONG_GOOMBA_KING_BATTLE, - SONG_KOOPA_BROS_BATTLE, - SONG_FAKE_BOWSER_BATTLE, - SONG_TUTANKOOPA_BATTLE, - SONG_TUBBA_BLUBBA_BATTLE, - SONG_GENERAL_GUY_BATTLE, - SONG_LAVA_PIRANHA_BATTLE, - SONG_HUFF_N_PUFF_BATTLE, - SONG_CRYSTAL_KING_BATTLE, - SONG_GOOMBA_VILLAGE, - SONG_PLEASANT_PATH, - SONG_FUZZY_ATTACK, - SONG_KOOPA_VILLAGE, - SONG_KOOPA_FORTRESS, - SONG_DRY_DRY_OUTPOST, - SONG_MT_RUGGED, - SONG_DRY_DRY_DESERT, - SONG_DRY_DRY_RUINS, - SONG_RUINS_BASEMENT, - SONG_FOREVER_FOREST, - SONG_BOOS_MANSION, - SONG_CHEERFUL_BOOS_MANSION, - SONG_GUSTY_GULCH, - SONG_TUBBAS_MANOR, - SONG_TUBBA_ESCAPE, - SONG_SHY_GUY_TOYBOX, - SONG_TOYBOX_TRAIN, - SONG_CREEPY_TOYBOX, - SONG_UNUSED_35, - SONG_JADE_JUNGLE, - SONG_DEEP_JUNGLE, - SONG_YOSHIS_VILLAGE, - SONG_YOSHIS_PANIC, - SONG_RAPHAEL_RAVEN, - SONG_MT_LAVALAVA, - SONG_VOLCANO_ESCAPE, - SONG_STAR_WAY_OPENS, - SONG_MASTER_BATTLE, - SONG_RADIO_ISLAND_SOUNDS, - SONG_RADIO_HOT_HITS, - SONG_RADIO_GOLDEN_OLDIES, - SONG_FLOWER_FIELDS_CLOUDY, - SONG_FLOWER_FIELDS_SUNNY, - SONG_CLOUDY_CLIMB, - SONG_PUFF_PUFF_MACHINE, - SONG_SUN_TOWER_CLOUDY, - SONG_SUN_TOWER_SUNNY, - SONG_UNUSED_54, - SONG_CRYSTAL_PALACE, - SONG_SHIVER_CITY, - SONG_PENGUIN_MYSTERY, - SONG_SHIVER_SNOWFIELD, - SONG_SHIVER_MOUNTAIN, - SONG_STARBORN_VALLEY, - SONG_MERLAR_THEME, - SONG_MAIL_CALL, - SONG_PEACHS_CASTLE_PARTY, - SONG_CHAPTER_END, - SONG_CHAPTER_START, - SONG_ITEM_UPGRADE, - SONG_UNUSED_67, - SONG_PHONOGRAPH_MUSIC, - SONG_TUTANKOOPA_THEME, - SONG_KAMMY_KOOPA_THEME, - SONG_JR_TROOPA_THEME, - SONG_BULLET_BILL_ASSAULT, - SONG_MONTY_MOLE_ASSAULT, - SONG_SHY_GUY_INVASION, - SONG_TOAD_TOWN_TUNNELS, - SONG_WHALE_THEME, - SONG_FOREVER_FOREST_WARNING, - SONG_YOSHI_KIDS_FOUND, - SONG_UNUSED_FANFARE, - SONG_GOOMBA_KING_THEME, - SONG_KOOPA_BROS_INTERLUDE, - SONG_KOOPA_BROS_THEME, - SONG_TUTANKOOPA_WARNING, - SONG_TUTANKOOPA_REVEALED, - SONG_TUBBA_BLUBBA_THEME, - SONG_GENERAL_GUY_THEME, - SONG_LAVA_PIRANHA_THEME, - SONG_HUFF_N_PUFF_THEME, - SONG_CRYSTAL_KING_THEME, - SONG_BLOOPER_THEME, - SONG_MINIBOSS_BATTLE, - SONG_MONSTAR_THEME, - SONG_CLUB64, - SONG_UNUSED_OPENING, - SONG_BOWSERS_CASTLE_FALLS, - SONG_STAR_HAVEN, - SONG_SHOOTING_STAR_SUMMIT, - SONG_STARSHIP_THEME, - SONG_STAR_SANCTUARY, - SONG_BOWSERS_CASTLE, - SONG_BOWSERS_CASTLE_CAVES, - SONG_BOWSER_THEME, - SONG_BOWSER_BATTLE, - SONG_PEACH_WISHES, - SONG_FILE_SELECT, - SONG_MAIN_THEME, - SONG_BOWSER_ATTACKS, - SONG_MARIO_FALLS, - SONG_PEACH_APPEARS, - SONG_THE_END, - SONG_RECOVERED_STAR_ROD, - SONG_TWINK_THEME, - SONG_STIRRING_CAKE, - SONG_GOURMET_GUY_FREAKOUT, - SONG_PRISONER_PEACH_THEME, - SONG_PEACH_MISSION, - SONG_PEACH_SNEAKING, - SONG_PEACH_CAUGHT, - SONG_PEACH_QUIZ_INTRO, - SONG_STAR_SPIRIT_THEME, - SONG_PENGUIN_WHODUNIT, - SONG_PENGUIN_WAKES_UP, - SONG_MAGIC_BEANSTALK, - SONG_MERLEE_SPELL, - SONG_LAKILESTER_THEME, - SONG_GOOMBA_BROS_RETREAT, - SONG_SUNSHINE_RETURNS, - SONG_RIDING_THE_RAILS, - SONG_RIDING_THE_WHALE, - SONG_NEW_PARTNER, - SONG_DRY_DRY_RUINS_APPEAR, - SONG_CANDY_CANES, - SONG_PLAYROOM, - SONG_MOUSTAFA_THEME, - SONG_GAME_OVER, - SONG_TAKING_REST, - SONG_FLOWER_N_P_C_THEME, - SONG_FLOWER_GATE_APPEARS, - SONG_BATTLE_END, - SONG_POP_DIVA_SONG, - SONG_BOO_MINIGAME, - SONG_LEVEL_UP, - SONG_UNUSED_143, - SONG_PARADE_DAY, - SONG_PARADE_NIGHT, - SONG_UNUSED_146, - SONG_UNUSED_147, - SONG_MARIO_BROS_HOUSE, - SONG_INTRO_STORY, - SONG_NEW_PARTNER_J_P, + SONG_TOAD_TOWN = 0x00000000, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000001, + SONG_NORMAL_BATTLE = 0x00000002, + SONG_SPECIAL_BATTLE = 0x00000003, + SONG_JR_TROOPA_BATTLE = 0x00000004, + SONG_FINAL_BOWSER_BATTLE = 0x00000005, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000006, + SONG_GOOMBA_KING_BATTLE = 0x00000007, + SONG_KOOPA_BROS_BATTLE = 0x00000008, + SONG_FAKE_BOWSER_BATTLE = 0x00000009, + SONG_TUTANKOOPA_BATTLE = 0x0000000A, + SONG_TUBBA_BLUBBA_BATTLE = 0x0000000B, + SONG_GENERAL_GUY_BATTLE = 0x0000000C, + SONG_LAVA_PIRANHA_BATTLE = 0x0000000D, + SONG_HUFF_N_PUFF_BATTLE = 0x0000000E, + SONG_CRYSTAL_KING_BATTLE = 0x0000000F, + SONG_GOOMBA_VILLAGE = 0x00000010, + SONG_PLEASANT_PATH = 0x00000011, + SONG_FUZZY_ATTACK = 0x00000012, + SONG_KOOPA_VILLAGE = 0x00000013, + SONG_KOOPA_FORTRESS = 0x00000014, + SONG_DRY_DRY_OUTPOST = 0x00000015, + SONG_MT_RUGGED = 0x00000016, + SONG_DRY_DRY_DESERT = 0x00000017, + SONG_DRY_DRY_RUINS = 0x00000018, + SONG_RUINS_BASEMENT = 0x00000019, + SONG_FOREVER_FOREST = 0x0000001A, + SONG_BOOS_MANSION = 0x0000001B, + SONG_CHEERFUL_BOOS_MANSION = 0x0000001C, + SONG_GUSTY_GULCH = 0x0000001D, + SONG_TUBBAS_MANOR = 0x0000001E, + SONG_TUBBA_ESCAPE = 0x0000001F, + SONG_SHY_GUY_TOYBOX = 0x00000020, + SONG_TOYBOX_TRAIN = 0x00000021, + SONG_CREEPY_TOYBOX = 0x00000022, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000023, + SONG_JADE_JUNGLE = 0x00000024, + SONG_DEEP_JUNGLE = 0x00000025, + SONG_YOSHIS_VILLAGE = 0x00000026, + SONG_YOSHIS_PANIC = 0x00000027, + SONG_RAPHAEL_RAVEN = 0x00000028, + SONG_MT_LAVALAVA = 0x00000029, + SONG_VOLCANO_ESCAPE = 0x0000002A, + SONG_STAR_WAY_OPENS = 0x0000002B, + SONG_MASTER_BATTLE = 0x0000002C, + SONG_RADIO_ISLAND_SOUNDS = 0x0000002D, + SONG_RADIO_HOT_HITS = 0x0000002E, + SONG_RADIO_GOLDEN_OLDIES = 0x0000002F, + SONG_FLOWER_FIELDS_CLOUDY = 0x00000030, + SONG_FLOWER_FIELDS_SUNNY = 0x00000031, + SONG_CLOUDY_CLIMB = 0x00000032, + SONG_PUFF_PUFF_MACHINE = 0x00000033, + SONG_SUN_TOWER_CLOUDY = 0x00000034, + SONG_SUN_TOWER_SUNNY = 0x00000035, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000036, + SONG_CRYSTAL_PALACE = 0x00000037, + SONG_SHIVER_CITY = 0x00000038, + SONG_PENGUIN_MYSTERY = 0x00000039, + SONG_SHIVER_SNOWFIELD = 0x0000003A, + SONG_SHIVER_MOUNTAIN = 0x0000003B, + SONG_STARBORN_VALLEY = 0x0000003C, + SONG_MERLAR_THEME = 0x0000003D, + SONG_MAIL_CALL = 0x0000003E, + SONG_PEACHS_CASTLE_PARTY = 0x0000003F, + SONG_CHAPTER_END = 0x00000040, + SONG_CHAPTER_START = 0x00000041, + SONG_ITEM_UPGRADE = 0x00000042, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000043, + SONG_PHONOGRAPH_MUSIC = 0x00000044, + SONG_TUTANKOOPA_THEME = 0x00000045, + SONG_KAMMY_KOOPA_THEME = 0x00000046, + SONG_JR_TROOPA_THEME = 0x00000047, + SONG_BULLET_BILL_ASSAULT = 0x00000048, + SONG_MONTY_MOLE_ASSAULT = 0x00000049, + SONG_SHY_GUY_INVASION = 0x0000004A, + SONG_TOAD_TOWN_TUNNELS = 0x0000004B, + SONG_WHALE_THEME = 0x0000004C, + SONG_FOREVER_FOREST_WARNING = 0x0000004D, + SONG_YOSHI_KIDS_FOUND = 0x0000004E, + SONG_UNUSED_FANFARE = 0x0000004F, + SONG_GOOMBA_KING_THEME = 0x00000050, + SONG_KOOPA_BROS_INTERLUDE = 0x00000051, + SONG_KOOPA_BROS_THEME = 0x00000052, + SONG_TUTANKOOPA_WARNING = 0x00000053, + SONG_TUTANKOOPA_REVEALED = 0x00000054, + SONG_TUBBA_BLUBBA_THEME = 0x00000055, + SONG_GENERAL_GUY_THEME = 0x00000056, + SONG_LAVA_PIRANHA_THEME = 0x00000057, + SONG_HUFF_N_PUFF_THEME = 0x00000058, + SONG_CRYSTAL_KING_THEME = 0x00000059, + SONG_BLOOPER_THEME = 0x0000005A, + SONG_MINIBOSS_BATTLE = 0x0000005B, + SONG_MONSTAR_THEME = 0x0000005C, + SONG_CLUB64 = 0x0000005D, + SONG_UNUSED_OPENING = 0x0000005E, + SONG_BOWSERS_CASTLE_FALLS = 0x0000005F, + SONG_STAR_HAVEN = 0x00000060, + SONG_SHOOTING_STAR_SUMMIT = 0x00000061, + SONG_STARSHIP_THEME = 0x00000062, + SONG_STAR_SANCTUARY = 0x00000063, + SONG_BOWSERS_CASTLE = 0x00000064, + SONG_BOWSERS_CASTLE_CAVES = 0x00000065, + SONG_BOWSER_THEME = 0x00000066, + SONG_BOWSER_BATTLE = 0x00000067, + SONG_PEACH_WISHES = 0x00000068, + SONG_FILE_SELECT = 0x00000069, + SONG_MAIN_THEME = 0x0000006A, + SONG_BOWSER_ATTACKS = 0x0000006B, + SONG_MARIO_FALLS = 0x0000006C, + SONG_PEACH_APPEARS = 0x0000006D, + SONG_THE_END = 0x0000006E, + SONG_RECOVERED_STAR_ROD = 0x0000006F, + SONG_TWINK_THEME = 0x00000070, + SONG_STIRRING_CAKE = 0x00000071, + SONG_GOURMET_GUY_FREAKOUT = 0x00000072, + SONG_PRISONER_PEACH_THEME = 0x00000073, + SONG_PEACH_MISSION = 0x00000074, + SONG_PEACH_SNEAKING = 0x00000075, + SONG_PEACH_CAUGHT = 0x00000076, + SONG_PEACH_QUIZ_INTRO = 0x00000077, + SONG_STAR_SPIRIT_THEME = 0x00000078, + SONG_PENGUIN_WHODUNIT = 0x00000079, + SONG_PENGUIN_WAKES_UP = 0x0000007A, + SONG_MAGIC_BEANSTALK = 0x0000007B, + SONG_MERLEE_SPELL = 0x0000007C, + SONG_LAKILESTER_THEME = 0x0000007D, + SONG_GOOMBA_BROS_RETREAT = 0x0000007E, + SONG_SUNSHINE_RETURNS = 0x0000007F, + SONG_RIDING_THE_RAILS = 0x00000080, + SONG_RIDING_THE_WHALE = 0x00000081, + SONG_NEW_PARTNER = 0x00000082, + SONG_DRY_DRY_RUINS_APPEAR = 0x00000083, + SONG_CANDY_CANES = 0x00000084, + SONG_PLAYROOM = 0x00000085, + SONG_MOUSTAFA_THEME = 0x00000086, + SONG_GAME_OVER = 0x00000087, + SONG_TAKING_REST = 0x00000088, + SONG_FLOWER_NPC_THEME = 0x00000089, + SONG_FLOWER_GATE_APPEARS = 0x0000008A, + SONG_BATTLE_END = 0x0000008B, + SONG_POP_DIVA_SONG = 0x0000008C, + SONG_BOO_MINIGAME = 0x0000008D, + SONG_LEVEL_UP = 0x0000008E, + //SONG_GOOMBA_VILLAGE_COPY = 0x0000008F, + SONG_PARADE_DAY = 0x00000090, + SONG_PARADE_NIGHT = 0x00000091, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000092, + //SONG_GOOMBA_VILLAGE_COPY = 0x00000093, + SONG_MARIO_BROS_HOUSE = 0x00000094, + SONG_INTRO_STORY = 0x00000095, + SONG_NEW_PARTNER_JP = 0x00000096, }; enum Abilities { - ABILITY_DODGE_MASTER, - ABILITY_UNUSED, - ABILITY_SPIKE_SHIELD, - ABILITY_FIRST_ATTACK, - ABILITY_HP_PLUS, - ABILITY_DOUBLE_DIP, - ABILITY_MYSTERY_SCROLL, - ABILITY_FIRE_SHIELD, - ABILITY_PRETTY_LUCKY, - ABILITY_HP_DRAIN, - ABILITY_ALL_OR_NOTHING, - ABILITY_SLOW_GO, - ABILITY_FP_PLUS, - ABILITY_ICE_POWER, - ABILITY_FEELING_FINE, - ABILITY_ATTACK_F_X, - ABILITY_MONEY_MONEY, - ABILITY_CHILL_OUT, - ABILITY_HAPPY_HEART, - ABILITY_ZAP_TAP, - ABILITY_MEGA_RUSH, - ABILITY_BERSERKER, - ABILITY_RIGHT_ON, - ABILITY_RUNAWAY_PAY, - ABILITY_FLOWER_SAVER, - ABILITY_PAY_OFF, - ABILITY_QUICK_CHANGE, - ABILITY_DEFEND_PLUS, - ABILITY_POWER_PLUS, - ABILITY_REFUND, - ABILITY_POWER_RUSH, - ABILITY_CRAZY_HEART, - ABILITY_LAST_STAND, - ABILITY_CLOSE_CALL, - ABILITY_P_UP_D_DOWN, - ABILITY_LUCKY_DAY, - ABILITY_MEGA_HP_DRAIN, - ABILITY_P_DOWN_D_UP, - ABILITY_FLOWER_FANATIC, - ABILITY_SPEEDY_SPIN, - ABILITY_SPIN_ATTACK, - ABILITY_I_SPY, - ABILITY_BUMP_ATTACK, - ABILITY_HEART_FINDER, - ABILITY_FLOWER_FINDER, - ABILITY_DIZZY_ATTACK, - ABILITY_FINAL_GOOMPA, - ABILITY_FINAL_BOMBOMB, - ABILITY_DEEP_FOCUS, - ABILITY_SUPER_FOCUS, - ABILITY_KAIDEN, - ABILITY_DAMAGE_DODGE, - ABILITY_HAPPY_FLOWER, - ABILITY_GROUP_FOCUS, - ABILITY_PEEKABOO, - ABILITY_HEALTHY_HEALTHY, + ABILITY_DODGE_MASTER = 0x00000000, + ABILITY_UNUSED = 0x00000001, + ABILITY_SPIKE_SHIELD = 0x00000002, + ABILITY_FIRST_ATTACK = 0x00000003, + ABILITY_HP_PLUS = 0x00000004, + ABILITY_DOUBLE_DIP = 0x00000005, + ABILITY_MYSTERY_SCROLL = 0x00000006, + ABILITY_FIRE_SHIELD = 0x00000007, + ABILITY_PRETTY_LUCKY = 0x00000008, + ABILITY_HP_DRAIN = 0x00000009, + ABILITY_ALL_OR_NOTHING = 0x0000000A, + ABILITY_SLOW_GO = 0x0000000B, + ABILITY_FP_PLUS = 0x0000000C, + ABILITY_ICE_POWER = 0x0000000D, + ABILITY_FEELING_FINE = 0x0000000E, + ABILITY_ATTACK_FX = 0x0000000F, + ABILITY_MONEY_MONEY = 0x00000010, + ABILITY_CHILL_OUT = 0x00000011, + ABILITY_HAPPY_HEART = 0x00000012, + ABILITY_ZAP_TAP = 0x00000013, + ABILITY_MEGA_RUSH = 0x00000014, + ABILITY_BERSERKER = 0x00000015, + ABILITY_RIGHT_ON = 0x00000016, + ABILITY_RUNAWAY_PAY = 0x00000017, + ABILITY_FLOWER_SAVER = 0x00000018, + ABILITY_PAY_OFF = 0x00000019, + ABILITY_QUICK_CHANGE = 0x0000001A, + ABILITY_DEFEND_PLUS = 0x0000001B, + ABILITY_POWER_PLUS = 0x0000001C, + ABILITY_REFUND = 0x0000001D, + ABILITY_POWER_RUSH = 0x0000001E, + ABILITY_CRAZY_HEART = 0x0000001F, + ABILITY_LAST_STAND = 0x00000020, + ABILITY_CLOSE_CALL = 0x00000021, + ABILITY_P_UP_D_DOWN = 0x00000022, + ABILITY_LUCKY_DAY = 0x00000023, + ABILITY_MEGA_HP_DRAIN = 0x00000024, + ABILITY_P_DOWN_D_UP = 0x00000025, + ABILITY_FLOWER_FANATIC = 0x00000026, + ABILITY_SPEEDY_SPIN = 0x00000027, + ABILITY_SPIN_ATTACK = 0x00000028, + ABILITY_I_SPY = 0x00000029, + ABILITY_BUMP_ATTACK = 0x0000002A, + ABILITY_HEART_FINDER = 0x0000002B, + ABILITY_FLOWER_FINDER = 0x0000002C, + ABILITY_DIZZY_ATTACK = 0x0000002D, + ABILITY_FINAL_GOOMPA = 0x0000002E, + ABILITY_FINAL_BOMBOMB = 0x0000002F, + ABILITY_DEEP_FOCUS = 0x00000030, + ABILITY_SUPER_FOCUS = 0x00000031, + ABILITY_KAIDEN = 0x00000032, + ABILITY_DAMAGE_DODGE = 0x00000033, + ABILITY_HAPPY_FLOWER = 0x00000034, + ABILITY_GROUP_FOCUS = 0x00000035, + ABILITY_PEEKABOO = 0x00000036, + ABILITY_HEALTHY_HEALTHY = 0x00000037, }; enum Emotes { - EMOTE_EXCLAMATION, - EMOTE_SHOCK, - EMOTE_QUESTION, - EMOTE_FRUSTRATION, - EMOTE_ELLIPSIS, - EMOTE_INVALID, + EMOTE_EXCLAMATION = 0, + EMOTE_SHOCK = 1, + EMOTE_QUESTION = 2, + EMOTE_FRUSTRATION = 3, + EMOTE_ELLIPSIS = 4, + EMOTE_INVALID = 5, }; enum Easings { - EASING_LINEAR, - EASING_QUADRATIC_IN, - EASING_CUBIC_IN, - EASING_QUARTIC_IN, - EASING_QUADRATIC_OUT, - EASING_CUBIC_OUT, - EASING_QUARTIC_OUT, - EASING_COS_SLOW_OVERSHOOT, - EASING_COS_FAST_OVERSHOOT, - EASING_COS_BOUNCE, - EASING_COS_IN_OUT, - EASING_SIN_OUT, - EASING_COS_IN, + EASING_LINEAR = 0, + EASING_QUADRATIC_IN = 1, + EASING_CUBIC_IN = 2, + EASING_QUARTIC_IN = 3, + EASING_QUADRATIC_OUT = 4, + EASING_CUBIC_OUT = 5, + EASING_QUARTIC_OUT = 6, + EASING_COS_SLOW_OVERSHOOT = 7, + EASING_COS_FAST_OVERSHOOT = 8, + EASING_COS_BOUNCE = 9, + EASING_COS_IN_OUT = 10, + EASING_SIN_OUT = 11, + EASING_COS_IN = 12, }; enum SoundIDs { - SOUND_UNKNOWN_0, - SOUND_MENU_BADGE_EQUIP = 5, - SOUND_MENU_BADGE_UNEQUIP = 6, - SOUND_UNKNOWN_D = 13, - SOUND_UNKNOWN_E = 14, - SOUND_UNKNOWN_43 = 67, - SOUND_JR_TROOPA_SPLASH = 69, - SOUND_JR_TROOPA_SWIM, - SOUND_BOO_SPOOK, - SOUND_UNKNOWN_52 = 82, - SOUND_UNKNOWN_A2 = 162, - SOUND_UNKNOWN_B4 = 180, - SOUND_BOO_VANISH = 193, - SOUND_BOO_APPEAR = 195, - SOUND_MENU_OPEN = 197, - SOUND_MENU_CLOSE, - SOUND_MENU_CHANGE_SELECTION, - SOUND_MENU_CHANGE_TAB, - SOUND_MENU_NEXT, - SOUND_MENU_BACK, - SOUND_E1 = 225, - SOUND_E2, - SOUND_E3, - SOUND_E9 = 233, - SOUND_EA, - SOUND_FREEZE, - SOUND_10C = 268, - SOUND_10D, - SOUND_STEP1 = 321, - SOUND_STEP2, - SOUND_TORNADO_JUMP = 327, - SOUND_SOFT_LAND = 328, - SOUND_LAND = 331, - SOUND_HIT_BLOCK = 334, - SOUND_SEARCH_BUSH = 339, - SOUND_UNKNOWN_162 = 354, - SOUND_SMASH_GOOMNUT_TREE = 357, - SOUND_UNKNOWN_167 = 359, - SOUND_UNKNOWN_172 = 370, - SOUND_UNKNOWN_17B = 379, - SOUND_UNKNOWN_194 = 404, - SOUND_BASIC_DOOR_OPEN = 449, - SOUND_BASIC_DOOR_CLOSE, - SOUND_METAL_DOOR_OPEN, - SOUND_METAL_DOOR_CLOSE, - SOUND_LARGE_DOOR_OPEN, - SOUND_LARGE_DOOR_CLOSE, - SOUND_CREAKY_DOOR_OPEN, - SOUND_CREAKY_DOOR_CLOSE, - SOUND_METAL_GATE_OPEN, - SOUND_METAL_GATE_CLOSE, - SOUND_MENU_BADGE_ERROR = 541, - SOUND_UNKNOWN_231 = 561, - SOUND_UNKNOWN_246 = 582, - SOUND_UNKNOWN_259 = 601, - SOUND_UNKNOWN_25A, - SOUND_UNKNOWN_25C = 604, - SOUND_UNKNOWN_25D, - SOUND_UNKNOWN_262 = 610, - SOUND_UNKNOWN_282 = 642, - SOUND_BOW_SPOOK = 657, - SOUND_UNKNOWN_295 = 661, - SOUND_UNUSED_2C1 = 705, - SOUND_SMOKE_BURST = 717, - SOUND_DAYZEE_SONG = 727, - SOUND_POWER_UP, - SOUND_UNKNOWN_2F1 = 753, - SOUND_UNKNOWN_2F6 = 758, - SOUND_UNKNOWN_2F7 = 759, - SOUND_CLOSE_SHELL = 767, - SOUND_SHY_GUY_SCREAMS1 = 780, - SOUND_SHY_GUY_SCREAMS2, - SOUND_SHY_GUY_SCREAMS3, - SOUND_TOY_TANK_MOVE1, - SOUND_TOY_TANK_MOVE2, - SOUND_UNKNOWN_315 = 789, - SOUND_MOLE_SURFACE = 801, - SOUND_MOLE_DIG, - SOUND_MOLE_POP, - SOUND_UNKNOWN_32E = 814, - SOUND_UNKNOWN_359 = 857, - SOUND_UNKNOWN_361 = 865, - SOUND_UNKNOWN_362, - SOUND_UNKNOWN_363, - SOUND_UNKNOWN_364, - SOUND_UNKNOWN_365, - SOUND_UNKNOWN_366, - SOUND_UNKNOWN_367, - SOUND_UNKNOWN_368, - SOUND_UNKNOWN_369, - SOUND_UNKNOWN_375 = 885, - SOUND_UNKNOWN_376, - SOUND_UNKNOWN_377, - SOUND_UNKNOWN_379 = 889, - SOUND_37A = 890, - SOUND_37B, - SOUND_GENERAL_WHISTLE = 917, - SOUND_OPEN_SHELL = 980, - SOUND_JUMP_3E2 = 994, - SOUND_MISS_JUMP, - SOUND_DEATH = 997, - SOUND_BIG_POWER_UP, - SOUND_MOLE_THROW = 1000, - SOUND_UNKNOWN_3F3 = 1011, - SOUND_THROW = 1018, - SOUND_UNKNOWN_759 = 1881, - SOUND_UNKNOWN_2003 = 8195, - SOUND_UNKNOWN_200D = 8205, - SOUND_BOW_VANISH, - SOUND_BOW_APPEAR, - SOUND_UNKNOWN_2010, - SOUND_CANNON1 = 8214, - SOUND_CANNON2, - SOUND_CANNON3, - SOUND_UNKNOWN_202C = 8236, - SOUND_UNKNOWN_202D, - SOUND_UNKNOWN_202E, - SOUND_UNKNOWN_202F, - SOUND_UNKNOWN_2030, - SOUND_INFLICT_SLEEP, - SOUND_INFLICT_STATUS, //< Stop, poison, paralyze - SOUND_UNKNOWN_2038 = 8248, - SOUND_UNKNOWN_2039, - SOUND_BOMB_BLAST = 8310, - SOUND_JUMP_2081 = 8321, - SOUND_JUMP_8BIT_MARIO = 8322, - SOUND_UNKNOWN_208C = 8332, - SOUND_UNKNOWN_208D, - SOUND_UNKNOWN_208E, - SOUND_UNKNOWN_208F, - SOUND_UNKNOWN_2095 = 8341, - SOUND_SPELL_CAST1 = 8404, - SOUND_SPELL_CAST2, - SOUND_SPELL_CAST3, - SOUND_SPELL_CAST4, - SOUND_SPELL_CAST5, - SOUND_UNKNOWN_20F6 = 8438, - SOUND_UNKNOWN_2106 = 8454, + SOUND_UNKNOWN_0 = 0x00000000, + SOUND_MENU_BADGE_EQUIP = 0x00000005, + SOUND_MENU_BADGE_UNEQUIP = 0x00000006, + SOUND_UNKNOWN_D = 0x0000000D, + SOUND_UNKNOWN_E = 0x0000000E, + SOUND_UNKNOWN_43 = 0x00000043, + SOUND_JR_TROOPA_SPLASH = 0x00000045, + SOUND_JR_TROOPA_SWIM = 0x00000046, + SOUND_BOO_SPOOK = 0x00000047, + SOUND_UNKNOWN_52 = 0x00000052, + SOUND_UNKNOWN_A2 = 0x000000A2, + SOUND_UNKNOWN_B4 = 0x000000B4, + SOUND_BOO_VANISH = 0x000000C1, + SOUND_BOO_APPEAR = 0x000000C3, + SOUND_MENU_OPEN = 0x000000C5, + SOUND_MENU_CLOSE = 0x000000C6, + SOUND_MENU_CHANGE_SELECTION = 0x000000C7, + SOUND_MENU_CHANGE_TAB = 0x000000C8, + SOUND_MENU_NEXT = 0x000000C9, + SOUND_MENU_BACK = 0x000000CA, + SOUND_E1 = 0x000000E1, + SOUND_E2 = 0x000000E2, + SOUND_E3 = 0x000000E3, + SOUND_E9 = 0x000000E9, + SOUND_EA = 0x000000EA, + SOUND_FREEZE = 0x000000EB, + SOUND_10C = 0x0000010C, + SOUND_10D = 0x0000010D, + SOUND_STEP1 = 0x00000141, + SOUND_STEP2 = 0x00000142, + SOUND_TORNADO_JUMP = 0x00000147, + SOUND_SOFT_LAND = 0x00000148, + SOUND_LAND = 0x0000014B, + SOUND_HIT_BLOCK = 0x0000014E, + SOUND_SEARCH_BUSH = 0x00000153, + SOUND_UNKNOWN_162 = 0x00000162, + SOUND_SMASH_GOOMNUT_TREE = 0x00000165, + SOUND_UNKNOWN_167 = 0x00000167, + SOUND_UNKNOWN_172 = 0x00000172, + SOUND_UNKNOWN_17B = 0x0000017B, + SOUND_UNKNOWN_194 = 0x00000194, + SOUND_BASIC_DOOR_OPEN = 0x000001C1, + SOUND_BASIC_DOOR_CLOSE = 0x000001C2, + SOUND_METAL_DOOR_OPEN = 0x000001C3, + SOUND_METAL_DOOR_CLOSE = 0x000001C4, + SOUND_LARGE_DOOR_OPEN = 0x000001C5, + SOUND_LARGE_DOOR_CLOSE = 0x000001C6, + SOUND_CREAKY_DOOR_OPEN = 0x000001C7, + SOUND_CREAKY_DOOR_CLOSE = 0x000001C8, + SOUND_METAL_GATE_OPEN = 0x000001C9, + SOUND_METAL_GATE_CLOSE = 0x000001CA, + SOUND_MENU_BADGE_ERROR = 0x0000021D, + SOUND_UNKNOWN_231 = 0x00000231, + SOUND_UNKNOWN_246 = 0x00000246, + SOUND_UNKNOWN_259 = 0x00000259, + SOUND_UNKNOWN_25A = 0x0000025A, + SOUND_UNKNOWN_25C = 0x0000025C, + SOUND_UNKNOWN_25D = 0x0000025D, + SOUND_UNKNOWN_262 = 0x00000262, + SOUND_UNKNOWN_282 = 0x00000282, + SOUND_BOW_SPOOK = 0x00000291, + SOUND_UNKNOWN_295 = 0x00000295, + SOUND_UNUSED_2C1 = 0x000002C1, + SOUND_SMOKE_BURST = 0x000002CD, + SOUND_DAYZEE_SONG = 0x000002D7, + SOUND_POWER_UP = 0x000002D8, + SOUND_UNKNOWN_2F1 = 0x000002F1, + SOUND_UNKNOWN_2F6 = 0x000002F6, + SOUND_UNKNOWN_2F7 = 0x000002F7, + SOUND_CLOSE_SHELL = 0x000002FF, + SOUND_SHY_GUY_SCREAMS1 = 0x0000030C, + SOUND_SHY_GUY_SCREAMS2 = 0x0000030D, + SOUND_SHY_GUY_SCREAMS3 = 0x0000030E, + SOUND_TOY_TANK_MOVE1 = 0x0000030F, + SOUND_TOY_TANK_MOVE2 = 0x00000310, + SOUND_UNKNOWN_315 = 0x00000315, + SOUND_MOLE_SURFACE = 0x00000321, + SOUND_MOLE_DIG = 0x00000322, + SOUND_MOLE_POP = 0x00000323, + SOUND_UNKNOWN_32E = 0x0000032E, + SOUND_UNKNOWN_359 = 0x00000359, + SOUND_UNKNOWN_361 = 0x00000361, + SOUND_UNKNOWN_362 = 0x00000362, + SOUND_UNKNOWN_363 = 0x00000363, + SOUND_UNKNOWN_364 = 0x00000364, + SOUND_UNKNOWN_365 = 0x00000365, + SOUND_UNKNOWN_366 = 0x00000366, + SOUND_UNKNOWN_367 = 0x00000367, + SOUND_UNKNOWN_368 = 0x00000368, + SOUND_UNKNOWN_369 = 0x00000369, + SOUND_UNKNOWN_375 = 0x00000375, + SOUND_UNKNOWN_376 = 0x00000376, + SOUND_UNKNOWN_377 = 0x00000377, + SOUND_UNKNOWN_379 = 0x00000379, + SOUND_37A = 0x0000037A, + SOUND_37B = 0x0000037B, + SOUND_GENERAL_WHISTLE = 0x00000395, + SOUND_OPEN_SHELL = 0x000003D4, + SOUND_JUMP_3E2 = 0x000003E2, + SOUND_MISS_JUMP = 0x000003E3, + SOUND_DEATH = 0x000003E5, + SOUND_BIG_POWER_UP = 0x000003E6, + SOUND_MOLE_THROW = 0x000003E8, + SOUND_UNKNOWN_3F3 = 0x000003F3, + SOUND_THROW = 0x000003FA, + SOUND_UNKNOWN_759 = 0x00000759, + SOUND_UNKNOWN_2003 = 0x00002003, + SOUND_UNKNOWN_200D = 0x0000200D, + SOUND_BOW_VANISH = 0x0000200E, + SOUND_BOW_APPEAR = 0x0000200F, + SOUND_UNKNOWN_2010 = 0x00002010, + SOUND_CANNON1 = 0x00002016, + SOUND_CANNON2 = 0x00002017, + SOUND_CANNON3 = 0x00002018, + SOUND_UNKNOWN_202C = 0x0000202C, + SOUND_UNKNOWN_202D = 0x0000202D, + SOUND_UNKNOWN_202E = 0x0000202E, + SOUND_UNKNOWN_202F = 0x0000202F, + SOUND_UNKNOWN_2030 = 0x00002030, + SOUND_INFLICT_SLEEP = 0x00002031, + SOUND_INFLICT_STATUS = 0x00002032, //< Stop, poison, paralyze + SOUND_UNKNOWN_2038 = 0x00002038, + SOUND_UNKNOWN_2039 = 0x00002039, + SOUND_BOMB_BLAST = 0x00002076, + SOUND_JUMP_2081 = 0x00002081, + SOUND_JUMP_8BIT_MARIO = 0x00002082, + SOUND_UNKNOWN_208C = 0x0000208C, + SOUND_UNKNOWN_208D = 0x0000208D, + SOUND_UNKNOWN_208E = 0x0000208E, + SOUND_UNKNOWN_208F = 0x0000208F, + SOUND_UNKNOWN_2095 = 0x00002095, + SOUND_SPELL_CAST1 = 0x000020D4, + SOUND_SPELL_CAST2 = 0x000020D5, + SOUND_SPELL_CAST3 = 0x000020D6, + SOUND_SPELL_CAST4 = 0x000020D7, + SOUND_SPELL_CAST5 = 0x000020D8, + SOUND_UNKNOWN_20F6 = 0x000020F6, + SOUND_UNKNOWN_2106 = 0x00002106, }; enum Cams { - CAM_DEFAULT, - CAM_BATTLE, - CAM_TATTLE, - CAM_CAM3, + CAM_DEFAULT = 0, + CAM_BATTLE = 1, + CAM_TATTLE = 2, + CAM_CAM3 = 3, }; #define LOOKUP_ITEM(itemID) gItemTable[itemID & ~0xF0000] - enum ItemIDs { - ITEM_NONE, - ITEM_JUMP, - ITEM_SPIN_JUMP, - ITEM_TORNADO_JUMP, - ITEM_HAMMER, - ITEM_SUPER_HAMMER, - ITEM_ULTRA_HAMMER, - ITEM_LUCKY_STAR, - ITEM_MAP, - ITEM_BIG_MAP, - ITEM_FIRST_DEGREE_CARD, - ITEM_SECOND_DEGREE_CARD, - ITEM_THIRD_DEGREE_CARD, - ITEM_FOURTH_DEGREE_CARD, - ITEM_DIPLOMA, - ITEM_ULTRA_STONE, - ITEM_FORTRESS_KEY, - ITEM_RUINS_KEY, - ITEM_PULSE_STONE, - ITEM_CASTLE_KEY1, - ITEM_PALACE_KEY, - ITEM_LUNAR_STONE, - ITEM_PYRAMID_STONE, - ITEM_DIAMOND_STONE, - ITEM_GOLDEN_VASE, - ITEM_KOOPERS_SHELL, - ITEM_CASTLE_KEY2, - ITEM_FOREST_PASS, - ITEM_WEIGHT, - ITEM_BOOS_PORTRAIT, - ITEM_CRYSTAL_BERRY, - ITEM_MYSTICAL_KEY, - ITEM_STOREROOM_KEY, - ITEM_TOY_TRAIN, - ITEM_RECORD, - ITEM_FRYING_PAN, - ITEM_DICTIONARY, - ITEM_MYSTERY_NOTE, - ITEM_SUSPICIOUS_NOTE, - ITEM_CRYSTAL_BALL, - ITEM_SCREWDRIVER, - ITEM_COOKBOOK, - ITEM_JADE_RAVEN, - ITEM_MAGICAL_SEED1, - ITEM_MAGICAL_SEED2, - ITEM_MAGICAL_SEED3, - ITEM_MAGICAL_SEED4, - ITEM_TOAD_DOLL, - ITEM_CALCULATOR, - ITEM_BUCKET, - ITEM_SCARF, - ITEM_RED_KEY, - ITEM_BLUE_KEY, - ITEM_LETTER01 = 54, - ITEM_LETTER02, - ITEM_LETTER03, - ITEM_LETTER04, - ITEM_LETTER05, - ITEM_LETTER06, - ITEM_LETTER07, - ITEM_LETTER08, - ITEM_LETTER09, - ITEM_LETTER10 = 64, - ITEM_LETTER11, - ITEM_LETTER12 = 69, - ITEM_LETTER13, - ITEM_LETTER14, - ITEM_LETTER15, - ITEM_LETTER16, - ITEM_LETTER17, - ITEM_LETTER18, - ITEM_LETTER19, - ITEM_LETTER20 = 78, - ITEM_LETTER21, - ITEM_LETTER22, - ITEM_LETTER23, - ITEM_LETTER24, - ITEM_ARTIFACT, - ITEM_LETTER25, - ITEM_DOLLY = 86, - ITEM_WATER_STONE, - ITEM_MAGICAL_BEAN, - ITEM_FERTILE_SOIL, - ITEM_MIRACLE_WATER, - ITEM_VOLCANO_VASE, - ITEM_TAPE, - ITEM_SUGAR, - ITEM_SALT, - ITEM_EGG1, - ITEM_CREAM, - ITEM_STRAWBERRY, - ITEM_BUTTER, - ITEM_CLEANSER, - ITEM_WATER, - ITEM_FLOUR, - ITEM_MILK, - ITEM_LYRICS, - ITEM_MELODY, - ITEM_MAILBAG, - ITEM_CASTLE_KEY3, - ITEM_ODD_KEY, - ITEM_STAR_STONE, - ITEM_SNEAKY_PARASOL, - ITEM_KOOPA_LEGENDS, - ITEM_AUTOGRAPH1, - ITEM_EMPTY_WALLET, - ITEM_AUTOGRAPH2, - ITEM_KOOPA_SHELL, - ITEM_OLD_PHOTO, - ITEM_GLASSES, - ITEM_PHOTOGRAPH, - ITEM_PACKAGE, - ITEM_RED_JAR, - ITEM_CASTLE_KEY4, - ITEM_WAREHOUSE_KEY, - ITEM_PRISON_KEY1, - ITEM_SILVER_CREDIT, - ITEM_GOLD_CREDIT, - ITEM_PRISON_KEY2, - ITEM_PRISON_KEY3, - ITEM_PRISON_KEY4, - ITEM_FIRE_FLOWER, - ITEM_SNOWMAN_DOLL, - ITEM_THUNDER_RAGE, - ITEM_SHOOTING_STAR, - ITEM_THUNDER_BOLT, - ITEM_PEBBLE, - ITEM_DUSTY_HAMMER, - ITEM_INSECTICIDE_HERB, - ITEM_STONE_CAP, - ITEM_TASTY_TONIC, - ITEM_MUSHROOM, - ITEM_VOLT_SHROOM, - ITEM_SUPER_SHROOM, - ITEM_DRIED_SHROOM, - ITEM_ULTRA_SHROOM, - ITEM_SLEEPY_SHEEP, - ITEM_P_O_W_BLOCK, - ITEM_HUSTLE_DRINK, - ITEM_STOP_WATCH, - ITEM_WHACKAS_BUMP, - ITEM_APPLE, - ITEM_LIFE_SHROOM, - ITEM_MYSTERY, - ITEM_REPEL_GEL, - ITEM_FRIGHT_JAR, - ITEM_PLEASE_COME_BACK, - ITEM_DIZZY_DIAL, - ITEM_SUPER_SODA, - ITEM_LEMON, - ITEM_LIME, - ITEM_BLUE_BERRY, - ITEM_RED_BERRY, - ITEM_YELLOW_BERRY, - ITEM_BUBBLE_BERRY, - ITEM_JAMMIN_JELLY, - ITEM_MAPLE_SYRUP, - ITEM_HONEY_SYRUP, - ITEM_GOOMNUT, - ITEM_KOOPA_LEAF, - ITEM_DRIED_PASTA, - ITEM_DRIED_FRUIT, - ITEM_STRANGE_LEAF, - ITEM_CAKE_MIX, - ITEM_EGG2, - ITEM_COCONUT, - ITEM_MELON, - ITEM_STINKY_HERB, - ITEM_ICED_POTATO, - ITEM_SPICY_SOUP, - ITEM_APPLE_PIE, - ITEM_HONEY_ULTRA, - ITEM_MAPLE_ULTRA, - ITEM_JELLY_ULTRA, - ITEM_KOOPASTA, - ITEM_FRIED_SHROOM, - ITEM_SHROOM_CAKE, - ITEM_SHROOM_STEAK, - ITEM_HOT_SHROOM, - ITEM_SWEET_SHROOM, - ITEM_YUMMY_MEAL, - ITEM_HEALTHY_JUICE, - ITEM_BLAND_MEAL, - ITEM_DELUXE_FEAST, - ITEM_SPECIAL_SHAKE, - ITEM_BIG_COOKIE, - ITEM_CAKE, - ITEM_MISTAKE, - ITEM_KOOPA_TEA, - ITEM_HONEY_SUPER, - ITEM_MAPLE_SUPER, - ITEM_JELLY_SUPER, - ITEM_SPAGHETTI, - ITEM_EGG_MISSILE, - ITEM_FRIED_EGG, - ITEM_HONEY_SHROOM, - ITEM_HONEY_CANDY, - ITEM_ELECTRO_POP, - ITEM_FIRE_POP, - ITEM_LIME_CANDY, - ITEM_COCO_POP, - ITEM_LEMON_CANDY, - ITEM_JELLY_POP, - ITEM_STRANGE_CAKE, - ITEM_KOOKY_COOKIE, - ITEM_FROZEN_FRIES, - ITEM_POTATO_SALAD, - ITEM_NUTTY_CAKE, - ITEM_MAPLE_SHROOM, - ITEM_BOILED_EGG, - ITEM_YOSHI_COOKIE, - ITEM_JELLY_SHROOM1, - ITEM_JELLY_SHROOM2, - ITEM_JELLY_SHROOM3, - ITEM_JELLY_SHROOM4, - ITEM_JELLY_SHROOM5, - ITEM_JELLY_SHROOM6, - ITEM_SPIN_SMASH, - ITEM_MULTIBOUNCE, - ITEM_POWER_PLUS_A, - ITEM_DODGE_MASTER, - ITEM_POWER_BOUNCE, - ITEM_SPIKE_SHIELD, - ITEM_FIRST_ATTACK, - ITEM_HP_PLUS_A, - ITEM_QUAKE_HAMMER, - ITEM_DOUBLE_DIP, - ITEM_MYSTERY_SCROLL, - ITEM_SLEEP_STOMP, - ITEM_FIRE_SHIELD, - ITEM_QUICK_CHANGE, - ITEM_D_DOWN_POUND, - ITEM_DIZZY_STOMP, - ITEM_SMASH_CHARGE0, - ITEM_PRETTY_LUCKY, - ITEM_FEELING_FINE, - ITEM_ATTACK_F_X_A, - ITEM_ALLOR_NOTHING, - ITEM_HP_DRAIN, - ITEM_JUMP_CHARGE0, - ITEM_SLOW_GO, - ITEM_FP_PLUS_A, - ITEM_MEGA_RUSH, - ITEM_ICE_POWER, - ITEM_DEFEND_PLUS_A, - ITEM_PAY_OFF, - ITEM_MONEY_MONEY, - ITEM_CHILL_OUT, - ITEM_HAPPY_HEART_A, - ITEM_ZAP_TAP, - ITEM_BERSERKER, - ITEM_RIGHT_ON, - ITEM_RUNAWAY_PAY, - ITEM_REFUND, - ITEM_FLOWER_SAVER_A, - ITEM_TRIPLE_DIP, - ITEM_HAMMER_THROW, - ITEM_MEGA_QUAKE, - ITEM_SMASH_CHARGE, - ITEM_JUMP_CHARGE, - ITEM_S_SMASH_CHG, - ITEM_S_JUMP_CHG, - ITEM_POWER_RUSH, - ITEM_AUTO_JUMP, - ITEM_AUTO_SMASH, - ITEM_CRAZY_HEART, - ITEM_LAST_STAND, - ITEM_CLOSE_CALL, - ITEM_P_UP_D_DOWN, - ITEM_LUCKY_DAY, - ITEM_MEGA_HP_DRAIN, - ITEM_P_DOWN_D_UP, - ITEM_POWER_QUAKE, - ITEM_AUTO_MULTIBOUNCE, - ITEM_FLOWER_FANATIC, - ITEM_HEART_FINDER, - ITEM_FLOWER_FINDER, - ITEM_SPIN_ATTACK, - ITEM_DIZZY_ATTACK, - ITEM_I_SPY, - ITEM_SPEEDY_SPIN, - ITEM_BUMP_ATTACK, - ITEM_POWER_JUMP, - ITEM_SUPER_JUMP, - ITEM_MEGA_JUMP, - ITEM_POWER_SMASH1, - ITEM_SUPER_SMASH, - ITEM_MEGA_SMASH, - ITEM_POWER_SMASH2, - ITEM_POWER_SMASH3, - ITEM_DEEP_FOCUS1, - ITEM_SUPER_FOCUS, - ITEM_SHRINK_SMASH, - ITEM_SHELL_CRACK, - ITEM_KAIDEN, - ITEM_D_DOWN_JUMP, - ITEM_SHRINK_STOMP, - ITEM_DAMAGE_DODGE_A, - ITEM_EARTHQUAKE_JUMP, - ITEM_DEEP_FOCUS2, - ITEM_DEEP_FOCUS3, - ITEM_HP_PLUS_B, - ITEM_FP_PLUS_B, - ITEM_HAPPY_HEART_B, - ITEM_HAPPY_HEART_X, - ITEM_FLOWER_SAVER_B, - ITEM_FLOWER_SAVER_X, - ITEM_DAMAGE_DODGE_B, - ITEM_DAMAGE_DODGE_X, - ITEM_POWER_PLUS_B, - ITEM_POWER_PLUS_X, - ITEM_DEFEND_PLUS_X, - ITEM_DEFEND_PLUS_Y, - ITEM_HAPPY_FLOWER_A, - ITEM_HAPPY_FLOWER_B, - ITEM_HAPPY_FLOWER_X, - ITEM_GROUP_FOCUS, - ITEM_PEEKABOO, - ITEM_ATTACK_F_X_D, - ITEM_ATTACK_F_X_B, - ITEM_ATTACK_F_X_E, - ITEM_ATTACK_F_X_C, - ITEM_ATTACK_F_X_F, - ITEM_HP_PLUS_C, - ITEM_HP_PLUS_X, - ITEM_HP_PLUS_Y, - ITEM_FP_PLUS_C, - ITEM_FP_PLUS_X, - ITEM_FP_PLUS_Y, - ITEM_HEALTHY_HEALTHY, - ITEM_ATTACK_F_X_F2, - ITEM_ATTACK_F_X_F3, - ITEM_ATTACK_F_X_F4, - ITEM_ATTACK_F_X_F5, - ITEM_PARTNER_ATTACK, - ITEM_HEART, - ITEM_COIN, - ITEM_HEART_PIECE, - ITEM_STAR_POINT, - ITEM_FULL_HEAL, - ITEM_FLOWER, - ITEM_STAR_PIECE, - ITEM_PRESENT, - ITEM_COMPLETE_CAKE, - ITEM_BARE_CAKE, - ITEM_EMPTY_CAKE_PAN, - ITEM_FULL_CAKE_PAN, - ITEM_EMPTY_MIXING_BOWL, - ITEM_FULL_MIXING_BOWL, - ITEM_CAKE_WITH_ICING, - ITEM_CAKE_WITH_BERRIES, - ITEM_HAMMER1_ICON, - ITEM_HAMMER2_ICON, - ITEM_HAMMER3_ICON, - ITEM_BOOTS1_ICON, - ITEM_BOOTS2_ICON, - ITEM_BOOTS3_ICON, - ITEM_ITEMS_ICON, + ITEM_NONE = 0x00000000, + ITEM_JUMP = 0x00000001, + ITEM_SPIN_JUMP = 0x00000002, + ITEM_TORNADO_JUMP = 0x00000003, + ITEM_HAMMER = 0x00000004, + ITEM_SUPER_HAMMER = 0x00000005, + ITEM_ULTRA_HAMMER = 0x00000006, + ITEM_LUCKY_STAR = 0x00000007, + ITEM_MAP = 0x00000008, + ITEM_BIG_MAP = 0x00000009, + ITEM_FIRST_DEGREE_CARD = 0x0000000A, + ITEM_SECOND_DEGREE_CARD = 0x0000000B, + ITEM_THIRD_DEGREE_CARD = 0x0000000C, + ITEM_FOURTH_DEGREE_CARD = 0x0000000D, + ITEM_DIPLOMA = 0x0000000E, + ITEM_ULTRA_STONE = 0x0000000F, + ITEM_KOOPA_FORTRESS_KEY = 0x00000010, + ITEM_RUINS_KEY = 0x00000011, + ITEM_PULSE_STONE = 0x00000012, + ITEM_TUBBA_CASTLE_KEY = 0x00000013, + ITEM_CRYSTAL_PALACE_KEY = 0x00000014, + ITEM_LUNAR_STONE = 0x00000015, + ITEM_PYRAMID_STONE = 0x00000016, + ITEM_DIAMOND_STONE = 0x00000017, + ITEM_GOLDEN_VASE = 0x00000018, + ITEM_KOOPER_SHELL = 0x00000019, + ITEM_BOWSER_CASTLE_KEY = 0x0000001A, + ITEM_FOREST_PASS = 0x0000001B, + ITEM_BOO_WEIGHT = 0x0000001C, + ITEM_BOO_PORTRAIT = 0x0000001D, + ITEM_CRYSTAL_BERRY = 0x0000001E, + ITEM_MYSTICAL_KEY = 0x0000001F, + ITEM_STOREROOM_KEY = 0x00000020, + ITEM_TOY_TRAIN = 0x00000021, + ITEM_BOO_RECORD = 0x00000022, + ITEM_FRYING_PAN = 0x00000023, + ITEM_DICTIONARY = 0x00000024, + ITEM_MYSTERY_NOTE = 0x00000025, + ITEM_SUSPICIOUS_NOTE = 0x00000026, + ITEM_CRYSTAL_BALL = 0x00000027, + ITEM_SCREWDRIVER = 0x00000028, + ITEM_COOKBOOK = 0x00000029, + ITEM_JADE_RAVEN = 0x0000002A, + ITEM_MAGICAL_SEED1 = 0x0000002B, + ITEM_MAGICAL_SEED2 = 0x0000002C, + ITEM_MAGICAL_SEED3 = 0x0000002D, + ITEM_MAGICAL_SEED4 = 0x0000002E, + ITEM_TOAD_DOLL = 0x0000002F, + ITEM_CALCULATOR = 0x00000030, + ITEM_SNOWMAN_BUCKET = 0x00000031, + ITEM_SNOWMAN_SCARF = 0x00000032, + ITEM_RED_KEY = 0x00000033, + ITEM_BLUE_KEY = 0x00000034, + ITEM_UNUSED_LETTER01 = 0x00000035, + ITEM_LETTER01 = 0x00000036, + ITEM_LETTER02 = 0x00000037, + ITEM_LETTER03 = 0x00000038, + ITEM_LETTER04 = 0x00000039, + ITEM_LETTER05 = 0x0000003A, + ITEM_LETTER06 = 0x0000003B, + ITEM_LETTER07 = 0x0000003C, + ITEM_LETTER08 = 0x0000003D, + ITEM_LETTER09 = 0x0000003E, + ITEM_UNUSED_LETTER02 = 0x0000003F, + ITEM_LETTER10 = 0x00000040, + ITEM_LETTER11 = 0x00000041, + ITEM_UNUSED_LETTER03 = 0x00000042, + ITEM_UNUSED_LETTER04 = 0x00000043, + ITEM_UNUSED_LETTER05 = 0x00000044, + ITEM_LETTER12 = 0x00000045, + ITEM_LETTER13 = 0x00000046, + ITEM_LETTER14 = 0x00000047, + ITEM_LETTER15 = 0x00000048, + ITEM_LETTER16 = 0x00000049, + ITEM_LETTER17 = 0x0000004A, + ITEM_LETTER18 = 0x0000004B, + ITEM_LETTER19 = 0x0000004C, + ITEM_UNUSED_LETTER06 = 0x0000004D, + ITEM_LETTER20 = 0x0000004E, + ITEM_LETTER21 = 0x0000004F, + ITEM_LETTER22 = 0x00000050, + ITEM_LETTER23 = 0x00000051, + ITEM_LETTER24 = 0x00000052, + ITEM_ARTIFACT = 0x00000053, + ITEM_LETTER25 = 0x00000054, + ITEM_UNUSED_LETTER07 = 0x00000055, + ITEM_DOLLY = 0x00000056, + ITEM_WATER_STONE = 0x00000057, + ITEM_MAGICAL_BEAN = 0x00000058, + ITEM_FERTILE_SOIL = 0x00000059, + ITEM_MIRACLE_WATER = 0x0000005A, + ITEM_VOLCANO_VASE = 0x0000005B, + ITEM_KOOT_THE_TAPE = 0x0000005C, + ITEM_BAKING_SUGAR = 0x0000005D, + ITEM_BAKING_SALT = 0x0000005E, + ITEM_BAKING_EGG = 0x0000005F, + ITEM_BAKING_CREAM = 0x00000060, + ITEM_BAKING_STRAWBERRY = 0x00000061, + ITEM_BAKING_BUTTER = 0x00000062, + ITEM_BAKING_CLEANSER = 0x00000063, + ITEM_BAKING_WATER = 0x00000064, + ITEM_BAKING_FLOUR = 0x00000065, + ITEM_BAKING_MILK = 0x00000066, + ITEM_LYRICS = 0x00000067, + ITEM_MELODY = 0x00000068, + ITEM_MAILBAG = 0x00000069, + ITEM_PEACH_KEY1 = 0x0000006A, + ITEM_ODD_KEY = 0x0000006B, + ITEM_STAR_STONE = 0x0000006C, + ITEM_SNEAKY_PARASOL = 0x0000006D, + ITEM_KOOT_KOOPA_LEGENDS = 0x0000006E, + ITEM_KOOT_MERLUVLEE_AUTOGRAPH = 0x0000006F, + ITEM_KOOT_EMPTY_WALLET = 0x00000070, + ITEM_KOOT_LUIGI_AUTOGRAPH = 0x00000071, + ITEM_KOOT_SHELL = 0x00000072, + ITEM_KOOT_OLD_PHOTO = 0x00000073, + ITEM_KOOT_GLASSES = 0x00000074, + ITEM_KOOT_ALT_PHOTO = 0x00000075, + ITEM_KOOT_PACKAGE = 0x00000076, + ITEM_KOOT_RED_JAR = 0x00000077, + ITEM_PEACH_KEY2 = 0x00000078, + ITEM_WAREHOUSE_KEY = 0x00000079, + ITEM_PRISON_KEY1 = 0x0000007A, + ITEM_SILVER_CREDIT = 0x0000007B, + ITEM_GOLD_CREDIT = 0x0000007C, + ITEM_PRISON_KEY2 = 0x0000007D, + ITEM_PRISON_KEY3 = 0x0000007E, + ITEM_PRISON_KEY4 = 0x0000007F, + ITEM_FIRE_FLOWER = 0x00000080, + ITEM_SNOWMAN_DOLL = 0x00000081, + ITEM_THUNDER_RAGE = 0x00000082, + ITEM_SHOOTING_STAR = 0x00000083, + ITEM_THUNDER_BOLT = 0x00000084, + ITEM_PEBBLE = 0x00000085, + ITEM_DUSTY_HAMMER = 0x00000086, + ITEM_INSECTICIDE_HERB = 0x00000087, + ITEM_STONE_CAP = 0x00000088, + ITEM_TASTY_TONIC = 0x00000089, + ITEM_MUSHROOM = 0x0000008A, + ITEM_VOLT_SHROOM = 0x0000008B, + ITEM_SUPER_SHROOM = 0x0000008C, + ITEM_DRIED_SHROOM = 0x0000008D, + ITEM_ULTRA_SHROOM = 0x0000008E, + ITEM_SLEEPY_SHEEP = 0x0000008F, + ITEM_P_O_W_BLOCK = 0x00000090, + ITEM_HUSTLE_DRINK = 0x00000091, + ITEM_STOP_WATCH = 0x00000092, + ITEM_WHACKAS_BUMP = 0x00000093, + ITEM_APPLE = 0x00000094, + ITEM_LIFE_SHROOM = 0x00000095, + ITEM_MYSTERY = 0x00000096, + ITEM_REPEL_GEL = 0x00000097, + ITEM_FRIGHT_JAR = 0x00000098, + ITEM_PLEASE_COME_BACK = 0x00000099, + ITEM_DIZZY_DIAL = 0x0000009A, + ITEM_SUPER_SODA = 0x0000009B, + ITEM_LEMON = 0x0000009C, + ITEM_LIME = 0x0000009D, + ITEM_BLUE_BERRY = 0x0000009E, + ITEM_RED_BERRY = 0x0000009F, + ITEM_YELLOW_BERRY = 0x000000A0, + ITEM_BUBBLE_BERRY = 0x000000A1, + ITEM_JAMMIN_JELLY = 0x000000A2, + ITEM_MAPLE_SYRUP = 0x000000A3, + ITEM_HONEY_SYRUP = 0x000000A4, + ITEM_GOOMNUT = 0x000000A5, + ITEM_KOOPA_LEAF = 0x000000A6, + ITEM_DRIED_PASTA = 0x000000A7, + ITEM_DRIED_FRUIT = 0x000000A8, + ITEM_STRANGE_LEAF = 0x000000A9, + ITEM_CAKE_MIX = 0x000000AA, + ITEM_EGG = 0x000000AB, + ITEM_COCONUT = 0x000000AC, + ITEM_MELON = 0x000000AD, + ITEM_STINKY_HERB = 0x000000AE, + ITEM_ICED_POTATO = 0x000000AF, + ITEM_SPICY_SOUP = 0x000000B0, + ITEM_APPLE_PIE = 0x000000B1, + ITEM_HONEY_ULTRA = 0x000000B2, + ITEM_MAPLE_ULTRA = 0x000000B3, + ITEM_JELLY_ULTRA = 0x000000B4, + ITEM_KOOPASTA = 0x000000B5, + ITEM_FRIED_SHROOM = 0x000000B6, + ITEM_SHROOM_CAKE = 0x000000B7, + ITEM_SHROOM_STEAK = 0x000000B8, + ITEM_HOT_SHROOM = 0x000000B9, + ITEM_SWEET_SHROOM = 0x000000BA, + ITEM_YUMMY_MEAL = 0x000000BB, + ITEM_HEALTHY_JUICE = 0x000000BC, + ITEM_BLAND_MEAL = 0x000000BD, + ITEM_DELUXE_FEAST = 0x000000BE, + ITEM_SPECIAL_SHAKE = 0x000000BF, + ITEM_BIG_COOKIE = 0x000000C0, + ITEM_CAKE = 0x000000C1, + ITEM_MISTAKE = 0x000000C2, + ITEM_KOOPA_TEA = 0x000000C3, + ITEM_HONEY_SUPER = 0x000000C4, + ITEM_MAPLE_SUPER = 0x000000C5, + ITEM_JELLY_SUPER = 0x000000C6, + ITEM_SPAGHETTI = 0x000000C7, + ITEM_EGG_MISSILE = 0x000000C8, + ITEM_FRIED_EGG = 0x000000C9, + ITEM_HONEY_SHROOM = 0x000000CA, + ITEM_HONEY_CANDY = 0x000000CB, + ITEM_ELECTRO_POP = 0x000000CC, + ITEM_FIRE_POP = 0x000000CD, + ITEM_LIME_CANDY = 0x000000CE, + ITEM_COCO_POP = 0x000000CF, + ITEM_LEMON_CANDY = 0x000000D0, + ITEM_JELLY_POP = 0x000000D1, + ITEM_STRANGE_CAKE = 0x000000D2, + ITEM_KOOKY_COOKIE = 0x000000D3, + ITEM_FROZEN_FRIES = 0x000000D4, + ITEM_POTATO_SALAD = 0x000000D5, + ITEM_NUTTY_CAKE = 0x000000D6, + ITEM_MAPLE_SHROOM = 0x000000D7, + ITEM_BOILED_EGG = 0x000000D8, + ITEM_YOSHI_COOKIE = 0x000000D9, + ITEM_JELLY_SHROOM1 = 0x000000DA, + ITEM_JELLY_SHROOM2 = 0x000000DB, + ITEM_JELLY_SHROOM3 = 0x000000DC, + ITEM_JELLY_SHROOM4 = 0x000000DD, + ITEM_JELLY_SHROOM5 = 0x000000DE, + ITEM_JELLY_SHROOM6 = 0x000000DF, + ITEM_SPIN_SMASH = 0x000000E0, + ITEM_MULTIBOUNCE = 0x000000E1, + ITEM_POWER_PLUS_A = 0x000000E2, + ITEM_DODGE_MASTER = 0x000000E3, + ITEM_POWER_BOUNCE = 0x000000E4, + ITEM_SPIKE_SHIELD = 0x000000E5, + ITEM_FIRST_ATTACK = 0x000000E6, + ITEM_HP_PLUS_A = 0x000000E7, + ITEM_QUAKE_HAMMER = 0x000000E8, + ITEM_DOUBLE_DIP = 0x000000E9, + ITEM_MYSTERY_SCROLL = 0x000000EA, + ITEM_SLEEP_STOMP = 0x000000EB, + ITEM_FIRE_SHIELD = 0x000000EC, + ITEM_QUICK_CHANGE = 0x000000ED, + ITEM_D_DOWN_POUND = 0x000000EE, + ITEM_DIZZY_STOMP = 0x000000EF, + ITEM_SMASH_CHARGE0 = 0x000000F0, + ITEM_PRETTY_LUCKY = 0x000000F1, + ITEM_FEELING_FINE = 0x000000F2, + ITEM_ATTACK_FX_A = 0x000000F3, + ITEM_ALLOR_NOTHING = 0x000000F4, + ITEM_HP_DRAIN = 0x000000F5, + ITEM_JUMP_CHARGE0 = 0x000000F6, + ITEM_SLOW_GO = 0x000000F7, + ITEM_FP_PLUS_A = 0x000000F8, + ITEM_MEGA_RUSH = 0x000000F9, + ITEM_ICE_POWER = 0x000000FA, + ITEM_DEFEND_PLUS_A = 0x000000FB, + ITEM_PAY_OFF = 0x000000FC, + ITEM_MONEY_MONEY = 0x000000FD, + ITEM_CHILL_OUT = 0x000000FE, + ITEM_HAPPY_HEART_A = 0x000000FF, + ITEM_ZAP_TAP = 0x00000100, + ITEM_BERSERKER = 0x00000101, + ITEM_RIGHT_ON = 0x00000102, + ITEM_RUNAWAY_PAY = 0x00000103, + ITEM_REFUND = 0x00000104, + ITEM_FLOWER_SAVER_A = 0x00000105, + ITEM_TRIPLE_DIP = 0x00000106, + ITEM_HAMMER_THROW = 0x00000107, + ITEM_MEGA_QUAKE = 0x00000108, + ITEM_SMASH_CHARGE = 0x00000109, + ITEM_JUMP_CHARGE = 0x0000010A, + ITEM_S_SMASH_CHG = 0x0000010B, + ITEM_S_JUMP_CHG = 0x0000010C, + ITEM_POWER_RUSH = 0x0000010D, + ITEM_AUTO_JUMP = 0x0000010E, + ITEM_AUTO_SMASH = 0x0000010F, + ITEM_CRAZY_HEART = 0x00000110, + ITEM_LAST_STAND = 0x00000111, + ITEM_CLOSE_CALL = 0x00000112, + ITEM_P_UP_D_DOWN = 0x00000113, + ITEM_LUCKY_DAY = 0x00000114, + ITEM_MEGA_HP_DRAIN = 0x00000115, + ITEM_P_DOWN_D_UP = 0x00000116, + ITEM_POWER_QUAKE = 0x00000117, + ITEM_AUTO_MULTIBOUNCE = 0x00000118, + ITEM_FLOWER_FANATIC = 0x00000119, + ITEM_HEART_FINDER = 0x0000011A, + ITEM_FLOWER_FINDER = 0x0000011B, + ITEM_SPIN_ATTACK = 0x0000011C, + ITEM_DIZZY_ATTACK = 0x0000011D, + ITEM_I_SPY = 0x0000011E, + ITEM_SPEEDY_SPIN = 0x0000011F, + ITEM_BUMP_ATTACK = 0x00000120, + ITEM_POWER_JUMP = 0x00000121, + ITEM_SUPER_JUMP = 0x00000122, + ITEM_MEGA_JUMP = 0x00000123, + ITEM_POWER_SMASH1 = 0x00000124, + ITEM_SUPER_SMASH = 0x00000125, + ITEM_MEGA_SMASH = 0x00000126, + ITEM_POWER_SMASH2 = 0x00000127, + ITEM_POWER_SMASH3 = 0x00000128, + ITEM_DEEP_FOCUS1 = 0x00000129, + ITEM_SUPER_FOCUS = 0x0000012A, + ITEM_SHRINK_SMASH = 0x0000012B, + ITEM_SHELL_CRACK = 0x0000012C, + ITEM_KAIDEN = 0x0000012D, + ITEM_D_DOWN_JUMP = 0x0000012E, + ITEM_SHRINK_STOMP = 0x0000012F, + ITEM_DAMAGE_DODGE_A = 0x00000130, + ITEM_EARTHQUAKE_JUMP = 0x00000131, + ITEM_DEEP_FOCUS2 = 0x00000132, + ITEM_DEEP_FOCUS3 = 0x00000133, + ITEM_HP_PLUS_B = 0x00000134, + ITEM_FP_PLUS_B = 0x00000135, + ITEM_HAPPY_HEART_B = 0x00000136, + ITEM_HAPPY_HEART_X = 0x00000137, + ITEM_FLOWER_SAVER_B = 0x00000138, + ITEM_FLOWER_SAVER_X = 0x00000139, + ITEM_DAMAGE_DODGE_B = 0x0000013A, + ITEM_DAMAGE_DODGE_X = 0x0000013B, + ITEM_POWER_PLUS_B = 0x0000013C, + ITEM_POWER_PLUS_X = 0x0000013D, + ITEM_DEFEND_PLUS_X = 0x0000013E, + ITEM_DEFEND_PLUS_Y = 0x0000013F, + ITEM_HAPPY_FLOWER_A = 0x00000140, + ITEM_HAPPY_FLOWER_B = 0x00000141, + ITEM_HAPPY_FLOWER_X = 0x00000142, + ITEM_GROUP_FOCUS = 0x00000143, + ITEM_PEEKABOO = 0x00000144, + ITEM_ATTACK_FX_D = 0x00000145, + ITEM_ATTACK_FX_B = 0x00000146, + ITEM_ATTACK_FX_E = 0x00000147, + ITEM_ATTACK_FX_C = 0x00000148, + ITEM_ATTACK_FX_F = 0x00000149, + ITEM_HP_PLUS_C = 0x0000014A, + ITEM_HP_PLUS_X = 0x0000014B, + ITEM_HP_PLUS_Y = 0x0000014C, + ITEM_FP_PLUS_C = 0x0000014D, + ITEM_FP_PLUS_X = 0x0000014E, + ITEM_FP_PLUS_Y = 0x0000014F, + ITEM_HEALTHY_HEALTHY = 0x00000150, + ITEM_ATTACK_FX_F2 = 0x00000151, + ITEM_ATTACK_FX_F3 = 0x00000152, + ITEM_ATTACK_FX_F4 = 0x00000153, + ITEM_ATTACK_FX_F5 = 0x00000154, + ITEM_PARTNER_ATTACK = 0x00000155, + ITEM_HEART = 0x00000156, + ITEM_COIN = 0x00000157, + ITEM_HEART_PIECE = 0x00000158, + ITEM_STAR_POINT = 0x00000159, + ITEM_HEART_POINT = 0x0000015A, + ITEM_FLOWER_POINT = 0x0000015B, + ITEM_STAR_PIECE = 0x0000015C, + ITEM_PRESENT = 0x0000015D, + ITEM_CAKE_DONE = 0x0000015E, + ITEM_CAKE_BARE = 0x0000015F, + ITEM_CAKE_PAN = 0x00000160, + ITEM_CAKE_BATTER = 0x00000161, + ITEM_CAKE_BOWL = 0x00000162, + ITEM_CAKE_MIXED = 0x00000163, + ITEM_CAKE_WITH_ICING = 0x00000164, + ITEM_CAKE_WITH_BERRIES = 0x00000165, + ITEM_HAMMER1_ICON = 0x00000166, + ITEM_HAMMER2_ICON = 0x00000167, + ITEM_HAMMER3_ICON = 0x00000168, + ITEM_BOOTS1_ICON = 0x00000169, + ITEM_BOOTS2_ICON = 0x0000016A, + ITEM_BOOTS3_ICON = 0x0000016B, + ITEM_ITEMS_ICON = 0x0000016C, }; #define ITEM_FIRST_KEY_ITEM ITEM_LUCKY_STAR @@ -1005,414 +1001,425 @@ enum ItemIDs { #define ITEM_FIRST_NORMAL_ITEM ITEM_FIRE_FLOWER #define ITEM_LAST_NORMAL_ITEM ITEM_JELLY_SHROOM6 #define ITEM_FIRST_BADGE ITEM_SPIN_SMASH -#define ITEM_LAST_BADGE ITEM_ATTACK_F_X_F5 +#define ITEM_LAST_BADGE ITEM_ATTACK_FX_F5 // TODO: use NPC_ANIM-like macro for player animations enum PlayerAnims { - ANIM_1 = 1, // XXX - ANIM_STAND_STILL = 0x10000, - ANIM_CROUCH_STILL, - ANIM_10002, - ANIM_PANTING, - ANIM_WALKING, - ANIM_RUNNING, - ANIM_BEFORE_JUMP, - ANIM_MIDAIR_STILL, - ANIM_MIDAIR, - ANIM_10009, - ANIM_STUNNED_STILL = 0x1000E, - ANIM_DEAD_STILL, - ANIM_SPINNING = 0x10011, - ANIM_FLAILING, - ANIM_SIT_STILL, - ANIM_CROUCH, - ANIM_STONE_STILL, - ANIM_THROW, - ANIM_FALL_BACK, - ANIM_FALL_DOWN, - ANIM_SCARED, - ANIM_HURT_FOOT, - ANIM_RUN_PANIC, - ANIM_EAT, - ANIM_STICK_OUT_TONGUE, - ANIM_PLANT, - ANIM_GOT_ITEM, - ANIM_READY_JUMP, - ANIM_THINKING, - ANIM_LOST_BALANCE, - ANIM_SHOCK_STILL, - ANIM_DRINK = 0x10025, - ANIM_SQUISH, - ANIM_RUN_THINKING, - ANIM_QUESTION, - ANIM_NOD_YES, - ANIM_1002B = 0x1002B, - ANIM_PRAY, - ANIM_CHARRED = 0x1002F, - ANIM_GET_UP, - ANIM_DUST_OFF, - ANIM_THUMBS_UP, - ANIM_30004 = 0x30004, - ANIM_30008 = 0x30008, - ANIM_30009, - ANIM_80003 = 0x80003, - ANIM_80007 = 0x80007, - ANIM_8000B = 0x8000B, - ANIM_8000C, - ANIM_80017 = 0x80017, - ANIM_8001B = 0x8001B, - ANIM_8001D = 0x8001D, - ANIM_8001E, - ANIM_90004 = 0x90004, - ANIM_90005, - ANIM_90006, + ANIM_1 = 0x00000001, + ANIM_STAND_STILL = 0x00010000, + ANIM_CROUCH_STILL = 0x00010001, + ANIM_10002 = 0x00010002, + ANIM_PANTING = 0x00010003, + ANIM_WALKING = 0x00010004, + ANIM_RUNNING = 0x00010005, + ANIM_BEFORE_JUMP = 0x00010006, + ANIM_MIDAIR_STILL = 0x00010007, + ANIM_MIDAIR = 0x00010008, + ANIM_10009 = 0x00010009, + ANIM_STUNNED_STILL = 0x0001000E, + ANIM_DEAD_STILL = 0x0001000F, + ANIM_SPINNING = 0x00010011, + ANIM_FLAILING = 0x00010012, + ANIM_SIT_STILL = 0x00010013, + ANIM_CROUCH = 0x00010014, + ANIM_STONE_STILL = 0x00010015, + ANIM_THROW = 0x00010016, + ANIM_FALL_BACK = 0x00010017, + ANIM_FALL_DOWN = 0x00010018, + ANIM_SCARED = 0x00010019, + ANIM_HURT_FOOT = 0x0001001A, + ANIM_RUN_PANIC = 0x0001001B, + ANIM_EAT = 0x0001001C, + ANIM_STICK_OUT_TONGUE = 0x0001001D, + ANIM_PLANT = 0x0001001E, + ANIM_GOT_ITEM = 0x0001001F, + ANIM_READY_JUMP = 0x00010020, + ANIM_THINKING = 0x00010021, + ANIM_LOST_BALANCE = 0x00010022, + ANIM_SHOCK_STILL = 0x00010023, + ANIM_DRINK = 0x00010025, + ANIM_SQUISH = 0x00010026, + ANIM_RUN_THINKING = 0x00010027, + ANIM_QUESTION = 0x00010028, + ANIM_NOD_YES = 0x00010029, + ANIM_1002B = 0x0001002B, + ANIM_PRAY = 0x0001002C, + ANIM_CHARRED = 0x0001002F, + ANIM_GET_UP = 0x00010030, + ANIM_DUST_OFF = 0x00010031, + ANIM_THUMBS_UP = 0x00010032, + ANIM_30004 = 0x00030004, + ANIM_30008 = 0x00030008, + ANIM_30009 = 0x00030009, + ANIM_80003 = 0x00080003, + ANIM_80007 = 0x00080007, + ANIM_8000B = 0x0008000B, + ANIM_8000C = 0x0008000C, + ANIM_80017 = 0x00080017, + ANIM_8001B = 0x0008001B, + ANIM_8001D = 0x0008001D, + ANIM_8001E = 0x0008001E, + ANIM_90004 = 0x00090004, + ANIM_90005 = 0x00090005, + ANIM_90006 = 0x00090006, }; enum AmbientSounds { - AMBIENT_SPOOKY, - AMBIENT_WIND, - AMBIENT_BEACH, - AMBIENT_JUNGLE, - AMBIENT_UNDER_SEA1, - AMBIENT_UNDER_SEA2, - AMBIENT_SILENCE, - AMBIENT_UNDER_SEA3, - AMBIENT_UNDER_SEA4, - AMBIENT_EXIT_SEA, - AMBIENT_UNDER_SEA5, - AMBIENT_UNDER_SEA6, - AMBIENT_BIRDS, - AMBIENT_SEA, - AMBIENT_MUSIC = 16, + AMBIENT_SPOOKY = 0, + AMBIENT_WIND = 1, + AMBIENT_BEACH = 2, + AMBIENT_JUNGLE = 3, + AMBIENT_UNDER_SEA1 = 4, + AMBIENT_UNDER_SEA2 = 5, + AMBIENT_SILENCE = 6, + AMBIENT_UNDER_SEA3 = 7, + AMBIENT_UNDER_SEA4 = 8, + AMBIENT_EXIT_SEA = 9, + AMBIENT_UNDER_SEA5 = 10, + AMBIENT_UNDER_SEA6 = 11, + AMBIENT_BIRDS = 12, + AMBIENT_SEA = 13, + AMBIENT_MUSIC = 16, }; enum EncounterOutcomes { - OUTCOME_PLAYER_WON, - OUTCOME_PLAYER_LOST, - OUTCOME_PLAYER_FLED, - OUTCOME_ENEMY_FLED, + OUTCOME_PLAYER_WON = 0, + OUTCOME_PLAYER_LOST = 1, + OUTCOME_PLAYER_FLED = 2, + OUTCOME_ENEMY_FLED = 3, }; enum DecorationIDs { - DECORATION_GOLDEN_FLAMES = 1, - DECORATION_SWEAT, - DECORATION_SEEING_STARS, - DECORATION_RED_FLAMES, - DECORATION_GREY_SMOKE_TRAIL, - DECORATION_FIRE_SMOKE_TRAIL, - DECORATION_WHIRLWIND, - DECORATION_STEAM_EMITTER, - DECORATION_RADIAL_STAR_EMITTER = 11, + DECORATION_GOLDEN_FLAMES = 0x00000001, + DECORATION_SWEAT = 0x00000002, + DECORATION_SEEING_STARS = 0x00000003, + DECORATION_RED_FLAMES = 0x00000004, + DECORATION_GREY_SMOKE_TRAIL = 0x00000005, + DECORATION_FIRE_SMOKE_TRAIL = 0x00000006, + DECORATION_WHIRLWIND = 0x00000007, + DECORATION_STEAM_EMITTER = 0x00000008, + DECORATION_RADIAL_STAR_EMITTER = 0x0000000B, }; enum HitResults { - HIT_RESULT_TRIGGERED_EXPLODE = -1, - HIT_RESULT_HIT, - HIT_RESULT_MISS_QUAKE = 2, - HIT_RESULT_LANDED_ON_SPIKE = 4, - HIT_RESULT_LUCKY, - HIT_RESULT_MISS, - HIT_RESULT_HIT_STATIC, - HIT_RESULT_IMMUNE, + HIT_RESULT_TRIGGERED_EXPLODE = -1, + HIT_RESULT_HIT = 0, + HIT_RESULT_QUAKE_IMMUNE = 2, + HIT_RESULT_LANDED_ON_SPIKE = 4, + HIT_RESULT_LUCKY = 5, + HIT_RESULT_MISS = 6, + HIT_RESULT_HIT_STATIC = 7, + HIT_RESULT_IMMUNE = 8, }; enum Iters { - ITER_FIRST = -1, - ITER_NEXT, - ITER_PREV, - ITER_LAST = 10, + ITER_FIRST = -1, + ITER_NEXT = 0, + ITER_PREV = 1, + ITER_LAST = 10, }; enum ActorSoundIDs { - ACTOR_SOUND_WALK, - ACTOR_SOUND_FLY, - ACTOR_SOUND_JUMP, - ACTOR_SOUND_HURT, - ACTOR_SOUND_WALK_INCREMENT, - ACTOR_SOUND_FLY_INCREMENT, + ACTOR_SOUND_WALK = 0x00000000, + ACTOR_SOUND_FLY = 0x00000001, + ACTOR_SOUND_JUMP = 0x00000002, + ACTOR_SOUND_HURT = 0x00000003, + ACTOR_SOUND_WALK_INCREMENT = 0x00000004, + ACTOR_SOUND_FLY_INCREMENT = 0x00000005, }; enum Phases { - PHASE_EXECUTE_ACTION, - PHASE_FIRST_STRIKE, - PHASE_RUN_AWAY_START = 3, - PHASE_RUN_AWAY_RESET, - PHASE_USE_DEFEND = 6, - PHASE_RUN_AWAY_FAIL, - PHASE_USE_LIFE_SHROOM, - PHASE_PLAYER_BEGIN = 10, - PHASE_ENEMY_END, - PHASE_ENEMY_BEGIN, - PHASE_PLAYER_END, - PHASE_MERLEE_ATTACK_BONUS = 20, - PHASE_MERLEE_DEFENSE_BONUS, - PHASE_MERLEE_EXP_BONUS, - PHASE_PLAYER_HAPPY = 30, + PHASE_EXECUTE_ACTION = 0, + PHASE_FIRST_STRIKE = 1, + PHASE_RUN_AWAY_START = 3, + PHASE_RUN_AWAY_RESET = 4, + PHASE_USE_DEFEND = 6, + PHASE_RUN_AWAY_FAIL = 7, + PHASE_USE_LIFE_SHROOM = 8, + PHASE_PLAYER_BEGIN = 10, + PHASE_ENEMY_END = 11, + PHASE_ENEMY_BEGIN = 12, + PHASE_PLAYER_END = 13, + PHASE_MERLEE_ATTACK_BONUS = 20, + PHASE_MERLEE_DEFENSE_BONUS = 21, + PHASE_MERLEE_EXP_BONUS = 22, + PHASE_PLAYER_HAPPY = 30, }; enum ActorIDs { - ACTOR_SELF = 0xFFFFFF81, - ACTOR_PLAYER = 0x0, - ACTOR_PARTNER = 0x100, - ACTOR_ENEMY0 = 0x200, - ACTOR_ENEMY1, - ACTOR_ENEMY2, - ACTOR_ENEMY3, - ACTOR_ENEMY4, - ACTOR_ENEMY5, - ACTOR_ENEMY6, - ACTOR_ENEMY7, - ACTOR_ENEMY8, - ACTOR_ENEMY9, - ACTOR_ENEMY10, - ACTOR_ENEMY11, - ACTOR_ENEMY12, - ACTOR_ENEMY13, - ACTOR_ENEMY14, - ACTOR_ENEMY15, - ACTOR_ENEMY16, - ACTOR_ENEMY17, - ACTOR_ENEMY18, - ACTOR_ENEMY19, - ACTOR_ENEMY20, - ACTOR_ENEMY21, - ACTOR_ENEMY22, - ACTOR_ENEMY23, + ACTOR_SELF = 0xFFFFFF81, + ACTOR_PLAYER = 0x00000000, + ACTOR_PARTNER = 0x00000100, + ACTOR_ENEMY0 = 0x00000200, + ACTOR_ENEMY1 = 0x00000201, + ACTOR_ENEMY2 = 0x00000202, + ACTOR_ENEMY3 = 0x00000203, + ACTOR_ENEMY4 = 0x00000204, + ACTOR_ENEMY5 = 0x00000205, + ACTOR_ENEMY6 = 0x00000206, + ACTOR_ENEMY7 = 0x00000207, + ACTOR_ENEMY8 = 0x00000208, + ACTOR_ENEMY9 = 0x00000209, + ACTOR_ENEMY10 = 0x0000020A, + ACTOR_ENEMY11 = 0x0000020B, + ACTOR_ENEMY12 = 0x0000020C, + ACTOR_ENEMY13 = 0x0000020D, + ACTOR_ENEMY14 = 0x0000020E, + ACTOR_ENEMY15 = 0x0000020F, + ACTOR_ENEMY16 = 0x00000210, + ACTOR_ENEMY17 = 0x00000211, + ACTOR_ENEMY18 = 0x00000212, + ACTOR_ENEMY19 = 0x00000213, + ACTOR_ENEMY20 = 0x00000214, + ACTOR_ENEMY21 = 0x00000215, + ACTOR_ENEMY22 = 0x00000216, + ACTOR_ENEMY23 = 0x00000217, }; enum Elements { - ELEMENT_END, - ELEMENT_NORMAL, - ELEMENT_FIRE, - ELEMENT_WATER, - ELEMENT_ICE, - ELEMENT_MYSTERY, - ELEMENT_MAGIC = 7, - ELEMENT_HAMMER, - ELEMENT_JUMP, - ELEMENT_COSMIC, - ELEMENT_BLAST, - ELEMENT_SHOCK, - ELEMENT_QUAKE, - ELEMENT_THROW = 15, + ELEMENT_END = 0x00000000, + ELEMENT_NORMAL = 0x00000001, + ELEMENT_FIRE = 0x00000002, + ELEMENT_WATER = 0x00000003, + ELEMENT_ICE = 0x00000004, + ELEMENT_MYSTERY = 0x00000005, + ELEMENT_MAGIC = 0x00000007, + ELEMENT_HAMMER = 0x00000008, + ELEMENT_JUMP = 0x00000009, + ELEMENT_COSMIC = 0x0000000A, + ELEMENT_BLAST = 0x0000000B, + ELEMENT_SHOCK = 0x0000000C, + ELEMENT_QUAKE = 0x0000000D, + ELEMENT_THROW = 0x0000000F, }; enum Events { - EVENT_HIT_COMBO = 9, - EVENT_HIT, - EVENT_SPIN_SMASH_HIT, - EVENT_FALL_TRIGGER, - EVENT_FLIP_TRIGGER, - EVENT_BURN_HIT, - EVENT_SPIN_SMASH_LAUNCH_HIT = 17, - EVENT_STAR_BEAM = 19, - EVENT_POWER_BOUNCE_HIT = 21, - EVENT_BLOW_AWAY, - EVENT_23, - EVENT_24, - EVENT_IMMUNE, - EVENT_BLOCK, - EVENT_SPIKE_TAUNT, - EVENT_BURN_TAUNT, - EVENT_AIR_LIFT_FAILED = 31, - EVENT_DEATH, - EVENT_SPIN_SMASH_DEATH, - EVENT_EXPLODE_TRIGGER, - EVENT_BURN_DEATH = 36, - EVENT_SPIN_SMASH_LAUNCH_DEATH = 37, - EVENT_SHOCK_DEATH = 38, - EVENT_SPIKE_DEATH, - EVENT_POWER_BOUNCE_DEATH, - EVENT_41, // burn death copy? - EVENT_SPIKE_CONTACT, - EVENT_BURN_CONTACT = 44, - EVENT_SHOCK_HIT = 47, - EVENT_RECOVER_STATUS = 49, - EVENT_END_FIRST_STRIKE = 53, - EVENT_LUCKY = 55, - EVENT_BEGIN_FIRST_STRIKE, - EVENT_SCARE_AWAY, - EVENT_BEGIN_AIR_LIFT, - EVENT_UP_AND_AWAY = 61, - EVENT_SWAP_PARTNER = 63, - EVENT_LIFE_SHROOM_PROC, - EVENT_REVIVE, + EVENT_HIT_COMBO = 0x00000009, + EVENT_HIT = 0x0000000A, + EVENT_SPIN_SMASH_HIT = 0x0000000B, + EVENT_FALL_TRIGGER = 0x0000000C, + EVENT_FLIP_TRIGGER = 0x0000000D, + EVENT_BURN_HIT = 0x0000000E, + EVENT_SPIN_SMASH_LAUNCH_HIT = 0x00000011, + EVENT_SHELL_CRACK_HIT = 0x00000012, + EVENT_STAR_BEAM = 0x00000013, + EVENT_POWER_BOUNCE_HIT = 0x00000015, + EVENT_BLOW_AWAY = 0x00000016, + EVENT_UNKNOWN_TRIGGER = 0x00000017, + EVENT_18 = 0x00000018, + EVENT_IMMUNE = 0x00000019, + EVENT_BLOCK = 0x0000001A, + EVENT_SPIKE_TAUNT = 0x0000001B, + EVENT_BURN_TAUNT = 0x0000001C, + EVENT_AIR_LIFT_FAILED = 0x0000001F, + EVENT_DEATH = 0x00000020, + EVENT_SPIN_SMASH_DEATH = 0x00000021, + EVENT_EXPLODE_TRIGGER = 0x00000022, + EVENT_23 = 0x00000023, + EVENT_BURN_DEATH = 0x00000024, + EVENT_SPIN_SMASH_LAUNCH_DEATH = 0x00000025, + EVENT_SHOCK_DEATH = 0x00000026, + EVENT_SPIKE_DEATH = 0x00000027, + EVENT_POWER_BOUNCE_DEATH = 0x00000028, + EVENT_FIRE_DEATH = 0x00000029, // burn death copy? + EVENT_SPIKE_CONTACT = 0x0000002A, + EVENT_BURN_CONTACT = 0x0000002C, + EVENT_SHOCK_HIT = 0x0000002F, + EVENT_RECOVER_STATUS = 0x00000031, + EVENT_END_FIRST_STRIKE = 0x00000035, + EVENT_LUCKY = 0x00000037, + EVENT_BEGIN_FIRST_STRIKE = 0x00000038, + EVENT_SCARE_AWAY = 0x00000039, + EVENT_BEGIN_AIR_LIFT = 0x0000003A, + EVENT_UP_AND_AWAY = 0x0000003D, + EVENT_SWAP_PARTNER = 0x0000003F, + EVENT_LIFE_SHROOM_PROC = 0x00000040, + EVENT_REVIVE = 0x00000041, }; enum HitSounds { - HIT_SOUND_MISS, - HIT_SOUND_BONES, - HIT_SOUND_NORMAL, - HIT_SOUND_FIRE, - HIT_SOUND_ICE, - HIT_SOUND_SHOCK, + HIT_SOUND_MISS = 0, + HIT_SOUND_BONES = 1, + HIT_SOUND_NORMAL = 2, + HIT_SOUND_FIRE = 3, + HIT_SOUND_ICE = 4, + HIT_SOUND_SHOCK = 5, }; enum Statuses { - STATUS_END = 0, - STATUS_NORMAL = 1, - STATUS_DEFAULT = 2, - STATUS_FEAR = 3, - STATUS_DIZZY = 4, - STATUS_PARALYZE = 5, - STATUS_SLEEP = 6, - STATUS_FROZEN = 7, - STATUS_STOP = 8, - STATUS_POISON = 9, - STATUS_SHRINK = 10, - STATUS_STATIC = 11, - STATUS_STONE = 12, - STATUS_DAZE = 13, - STATUS_E, - STATUS_KO, - STATUS_BERSERK = 16, - STATUS_TURN_DONE = 18, - STATUS_HUSTLE = 25, - STATUS_DANGER = 26, - STATUS_THINKING = 28, - STATUS_WEARY = 29, - STATUS_DEFAULT_TURN_MOD = 31, - STATUS_SLEEP_TURN_MOD, - STATUS_STATIC_TURN_MOD, - STATUS_FROZEN_TURN_MOD, - STATUS_FEAR_TURN_MOD, - STATUS_DIZZY_TURN_MOD, - STATUS_POISON_TURN_MOD, - STATUS_PARALYZE_TURN_MOD, - STATUS_SHRINK_TURN_MOD, - STATUS_STONE_TURN_MOD, - STATUS_STOP_TURN_MOD, + STATUS_END = 0x00000000, + STATUS_NORMAL = 0x00000001, + STATUS_DEFAULT = 0x00000002, + STATUS_FEAR = 0x00000003, + STATUS_DIZZY = 0x00000004, + STATUS_PARALYZE = 0x00000005, + STATUS_SLEEP = 0x00000006, + STATUS_FROZEN = 0x00000007, + STATUS_STOP = 0x00000008, + STATUS_POISON = 0x00000009, + STATUS_SHRINK = 0x0000000A, + STATUS_STATIC = 0x0000000B, + STATUS_STONE = 0x0000000C, + STATUS_DAZE = 0x0000000D, + STATUS_E = 0x0000000E, + STATUS_KO = 0x0000000F, + STATUS_BERSERK = 0x00000010, + STATUS_11 = 0x00000011, + STATUS_TURN_DONE = 0x00000012, + STATUS_13 = 0x00000013, + STATUS_14 = 0x00000014, + STATUS_15 = 0x00000015, + STATUS_16 = 0x00000016, + STATUS_17 = 0x00000017, + STATUS_18 = 0x00000018, + STATUS_HUSTLE = 0x00000019, + STATUS_DANGER = 0x0000001A, + STATUS_1B = 0x0000001B, + STATUS_THINKING = 0x0000001C, + STATUS_WEARY = 0x0000001D, + STATUS_1E = 0x0000001E, + STATUS_DEFAULT_TURN_MOD = 0x0000001F, + STATUS_SLEEP_TURN_MOD = 0x00000020, + STATUS_STATIC_TURN_MOD = 0x00000021, + STATUS_FROZEN_TURN_MOD = 0x00000022, + STATUS_FEAR_TURN_MOD = 0x00000023, + STATUS_DIZZY_TURN_MOD = 0x00000024, + STATUS_POISON_TURN_MOD = 0x00000025, + STATUS_PARALYZE_TURN_MOD = 0x00000026, + STATUS_SHRINK_TURN_MOD = 0x00000027, + STATUS_STONE_TURN_MOD = 0x00000028, + STATUS_STOP_TURN_MOD = 0x00000029, }; -enum DoorSwings { - DOOR_SWING_OUT = -1, - DOOR_SWING_IN = 1, +enum doorSwing { + DOOR_SWING_IN = -1, + DOOR_SWING_OUT = 1, }; enum ItemSpawnModes { - ITEM_SPAWN_MODE_UNKNOWN_0, - ITEM_SPAWN_MODE_DECORATION, - ITEM_SPAWN_MODE_UNKNOWN_2, - ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, - ITEM_SPAWN_MODE_BATTLE_REWARD, - ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, - ITEM_SPAWN_MODE_TOSS, - ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, - ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE_NEVER_VANISH, - ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_NEVER_VANISH, - ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM, - ITEM_SPAWN_MODE_ITEM_BLOCK_BADGE, - ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS, - ITEM_SPAWN_MODE_FALL_NEVER_VANISH, - ITEM_SPAWN_MODE_FALL, - ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, - ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS, - ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, - ITEM_SPAWN_MODE_FIXED, - ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS_NEVER_VANISH, - ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS, - ITEM_SPAWN_MODE_ITEM_BLOCK_COIN, - ITEM_SPAWN_MODE_TOSS_HIGHER_NEVER_VANISH, - ITEM_SPAWN_MODE_UNKNOWN_17, - ITEM_SPAWN_MODE_UNKNOWN_18, - ITEM_SPAWN_MODE_UNKNOWN_19, - ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, - ITEM_SPAWN_MODE_UNKNOWN_1B, + ITEM_SPAWN_MODE_NOTHING = 0x00000000, + ITEM_SPAWN_MODE_DECORATION = 0x00000001, + ITEM_SPAWN_MODE_INVISIBLE = 0x00000002, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS = 0x00000003, + ITEM_SPAWN_MODE_BATTLE_REWARD = 0x00000004, + ITEM_SPAWN_MODE_TOSS_NEVER_VANISH = 0x00000005, + ITEM_SPAWN_MODE_TOSS = 0x00000006, + ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE = 0x00000007, + ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE_NEVER_VANISH = 0x00000008, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_NEVER_VANISH = 0x00000009, + ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM = 0x0000000A, + ITEM_SPAWN_MODE_ITEM_BLOCK_BADGE = 0x0000000B, + ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS = 0x0000000C, + ITEM_SPAWN_MODE_FALL_NEVER_VANISH = 0x0000000D, + ITEM_SPAWN_MODE_FALL = 0x0000000E, + ITEM_SPAWN_MODE_FALL_SPAWN_ONCE = 0x0000000F, + ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS = 0x00000010, + ITEM_SPAWN_MODE_FIXED_NEVER_VANISH = 0x00000011, + ITEM_SPAWN_MODE_FIXED = 0x00000012, + ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS_NEVER_VANISH = 0x00000013, + ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS = 0x00000014, + ITEM_SPAWN_MODE_ITEM_BLOCK_COIN = 0x00000015, + ITEM_SPAWN_MODE_TOSS_HIGHER_NEVER_VANISH = 0x00000016, + ITEM_SPAWN_MODE_TOSS_FADE1 = 0x00000017, + ITEM_SPAWN_MODE_TOSS_FADE2 = 0x00000018, + ITEM_SPAWN_MODE_TOSS_FADE3 = 0x00000019, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL = 0x0000001A, + ITEM_SPAWN_MODE_UNKNOWN_1B = 0x0000001B, }; enum Locations { - LOCATION_TOAD_TOWN = 1, - LOCATION_TOAD_TOWN_TUNNELS, - LOCATION_KOOPA_BROS_FORTRESS = 7, - LOCATION_MT_RUGGED, - LOCATION_DRY_DRY_OUTPOST, - LOCATION_DRY_DRY_DESERT, - LOCATION_DRY_DRY_RUINS, - LOCATION_FOREVER_FOREST, - LOCATION_BOOS_MANSION, - LOCATION_TUBBAS_MANOR = 15, - LOCATION_SHY_GUYS_TOYBOX, - LOCATION_MT_LAVALAVA = 18, - LOCATION_CRYSTAL_PALACE = 21, - LOCATION_BOWSERS_CASTLE, - LOCATION_TESTING, - LOCATION_NONE, - LOCATION_PEACH_CASTLE_GROUNDS, - LOCATION_PEACHS_CASTLE, - LOCATION_SHOOTING_STAR_SUMMIT, - LOCATION_STAR_WAY, - LOCATION_STAR_HAVEN, - LOCATION_GOOMBA_VILLAGE, - LOCATION_GOOMBA_ROAD, - LOCATION_PLEASANT_PATH, - LOCATION_KOOPA_VILLAGE, - LOCATION_GUSTY_GULCH, - LOCATION_WINDY_MILL, - LOCATION_JADE_JUNGLE, - LOCATION_YOSHIS_VILLAGE, - LOCATION_FLOWER_FIELDS, - LOCATION_CLOUDY_CLIMB, - LOCATION_SHIVER_CITY, - LOCATION_SHIVER_SNOWFIELD, - LOCATION_STARBORN_VALLEY, - LOCATION_SHIVER_MOUNTAIN, - LOCATION_MARIOS_HOUSE, + LOCATION_TOAD_TOWN = 0x00000001, + LOCATION_TOAD_TOWN_TUNNELS = 0x00000002, + LOCATION_KOOPA_BROS_FORTRESS = 0x00000007, + LOCATION_MT_RUGGED = 0x00000008, + LOCATION_DRY_DRY_OUTPOST = 0x00000009, + LOCATION_DRY_DRY_DESERT = 0x0000000A, + LOCATION_DRY_DRY_RUINS = 0x0000000B, + LOCATION_FOREVER_FOREST = 0x0000000C, + LOCATION_BOOS_MANSION = 0x0000000D, + LOCATION_TUBBAS_MANOR = 0x0000000F, + LOCATION_SHY_GUYS_TOYBOX = 0x00000010, + LOCATION_MT_LAVALAVA = 0x00000012, + LOCATION_CRYSTAL_PALACE = 0x00000015, + LOCATION_BOWSERS_CASTLE = 0x00000016, + LOCATION_PEACHS_CASTLE = 0x0000001A, + LOCATION_TESTING = 0x00000017, + LOCATION_NONE = 0x00000018, + LOCATION_PEACH_CASTLE_GROUNDS = 0x00000019, + LOCATION_SHOOTING_STAR_SUMMIT = 0x0000001B, + LOCATION_STAR_WAY = 0x0000001C, + LOCATION_STAR_HAVEN = 0x0000001D, + LOCATION_GOOMBA_VILLAGE = 0x0000001E, + LOCATION_GOOMBA_ROAD = 0x0000001F, + LOCATION_PLEASANT_PATH = 0x00000020, + LOCATION_KOOPA_VILLAGE = 0x00000021, + LOCATION_GUSTY_GULCH = 0x00000022, + LOCATION_WINDY_MILL = 0x00000023, + LOCATION_JADE_JUNGLE = 0x00000024, + LOCATION_YOSHIS_VILLAGE = 0x00000025, + LOCATION_FLOWER_FIELDS = 0x00000026, + LOCATION_CLOUDY_CLIMB = 0x00000027, + LOCATION_SHIVER_CITY = 0x00000028, + LOCATION_SHIVER_SNOWFIELD = 0x00000029, + LOCATION_STARBORN_VALLEY = 0x0000002A, + LOCATION_SHIVER_MOUNTAIN = 0x0000002B, + LOCATION_MARIOS_HOUSE = 0x0000002C, }; enum DoorSounds { - DOOR_SOUND_BASIC, - DOOR_SOUND_METAL, - DOOR_SOUND_LARGE, - DOOR_SOUND_CREAKY, - DOOR_SOUND_GATE, - DOOR_SOUND_UNKNOWN_5, - DOOR_SOUND_UNKNOWN_6, + DOOR_SOUNDS_BASIC = 0, + DOOR_SOUNDS_METAL = 1, + DOOR_SOUNDS_LARGE = 2, + DOOR_SOUNDS_CREAKY = 3, + DOOR_SOUNDS_GATE = 4, + DOOR_SOUNDS_DOOR = 5, + DOOR_SOUNDS_UNUSED = 6, }; enum ActionStates { - ACTION_STATE_IDLE, - ACTION_STATE_WALK, - ACTION_STATE_RUN, - ACTION_STATE_JUMP, - ACTION_STATE_BOUNCE, ///< Used with Kooper - ACTION_STATE_HOP, ///< Released A before apex of jump - ACTION_STATE_LAUNCH, ///< Shy Guy Toybox jack-in-the-boxes - ACTION_STATE_LAND_ON_SWITCH, ///< Small red/blue ! switches - ACTION_STATE_FALLING, - ACTION_STATE_STEP_DOWN, - ACTION_STATE_LAND, - ACTION_STATE_STEP_DOWN_LAND, - + ACTION_STATE_IDLE = 0x00000000, + ACTION_STATE_WALK = 0x00000001, + ACTION_STATE_RUN = 0x00000002, + ACTION_STATE_JUMP = 0x00000003, + ACTION_STATE_BOUNCE = 0x00000004, ///< Used with Kooper + ACTION_STATE_HOP = 0x00000005, ///< Released A before apex of jump + ACTION_STATE_LAUNCH = 0x00000006, ///< Shy Guy Toybox jack-in-the-boxes + ACTION_STATE_LANDING_ON_SWITCH = 0x00000007, ///< Small red/blue ! switches + ACTION_STATE_FALLING = 0x00000008, + ACTION_STATE_STEP_DOWN = 0x00000009, + ACTION_STATE_LAND = 0x0000000A, + ACTION_STATE_STEP_DOWN_LAND = 0x0000000B, // Following action states prohibit movement (see set_action_state()) - ACTION_STATE_TALK, ///< Reading signs doesn't count - ACTION_STATE_SPIN_JUMP, - ACTION_STATE_GROUND_POUND, - ACTION_STATE_ULTRA_JUMP, - ACTION_STATE_ULTRA_POUND, - ACTION_STATE_SLIDE, - ACTION_STATE_HAMMER, - ACTION_STATE_13, - ACTION_STATE_14, - ACTION_STATE_HIT_FIRE, ///< Causes Mario to fly up and take damage. Used for fire bars. - ACTION_STATE_UNKNOWN_16, // some kind of knockback, does no damage - ACTION_STATE_HIT_LAVA, - ACTION_STATE_18, - ACTION_STATE_SNEAKY_PARASOL, - ACTION_STATE_SPIN, - ACTION_STATE_ENEMY_FIRST_STRIKE, - ACTION_STATE_GET_STAR_SPIRIT, - ACTION_STATE_USE_SPINNING_FLOWER, - ACTION_STATE_USE_MUNCHLESIA, ///< Set by the jan_09 squishy flower entity; throws the player in the air. - ACTION_STATE_USE_TWEESTER, - ACTION_STATE_BOUNCE_OFF_SWITCH, ///< Small red/blue ! switches - ACTION_STATE_RIDE, - ACTION_STATE_STEP_UP, - ACTION_STATE_23, - ACTION_STATE_24, - ACTION_STATE_25, - ACTION_STATE_USE_SPRING, + ACTION_STATE_TALK = 0x0000000C, ///< Reading signs doesn't count + ACTION_STATE_SPIN_JUMP = 0x0000000D, + ACTION_STATE_GROUND_POUND = 0x0000000E, + ACTION_STATE_ULTRA_JUMP = 0x0000000F, + ACTION_STATE_ULTRA_POUND = 0x00000010, + ACTION_STATE_SLIDING = 0x00000011, + ACTION_STATE_HAMMER = 0x00000012, + ACTION_STATE_13 = 0x00000011, + ACTION_STATE_14 = 0x00000012, + ACTION_STATE_HIT_FIRE = 0x00000015, ///< Causes Mario to fly up and take damage. Used for fire bars. + ACTION_STATE_KNOCKBACK = 0x00000016, // some kind of knockback, does no damage + ACTION_STATE_HIT_LAVA = 0x00000017, + ACTION_STATE_STEP_UP_PEACH = 0x00000018, + ACTION_STATE_USE_SNEAKY_PARASOL = 0x00000019, + ACTION_STATE_SPIN = 0x0000001A, + ACTION_STATE_ENEMY_FIRST_STRIKE = 0x0000001B, + ACTION_STATE_GET_STAR_SPIRIT = 0x0000001C, + ACTION_STATE_USE_SPINNING_FLOWER = 0x0000001D, + ACTION_STATE_USE_MUNCHLESIA = 0x0000001E, ///< Set by the jan_09 squishy flower entity; throws the player in the air. + ACTION_STATE_USE_TWEESTER = 0x0000001F, + ACTION_STATE_BOUNCE_OFF_SWITCH = 0x00000020, ///< Small red/blue ! switches + ACTION_STATE_RIDE = 0x00000021, + ACTION_STATE_STEP_UP = 0x00000022, + ACTION_STATE_23 = 0x00000023, + ACTION_STATE_24 = 0x00000024, + ACTION_STATE_25 = 0x00000025, + ACTION_STATE_USE_SPRING = 0x00000026, }; +// Requires decimals enum NpcIDs { NPC_SELF = -1, NPC_PLAYER = -2, @@ -1420,7 +1427,7 @@ enum NpcIDs { NPC_BTL_MERLEE = -10, }; -enum { +enum Triggers { TRIGGER_WALL_PUSH = 0x00000040, TRIGGER_FLOOR_TOUCH = 0x00000080, TRIGGER_WALL_PRESS_A = 0x00000100, @@ -1457,6 +1464,7 @@ enum Buttons { }; enum PlayerBuffs { + PLAYER_BUFF_ALL = 0xFFFFFFFF, PLAYER_BUFF_JUMP_CHARGE = 0x00000001, PLAYER_BUFF_HAMMER_CHARGE = 0x00000002, PLAYER_BUFF_STONE = 0x00000008, @@ -1467,13 +1475,12 @@ enum PlayerBuffs { PLAYER_BUFF_TURBO_CHARGE = 0x00000100, PLAYER_BUFF_WATER_BLOCK = 0x00000200, PLAYER_BUFF_PARTNER_GLOWING = 0x00010000, - PLAYER_BUFF_ALL = 0xFFFFFFFF, }; enum StatusFlags { STATUS_FLAG_SLEEP = 0x00001000, STATUS_FLAG_STATIC = 0x00002000, - STATUS_FLAG_FROZEN = 0x00004000, // TODO: rename to "freeze" + STATUS_FLAG_FROZEN = 0x00004000, STATUS_FLAG_FEAR = 0x00008000, STATUS_FLAG_PARALYZE = 0x00010000, STATUS_FLAG_POISON = 0x00020000, @@ -1491,40 +1498,81 @@ enum StatusFlags { }; enum DamageTypes { - DAMAGE_TYPE_FIRE = 0x00000002, - DAMAGE_TYPE_WATER = 0x00000004, - DAMAGE_TYPE_ICE = 0x00000008, - DAMAGE_TYPE_MAGIC = 0x00000010, - DAMAGE_TYPE_ELECTRIC = 0x00000020, - DAMAGE_TYPE_SMASH = 0x00000040, - DAMAGE_TYPE_JUMP = 0x00000080, - DAMAGE_TYPE_COSMIC = 0x00000100, - DAMAGE_TYPE_BLAST = 0x00000200, - DAMAGE_TYPE_POW = 0x00000400, - DAMAGE_TYPE_QUAKE = 0x00000800, - DAMAGE_TYPE_4000 = 0x00004000, - DAMAGE_TYPE_THROW = 0x00040000, - DAMAGE_TYPE_2000000 = 0x02000000, - DAMAGE_TYPE_IGNORE_DEFENSE = 0x08000000, - DAMAGE_TYPE_NO_CONTACT = 0x10000000, - DAMAGE_TYPE_UNBLOCKABLE = 0x20000000, - DAMAGE_TYPE_40000000 = 0x40000000, - DAMAGE_TYPE_TRIGGER_LUCKY = 0x80000000, + DAMAGE_TYPE_FIRE = 0x00000002, + DAMAGE_TYPE_WATER = 0x00000004, + DAMAGE_TYPE_ICE = 0x00000008, + DAMAGE_TYPE_MAGIC = 0x00000010, + DAMAGE_TYPE_ELECTRIC = 0x00000020, + DAMAGE_TYPE_SMASH = 0x00000040, + DAMAGE_TYPE_JUMP = 0x00000080, + DAMAGE_TYPE_COSMIC = 0x00000100, + DAMAGE_TYPE_BLAST = 0x00000200, + DAMAGE_TYPE_POW = 0x00000400, + DAMAGE_TYPE_QUAKE = 0x00000800, + DAMAGE_TYPE_FEAR = 0x00001000, + DAMAGE_TYPE_4000 = 0x00004000, + DAMAGE_TYPE_AIR_LIFT = 0x00008000, + DAMAGE_TYPE_SPINY_SURGE = 0x00010000, + DAMAGE_TYPE_SHELL_CRACK = 0x00020000, + DAMAGE_TYPE_THROW = 0x00040000, + DAMAGE_TYPE_POWER_BOUNCE = 0x00100000, + DAMAGE_TYPE_QUAKE_HAMMER = 0x00200000, + DAMAGE_TYPE_REMOVE_BUFFS = 0x00400000, + DAMAGE_TYPE_PEACH_BEAM = 0x00800000, + DAMAGE_TYPE_MULTI_BOUNCE = 0x01000000, + DAMAGE_TYPE_UNBLOCKABLE = 0x02000000, + DAMAGE_TYPE_SPIN_SMASH = 0x04000000, + DAMAGE_TYPE_IGNORE_DEFENSE = 0x08000000, + DAMAGE_TYPE_NO_CONTACT = 0x10000000, + DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS = 0x20000000, + DAMAGE_TYPE_STATUS_ALWAYS_HITS = 0x40000000, + DAMAGE_TYPE_TRIGGER_LUCKY = 0x80000000, +}; + +enum damageType { + DAMAGETYPE_FIRE = 0x00000002, + DAMAGETYPE_WATER = 0x00000004, + DAMAGETYPE_ICE = 0x00000008, + DAMAGETYPE_MAGIC = 0x00000010, + DAMAGETYPE_ELECTRIC = 0x00000020, + DAMAGETYPE_SMASH = 0x00000040, + DAMAGETYPE_JUMP = 0x00000080, + DAMAGETYPE_COSMIC = 0x00000100, + DAMAGETYPE_BLAST = 0x00000200, + DAMAGETYPE_POW = 0x00000400, + DAMAGETYPE_QUAKE = 0x00000800, + DAMAGETYPE_FEAR = 0x00001000, + DAMAGETYPE_AIR_LIFT = 0x00008000, + DAMAGETYPE_SPINY_SURGE = 0x00010000, + DAMAGETYPE_SHELL_CRACK = 0x00020000, + DAMAGETYPE_THROW = 0x00040000, + DAMAGETYPE_POWER_BOUNCE = 0x00100000, + DAMAGETYPE_QUAKE_HAMMER = 0x00200000, + DAMAGETYPE_REMOVE_BUFFS = 0x00400000, + DAMAGETYPE_PEACH_BEAM = 0x00800000, + DAMAGETYPE_MULTI_BOUNCE = 0x01000000, + DAMAGETYPE_UNBLOCKABLE = 0x02000000, + DAMAGETYPE_SPIN_SMASH = 0x04000000, + DAMAGETYPE_IGNORE_DEFENSE = 0x08000000, + DAMAGETYPE_NO_CONTACT = 0x10000000, + DAMAGETYPE_NO_OTHER_DAMAGE_POPUPS = 0x20000000, + DAMAGETYPE_STATUS_ALWAYS_HITS = 0x40000000, + DAMAGETYPE_TRIGGER_LUCKY = 0x80000000, }; enum PartnerIDs { - PARTNER_NONE, - PARTNER_GOOMBARIO, - PARTNER_KOOPER, - PARTNER_BOMBETTE, - PARTNER_PARAKARRY, - PARTNER_GOOMPA, - PARTNER_WATT, - PARTNER_SUSHIE, - PARTNER_LAKILESTER, - PARTNER_BOW, - PARTNER_GOOMBARIA, - PARTNER_TWINK, + PARTNER_NONE = 0x00000000, + PARTNER_GOOMBARIO = 0x00000001, + PARTNER_KOOPER = 0x00000002, + PARTNER_BOMBETTE = 0x00000003, + PARTNER_PARAKARRY = 0x00000004, + PARTNER_GOOMPA = 0x00000005, + PARTNER_WATT = 0x00000006, + PARTNER_SUSHIE = 0x00000007, + PARTNER_LAKILESTER = 0x00000008, + PARTNER_BOW = 0x00000009, + PARTNER_GOOMBARIA = 0x0000000A, + PARTNER_TWINK = 0x0000000B, }; /// @see gAreas @@ -1560,6 +1608,7 @@ enum Areas { }; enum NpcFlags { + NPC_FLAG_0 = 0x00000000, NPC_FLAG_PASSIVE = 0x00000001, ///< Collision does not trigger battle NPC_FLAG_2 = 0x00000002, NPC_FLAG_4 = 0x00000004, @@ -1585,7 +1634,7 @@ enum NpcFlags { NPC_FLAG_400000 = 0x00400000, NPC_FLAG_NO_DROPS = 0x00800000, ///< Do not drop hearts, flowers, or coins on defeat NPC_FLAG_1000000 = 0x01000000, // TODO. fails assert in set_npc_sprite - + NPC_FLAG_2000000 = 0x02000000, /// Use simpler, faster physics calculations: /// - Perform only one lateral collision test during motion /// - Allow falling below Y=-2000 (by default, NPC_FLAG_NO_Y_MOVEMENT is set when an NPC falls out-of-bounds) @@ -1595,93 +1644,188 @@ enum NpcFlags { NPC_FLAG_80000000 = 0x80000000, }; -// XXX bad name +enum PlayerStatusFlags { + PLAYER_STATUS_FLAGS_JUMPING = 0x00000002, + PLAYER_STATUS_FLAGS_FALLING = 0x00000004, + PLAYER_STATUS_FLAGS_INPUT_DISABLED = 0x00002000, + PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC = 0x02000000, + PLAYER_STATUS_FLAGS_CAMERA_DOESNT_FOLLOW = 0x04000000, + PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED = 0x80000000, +}; + /// @see PlayerStatus::animFlags -enum PlayerAnimFlags { - PLAYER_ANIM_FLAG_HOLDING_ITEM = 0x00000001, - PLAYER_ANIM_FLAG_2 = 0x00000002, - PLAYER_ANIM_FLAG_4 = 0x00000004, - PLAYER_ANIM_FLAG_8 = 0x00000008, - PLAYER_ANIM_FLAG_INTERACT_PROMPT = 0x00000010, ///< ! prompt - PLAYER_ANIM_FLAG_SPEECH_PROMPT = 0x00000020, ///< (...) prompt - PLAYER_ANIM_FLAG_40 = 0x00000040, - PLAYER_ANIM_FLAG_PULSE_STONE = 0x00000080, - PLAYER_ANIM_FLAG_100 = 0x00000100, - PLAYER_ANIM_FLAG_GET_STAR_SPIRIT = 0x00000200, ///< Sets action state to ACTION_STATE_GET_STAR_SPIRIT on idle - PLAYER_ANIM_FLAG_SHIVER = 0x00000400, - PLAYER_ANIM_FLAG_PEACH_PHYSICS = 0x00001000, - PLAYER_ANIM_FLAG_IN_DISGUISE = 0x00002000, - PLAYER_ANIM_FLAG_8BIT_MARIO = 0x00004000, +enum PlayerStatusAnimFlags { + PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT = 0x00000001, + PLAYER_STATUS_ANIM_FLAGS_2 = 0x00000002, + PLAYER_STATUS_ANIM_FLAGS_4 = 0x00000004, + PLAYER_STATUS_ANIM_FLAGS_8 = 0x00000008, + PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE = 0x00000010, ///< ! prompt + PLAYER_STATUS_ANIM_FLAGS_SPEECH_PROMPT_AVAILABLE = 0x00000020, ///< (...) prompt + PLAYER_STATUS_ANIM_FLAGS_40 = 0x00000040, + PLAYER_STATUS_ANIM_FLAGS_USING_PULSE_STONE = 0x00000080, + PLAYER_STATUS_ANIM_FLAGS_100 = 0x00000100, + PLAYER_STATUS_ANIM_FLAGS_GET_STAR_SPIRIT = 0x00000200, ///< Sets action state to ACTION_STATE_GET_STAR_SPIRIT on idle + PLAYER_STATUS_ANIM_FLAGS_SHIVERING = 0x00000400, + PLAYER_STATUS_ANIM_FLAGS_800 = 0x00000800, + PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS = 0x00001000, + PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE = 0x00002000, + PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO = 0x00004000, + PLAYER_STATUS_ANIM_FLAGS_8000 = 0x00008000, + PLAYER_STATUS_ANIM_FLAGS_SPINNING = 0x00010000, + PLAYER_STATUS_ANIM_FLAGS_20000 = 0x00020000, + PLAYER_STATUS_ANIM_FLAGS_40000 = 0x00040000, + PLAYER_STATUS_ANIM_FLAGS_80000 = 0x00080000, + PLAYER_STATUS_ANIM_FLAGS_100000 = 0x00100000, + PLAYER_STATUS_ANIM_FLAGS_200000 = 0x00200000, + PLAYER_STATUS_ANIM_FLAGS_400000 = 0x00400000, + PLAYER_STATUS_ANIM_FLAGS_800000 = 0x00800000, + PLAYER_STATUS_ANIM_FLAGS_1000000 = 0x01000000, + PLAYER_STATUS_ANIM_FLAGS_2000000 = 0x02000000, + PLAYER_STATUS_ANIM_FLAGS_4000000 = 0x04000000, + PLAYER_STATUS_ANIM_FLAGS_8000000 = 0x08000000, + PLAYER_STATUS_ANIM_FLAGS_10000000 = 0x10000000, + PLAYER_STATUS_ANIM_FLAGS_20000000 = 0x20000000, + PLAYER_STATUS_ANIM_FLAGS_40000000 = 0x40000000, + PLAYER_STATUS_ANIM_FLAGS_80000000 = 0x80000000, }; /// not really enum RenderMode { - RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0 = 0x00, - RENDER_MODE_SURFACE_OPA = 0x01, - RENDER_MODE_2 = 0x02, - RENDER_MODE_SURFACE_OPA_NO_AA = 0x03, - RENDER_MODE_SURFACE_OPA_NO_ZB = 0x04, - RENDER_MODE_DECAL_OPA = 0x05, - RENDER_MODE_DECAL_OPA_NO_AA = 0x07, - RENDER_MODE_INTERSECTING_OPA = 0x09, - RENDER_MODE_ALPHATEST = 0x0D, - RENDER_MODE_ALPHATEST_ONESIDED = 0x0F, - RENDER_MODE_ALPHATEST_NO_ZB = 0x10, - RENDER_MODE_SURFACE_XLU_LAYER1 = 0x11, - RENDER_MODE_SURFACE_XLU_NO_AA = 0x13, - RENDER_MODE_SURFACE_XLU_NO_ZB = 0x14, - RENDER_MODE_SURF_XLU_ZB_ZUPD = 0x15, - RENDER_MODE_SURFACE_XLU_LAYER2 = 0x16, - RENDER_MODE_DECAL_XLU = 0x1A, - RENDER_MODE_DECAL_XLU_NO_AA = 0x1C, - RENDER_MODE_SHADOW = 0x20, - RENDER_MODE_SURFACE_XLU_LAYER3 = 0x22, - RENDER_MODE_INTERSECTING_XLU = 0x26, - RENDER_MODE_28 = 0x28, - RENDER_MODE_SURF_XLU_AA_ZB_ZUPD = 0x29, - RENDER_MODE_2D = 0x2D, - RENDER_MODE_CLOUD = 0x2E, - RENDER_MODE_CLOUD_NO_ZB = 0x2F, + RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0 = 0x00000000, + RENDER_MODE_SURFACE_OPA = 0x00000001, + RENDER_MODE_2 = 0x00000002, + RENDER_MODE_SURFACE_OPA_NO_AA = 0x00000003, + RENDER_MODE_SURFACE_OPA_NO_ZB = 0x00000004, + RENDER_MODE_DECAL_OPA = 0x00000005, + RENDER_MODE_DECAL_OPA_NO_AA = 0x00000007, + RENDER_MODE_INTERSECTING_OPA = 0x00000009, + RENDER_MODE_ALPHATEST = 0x0000000D, + RENDER_MODE_ALPHATEST_ONESIDED = 0x0000000F, + RENDER_MODE_ALPHATEST_NO_ZB = 0x00000010, + RENDER_MODE_SURFACE_XLU_LAYER1 = 0x00000011, + RENDER_MODE_SURFACE_XLU_NO_AA = 0x00000013, + RENDER_MODE_SURFACE_XLU_NO_ZB = 0x00000014, + RENDER_MODE_SURFXLU_ZB_ZUPD = 0x00000015, + RENDER_MODE_SURFACE_XLU_LAYER2 = 0x00000016, + RENDER_MODE_DECAL_XLU = 0x0000001A, + RENDER_MODE_DECAL_XLU_NOAA = 0x0000001C, + RENDER_MODE_SHADOW = 0x00000020, + RENDER_MODE_SURFACE_XLU_LAYER3 = 0x00000022, + RENDER_MODE_INTERSECTING_XLU = 0x00000026, + RENDER_MODE_28 = 0x00000028, + RENDER_MODE_SURFXLU_AA_ZB_ZUPD = 0x00000029, + RENDER_MODE_2D = 0x0000002D, + RENDER_MODE_CLOUD = 0x0000002E, + RENDER_MODE_CLOUD_NO_ZB = 0x0000002F, }; enum ActorFlags { - ACTOR_FLAG_DISABLED = 0x00000001, ///< Disables the actor. - ACTOR_FLAG_NO_SHADOW = 0x00000004, ///< Hide shadow. - ACTOR_FLAG_FLYING = 0x00000200, ///< Quake Hammer can't hit. - ACTOR_FLAG_HP_OFFSET_BELOW = 0x00000800, ///< HP bar offset below actor (e.g. Swooper when upside-down). - ACTOR_FLAG_TARGET_ONLY = 0x00004000, ///< Battle ends even if undefeated. No turn. - ACTOR_FLAG_8000 = 0x00008000, - ACTOR_FLAG_80000 = 0x00080000, - ACTOR_FLAG_NO_ATTACK = 0x00200000, ///< Skip attack turn. - ACTOR_FLAG_NO_DMG_APPLY = 0x00400000, ///< Damage is not applied to actor HP. - ACTOR_FLAG_NO_DMG_POPUP = 0x02000000, ///< Hide damage popup. - ACTOR_FLAG_4000000 = 0x04000000, - ACTOR_FLAG_8000000 = 0x08000000, - ACTOR_FLAG_10000000 = 0x10000000, + ACTOR_FLAG_DISABLED = 0x00000001, ///< Disables the actor. + ACTOR_FLAG_2 = 0x00000002, + ACTOR_FLAG_NO_SHADOW = 0x00000004, ///< Hide shadow. + ACTOR_FLAG_8 = 0x00000008, + ACTOR_FLAG_10 = 0x00000010, + ACTOR_FLAG_20 = 0x00000020, + ACTOR_FLAG_40 = 0x00000040, + ACTOR_FLAG_80 = 0x00000080, + ACTOR_FLAG_100 = 0x00000100, + ACTOR_FLAG_FLYING = 0x00000200, ///< Quake Hammer can't hit. + ACTOR_FLAG_400 = 0x00000400, + ACTOR_FLAG_HP_OFFSET_BELOW = 0x00000800, ///< HP bar offset below actor (e.g. Swooper when upside-down). + ACTOR_FLAG_1000 = 0x00001000, + ACTOR_FLAG_2000 = 0x00002000, + ACTOR_FLAG_TARGET_ONLY = 0x00004000, ///< Battle ends even if undefeated. No turn. + ACTOR_FLAG_8000 = 0x00008000, + ACTOR_FLAG_10000 = 0x00010000, + ACTOR_FLAG_20000 = 0x00020000, + ACTOR_FLAG_40000 = 0x00040000, + ACTOR_FLAG_80000 = 0x00080000, + ACTOR_FLAG_100000 = 0x00100000, + ACTOR_FLAG_NO_ATTACK = 0x00200000, ///< Skip attack turn. + ACTOR_FLAG_NO_DMG_APPLY = 0x00400000, ///< Damage is not applied to actor HP. + ACTOR_FLAG_800000 = 0x00800000, + ACTOR_FLAG_1000000 = 0x01000000, + ACTOR_FLAG_NO_DMG_POPUP = 0x02000000, ///< Hide damage popup. + ACTOR_FLAG_4000000 = 0x04000000, + ACTOR_FLAG_8000000 = 0x08000000, + ACTOR_FLAG_10000000 = 0x10000000, + ACTOR_FLAG_20000000 = 0x20000000, + ACTOR_FLAG_40000000 = 0x40000000, + ACTOR_FLAG_80000000 = 0x80000000, }; enum ActorPartFlags { - PART_FLAG_INVISIBLE = 0x00000001, - PART_FLAG_2000 = 0x00002000, ///< Plays extra hurt SFX? - PART_FLAG_NO_TARGET = 0x00020000, ///< Cannot be targeted. - PART_FLAG_MULTI_TARGET = 0x00800000, ///< Can be targeted with multi-target attacks (e.g. Star Storm). + ACTOR_PART_FLAG_INVISIBLE = 0x00000001, + ACTOR_PART_FLAG_2 = 0x00000002, + ACTOR_PART_FLAG_4 = 0x00000004, + ACTOR_PART_FLAG_8 = 0x00000008, + ACTOR_PART_FLAG_10 = 0x00000010, + ACTOR_PART_FLAG_20 = 0x00000020, + ACTOR_PART_FLAG_40 = 0x00000040, + ACTOR_PART_FLAG_80 = 0x00000080, + ACTOR_PART_FLAG_100 = 0x00000100, + ACTOR_PART_FLAG_200 = 0x00000200, + ACTOR_PART_FLAG_400 = 0x00000400, + ACTOR_PART_FLAG_800 = 0x00000800, + ACTOR_PART_FLAG_1000 = 0x00001000, + ACTOR_PART_FLAG_2000 = 0x00002000, ///< Plays extra hurt SFX? + ACTOR_PART_FLAG_4000 = 0x00004000, + ACTOR_PART_FLAG_8000 = 0x00008000, + ACTOR_PART_FLAG_10000 = 0x00010000, + ACTOR_PART_FLAG_NO_TARGET = 0x00020000, ///< Cannot be targeted. + ACTOR_PART_FLAG_40000 = 0x00040000, + ACTOR_PART_FLAG_80000 = 0x00080000, + ACTOR_PART_FLAG_100000 = 0x00100000, + ACTOR_PART_FLAG_200000 = 0x00200000, + ACTOR_PART_FLAG_400000 = 0x00400000, + ACTOR_PART_FLAG_MULTI_TARGET = 0x00800000, ///< Can be targeted with multi-target attacks (e.g. Star Storm). + ACTOR_PART_FLAG_1000000 = 0x01000000, + ACTOR_PART_FLAG_2000000 = 0x02000000, + ACTOR_PART_FLAG_4000000 = 0x04000000, + ACTOR_PART_FLAG_8000000 = 0x08000000, + ACTOR_PART_FLAG_10000000 = 0x10000000, + ACTOR_PART_FLAG_20000000 = 0x20000000, + ACTOR_PART_FLAG_40000000 = 0x40000000, + ACTOR_PART_FLAG_80000000 = 0x80000000, }; enum ActorEventFlags { - EVENT_FLAG_FIREY = 0x00000002, ///< Player takes burn damage upon contact. - EVENT_FLAG_ICY = 0x00000008, ///< No known effect, but is used. - EVENT_FLAG_SPIKY_TOP = 0x00000010, ///< Player takes spike damage from jump attacks. - EVENT_FLAG_ILLUSORY = 0x00000020, ///< Player attacks pass through and miss. - EVENT_FLAG_ELECTRIFIED = 0x00000080, ///< Player takes shock damage upon contact. - EVENT_FLAG_EXPLOSIVE = 0x00000200, ///< Blast and fire attacks trigger an explosion. - EVENT_FLAG_800 = 0x00000800, - EVENT_FLAG_FLIPABLE = 0x00001000, ///< Actor can be flipped; triggered by jump and quake attacks. - EVENT_FLAG_GROUNDABLE = 0x00004000, ///< Actor can be knocked down from flight; triggered by jump attacks. - EVENT_FLAG_SPIKY_FRONT = 0x00010000, ///< Player takes spike damage from hammer attacks. - EVENT_FLAG_ENCHANTED = 0x00040000, ///< Actor glows and listens for the Star Beam event. - EVENT_FLAG_POWER_BOUNCE = 0x00100000, ///< Actor listens for Power Bounce events. + ACTOR_EVENT_FLAG_0 = 0x00000000, + ACTOR_EVENT_FLAG_1 = 0x00000001, + ACTOR_EVENT_FLAG_FIREY = 0x00000002, ///< Player takes burn damage upon contact. + ACTOR_EVENT_FLAG_4 = 0x00000004, + ACTOR_EVENT_FLAG_ICY = 0x00000008, ///< No known effect, but is used. + ACTOR_EVENT_FLAG_SPIKY_TOP = 0x00000010, ///< Player takes spike damage from jump attacks. + ACTOR_EVENT_FLAG_ILLUSORY = 0x00000020, ///< Player attacks pass through and miss. + ACTOR_EVENT_FLAG_40 = 0x00000040, + ACTOR_EVENT_FLAG_ELECTRIFIED = 0x00000080, ///< Player takes shock damage upon contact. + ACTOR_EVENT_FLAG_100 = 0x00000100, + ACTOR_EVENT_FLAG_EXPLOSIVE = 0x00000200, ///< Blast and fire attacks trigger an explosion. + ACTOR_EVENT_FLAG_400 = 0x00000400, + ACTOR_EVENT_FLAG_800 = 0x00000800, + ACTOR_EVENT_FLAG_FLIPABLE = 0x00001000, ///< Actor can be flipped; triggered by jump and quake attacks. + ACTOR_EVENT_FLAG_2000 = 0x00002000, + ACTOR_EVENT_FLAG_GROUNDABLE = 0x00004000, ///< Actor can be knocked down from flight; triggered by jump attacks. + ACTOR_EVENT_FLAG_8000 = 0x00008000, + ACTOR_EVENT_FLAG_SPIKY_FRONT = 0x00010000, ///< Player takes spike damage from hammer attacks. + ACTOR_EVENT_FLAG_20000 = 0x00020000, + ACTOR_EVENT_FLAG_ENCHANTED = 0x00040000, ///< Actor glows and listens for the Star Beam event. + ACTOR_EVENT_FLAG_80000 = 0x00080000, + ACTOR_EVENT_FLAG_POWER_BOUNCE = 0x00100000, ///< Actor listens for Power Bounce events. + ACTOR_EVENT_FLAG_200000 = 0x00200000, + ACTOR_EVENT_FLAG_400000 = 0x00400000, + ACTOR_EVENT_FLAG_800000 = 0x00800000, + ACTOR_EVENT_FLAG_1000000 = 0x01000000, + ACTOR_EVENT_FLAG_2000000 = 0x02000000, + ACTOR_EVENT_FLAG_4000000 = 0x04000000, + ACTOR_EVENT_FLAG_8000000 = 0x08000000, + ACTOR_EVENT_FLAG_10000000 = 0x10000000, + ACTOR_EVENT_FLAG_20000000 = 0x20000000, + ACTOR_EVENT_FLAG_40000000 = 0x40000000, + ACTOR_EVENT_FLAG_80000000 = 0x80000000, }; +// TODO alex struct enum PartnerAnims { PARTNER_ANIM_STILL, PARTNER_ANIM_WALK, @@ -1695,75 +1839,288 @@ enum PartnerAnims { }; enum FirstStrikes { - FIRST_STRIKE_NONE, - FIRST_STRIKE_PLAYER, - FIRST_STRIKE_ENEMY, + FIRST_STRIKE_NONE = 0x00000000, + FIRST_STRIKE_PLAYER = 0x00000001, + FIRST_STRIKE_ENEMY = 0x00000002, }; enum TimeFreezeMode { - TIME_FREEZE_NORMAL, - TIME_FREEZE_PARTIAL, - TIME_FREEZE_FULL, - TIME_FREEZE_PARTNER_MENU, - TIME_FREEZE_EXIT, + TIME_FREEZE_NORMAL = 0x00000000, + TIME_FREEZE_PARTIAL = 0x00000001, + TIME_FREEZE_FULL = 0x00000002, + TIME_FREEZE_PARTNER_MENU = 0x00000003, + TIME_FREEZE_EXIT = 0x00000004, }; enum ActionCommand { - ACTION_COMMAND_JUMP = 1, - ACTION_COMMAND_SMASH, - ACTION_COMMAND_FLEE, - ACTION_COMMAND_BREAK_FREE, - ACTION_COMMAND_WHIRLWIND, - ACTION_COMMAND_STOP_LEECH, - ACTION_COMMAND_07, - ACTION_COMMAND_DIZZY_SHELL, - ACTION_COMMAND_FIRE_SHELL, - ACTION_COMMAND_0A, - ACTION_COMMAND_BOMB, - ACTION_COMMAND_BODY_SLAM, - ACTION_COMMAND_AIR_LIFT, - ACTION_COMMAND_AIR_RAID, - ACTION_COMMAND_SQUIRT, - ACTION_COMMAND_POWER_SHOCK, - ACTION_COMMAND_MEGA_SHOCK, - ACTION_COMMAND_SMACK, - ACTION_COMMAND_SPINY_SURGE, - ACTION_COMMAND_HURRICANE, - ACTION_COMMAND_SPOOK, - ACTION_COMMAND_WATER_BLOCK, - ACTION_COMMAND_TIDAL_WAVE, + ACTION_COMMAND_JUMP = 0x00000001, + ACTION_COMMAND_SMASH = 0x00000002, + ACTION_COMMAND_FLEE = 0x00000003, + ACTION_COMMAND_BREAK_FREE = 0x00000004, + ACTION_COMMAND_WHIRLWIND = 0x00000005, + ACTION_COMMAND_STOP_LEECH = 0x00000006, + ACTION__COMMAND_07 = 0x00000007, + ACTION_COMMAND_DIZZY_SHELL = 0x00000008, + ACTION_COMMAND_FIRE_SHELL = 0x00000009, + ACTION__COMMAND_0A = 0x0000000A, + ACTION_COMMAND_BOMB = 0x0000000B, + ACTION_COMMAND_BODY_SLAM = 0x0000000C, + ACTION_COMMAND_AIR_LIFT = 0x0000000D, + ACTION_COMMAND_AIR_RAID = 0x0000000E, + ACTION_COMMAND_SQUIRT = 0x0000000F, + ACTION_COMMAND_POWER_SHOCK = 0x00000010, + ACTION_COMMAND_MEGA_SHOCK = 0x00000011, + ACTION_COMMAND_SMACK = 0x00000012, + ACTION_COMMAND_SPINY_SURGE = 0x00000013, + ACTION_COMMAND_HURRICANE = 0x00000014, + ACTION_COMMAND_SPOOK = 0x00000015, + ACTION_COMMAND_WATER_BLOCK = 0x00000016, + ACTION_COMMAND_TIDAL_WAVE = 0x00000017, }; enum EffectGfxDataFlags { - FX_GRAPHICS_DISABLED = 0, - FX_GRAPHICS_ENABLED = 1, - FX_GRAPHICS_2 = 2, + FX_GRAPHICS_DISABLED = 0x00000000, + FX_GRAPHICS_ENABLED = 0x00000001, + FX_GRAPHICS_FLAGS_2 = 0x00000002, + FX_GRAPHICS_FLAGS_4 = 0x00000004, + FX_GRAPHICS_FLAGS_8 = 0x00000008, + FX_GRAPHICS_FLAGS_10 = 0x00000010, + FX_GRAPHICS_FLAGS_20 = 0x00000020, + FX_GRAPHICS_FLAGS_40 = 0x00000040, + FX_GRAPHICS_FLAGS_80 = 0x00000080, + FX_GRAPHICS_FLAGS_100 = 0x00000100, + FX_GRAPHICS_FLAGS_200 = 0x00000200, + FX_GRAPHICS_FLAGS_400 = 0x00000400, + FX_GRAPHICS_FLAGS_800 = 0x00000800, + FX_GRAPHICS_FLAGS_1000 = 0x00001000, + FX_GRAPHICS_FLAGS_2000 = 0x00002000, + FX_GRAPHICS_FLAGS_4000 = 0x00004000, + FX_GRAPHICS_FLAGS_8000 = 0x00008000, + FX_GRAPHICS_FLAGS_10000 = 0x00010000, + FX_GRAPHICS_FLAGS_20000 = 0x00020000, + FX_GRAPHICS_FLAGS_40000 = 0x00040000, + FX_GRAPHICS_FLAGS_80000 = 0x00080000, + FX_GRAPHICS_FLAGS_100000 = 0x00100000, + FX_GRAPHICS_FLAGS_200000 = 0x00200000, + FX_GRAPHICS_FLAGS_400000 = 0x00400000, + FX_GRAPHICS_FLAGS_800000 = 0x00800000, + FX_GRAPHICS_FLAGS_1000000 = 0x01000000, + FX_GRAPHICS_FLAGS_2000000 = 0x02000000, + FX_GRAPHICS_FLAGS_4000000 = 0x04000000, + FX_GRAPHICS_FLAGS_8000000 = 0x08000000, + FX_GRAPHICS_FLAGS_10000000 = 0x10000000, + FX_GRAPHICS_FLAGS_20000000 = 0x20000000, + FX_GRAPHICS_FLAGS_40000000 = 0x40000000, + FX_GRAPHICS_FLAGS_80000000 = 0x80000000, }; enum MoveIDs { - MOVE_NONE, - MOVE_UNK_184 = 184, + MOVE_NOTHING = 0x00000000, + MOVE_UNUSED_01 = 0x00000001, + MOVE_UNUSED_02 = 0x00000002, + MOVE_HAMMER1 = 0x00000003, + MOVE_HAMMER2 = 0x00000004, + MOVE_HAMMER3 = 0x00000005, + MOVE_UNUSED_HAMMER4 = 0x00000006, + MOVE_UNUSED_HAMMER5 = 0x00000007, + MOVE_SPIN_SMASH = 0x00000008, + MOVE_QUAKE_HAMMER = 0x00000009, + MOVE_D_DOWN_POUND = 0x0000000A, + MOVE_SMASH_CHARGE0 = 0x0000000B, + MOVE_UNUSED_HAMMER_0C = 0x0000000C, + MOVE_HAMMER_THROW = 0x0000000D, + MOVE_MEGA_QUAKE = 0x0000000E, + MOVE_SMASH_CHARGE = 0x0000000F, + MOVE_UNUSED_HAMMER_10 = 0x00000010, + MOVE_SUPER_SMASH_CHARGE = 0x00000011, + MOVE_UNUSED_HAMMER_12 = 0x00000012, + MOVE_AUTO_SMASH = 0x00000013, + MOVE_POWER_QUAKE = 0x00000014, + MOVE_POWER_SMASH = 0x00000015, + MOVE_SUPER_SMASH = 0x00000016, + MOVE_MEGA_SMASH = 0x00000017, + MOVE_SHRINK_SMASH = 0x00000018, + MOVE_SHELL_CRACK = 0x00000019, + MOVE_JUMP1 = 0x0000001A, + MOVE_JUMP2 = 0x0000001B, + MOVE_JUMP3 = 0x0000001C, + MOVE_UNUSED_JUMP4 = 0x0000001D, + MOVE_UNUSED_JUMP5 = 0x0000001E, + MOVE_MULTIBOUNCE = 0x0000001F, + MOVE_POWER_BOUNCE = 0x00000020, + MOVE_SLEEP_STOMP = 0x00000021, + MOVE_DIZZY_STOMP = 0x00000022, + MOVE_JUMP_CHARGE0 = 0x00000023, + MOVE_UNUSED_24 = 0x00000024, + MOVE_JUMP_CHARGE = 0x00000025, + MOVE_UNUSED_26 = 0x00000026, + MOVE_SUPER_JUMP_CHARGE = 0x00000027, + MOVE_UNUSED_28 = 0x00000028, + MOVE_AUTO_JUMP = 0x00000029, + MOVE_AUTO_MULTIBOUNCE = 0x0000002A, + MOVE_POWER_JUMP = 0x0000002B, + MOVE_SUPER_JUMP = 0x0000002C, + MOVE_MEGA_JUMP = 0x0000002D, + MOVE_D_DOWN_JUMP = 0x0000002E, + MOVE_SHRINK_STOMP = 0x0000002F, + MOVE_EARTHQUAKE_JUMP = 0x00000030, + MOVE_UNUSED_DEFEND_PLUS = 0x00000031, + MOVE_UNUSED_32 = 0x00000032, + MOVE_DAMAGE_DODGE = 0x00000033, + MOVE_ITEMS = 0x00000034, + MOVE_DOUBLE_DIP = 0x00000035, + MOVE_TRIPLE_DIP = 0x00000036, + MOVE_UNUSED_37 = 0x00000037, + MOVE_QUICK_CHANGE = 0x00000038, + MOVE_UNUSED_39 = 0x00000039, + MOVE_UNUSED_3A = 0x0000003A, + MOVE_POWER_PLUS = 0x0000003B, + MOVE_ALLOR_NOTHING = 0x0000003C, + MOVE_ICE_POWER = 0x0000003D, + MOVE_P_UP_D_DOWN = 0x0000003E, + MOVE_UNUSED_3F = 0x0000003F, + MOVE_SPIKE_SHIELD = 0x00000040, + MOVE_FIRE_SHIELD = 0x00000041, + MOVE_PRETTY_LUCKY = 0x00000042, + MOVE_FEELING_FINE = 0x00000043, + MOVE_ZAP_TAP = 0x00000044, + MOVE_DEFEND_PLUS = 0x00000045, + MOVE_LAST_STAND = 0x00000046, + MOVE_CLOSE_CALL = 0x00000047, + MOVE_LUCKY_DAY = 0x00000048, + MOVE_P_DOWN_D_UP = 0x00000049, + MOVE_HEALTHY_HEALTHY = 0x0000004A, + MOVE_UNUSED_4B = 0x0000004B, + MOVE_DODGE_MASTER = 0x0000004C, + MOVE_FIRST_ATTACK = 0x0000004D, + MOVE_SLOW_GO = 0x0000004E, + MOVE_RIGHT_ON = 0x0000004F, + MOVE_BUMP_ATTACK = 0x00000050, + MOVE_UNUSED_51 = 0x00000051, + MOVE_HP_PLUS = 0x00000052, + MOVE_MYSTERY_SCROLL = 0x00000053, + MOVE_ATTACK_FX_A = 0x00000054, + MOVE_ATTACK_FX_D = 0x00000055, + MOVE_ATTACK_FX_B = 0x00000056, + MOVE_ATTACK_FX_E = 0x00000057, + MOVE_ATTACK_FX_C = 0x00000058, + MOVE_ATTACK_FX_F = 0x00000059, + MOVE_HP_DRAIN = 0x0000005A, + MOVE_FP_PLUS = 0x0000005B, + MOVE_MONEY_MONEY = 0x0000005C, + MOVE_CHILL_OUT_BADGE = 0x0000005D, + MOVE_HAPPY_HEART = 0x0000005E, + MOVE_MEGA_RUSH = 0x0000005F, + MOVE_BERSERKER = 0x00000060, + MOVE_RUNAWAY_PAY = 0x00000061, + MOVE_FLOWER_SAVER = 0x00000062, + MOVE_PAY_OFF = 0x00000063, + MOVE_POWER_RUSH = 0x00000064, + MOVE_CRAZY_HEART = 0x00000065, + MOVE_MEGA_HP_DRAIN = 0x00000066, + MOVE_FLOWER_FANATIC = 0x00000067, + MOVE_HEART_FINDER = 0x00000068, + MOVE_FLOWER_FINDER = 0x00000069, + MOVE_SPIN_ATTACK = 0x0000006A, + MOVE_DIZZY_ATTACK = 0x0000006B, + MOVE_I_SPY = 0x0000006C, + MOVE_SPEEDY_SPIN = 0x0000006D, + MOVE_REFUND = 0x0000006E, + MOVE_UNUSED_FINAL_GOOMPA = 0x0000006F, + MOVE_UNUSED_FINAL_BOMBOMB = 0x00000070, + MOVE_DEEP_FOCUS = 0x00000071, + MOVE_SUPER_FOCUS = 0x00000072, + MOVE_KAIDEN = 0x00000073, + MOVE_HAPPY_FLOWER = 0x00000074, + MOVE_GROUP_FOCUS = 0x00000075, + MOVE_PEEKABOO = 0x00000076, + MOVE_FOCUS = 0x00000077, + MOVE_REFRESH = 0x00000078, + MOVE_LULLABY = 0x00000079, + MOVE_STAR_STORM = 0x0000007A, + MOVE_CHILL_OUT_MOVE = 0x0000007B, + MOVE_SMOOCH = 0x0000007C, + MOVE_TIME_OUT = 0x0000007D, + MOVE_UP_AND_AWAY = 0x0000007E, + MOVE_STAR_BEAM = 0x0000007F, + MOVE_PEACH_BEAM = 0x00000080, + MOVE_PEACH_FOCUS = 0x00000081, + MOVE_TWINK_DASH = 0x00000082, + MOVE_HEADBONK1 = 0x00000083, + MOVE_HEADBONK2 = 0x00000084, + MOVE_HEADBONK3 = 0x00000085, + MOVE_TATTLE = 0x00000086, + MOVE_CHARGE = 0x00000087, + MOVE_MULTIBONK = 0x00000088, + MOVE_SHELL_TOSS1 = 0x00000089, + MOVE_SHELL_TOSS2 = 0x0000008A, + MOVE_SHELL_TOSS3 = 0x0000008B, + MOVE_POWER_SHELL = 0x0000008C, + MOVE_DIZZY_SHELL = 0x0000008D, + MOVE_FIRE_SHELL = 0x0000008E, + MOVE_BODY_SLAM1 = 0x0000008F, + MOVE_BODY_SLAM2 = 0x00000090, + MOVE_BODY_SLAM3 = 0x00000091, + MOVE_BOMB = 0x00000092, + MOVE_POWER_BOMB = 0x00000093, + MOVE_MEGA_BOMB = 0x00000094, + MOVE_SKY_DIVE1 = 0x00000095, + MOVE_SKY_DIVE2 = 0x00000096, + MOVE_SKY_DIVE3 = 0x00000097, + MOVE_SHELL_SHOT = 0x00000098, + MOVE_AIR_LIFT = 0x00000099, + MOVE_AIR_RAID = 0x0000009A, + MOVE_UNUSED_LONE_FOOL1 = 0x0000009B, + MOVE_UNUSED_LONE_FOOL2 = 0x0000009C, + MOVE_UNUSED_LONE_FOOL3 = 0x0000009D, + MOVE_UNUSED_MUMBLE = 0x0000009E, + MOVE_UNUSED_PREACH = 0x0000009F, + MOVE_UNUSED_AWAKENING = 0x000000A0, + MOVE_ELECTRO_DASH1 = 0x000000A1, + MOVE_ELECTRO_DASH2 = 0x000000A2, + MOVE_ELECTRO_DASH3 = 0x000000A3, + MOVE_POWER_SHOCK = 0x000000A4, + MOVE_TURBO_CHARGE = 0x000000A5, + MOVE_MEGA_SHOCK = 0x000000A6, + MOVE_BELLY_FLOP1 = 0x000000A7, + MOVE_BELLY_FLOP2 = 0x000000A8, + MOVE_BELLY_FLOP3 = 0x000000A9, + MOVE_SQUIRT = 0x000000AA, + MOVE_WATER_BLOCK = 0x000000AB, + MOVE_TIDAL_WAVE = 0x000000AC, + MOVE_SPINY_FLIP1 = 0x000000AD, + MOVE_SPINY_FLIP2 = 0x000000AE, + MOVE_SPINY_FLIP3 = 0x000000AF, + MOVE_SPINY_SURGE = 0x000000B0, + MOVE_CLOUD_NINE = 0x000000B1, + MOVE_HURRICANE = 0x000000B2, + MOVE_SMACK1 = 0x000000B3, + MOVE_SMACK2 = 0x000000B4, + MOVE_SMACK3 = 0x000000B5, + MOVE_OUTTA_SIGHT = 0x000000B6, + MOVE_SPOOK = 0x000000B7, + MOVE_FAN_SMACK = 0x000000B8, }; enum GameModeIDs { - GAME_MODE_STARTUP, - GAME_MODE_LOGOS, - GAME_MODE_TITLE_SCREEN, - GAME_MODE_ENTER_DEMO, - GAME_MODE_CHANGE_MAP, - GAME_MODE_UNK_5, - GAME_MODE_ENTER_WORLD, - GAME_MODE_WORLD, - GAME_MODE_BATTLE, - GAME_MODE_END_BATTLE, - GAME_MODE_PAUSE, - GAME_MODE_UNPAUSE, - GAME_MODE_LANGUAGE_SELECT, - GAME_MODE_EXIT_LANGUAGE_SELECT, - GAME_MODE_FILE_SELECT, - GAME_MODE_EXIT_FILE_SELECT, - GAME_MODE_INTRO, - GAME_MODE_DEMO, + GAME_MODE_STARTUP = 0x00000000, + GAME_MODE_LOGOS = 0x00000001, + GAME_MODE_TITLE_SCREEN = 0x00000002, + GAME_MODE_ENTER_DEMO_WORLD = 0x00000003, + GAME_MODE_CHANGE_MAP = 0x00000004, + GAME_MODE_UNUSED = 0x00000005, + GAME_MODE_ENTER_WORLD = 0x00000006, + GAME_MODE_WORLD = 0x00000007, + GAME_MODE_BATTLE = 0x00000008, + GAME_MODE_END_BATTLE = 0x00000009, + GAME_MODE_PAUSE = 0x0000000A, + GAME_MODE_UNPAUSE = 0x0000000B, + GAME_MODE_LANGUAGE_SELECT = 0x0000000C, + GAME_MODE_END_LANGUAGE_SELECT = 0x0000000D, + GAME_MODE_FILE_SELECT = 0x0000000E, + GAME_MODE_END_FILE_SELECT = 0x0000000F, + GAME_MODE_INTRO = 0x00000010, + GAME_MODE_DEMO = 0x00000011, }; enum BattleStatusFlags1 { @@ -1803,8 +2160,750 @@ enum BattleStatusFlags1 { }; enum BattleStatusFlags2 { - BS_FLAGS2_1000 = 0x1000, - BS_FLAGS2_1000000 = 0x1000000, + BS_FLAGS2_NO_TARGET_AVAILABLE = 0x00001000, + BS_FLAGS2_1000000 = 0x01000000, }; +enum DebuffTypes { + DEBUFF_TYPE_SLEEP = 0x00001000, + DEBUFF_TYPE_STATIC = 0x00002000, + DEBUFF_TYPE_FROZEN = 0x00004000, + DEBUFF_TYPE_PARALYZED = 0x00010000, + DEBUFF_TYPE_POISON = 0x00020000, + DEBUFF_TYPE_DIZZY = 0x00040000, + DEBUFF_TYPE_SHRINK = 0x00080000, + DEBUFF_TYPE_STONE = 0x00100000, + DEBUFF_TYPE_STOP = 0x00200000, + DEBUFF_TYPE_DAZE = 0x01000000, + DEBUFF_TYPE_INVISIBLE = 0x04000000, +}; + +enum GlobalOverrides { + GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD = 0x00000002, + GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL = 0x00000020, + GLOBAL_OVERRIDES_DISABLE_BATTLES = 0x00000100, + GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS = 0x00010000, + GLOBAL_OVERRIDES_DISABLE_MENUS = 0x00040000, + GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS = 0x00100000, + GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS = 0x00200000, +}; + +#define MODEL_FLAGS_MASK_FFF0 (MODEL_FLAGS_USES_CUSTOM_GFX | MODEL_FLAGS_FLAG_20 | MODEL_FLAGS_FLAG_40 | MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY | MODEL_FLAGS_USE_CAMERA_UNK_MATRIX | MODEL_FLAGS_FLAG_200 | MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_HAS_TEX_PANNER | MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_FLAG_2000 | MODEL_FLAGS_FLAG_4000 | MODEL_FLAGS_FLAG_8000) + +enum ModelFlags { + MODEL_FLAGS_FLAG_1 = 0x00000001, + MODEL_FLAGS_ENABLED = 0x00000002, + MODEL_FLAGS_FLAG_4 = 0x00000004, + MODEL_FLAGS_TRANSFORM_GROUP_MEMBER = 0x00000008, + MODEL_FLAGS_USES_CUSTOM_GFX = 0x00000010, + MODEL_FLAGS_FLAG_20 = 0x00000020, + MODEL_FLAGS_FLAG_40 = 0x00000040, + MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY = 0x00000080, + MODEL_FLAGS_USE_CAMERA_UNK_MATRIX = 0x00000100, + MODEL_FLAGS_FLAG_200 = 0x00000200, + MODEL_FLAGS_HAS_TRANSFORM_APPLIED = 0x00000400, + MODEL_FLAGS_HAS_TEX_PANNER = 0x00000800, + MODEL_FLAGS_USES_TRANSFORM_MATRIX = 0x00001000, + MODEL_FLAGS_FLAG_2000 = 0x00002000, + MODEL_FLAGS_FLAG_4000 = 0x00004000, + MODEL_FLAGS_FLAG_8000 = 0x00008000, + MODEL_FLAGS_FLAG_10000 = 0x00010000, + MODEL_FLAGS_FLAG_20000 = 0x00020000, + MODEL_FLAGS_FLAG_40000 = 0x00040000, + MODEL_FLAGS_FLAG_80000 = 0x00080000, + MODEL_FLAGS_FLAG_100000 = 0x00100000, + MODEL_FLAGS_FLAG_200000 = 0x00200000, + MODEL_FLAGS_FLAG_400000 = 0x00400000, + MODEL_FLAGS_FLAG_800000 = 0x00800000, + MODEL_FLAGS_FLAG_1000000 = 0x01000000, + MODEL_FLAGS_FLAG_2000000 = 0x02000000, + MODEL_FLAGS_FLAG_4000000 = 0x04000000, + MODEL_FLAGS_FLAG_8000000 = 0x08000000, + MODEL_FLAGS_FLAG_10000000 = 0x10000000, + MODEL_FLAGS_FLAG_20000000 = 0x20000000, + MODEL_FLAGS_FLAG_40000000 = 0x40000000, + MODEL_FLAGS_FLAG_80000000 = 0x80000000, +}; + +// DynamicEntity, Entity, ItemEntity +enum EntityFlags { + ENTITY_FLAGS_HIDDEN = 0x00000001, + ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 = 0x00000002, + ENTITY_FLAGS_HAS_DYNAMIC_SHADOW = 0x00000004, + ENTITY_FLAGS_HAS_ANIMATED_MODEL = 0x00000008, + ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX = 0x00000010, + ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX = 0x00000020, + ENTITY_FLAGS_CONTINUOUS_COLLISION = 0x00000040, + ENTITY_FLAGS_80 = 0x00000080, + ENTITY_FLAGS_100 = 0x00000100, + ENTITY_FLAGS_SET_SHADOW_FLAG200 = 0x00000200, + ENTITY_FLAGS_400 = 0x00000400, + ENTITY_FLAGS_SQUARE_SHADOW = 0x00000800, + ENTITY_FLAGS_SHOWS_INSPECT_PROMPT = 0x00001000, + ENTITY_FLAGS_ALWAYS_FACE_CAMERA = 0x00002000, + ENTITY_FLAGS_4000 = 0x00004000, + ENTITY_FLAGS_8000 = 0x00008000, + ENTITY_FLAGS_DETECTED_COLLISION = 0x00010000, + ENTITY_FLAGS_BLOCK_BEING_HIT = 0x00020000, + ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 = 0x00040000, + ENTITY_FLAGS_IGNORE_DISTANCE_CULLING = 0x00080000, + ENTITY_FLAGS_100000 = 0x00100000, + ENTITY_FLAGS_200000 = 0x00200000, + ENTITY_FLAGS_400000 = 0x00400000, + ENTITY_FLAGS_800000 = 0x00800000, + ENTITY_FLAGS_BOUND_SCRIPT_DIRTY = 0x01000000, + ENTITY_FLAGS_2000000 = 0x02000000, + ENTITY_FLAGS_PENDING_FULL_DELETE = 0x04000000, + ENTITY_FLAGS_8000000 = 0x08000000, + ENTITY_FLAGS_10000000 = 0x10000000, + ENTITY_FLAGS_PENDING_INSTANCE_DELETE = 0x20000000, + ENTITY_FLAGS_SKIP_UPDATE = 0x40000000, + ENTITY_FLAGS_CREATED = 0x80000000, +}; + +enum EnemyFlags { + ENEMY_FLAGS_1 = 0x00000001, + ENEMY_FLAGS_2 = 0x00000002, + ENEMY_FLAGS_4 = 0x00000004, + ENEMY_FLAGS_8 = 0x00000008, + ENEMY_FLAGS_10 = 0x00000010, + ENEMY_FLAGS_20 = 0x00000020, + ENEMY_FLAGS_40 = 0x00000040, + ENEMY_FLAGS_80 = 0x00000080, + ENEMY_FLAGS_100 = 0x00000100, + ENEMY_FLAGS_200 = 0x00000200, + ENEMY_FLAGS_400 = 0x00000400, + ENEMY_FLAGS_800 = 0x00000800, + ENEMY_FLAGS_1000 = 0x00001000, + ENEMY_FLAGS_2000 = 0x00002000, + ENEMY_FLAGS_4000 = 0x00004000, + ENEMY_FLAGS_8000 = 0x00008000, + ENEMY_FLAGS_10000 = 0x00010000, + ENEMY_FLAGS_20000 = 0x00020000, + ENEMY_FLAGS_40000 = 0x00040000, + ENEMY_FLAGS_80000 = 0x00080000, + ENEMY_FLAGS_100000 = 0x00100000, + ENEMY_FLAGS_200000 = 0x00200000, + ENEMY_FLAGS_400000 = 0x00400000, + ENEMY_FLAGS_800000 = 0x00800000, + ENEMY_FLAGS_IGNORE_TOUCH = 0x01000000, + ENEMY_FLAGS_IGNORE_JUMP = 0x02000000, + ENEMY_FLAGS_IGNORE_HAMMER = 0x04000000, + ENEMY_FLAGS_8000000 = 0x08000000, + ENEMY_FLAGS_10000000 = 0x10000000, + ENEMY_FLAGS_20000000 = 0x20000000, + ENEMY_FLAGS_40000000 = 0x40000000, + ENEMY_FLAGS_80000000 = 0x80000000, +}; + +enum MusicSettingsFlags { + MUSIC_SETTINGS_FLAGS_1 = 0x00000001, + MUSIC_SETTINGS_FLAGS_2 = 0x00000002, + MUSIC_SETTINGS_FLAGS_4 = 0x00000004, + MUSIC_SETTINGS_FLAGS_8 = 0x00000008, + MUSIC_SETTINGS_FLAGS_10 = 0x00000010, + MUSIC_SETTINGS_FLAGS_20 = 0x00000020, + MUSIC_SETTINGS_FLAGS_40 = 0x00000040, + MUSIC_SETTINGS_FLAGS_80 = 0x00000080, + MUSIC_SETTINGS_FLAGS_100 = 0x00000100, + MUSIC_SETTINGS_FLAGS_200 = 0x00000200, + MUSIC_SETTINGS_FLAGS_400 = 0x00000400, + MUSIC_SETTINGS_FLAGS_800 = 0x00000800, + MUSIC_SETTINGS_FLAGS_1000 = 0x00001000, + MUSIC_SETTINGS_FLAGS_2000 = 0x00002000, + MUSIC_SETTINGS_FLAGS_4000 = 0x00004000, + MUSIC_SETTINGS_FLAGS_8000 = 0x00008000, + MUSIC_SETTINGS_FLAGS_10000 = 0x00010000, + MUSIC_SETTINGS_FLAGS_20000 = 0x00020000, + MUSIC_SETTINGS_FLAGS_40000 = 0x00040000, + MUSIC_SETTINGS_FLAGS_80000 = 0x00080000, + MUSIC_SETTINGS_FLAGS_100000 = 0x00100000, + MUSIC_SETTINGS_FLAGS_200000 = 0x00200000, + MUSIC_SETTINGS_FLAGS_400000 = 0x00400000, + MUSIC_SETTINGS_FLAGS_800000 = 0x00800000, + MUSIC_SETTINGS_FLAGS_1000000 = 0x01000000, + MUSIC_SETTINGS_FLAGS_2000000 = 0x02000000, + MUSIC_SETTINGS_FLAGS_4000000 = 0x04000000, + MUSIC_SETTINGS_FLAGS_8000000 = 0x08000000, + MUSIC_SETTINGS_FLAGS_10000000 = 0x10000000, + MUSIC_SETTINGS_FLAGS_20000000 = 0x20000000, + MUSIC_SETTINGS_FLAGS_40000000 = 0x40000000, + MUSIC_SETTINGS_FLAGS_80000000 = 0x80000000, +}; + +enum ColliderFlags { + COLLIDER_FLAGS_1 = 0x00000001, + COLLIDER_FLAGS_2 = 0x00000002, + COLLIDER_FLAGS_4 = 0x00000004, + COLLIDER_FLAGS_8 = 0x00000008, + COLLIDER_FLAGS_10 = 0x00000010, + COLLIDER_FLAGS_20 = 0x00000020, + COLLIDER_FLAGS_40 = 0x00000040, + COLLIDER_FLAGS_80 = 0x00000080, + COLLIDER_FLAGS_100 = 0x00000100, + COLLIDER_FLAGS_200 = 0x00000200, + COLLIDER_FLAGS_400 = 0x00000400, + COLLIDER_FLAGS_800 = 0x00000800, + COLLIDER_FLAGS_1000 = 0x00001000, + COLLIDER_FLAGS_2000 = 0x00002000, + COLLIDER_FLAGS_4000 = 0x00004000, + COLLIDER_FLAGS_8000 = 0x00008000, + COLLIDER_FLAGS_10000 = 0x00010000, + COLLIDER_FLAGS_20000 = 0x00020000, + COLLIDER_FLAGS_40000 = 0x00040000, + COLLIDER_FLAGS_80000 = 0x00080000, + COLLIDER_FLAGS_100000 = 0x00100000, + COLLIDER_FLAGS_200000 = 0x00200000, + COLLIDER_FLAGS_400000 = 0x00400000, + COLLIDER_FLAGS_800000 = 0x00800000, + COLLIDER_FLAGS_1000000 = 0x01000000, + COLLIDER_FLAGS_2000000 = 0x02000000, + COLLIDER_FLAGS_4000000 = 0x04000000, + COLLIDER_FLAGS_8000000 = 0x08000000, + COLLIDER_FLAGS_10000000 = 0x10000000, + COLLIDER_FLAGS_20000000 = 0x20000000, + COLLIDER_FLAGS_40000000 = 0x40000000, + COLLIDER_FLAGS_80000000 = 0x80000000, +}; + +enum CameraInitDataFlags { + CAMERA_INIT_DATA_FLAGS_1 = 0x00000001, + CAMERA_INIT_DATA_FLAGS_2 = 0x00000002, + CAMERA_INIT_DATA_FLAGS_4 = 0x00000004, + CAMERA_INIT_DATA_FLAGS_8 = 0x00000008, + CAMERA_INIT_DATA_FLAGS_10 = 0x00000010, + CAMERA_INIT_DATA_FLAGS_20 = 0x00000020, + CAMERA_INIT_DATA_FLAGS_40 = 0x00000040, + CAMERA_INIT_DATA_FLAGS_80 = 0x00000080, + CAMERA_INIT_DATA_FLAGS_100 = 0x00000100, + CAMERA_INIT_DATA_FLAGS_200 = 0x00000200, + CAMERA_INIT_DATA_FLAGS_400 = 0x00000400, + CAMERA_INIT_DATA_FLAGS_800 = 0x00000800, + CAMERA_INIT_DATA_FLAGS_1000 = 0x00001000, + CAMERA_INIT_DATA_FLAGS_2000 = 0x00002000, + CAMERA_INIT_DATA_FLAGS_4000 = 0x00004000, + CAMERA_INIT_DATA_FLAGS_8000 = 0x00008000, + CAMERA_INIT_DATA_FLAGS_10000 = 0x00010000, + CAMERA_INIT_DATA_FLAGS_20000 = 0x00020000, + CAMERA_INIT_DATA_FLAGS_40000 = 0x00040000, + CAMERA_INIT_DATA_FLAGS_80000 = 0x00080000, + CAMERA_INIT_DATA_FLAGS_100000 = 0x00100000, + CAMERA_INIT_DATA_FLAGS_200000 = 0x00200000, + CAMERA_INIT_DATA_FLAGS_400000 = 0x00400000, + CAMERA_INIT_DATA_FLAGS_800000 = 0x00800000, + CAMERA_INIT_DATA_FLAGS_1000000 = 0x01000000, + CAMERA_INIT_DATA_FLAGS_2000000 = 0x02000000, + CAMERA_INIT_DATA_FLAGS_4000000 = 0x04000000, + CAMERA_INIT_DATA_FLAGS_8000000 = 0x08000000, + CAMERA_INIT_DATA_FLAGS_10000000 = 0x10000000, + CAMERA_INIT_DATA_FLAGS_20000000 = 0x20000000, + CAMERA_INIT_DATA_FLAGS_40000000 = 0x40000000, + CAMERA_INIT_DATA_FLAGS_80000000 = 0x80000000, +}; + +enum CameraFlags { + CAMERA_FLAGS_1 = 0x00000001, + CAMERA_FLAGS_2 = 0x00000002, + CAMERA_FLAGS_4 = 0x00000004, + CAMERA_FLAGS_8 = 0x00000008, + CAMERA_FLAGS_10 = 0x00000010, + CAMERA_FLAGS_20 = 0x00000020, + CAMERA_FLAGS_40 = 0x00000040, + CAMERA_FLAGS_80 = 0x00000080, + CAMERA_FLAGS_100 = 0x00000100, + CAMERA_FLAGS_200 = 0x00000200, + CAMERA_FLAGS_400 = 0x00000400, + CAMERA_FLAGS_800 = 0x00000800, + CAMERA_FLAGS_1000 = 0x00001000, + CAMERA_FLAGS_2000 = 0x00002000, + CAMERA_FLAGS_4000 = 0x00004000, + CAMERA_FLAGS_8000 = 0x00008000, + CAMERA_FLAGS_10000 = 0x00010000, + CAMERA_FLAGS_20000 = 0x00020000, + CAMERA_FLAGS_40000 = 0x00040000, + CAMERA_FLAGS_80000 = 0x00080000, + CAMERA_FLAGS_100000 = 0x00100000, + CAMERA_FLAGS_200000 = 0x00200000, + CAMERA_FLAGS_400000 = 0x00400000, + CAMERA_FLAGS_800000 = 0x00800000, + CAMERA_FLAGS_1000000 = 0x01000000, + CAMERA_FLAGS_2000000 = 0x02000000, + CAMERA_FLAGS_4000000 = 0x04000000, + CAMERA_FLAGS_8000000 = 0x08000000, + CAMERA_FLAGS_10000000 = 0x10000000, + CAMERA_FLAGS_20000000 = 0x20000000, + CAMERA_FLAGS_40000000 = 0x40000000, + CAMERA_FLAGS_80000000 = 0x80000000, +}; + +enum StaticMoveFlags { + STATIC_MOVE_FLAGS_1 = 0x00000001, + STATIC_MOVE_FLAGS_2 = 0x00000002, + STATIC_MOVE_FLAGS_4 = 0x00000004, + STATIC_MOVE_FLAGS_8 = 0x00000008, + STATIC_MOVE_FLAGS_10 = 0x00000010, + STATIC_MOVE_FLAGS_20 = 0x00000020, + STATIC_MOVE_FLAGS_40 = 0x00000040, + STATIC_MOVE_FLAGS_80 = 0x00000080, + STATIC_MOVE_FLAGS_100 = 0x00000100, + STATIC_MOVE_FLAGS_200 = 0x00000200, + STATIC_MOVE_FLAGS_400 = 0x00000400, + STATIC_MOVE_FLAGS_800 = 0x00000800, + STATIC_MOVE_FLAGS_1000 = 0x00001000, + STATIC_MOVE_FLAGS_2000 = 0x00002000, + STATIC_MOVE_FLAGS_4000 = 0x00004000, + STATIC_MOVE_FLAGS_8000 = 0x00008000, + STATIC_MOVE_FLAGS_10000 = 0x00010000, + STATIC_MOVE_FLAGS_20000 = 0x00020000, + STATIC_MOVE_FLAGS_40000 = 0x00040000, + STATIC_MOVE_FLAGS_80000 = 0x00080000, + STATIC_MOVE_FLAGS_100000 = 0x00100000, + STATIC_MOVE_FLAGS_200000 = 0x00200000, + STATIC_MOVE_FLAGS_400000 = 0x00400000, + STATIC_MOVE_FLAGS_800000 = 0x00800000, + STATIC_MOVE_FLAGS_1000000 = 0x01000000, + STATIC_MOVE_FLAGS_2000000 = 0x02000000, + STATIC_MOVE_FLAGS_4000000 = 0x04000000, + STATIC_MOVE_FLAGS_8000000 = 0x08000000, + STATIC_MOVE_FLAGS_10000000 = 0x10000000, + STATIC_MOVE_FLAGS_20000000 = 0x20000000, + STATIC_MOVE_FLAGS_40000000 = 0x40000000, + STATIC_MOVE_FLAGS_80000000 = 0x80000000, +}; + +enum AnimatorNodeFlags { + ANIMATOR_NODE_FLAGS_0 = 0x00000000, + ANIMATOR_NODE_FLAGS_1 = 0x00000001, + ANIMATOR_NODE_FLAGS_2 = 0x00000002, + ANIMATOR_NODE_FLAGS_4 = 0x00000004, + ANIMATOR_NODE_FLAGS_8 = 0x00000008, + ANIMATOR_NODE_FLAGS_10 = 0x00000010, + ANIMATOR_NODE_FLAGS_20 = 0x00000020, + ANIMATOR_NODE_FLAGS_40 = 0x00000040, + ANIMATOR_NODE_FLAGS_80 = 0x00000080, + ANIMATOR_NODE_FLAGS_100 = 0x00000100, + ANIMATOR_NODE_FLAGS_200 = 0x00000200, + ANIMATOR_NODE_FLAGS_400 = 0x00000400, + ANIMATOR_NODE_FLAGS_800 = 0x00000800, + ANIMATOR_NODE_FLAGS_1000 = 0x00001000, + ANIMATOR_NODE_FLAGS_2000 = 0x00002000, + ANIMATOR_NODE_FLAGS_4000 = 0x00004000, + ANIMATOR_NODE_FLAGS_8000 = 0x00008000, + ANIMATOR_NODE_FLAGS_10000 = 0x00010000, + ANIMATOR_NODE_FLAGS_20000 = 0x00020000, + ANIMATOR_NODE_FLAGS_40000 = 0x00040000, + ANIMATOR_NODE_FLAGS_80000 = 0x00080000, + ANIMATOR_NODE_FLAGS_100000 = 0x00100000, + ANIMATOR_NODE_FLAGS_200000 = 0x00200000, + ANIMATOR_NODE_FLAGS_400000 = 0x00400000, + ANIMATOR_NODE_FLAGS_800000 = 0x00800000, + ANIMATOR_NODE_FLAGS_1000000 = 0x01000000, + ANIMATOR_NODE_FLAGS_2000000 = 0x02000000, + ANIMATOR_NODE_FLAGS_4000000 = 0x04000000, + ANIMATOR_NODE_FLAGS_8000000 = 0x08000000, + ANIMATOR_NODE_FLAGS_10000000 = 0x10000000, + ANIMATOR_NODE_FLAGS_20000000 = 0x20000000, + ANIMATOR_NODE_FLAGS_40000000 = 0x40000000, + ANIMATOR_NODE_FLAGS_80000000 = 0x80000000, +}; + +enum ModelAnimatorFlags { + MODEL_ANIMATOR_FLAGS_0 = 0x00000000, + MODEL_ANIMATOR_FLAGS_1 = 0x00000001, + MODEL_ANIMATOR_FLAGS_2 = 0x00000002, + MODEL_ANIMATOR_FLAGS_4 = 0x00000004, + MODEL_ANIMATOR_FLAGS_8 = 0x00000008, + MODEL_ANIMATOR_FLAGS_10 = 0x00000010, + MODEL_ANIMATOR_FLAGS_20 = 0x00000020, + MODEL_ANIMATOR_FLAGS_40 = 0x00000040, + MODEL_ANIMATOR_FLAGS_80 = 0x00000080, + MODEL_ANIMATOR_FLAGS_100 = 0x00000100, + MODEL_ANIMATOR_FLAGS_200 = 0x00000200, + MODEL_ANIMATOR_FLAGS_400 = 0x00000400, + MODEL_ANIMATOR_FLAGS_800 = 0x00000800, + MODEL_ANIMATOR_FLAGS_1000 = 0x00001000, + MODEL_ANIMATOR_FLAGS_2000 = 0x00002000, + MODEL_ANIMATOR_FLAGS_4000 = 0x00004000, + MODEL_ANIMATOR_FLAGS_8000 = 0x00008000, + MODEL_ANIMATOR_FLAGS_10000 = 0x00010000, + MODEL_ANIMATOR_FLAGS_20000 = 0x00020000, + MODEL_ANIMATOR_FLAGS_40000 = 0x00040000, + MODEL_ANIMATOR_FLAGS_80000 = 0x00080000, + MODEL_ANIMATOR_FLAGS_100000 = 0x00100000, + MODEL_ANIMATOR_FLAGS_200000 = 0x00200000, + MODEL_ANIMATOR_FLAGS_400000 = 0x00400000, + MODEL_ANIMATOR_FLAGS_800000 = 0x00800000, + MODEL_ANIMATOR_FLAGS_1000000 = 0x01000000, + MODEL_ANIMATOR_FLAGS_2000000 = 0x02000000, + MODEL_ANIMATOR_FLAGS_4000000 = 0x04000000, + MODEL_ANIMATOR_FLAGS_8000000 = 0x08000000, + MODEL_ANIMATOR_FLAGS_10000000 = 0x10000000, + MODEL_ANIMATOR_FLAGS_20000000 = 0x20000000, + MODEL_ANIMATOR_FLAGS_40000000 = 0x40000000, + MODEL_ANIMATOR_FLAGS_80000000 = 0x80000000, +}; + +enum ShadowFlags { + SHADOW_FLAGS_1 = 0x00000001, + SHADOW_FLAGS_2 = 0x00000002, + SHADOW_FLAGS_4 = 0x00000004, + SHADOW_FLAGS_8 = 0x00000008, + SHADOW_FLAGS_10 = 0x00000010, + SHADOW_FLAGS_20 = 0x00000020, + SHADOW_FLAGS_40 = 0x00000040, + SHADOW_FLAGS_80 = 0x00000080, + SHADOW_FLAGS_100 = 0x00000100, + SHADOW_FLAGS_200 = 0x00000200, + SHADOW_FLAGS_400 = 0x00000400, + SHADOW_FLAGS_800 = 0x00000800, + SHADOW_FLAGS_1000 = 0x00001000, + SHADOW_FLAGS_2000 = 0x00002000, + SHADOW_FLAGS_4000 = 0x00004000, + SHADOW_FLAGS_8000 = 0x00008000, + SHADOW_FLAGS_10000 = 0x00010000, + SHADOW_FLAGS_20000 = 0x00020000, + SHADOW_FLAGS_40000 = 0x00040000, + SHADOW_FLAGS_80000 = 0x00080000, + SHADOW_FLAGS_100000 = 0x00100000, + SHADOW_FLAGS_200000 = 0x00200000, + SHADOW_FLAGS_400000 = 0x00400000, + SHADOW_FLAGS_800000 = 0x00800000, + SHADOW_FLAGS_1000000 = 0x01000000, + SHADOW_FLAGS_2000000 = 0x02000000, + SHADOW_FLAGS_4000000 = 0x04000000, + SHADOW_FLAGS_8000000 = 0x08000000, + SHADOW_FLAGS_10000000 = 0x10000000, + SHADOW_FLAGS_20000000 = 0x20000000, + SHADOW_FLAGS_40000000 = 0x40000000, + SHADOW_FLAGS_80000000 = 0x80000000, +}; + +enum TriggerDefinitionFlags { + TRIGGER_DEFINITION_FLAGS_1 = 0x00000001, + TRIGGER_DEFINITION_FLAGS_2 = 0x00000002, + TRIGGER_DEFINITION_FLAGS_4 = 0x00000004, + TRIGGER_DEFINITION_FLAGS_8 = 0x00000008, + TRIGGER_DEFINITION_FLAGS_10 = 0x00000010, + TRIGGER_DEFINITION_FLAGS_20 = 0x00000020, + TRIGGER_DEFINITION_FLAGS_40 = 0x00000040, + TRIGGER_DEFINITION_FLAGS_80 = 0x00000080, + TRIGGER_DEFINITION_FLAGS_100 = 0x00000100, + TRIGGER_DEFINITION_FLAGS_200 = 0x00000200, + TRIGGER_DEFINITION_FLAGS_400 = 0x00000400, + TRIGGER_DEFINITION_FLAGS_800 = 0x00000800, + TRIGGER_DEFINITION_FLAGS_1000 = 0x00001000, + TRIGGER_DEFINITION_FLAGS_2000 = 0x00002000, + TRIGGER_DEFINITION_FLAGS_4000 = 0x00004000, + TRIGGER_DEFINITION_FLAGS_8000 = 0x00008000, + TRIGGER_DEFINITION_FLAGS_10000 = 0x00010000, + TRIGGER_DEFINITION_FLAGS_20000 = 0x00020000, + TRIGGER_DEFINITION_FLAGS_40000 = 0x00040000, + TRIGGER_DEFINITION_FLAGS_80000 = 0x00080000, + TRIGGER_DEFINITION_FLAGS_100000 = 0x00100000, + TRIGGER_DEFINITION_FLAGS_200000 = 0x00200000, + TRIGGER_DEFINITION_FLAGS_400000 = 0x00400000, + TRIGGER_DEFINITION_FLAGS_800000 = 0x00800000, + TRIGGER_DEFINITION_FLAGS_1000000 = 0x01000000, + TRIGGER_DEFINITION_FLAGS_2000000 = 0x02000000, + TRIGGER_DEFINITION_FLAGS_4000000 = 0x04000000, + TRIGGER_DEFINITION_FLAGS_8000000 = 0x08000000, + TRIGGER_DEFINITION_FLAGS_10000000 = 0x10000000, + TRIGGER_DEFINITION_FLAGS_20000000 = 0x20000000, + TRIGGER_DEFINITION_FLAGS_40000000 = 0x40000000, + TRIGGER_DEFINITION_FLAGS_80000000 = 0x80000000, +}; + +enum ShopFlags { + SHOP_FLAGS_1 = 0x00000001, + SHOP_FLAGS_2 = 0x00000002, + SHOP_FLAGS_4 = 0x00000004, + SHOP_FLAGS_8 = 0x00000008, + SHOP_FLAGS_10 = 0x00000010, + SHOP_FLAGS_20 = 0x00000020, + SHOP_FLAGS_40 = 0x00000040, + SHOP_FLAGS_80 = 0x00000080, + SHOP_FLAGS_100 = 0x00000100, + SHOP_FLAGS_200 = 0x00000200, + SHOP_FLAGS_400 = 0x00000400, + SHOP_FLAGS_800 = 0x00000800, + SHOP_FLAGS_1000 = 0x00001000, + SHOP_FLAGS_2000 = 0x00002000, + SHOP_FLAGS_4000 = 0x00004000, + SHOP_FLAGS_8000 = 0x00008000, + SHOP_FLAGS_10000 = 0x00010000, + SHOP_FLAGS_20000 = 0x00020000, + SHOP_FLAGS_40000 = 0x00040000, + SHOP_FLAGS_80000 = 0x00080000, + SHOP_FLAGS_100000 = 0x00100000, + SHOP_FLAGS_200000 = 0x00200000, + SHOP_FLAGS_400000 = 0x00400000, + SHOP_FLAGS_800000 = 0x00800000, + SHOP_FLAGS_1000000 = 0x01000000, + SHOP_FLAGS_2000000 = 0x02000000, + SHOP_FLAGS_4000000 = 0x04000000, + SHOP_FLAGS_8000000 = 0x08000000, + SHOP_FLAGS_10000000 = 0x10000000, + SHOP_FLAGS_20000000 = 0x20000000, + SHOP_FLAGS_40000000 = 0x40000000, + SHOP_FLAGS_80000000 = 0x80000000, +}; + +enum EncounterStatusFlags { + ENCOUNTER_STATUS_FLAGS_0 = 0x00000000, + ENCOUNTER_STATUS_FLAGS_1 = 0x00000001, + ENCOUNTER_STATUS_FLAGS_2 = 0x00000002, + ENCOUNTER_STATUS_FLAGS_4 = 0x00000004, + ENCOUNTER_STATUS_FLAGS_8 = 0x00000008, + ENCOUNTER_STATUS_FLAGS_10 = 0x00000010, + ENCOUNTER_STATUS_FLAGS_20 = 0x00000020, + ENCOUNTER_STATUS_FLAGS_40 = 0x00000040, + ENCOUNTER_STATUS_FLAGS_80 = 0x00000080, + ENCOUNTER_STATUS_FLAGS_100 = 0x00000100, + ENCOUNTER_STATUS_FLAGS_200 = 0x00000200, + ENCOUNTER_STATUS_FLAGS_400 = 0x00000400, + ENCOUNTER_STATUS_FLAGS_800 = 0x00000800, + ENCOUNTER_STATUS_FLAGS_1000 = 0x00001000, + ENCOUNTER_STATUS_FLAGS_2000 = 0x00002000, + ENCOUNTER_STATUS_FLAGS_4000 = 0x00004000, + ENCOUNTER_STATUS_FLAGS_8000 = 0x00008000, + ENCOUNTER_STATUS_FLAGS_10000 = 0x00010000, + ENCOUNTER_STATUS_FLAGS_20000 = 0x00020000, + ENCOUNTER_STATUS_FLAGS_40000 = 0x00040000, + ENCOUNTER_STATUS_FLAGS_80000 = 0x00080000, + ENCOUNTER_STATUS_FLAGS_100000 = 0x00100000, + ENCOUNTER_STATUS_FLAGS_200000 = 0x00200000, + ENCOUNTER_STATUS_FLAGS_400000 = 0x00400000, + ENCOUNTER_STATUS_FLAGS_800000 = 0x00800000, + ENCOUNTER_STATUS_FLAGS_1000000 = 0x01000000, + ENCOUNTER_STATUS_FLAGS_2000000 = 0x02000000, + ENCOUNTER_STATUS_FLAGS_4000000 = 0x04000000, + ENCOUNTER_STATUS_FLAGS_8000000 = 0x08000000, + ENCOUNTER_STATUS_FLAGS_10000000 = 0x10000000, + ENCOUNTER_STATUS_FLAGS_20000000 = 0x20000000, + ENCOUNTER_STATUS_FLAGS_40000000 = 0x40000000, + ENCOUNTER_STATUS_FLAGS_80000000 = 0x80000000, +}; + +enum WindowFlags { + WINDOW_FLAGS_1 = 0x00000001, + WINDOW_FLAGS_2 = 0x00000002, + WINDOW_FLAGS_4 = 0x00000004, + WINDOW_FLAGS_8 = 0x00000008, + WINDOW_FLAGS_10 = 0x00000010, + WINDOW_FLAGS_20 = 0x00000020, + WINDOW_FLAGS_40 = 0x00000040, + WINDOW_FLAGS_80 = 0x00000080, + WINDOW_FLAGS_100 = 0x00000100, + WINDOW_FLAGS_200 = 0x00000200, + WINDOW_FLAGS_400 = 0x00000400, + WINDOW_FLAGS_800 = 0x00000800, + WINDOW_FLAGS_1000 = 0x00001000, + WINDOW_FLAGS_2000 = 0x00002000, + WINDOW_FLAGS_4000 = 0x00004000, + WINDOW_FLAGS_8000 = 0x00008000, + WINDOW_FLAGS_10000 = 0x00010000, + WINDOW_FLAGS_20000 = 0x00020000, + WINDOW_FLAGS_40000 = 0x00040000, + WINDOW_FLAGS_80000 = 0x00080000, + WINDOW_FLAGS_100000 = 0x00100000, + WINDOW_FLAGS_200000 = 0x00200000, + WINDOW_FLAGS_400000 = 0x00400000, + WINDOW_FLAGS_800000 = 0x00800000, + WINDOW_FLAGS_1000000 = 0x01000000, + WINDOW_FLAGS_2000000 = 0x02000000, + WINDOW_FLAGS_4000000 = 0x04000000, + WINDOW_FLAGS_8000000 = 0x08000000, + WINDOW_FLAGS_10000000 = 0x10000000, + WINDOW_FLAGS_20000000 = 0x20000000, + WINDOW_FLAGS_40000000 = 0x40000000, + WINDOW_FLAGS_80000000 = 0x80000000, +}; + +enum EntityModelFlags { + ENTITY_MODEL_FLAGS_1 = 0x00000001, + ENTITY_MODEL_FLAGS_2 = 0x00000002, + ENTITY_MODEL_FLAGS_4 = 0x00000004, + ENTITY_MODEL_FLAGS_8 = 0x00000008, + ENTITY_MODEL_FLAGS_10 = 0x00000010, + ENTITY_MODEL_FLAGS_20 = 0x00000020, + ENTITY_MODEL_FLAGS_40 = 0x00000040, + ENTITY_MODEL_FLAGS_80 = 0x00000080, + ENTITY_MODEL_FLAGS_100 = 0x00000100, + ENTITY_MODEL_FLAGS_200 = 0x00000200, + ENTITY_MODEL_FLAGS_400 = 0x00000400, + ENTITY_MODEL_FLAGS_800 = 0x00000800, + ENTITY_MODEL_FLAGS_1000 = 0x00001000, + ENTITY_MODEL_FLAGS_2000 = 0x00002000, + ENTITY_MODEL_FLAGS_4000 = 0x00004000, + ENTITY_MODEL_FLAGS_8000 = 0x00008000, + ENTITY_MODEL_FLAGS_10000 = 0x00010000, + ENTITY_MODEL_FLAGS_20000 = 0x00020000, + ENTITY_MODEL_FLAGS_40000 = 0x00040000, + ENTITY_MODEL_FLAGS_80000 = 0x00080000, + ENTITY_MODEL_FLAGS_100000 = 0x00100000, + ENTITY_MODEL_FLAGS_200000 = 0x00200000, + ENTITY_MODEL_FLAGS_400000 = 0x00400000, + ENTITY_MODEL_FLAGS_800000 = 0x00800000, + ENTITY_MODEL_FLAGS_1000000 = 0x01000000, + ENTITY_MODEL_FLAGS_2000000 = 0x02000000, + ENTITY_MODEL_FLAGS_4000000 = 0x04000000, + ENTITY_MODEL_FLAGS_8000000 = 0x08000000, + ENTITY_MODEL_FLAGS_10000000 = 0x10000000, + ENTITY_MODEL_FLAGS_20000000 = 0x20000000, + ENTITY_MODEL_FLAGS_40000000 = 0x40000000, + ENTITY_MODEL_FLAGS_80000000 = 0x80000000, +}; + +enum TempSetZoneEnabledFlags { + TEMP_SET_ZONE_ENABLED_FLAGS_1 = 0x00000001, + TEMP_SET_ZONE_ENABLED_FLAGS_2 = 0x00000002, + TEMP_SET_ZONE_ENABLED_FLAGS_4 = 0x00000004, + TEMP_SET_ZONE_ENABLED_FLAGS_8 = 0x00000008, + TEMP_SET_ZONE_ENABLED_FLAGS_10 = 0x00000010, + TEMP_SET_ZONE_ENABLED_FLAGS_20 = 0x00000020, + TEMP_SET_ZONE_ENABLED_FLAGS_40 = 0x00000040, + TEMP_SET_ZONE_ENABLED_FLAGS_80 = 0x00000080, + TEMP_SET_ZONE_ENABLED_FLAGS_100 = 0x00000100, + TEMP_SET_ZONE_ENABLED_FLAGS_200 = 0x00000200, + TEMP_SET_ZONE_ENABLED_FLAGS_400 = 0x00000400, + TEMP_SET_ZONE_ENABLED_FLAGS_800 = 0x00000800, + TEMP_SET_ZONE_ENABLED_FLAGS_1000 = 0x00001000, + TEMP_SET_ZONE_ENABLED_FLAGS_2000 = 0x00002000, + TEMP_SET_ZONE_ENABLED_FLAGS_4000 = 0x00004000, + TEMP_SET_ZONE_ENABLED_FLAGS_8000 = 0x00008000, + TEMP_SET_ZONE_ENABLED_FLAGS_10000 = 0x00010000, + TEMP_SET_ZONE_ENABLED_FLAGS_20000 = 0x00020000, + TEMP_SET_ZONE_ENABLED_FLAGS_40000 = 0x00040000, + TEMP_SET_ZONE_ENABLED_FLAGS_80000 = 0x00080000, + TEMP_SET_ZONE_ENABLED_FLAGS_100000 = 0x00100000, + TEMP_SET_ZONE_ENABLED_FLAGS_200000 = 0x00200000, + TEMP_SET_ZONE_ENABLED_FLAGS_400000 = 0x00400000, + TEMP_SET_ZONE_ENABLED_FLAGS_800000 = 0x00800000, + TEMP_SET_ZONE_ENABLED_FLAGS_1000000 = 0x01000000, + TEMP_SET_ZONE_ENABLED_FLAGS_2000000 = 0x02000000, + TEMP_SET_ZONE_ENABLED_FLAGS_4000000 = 0x04000000, + TEMP_SET_ZONE_ENABLED_FLAGS_8000000 = 0x08000000, + TEMP_SET_ZONE_ENABLED_FLAGS_10000000 = 0x10000000, + TEMP_SET_ZONE_ENABLED_FLAGS_20000000 = 0x20000000, + TEMP_SET_ZONE_ENABLED_FLAGS_40000000 = 0x40000000, + TEMP_SET_ZONE_ENABLED_FLAGS_80000000 = 0x80000000, +}; + +enum EffectInstanceFlags { + EFFECT_INSTANCE_FLAGS_1 = 0x00000001, + EFFECT_INSTANCE_FLAGS_2 = 0x00000002, + EFFECT_INSTANCE_FLAGS_4 = 0x00000004, + EFFECT_INSTANCE_FLAGS_8 = 0x00000008, + EFFECT_INSTANCE_FLAGS_10 = 0x00000010, + EFFECT_INSTANCE_FLAGS_20 = 0x00000020, + EFFECT_INSTANCE_FLAGS_40 = 0x00000040, + EFFECT_INSTANCE_FLAGS_80 = 0x00000080, + EFFECT_INSTANCE_FLAGS_100 = 0x00000100, + EFFECT_INSTANCE_FLAGS_200 = 0x00000200, + EFFECT_INSTANCE_FLAGS_400 = 0x00000400, + EFFECT_INSTANCE_FLAGS_800 = 0x00000800, + EFFECT_INSTANCE_FLAGS_1000 = 0x00001000, + EFFECT_INSTANCE_FLAGS_2000 = 0x00002000, + EFFECT_INSTANCE_FLAGS_4000 = 0x00004000, + EFFECT_INSTANCE_FLAGS_8000 = 0x00008000, + EFFECT_INSTANCE_FLAGS_10000 = 0x00010000, + EFFECT_INSTANCE_FLAGS_20000 = 0x00020000, + EFFECT_INSTANCE_FLAGS_40000 = 0x00040000, + EFFECT_INSTANCE_FLAGS_80000 = 0x00080000, + EFFECT_INSTANCE_FLAGS_100000 = 0x00100000, + EFFECT_INSTANCE_FLAGS_200000 = 0x00200000, + EFFECT_INSTANCE_FLAGS_400000 = 0x00400000, + EFFECT_INSTANCE_FLAGS_800000 = 0x00800000, + EFFECT_INSTANCE_FLAGS_1000000 = 0x01000000, + EFFECT_INSTANCE_FLAGS_2000000 = 0x02000000, + EFFECT_INSTANCE_FLAGS_4000000 = 0x04000000, + EFFECT_INSTANCE_FLAGS_8000000 = 0x08000000, + EFFECT_INSTANCE_FLAGS_10000000 = 0x10000000, + EFFECT_INSTANCE_FLAGS_20000000 = 0x20000000, + EFFECT_INSTANCE_FLAGS_40000000 = 0x40000000, + EFFECT_INSTANCE_FLAGS_80000000 = 0x80000000, +}; + +enum ModelTransformGroupFlags { + MODEL_TRANSFORM_GROUP_FLAGS_1 = 0x00000001, + MODEL_TRANSFORM_GROUP_FLAGS_2 = 0x00000002, + MODEL_TRANSFORM_GROUP_FLAGS_4 = 0x00000004, + MODEL_TRANSFORM_GROUP_FLAGS_8 = 0x00000008, + MODEL_TRANSFORM_GROUP_FLAGS_10 = 0x00000010, + MODEL_TRANSFORM_GROUP_FLAGS_20 = 0x00000020, + MODEL_TRANSFORM_GROUP_FLAGS_40 = 0x00000040, + MODEL_TRANSFORM_GROUP_FLAGS_80 = 0x00000080, + MODEL_TRANSFORM_GROUP_FLAGS_100 = 0x00000100, + MODEL_TRANSFORM_GROUP_FLAGS_200 = 0x00000200, + MODEL_TRANSFORM_GROUP_FLAGS_400 = 0x00000400, + MODEL_TRANSFORM_GROUP_FLAGS_800 = 0x00000800, + MODEL_TRANSFORM_GROUP_FLAGS_1000 = 0x00001000, + MODEL_TRANSFORM_GROUP_FLAGS_2000 = 0x00002000, + MODEL_TRANSFORM_GROUP_FLAGS_4000 = 0x00004000, + MODEL_TRANSFORM_GROUP_FLAGS_8000 = 0x00008000, + MODEL_TRANSFORM_GROUP_FLAGS_10000 = 0x00010000, + MODEL_TRANSFORM_GROUP_FLAGS_20000 = 0x00020000, + MODEL_TRANSFORM_GROUP_FLAGS_40000 = 0x00040000, + MODEL_TRANSFORM_GROUP_FLAGS_80000 = 0x00080000, + MODEL_TRANSFORM_GROUP_FLAGS_100000 = 0x00100000, + MODEL_TRANSFORM_GROUP_FLAGS_200000 = 0x00200000, + MODEL_TRANSFORM_GROUP_FLAGS_400000 = 0x00400000, + MODEL_TRANSFORM_GROUP_FLAGS_800000 = 0x00800000, + MODEL_TRANSFORM_GROUP_FLAGS_1000000 = 0x01000000, + MODEL_TRANSFORM_GROUP_FLAGS_2000000 = 0x02000000, + MODEL_TRANSFORM_GROUP_FLAGS_4000000 = 0x04000000, + MODEL_TRANSFORM_GROUP_FLAGS_8000000 = 0x08000000, + MODEL_TRANSFORM_GROUP_FLAGS_10000000 = 0x10000000, + MODEL_TRANSFORM_GROUP_FLAGS_20000000 = 0x20000000, + MODEL_TRANSFORM_GROUP_FLAGS_40000000 = 0x40000000, + MODEL_TRANSFORM_GROUP_FLAGS_80000000 = 0x80000000, +}; + +enum NpcDropFlags { + NPC_DROP_FLAGS_1 = 0x01, + NPC_DROP_FLAGS_2 = 0x02, + NPC_DROP_FLAGS_4 = 0x04, + NPC_DROP_FLAGS_8 = 0x08, + NPC_DROP_FLAGS_10 = 0x10, + NPC_DROP_FLAGS_20 = 0x20, + NPC_DROP_FLAGS_40 = 0x40, + NPC_DROP_FLAGS_80 = 0x80, +}; + +enum ElementImmunityFlags { + ELEMENT_IMMUNITY_FLAGS_0 = 0x00000000, + ELEMENT_IMMUNITY_FLAGS_1 = 0x00000001, + ELEMENT_IMMUNITY_FLAGS_2 = 0x00000002, + ELEMENT_IMMUNITY_FLAGS_4 = 0x00000004, + ELEMENT_IMMUNITY_FLAGS_8 = 0x00000008, + ELEMENT_IMMUNITY_FLAGS_10 = 0x00000010, + ELEMENT_IMMUNITY_FLAGS_20 = 0x00000020, + ELEMENT_IMMUNITY_FLAGS_40 = 0x00000040, + ELEMENT_IMMUNITY_FLAGS_80 = 0x00000080, + ELEMENT_IMMUNITY_FLAGS_100 = 0x00000100, + ELEMENT_IMMUNITY_FLAGS_200 = 0x00000200, + ELEMENT_IMMUNITY_FLAGS_400 = 0x00000400, + ELEMENT_IMMUNITY_FLAGS_800 = 0x00000800, + ELEMENT_IMMUNITY_FLAGS_1000 = 0x00001000, + ELEMENT_IMMUNITY_FLAGS_2000 = 0x00002000, + ELEMENT_IMMUNITY_FLAGS_4000 = 0x00004000, + ELEMENT_IMMUNITY_FLAGS_8000 = 0x00008000, + ELEMENT_IMMUNITY_FLAGS_10000 = 0x00010000, + ELEMENT_IMMUNITY_FLAGS_20000 = 0x00020000, + ELEMENT_IMMUNITY_FLAGS_40000 = 0x00040000, + ELEMENT_IMMUNITY_FLAGS_80000 = 0x00080000, + ELEMENT_IMMUNITY_FLAGS_100000 = 0x00100000, + ELEMENT_IMMUNITY_FLAGS_200000 = 0x00200000, + ELEMENT_IMMUNITY_FLAGS_400000 = 0x00400000, + ELEMENT_IMMUNITY_FLAGS_800000 = 0x00800000, + ELEMENT_IMMUNITY_FLAGS_1000000 = 0x01000000, + ELEMENT_IMMUNITY_FLAGS_2000000 = 0x02000000, + ELEMENT_IMMUNITY_FLAGS_4000000 = 0x04000000, + ELEMENT_IMMUNITY_FLAGS_8000000 = 0x08000000, + ELEMENT_IMMUNITY_FLAGS_10000000 = 0x10000000, + ELEMENT_IMMUNITY_FLAGS_20000000 = 0x20000000, + ELEMENT_IMMUNITY_FLAGS_40000000 = 0x40000000, + ELEMENT_IMMUNITY_FLAGS_80000000 = 0x80000000, +}; + #endif diff --git a/include/npc.h b/include/npc.h index c760e502a5..bd2809a13c 100644 --- a/include/npc.h +++ b/include/npc.h @@ -136,7 +136,7 @@ typedef struct StaticNpc { /* 0x018 */ EvtSource* init; /* 0x01C */ char unk_1C[8]; /* 0x024 */ s32 yaw; - /* 0x028 */ s8 dropFlags; // TODO: use EnemyDrops (requires tons of map edits) + /* 0x028 */ u8 dropFlags; // TODO: use EnemyDrops (requires tons of map edits) /* 0x029 */ s8 itemDropChance; // % /* 0x02A */ ItemDrop itemDrops[8]; /* 0x05A */ StatDrop heartDrops[8]; @@ -177,7 +177,7 @@ typedef struct { #define NPC_GROUP(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle } typedef struct EnemyDrops { - /* 0x00 */ s8 dropFlags; + /* 0x00 */ u8 dropFlags; /* 0x01 */ s8 itemDropChance; // % /* 0x02 */ ItemDrop itemDrops[8]; /* 0x32 */ StatDrop heartDrops[8]; diff --git a/src/104730.c b/src/104730.c index 447ca747ff..9c991dd8ef 100644 --- a/src/104730.c +++ b/src/104730.c @@ -91,7 +91,7 @@ s32 D_802E9898[9] = { }; StaticShadowData D_802E98BC = { - .flags = 0x20, + .flags = SHADOW_FLAGS_20, .unk_04 = D_802E9850, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, @@ -99,7 +99,7 @@ StaticShadowData D_802E98BC = { }; StaticShadowData D_802E98E0 = { - .flags = 0x20, + .flags = SHADOW_FLAGS_20, .unk_04 = D_802E9874, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, @@ -107,7 +107,7 @@ StaticShadowData D_802E98E0 = { }; StaticShadowData D_802E9904 = { - .flags = 0x20, + .flags = SHADOW_FLAGS_20, .unk_04 = D_802E9898, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, diff --git a/src/163400.c b/src/163400.c index f8b0df9efa..8ceb4436fd 100644 --- a/src/163400.c +++ b/src/163400.c @@ -100,14 +100,14 @@ void func_8024330C( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249BBC)) { *posX -= D_80249BBC[updateCounter]; } else { *posX -= D_80249BBC[ARRAY_COUNT(D_80249BBC) - 1]; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -124,14 +124,14 @@ void filemenu_update_show_name_input( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249BDC)) { *posX += D_80249BDC[updateCounter]; } else { *posX += D_80249BDC[ARRAY_COUNT(D_80249BDC) - 1]; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -148,14 +148,14 @@ void filemenu_update_show_options_left( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249BFC)) { *posX -= D_80249BFC[updateCounter]; } else { *posX -= D_80249BFC[ARRAY_COUNT(D_80249BFC) - 1]; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -172,14 +172,14 @@ void filemenu_update_show_options_right( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249C1C)) { *posX += D_80249C1C[updateCounter]; } else { *posX += D_80249C1C[ARRAY_COUNT(D_80249C1C) - 1]; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -196,14 +196,14 @@ void filemenu_update_show_options_bottom( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249C3C)) { *posY += D_80249C3C[updateCounter]; } else { *posY += D_80249C3C[ARRAY_COUNT(D_80249C3C) - 1]; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -220,14 +220,14 @@ void filemenu_update_show_title( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249C5C)) { *posY -= D_80249C5C[updateCounter]; } else { *posY -= D_80249C5C[ARRAY_COUNT(D_80249C5C) - 1]; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -247,8 +247,8 @@ void func_802435C4( *posX += D_80249C7C[updateCounter]; } else { *posX += D_80249C7C[ARRAY_COUNT(D_80249C7C) - 1]; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -268,8 +268,8 @@ void filemenu_update_hidden_name_input( *posX -= D_80249C90[updateCounter]; } else { *posX -= D_80249C90[ARRAY_COUNT(D_80249C90) - 1]; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -289,8 +289,8 @@ void filemenu_update_hidden_options_left( *posX += D_80249CA4[updateCounter]; } else { *posX += D_80249CA4[ARRAY_COUNT(D_80249CA4) - 1]; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -310,8 +310,8 @@ void filemenu_update_hidden_options_right( *posX -= D_80249CB8[updateCounter]; } else { *posX -= D_80249CB8[ARRAY_COUNT(D_80249CB8) - 1]; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -331,8 +331,8 @@ void filemenu_update_hidden_title( *posY += D_80249CCC[updateCounter]; } else { *posY += D_80249CCC[ARRAY_COUNT(D_80249CCC) - 1]; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -352,8 +352,8 @@ void filemenu_update_hidden_options_bottom( *posY -= D_80249CE0[updateCounter]; } else { *posY -= D_80249CE0[ARRAY_COUNT(D_80249CE0) - 1]; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -370,7 +370,7 @@ void filemenu_update_show_with_rotation( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~0x4; + window->flags &= ~WINDOW_FLAGS_4; } if (updateCounter < ARRAY_COUNT(D_80249CF4)) { @@ -378,7 +378,7 @@ void filemenu_update_show_with_rotation( *flags = 8 | 1; } else { *flags = 0; - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; } } @@ -399,8 +399,8 @@ void filemenu_update_hidden_with_rotation( *flags = 8 | 1; } else { *flags = 0; - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } @@ -431,8 +431,8 @@ void filemenu_update_hidden_name_confirm( mainmenu_draw_rect(0, 0, 1280, 960, 0, 0, 0, 0, 0); *posY -= D_80249D48[updateCounter]; } else { - window->flags &= ~0x8; - window->flags |= 0x4; + window->flags &= ~WINDOW_FLAGS_8; + window->flags |= WINDOW_FLAGS_4; } } diff --git a/src/168590.c b/src/168590.c index 24b43f34c5..537d4eaad0 100644 --- a/src/168590.c +++ b/src/168590.c @@ -105,7 +105,7 @@ void func_80248170(s32 idx) { Window* window = &gWindows[idx]; if (window->updateCounter == 8) { - window->flags &= ~0x8; + window->flags &= ~WINDOW_FLAGS_8; set_window_update(idx, 1); } } diff --git a/src/16F740.c b/src/16F740.c index 1c4ff01cee..50642facff 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -130,8 +130,8 @@ void btl_state_update_switch_to_player(void) { for (i = 0; i < ARRAY_COUNT(gBattleStatus.enemyActors); i++) { Actor* enemy = gBattleStatus.enemyActors[i]; if (enemy != NULL) { - enemy->flags |= 0x80000; - enemy->flags |= 0x8000000; + enemy->flags |= ENEMY_FLAGS_80000; + enemy->flags |= ENEMY_FLAGS_8000000; } } @@ -165,8 +165,8 @@ void btl_state_update_switch_to_partner(void) { for (i = 0; i < ARRAY_COUNT(gBattleStatus.enemyActors); i++) { Actor* enemy = gBattleStatus.enemyActors[i]; if (enemy != NULL) { - enemy->flags |= 0x80000; - enemy->flags |= 0x8000000; + enemy->flags |= ENEMY_FLAGS_80000; + enemy->flags |= ENEMY_FLAGS_8000000; } } diff --git a/src/17FEB0.c b/src/17FEB0.c index 2cd574ff5c..6ad711e275 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -18,7 +18,7 @@ s32 calc_item_check_hit(void) { actorPart = get_actor_part(actor, currentTargetPart); ASSERT(actorPart != NULL); - if (!(actorPart->eventFlags & 0x20)) { + if (!(actorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY)) { if (actor->transStatus == 0xE) { return HIT_RESULT_MISS; } @@ -26,7 +26,7 @@ s32 calc_item_check_hit(void) { sfx_play_sound_at_position(0x10C, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z); return HIT_RESULT_IMMUNE; } - if ((battleStatus->currentAttackElement & 0x80) && (actorPart->eventFlags & 0x10)) { + if ((battleStatus->currentAttackElement & 0x80) && (actorPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)) { sfx_play_sound_at_position(0xE9, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z); return HIT_RESULT_LANDED_ON_SPIKE; } diff --git a/src/181810.c b/src/181810.c index fad6b99e95..13f5c42876 100644 --- a/src/181810.c +++ b/src/181810.c @@ -42,7 +42,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) { gSpeakingActorPart = part; headX = actor->currentPos.x + actor->headOffset.x; - if (!(actor->flags & 0x8000)) { + if (!(actor->flags & ACTOR_FLAG_8000)) { headY = actor->size.y + (actor->currentPos.y + actor->headOffset.y); } else { headY = actor->currentPos.y + actor->headOffset.y + (actor->size.y / 2); @@ -68,7 +68,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) { part = gSpeakingActorPart; headX = actor->currentPos.x + actor->headOffset.x; - if (!(actor->flags & 0x8000)) { + if (!(actor->flags & ACTOR_FLAG_8000)) { headY = actor->size.y + (actor->currentPos.y + actor->headOffset.y); } else { headY = actor->headOffset.y; @@ -136,7 +136,7 @@ ApiStatus EndActorSpeech(Evt* script, s32 isInitialCall) { ActorPart* actorPart = gSpeakingActorPart; x = actor->currentPos.x + actor->headOffset.x; - if (!(gSpeakingActor->flags & 0x8000)) { + if (!(gSpeakingActor->flags & ACTOR_FLAG_8000)) { y = actor->currentPos.y + actor->headOffset.y + actor->size.y ; } else { y = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2; @@ -403,7 +403,7 @@ s32 is_actor_hp_bar_visible(Actor* actor) { } flags = get_global_byte((actor->actorType >> 3) + 365); - if (actor->flags & 0x1000) { + if (actor->flags & ACTOR_FLAG_1000) { flags |= battleStatus->tattleFlags[actor->actorType >> 3]; } return (flags >> (actor->actorType & 7)) & 1; diff --git a/src/182B30.c b/src/182B30.c index deccee935d..11b574d9b7 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "182B30", enable_actor_blur); void disable_actor_blur(Actor* actor) { ActorPart* actorPart = actor->partsTable; - if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & 2)) { + if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & ACTOR_PART_FLAG_2)) { DecorationTable* decorationTable = actorPart->decorationTable; if (decorationTable->unk_7DB != 0) { @@ -46,7 +46,7 @@ void disable_actor_blur(Actor* actor) { void reset_actor_blur(Actor* actor) { ActorPart* actorPart = actor->partsTable; - if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & 2)) { + if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & ACTOR_PART_FLAG_2)) { DecorationTable* decorationTable = actorPart->decorationTable; if (decorationTable->unk_7DB != 0) { @@ -62,7 +62,7 @@ void reset_actor_blur(Actor* actor) { void func_80254610(Actor* actor) { ActorPart* actorPart = actor->partsTable; - if (actorPart->idleAnimations != NULL && !(actorPart->flags & 2)) { + if (actorPart->idleAnimations != NULL && !(actorPart->flags & ACTOR_PART_FLAG_2)) { DecorationTable* decorationTable = actorPart->decorationTable; decorationTable->unk_7DB = 0; diff --git a/src/18C790.c b/src/18C790.c index 8e3346e569..6cc18a637c 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -19,25 +19,28 @@ ApiStatus func_8025E044(Evt* script, s32 isInitialCall) { EntityModel* model; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[6])); - model->flags &= 0xFFFF000F; - model->flags |= 0x8; + model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; + model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[7])); - model->flags &= 0xFFFF000F; - model->flags |= 0x8; + model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; + model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[8])); - model->flags &= 0xFFFF000F; - model->flags |= 0x8; + model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; + model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[9])); - model->flags &= 0xFFFF000F; - model->flags |= 0x8; + model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; + model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; return ApiStatus_DONE2; } ApiStatus func_8025E108(Evt* script, s32 isInitialCall) { EntityModel* model = get_entity_model(*virtual_entity_get_by_index(script->varTable[9])); - model->flags &= 0xFFFF000F; - model->flags |= 0x8; + model->flags &= ~(MODEL_FLAGS_USES_CUSTOM_GFX | MODEL_FLAGS_FLAG_20 | MODEL_FLAGS_FLAG_40 + | MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY | MODEL_FLAGS_USE_CAMERA_UNK_MATRIX | MODEL_FLAGS_FLAG_200 + | MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_HAS_TEX_PANNER | MODEL_FLAGS_USES_TRANSFORM_MATRIX + | MODEL_FLAGS_FLAG_2000 | MODEL_FLAGS_FLAG_4000 | MODEL_FLAGS_FLAG_8000); + model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; return ApiStatus_DONE2; } diff --git a/src/190B20.c b/src/190B20.c index 38c722d035..11833043f5 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1194,7 +1194,7 @@ void func_802634B8(void) { if (player->targetListLength == 0) { battleStatus->submenuEnabled[i] = -2; } - if ((gBattleStatus.flags2 & BS_FLAGS2_1000) != 0) { + if ((gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) != 0) { battleStatus->submenuEnabled[moveCount] = -1; } } @@ -1271,7 +1271,7 @@ void func_802636E4(void) { if (player->targetListLength == 0) { battleStatus->submenuEnabled[i] = -2; } - if ((gBattleStatus.flags2 & BS_FLAGS2_1000) != 0) { + if ((gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) != 0) { battleStatus->submenuEnabled[moveCount] = -1; } } @@ -1334,7 +1334,7 @@ void func_80263914(void) { battleStatus->submenuEnabled[i] = 0; } - if (gBattleStatus.flags2 & BS_FLAGS2_1000) { + if (gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) { battleStatus->submenuEnabled[i] = -1; } @@ -1832,7 +1832,7 @@ INCLUDE_ASM(s32, "190B20", func_80266F60); INCLUDE_ASM(s32, "190B20", func_80266F8C); void func_80266FD8(ActorPart* part, s32 arg1) { - if (part->idleAnimations != NULL && !(part->flags & 2)) { + if (part->idleAnimations != NULL && !(part->flags & ACTOR_PART_FLAG_2)) { DecorationTable* decorationTable = part->decorationTable; if (decorationTable->unk_764 != arg1) { @@ -1847,7 +1847,7 @@ void func_80267018(Actor* actor, s32 arg1) { ActorPart* actorPart = &actor->partsTable[0]; while (actorPart != NULL) { - if (!(actorPart->flags & 0x100001) && actorPart->decorationTable != NULL && !(actorPart->flags & 2) && + if (!(actorPart->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000)) && actorPart->decorationTable != NULL && !(actorPart->flags & ACTOR_PART_FLAG_2) && actorPart->idleAnimations != NULL) { func_80266FD8(actorPart, arg1); } @@ -1860,7 +1860,7 @@ INCLUDE_ASM(s32, "190B20", func_8026709C); INCLUDE_ASM(s32, "190B20", func_802670C8); void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationType) { - if ((part->idleAnimations) && !(part->flags & 2)) { + if ((part->idleAnimations) && !(part->flags & ACTOR_PART_FLAG_2)) { DecorationTable* decorationTable = part->decorationTable; _remove_part_decoration(part, decorationIndex); @@ -1874,7 +1874,7 @@ void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationTyp void add_actor_decoration(Actor* actor, s32 decorationIndex, s32 decorationType) { ActorPart* part; for (part = actor->partsTable; part != NULL; part = part->nextPart) { - if ((part->flags & 0x100001) == 0 && part->idleAnimations && !(part->flags & 2)) { + if ((part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000)) == 0 && part->idleAnimations && !(part->flags & ACTOR_PART_FLAG_2)) { add_part_decoration(part, decorationIndex, decorationType); } } @@ -1887,7 +1887,7 @@ void remove_part_decoration(ActorPart* part, s32 decorationIndex) { void remove_actor_decoration(Actor* actor, s32 decorationIndex) { ActorPart* part; for (part = actor->partsTable; part != NULL; part = part->nextPart) { - if ((part->flags & 0x100001) == 0 && part->idleAnimations && !(part->flags & 2)) { + if ((part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000)) == 0 && part->idleAnimations && !(part->flags & ACTOR_PART_FLAG_2)) { remove_part_decoration(part, decorationIndex); } } @@ -1914,7 +1914,7 @@ s32 player_team_is_ability_active(Actor* actor, s32 ability) { void create_part_shadow(s32 actorID, s32 partIndex) { ActorPart* part = get_actor_part(get_actor(actorID), partIndex); - part->flags &= ~4; + part->flags &= ~ACTOR_PART_FLAG_4; part->shadowIndex = create_shadow_type(0, part->currentPos.x, part->currentPos.y, part->currentPos.z); part->shadowScale = part->size.x / 24.0; } @@ -1922,12 +1922,12 @@ void create_part_shadow(s32 actorID, s32 partIndex) { void remove_part_shadow(s32 actorID, s32 partIndex) { ActorPart* part = get_actor_part(get_actor(actorID), partIndex); - part->flags |= 4; + part->flags |= ACTOR_PART_FLAG_4; delete_shadow(part->shadowIndex); } void create_part_shadow_by_ref(UNK_TYPE arg0, ActorPart* part) { - part->flags &= ~4; + part->flags &= ~ACTOR_PART_FLAG_4; part->shadowIndex = create_shadow_type(0, part->currentPos.x, part->currentPos.y, part->currentPos.z); part->shadowScale = part->size.x / 24.0; } @@ -2039,7 +2039,7 @@ void hide_foreground_models_unchecked(void) { s32 id = *idList++; if (id >= 0) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags |= 2; + model->flags |= MODEL_FLAGS_ENABLED; } } } @@ -2054,7 +2054,7 @@ void show_foreground_models_unchecked(void) { s32 id = *idList++; if (id >= 0) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags &= ~2; + model->flags &= ~MODEL_FLAGS_ENABLED; } } } @@ -2071,7 +2071,7 @@ void hide_foreground_models(void) { break; } else { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags |= 2; + model->flags |= MODEL_FLAGS_ENABLED; } } @@ -2089,7 +2089,7 @@ void show_foreground_models(void) { break; } else { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags &= ~2; + model->flags &= ~MODEL_FLAGS_ENABLED; } } } diff --git a/src/197F40.c b/src/197F40.c index 68bc3ce619..a3ad7e8e30 100644 --- a/src/197F40.c +++ b/src/197F40.c @@ -561,7 +561,7 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { outY = *args++; outZ = *args++; - if (!(actorPart->flags & 0x100000)) { + if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) { x = actorPart->partOffset.x; y = actorPart->partOffset.y; z = actorPart->partOffset.z; @@ -687,7 +687,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { case 0x200: actorPart = get_actor_part(actor, partIndex); - if (!(actorPart->flags & 0x100000)) { + if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) { actorPart->partOffset.x = x; actorPart->partOffset.y = y; actorPart->partOffset.z = z; @@ -1020,7 +1020,7 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) { actorPart = get_actor_part(get_actor(actorID), partIndex); - if (!(actorPart->flags & 0x100000)) { + if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) { x = actorPart->partOffset.x; y = actorPart->partOffset.y; z = actorPart->partOffset.z; @@ -1055,7 +1055,7 @@ ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) { z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); - if (!(actorPart->flags & 0x100000)) { + if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) { actorPart->partOffset.x = x; actorPart->partOffset.y = y; actorPart->partOffset.z = z; @@ -1086,7 +1086,7 @@ ApiStatus AddPartDispOffset(Evt* script, s32 isInitialCall) { z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); - if (!(actorPart->flags & 0x100000)) { + if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) { actorPart->partOffset.x += x; actorPart->partOffset.y += y; actorPart->partOffset.z += z; @@ -1845,7 +1845,7 @@ ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) { actor->healthBarPosition.y = actor->homePos.y + actor->staticActorData->hpBarOffset.y; actor->healthBarPosition.z = actor->homePos.z; - if (actor->flags & 0x800) { + if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { actor->healthBarPosition.y = actor->homePos.y - actor->size.y - actor->staticActorData->hpBarOffset.y; } @@ -1868,7 +1868,7 @@ ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) { actor->healthBarPosition.y = actor->currentPos.y + actor->staticActorData->hpBarOffset.y; actor->healthBarPosition.z = actor->currentPos.z; - if (actor->flags & 0x800) { + if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - actor->staticActorData->hpBarOffset.y; } @@ -1911,7 +1911,7 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) { actor->healthBarPosition.y = actor->homePos.y + actor->staticActorData->hpBarOffset.y + actor->unk_198.y; actor->healthBarPosition.z = actor->homePos.z; - if (actor->flags & 0x800) { + if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { actor->healthBarPosition.y = actor->homePos.y - actor->size.y; } @@ -2473,7 +2473,7 @@ ApiStatus GetStatusFlags(Evt* script, s32 isInitialCall) { if (partsTable->flags & 0x100) { flags |= STATUS_FLAG_TRANSPARENT; } - if (partsTable->eventFlags & EVENT_FLAG_ILLUSORY) { + if (partsTable->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { flags |= STATUS_FLAG_TRANSPARENT; } } diff --git a/src/1A5830.c b/src/1A5830.c index 64acad0897..bd43d52c24 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -18,7 +18,7 @@ s32 has_enchanted_part(Actor* actor) { s32 ret = FALSE; while (partIt != NULL) { - if (partIt->eventFlags & 0xC0000) { + if (partIt->eventFlags & (ACTOR_EVENT_FLAG_ENCHANTED | ACTOR_EVENT_FLAG_80000)) { ret = TRUE; break; } else { @@ -174,7 +174,7 @@ s32 calc_enemy_test_target(Actor* actor) { hitResult = HIT_RESULT_HIT; target2 = target; - if (targetPart->eventFlags & EVENT_FLAG_ILLUSORY || battleStatus->outtaSightActive || target2->transStatus == STATUS_E) { + if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY || battleStatus->outtaSightActive || target2->transStatus == STATUS_E) { if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_MAGIC)) { hitResult = HIT_RESULT_MISS; } @@ -227,9 +227,9 @@ s32 calc_enemy_test_target(Actor* actor) { } if (target2->stoneStatus == STATUS_STONE) { - return HIT_RESULT_IMMUNE; + return HIT_RESULT_IMMUNE; } - + if (target2->staticStatus == STATUS_STATIC) { return HIT_RESULT_HIT_STATIC; } @@ -287,11 +287,11 @@ s32 calc_enemy_damage_target(Actor* attacker) { break; } - if (targetPart->eventFlags & EVENT_FLAG_ILLUSORY) { + if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { return HIT_RESULT_MISS; } - if (target->transStatus == STATUS_E || targetPart->eventFlags & EVENT_FLAG_800 && !(battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE)) { + if (target->transStatus == STATUS_E || targetPart->eventFlags & ACTOR_EVENT_FLAG_800 && !(battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE)) { return HIT_RESULT_MISS; } @@ -303,7 +303,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { return HIT_RESULT_HIT; } if (battleStatus->currentAttackElement & DAMAGE_TYPE_BLAST) { - if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && (targetPart->eventFlags & EVENT_FLAG_EXPLOSIVE)) { + if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLOSIVE)) { do { play_hit_sound(attacker, state->goalPos.x, state->goalPos.y, state->goalPos.z, 3); } while (0); // TODO ? @@ -313,7 +313,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if ((battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE) && (target->flags & ACTOR_FLAG_FLYING)) { play_hit_sound(attacker, state->goalPos.x, state->goalPos.y, state->goalPos.z, 1); - return HIT_RESULT_MISS_QUAKE; + return HIT_RESULT_QUAKE_IMMUNE; } if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) { playFX_24(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18); @@ -331,7 +331,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if (!(attacker->staticStatus == STATUS_STATIC)) { - if ((target->staticStatus == STATUS_STATIC) || (targetPart->eventFlags & EVENT_FLAG_ELECTRIFIED)) { + if ((target->staticStatus == STATUS_STATIC) || (targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) { if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_ELECTRIC | DAMAGE_TYPE_NO_CONTACT))) { if (!(battleStatus->currentAttackEventSuppression & 8)) { if (!has_enchanted_part(attacker)) { @@ -419,7 +419,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { switch (actorMasked) { case ACTOR_PLAYER: // TODO figure out how to better write target->debuff >= STATUS_POISON - if ((target->debuff == 0 || target->debuff >= STATUS_POISON) && (target->stoneStatus == STATUS_END) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_2000000)) { + if ((target->debuff == 0 || target->debuff >= STATUS_POISON) && (target->stoneStatus == STATUS_END) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) { s32 blocked; if (player_team_is_ability_active(target, ABILITY_BERSERKER)) { @@ -441,7 +441,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { break; case ACTOR_PARTNER: if (target->stoneStatus == STATUS_END) { - if (target->koStatus == STATUS_END && !(battleStatus->currentAttackElement & DAMAGE_TYPE_2000000)) { + if (target->koStatus == STATUS_END && !(battleStatus->currentAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) { if (check_block_input(BUTTON_A)) { damage = 0; sfx_play_sound_at_position(SOUND_UNKNOWN_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -462,12 +462,12 @@ s32 calc_enemy_damage_target(Actor* attacker) { event = EVENT_HIT_COMBO; if (damage <= 0) { target->hpChangeCounter = 0; - if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_40000000)) { - hitResult = HIT_RESULT_MISS_QUAKE; - event = EVENT_23; + if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS)) { + hitResult = HIT_RESULT_QUAKE_IMMUNE; + event = EVENT_UNKNOWN_TRIGGER; } else { - hitResult = HIT_RESULT_MISS_QUAKE; - event = EVENT_23; + hitResult = HIT_RESULT_QUAKE_IMMUNE; + event = EVENT_UNKNOWN_TRIGGER; if (target->currentHP <= 0) { event = EVENT_DEATH; } @@ -478,7 +478,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { target->hpChangeCounter -= damage; battleStatus->lastAttackDamage = 0; hitResult = HIT_RESULT_HIT; - if (!(targetPart->flags & PART_FLAG_2000)) { + if (!(targetPart->flags & ACTOR_PART_FLAG_2000)) { if (!(gBattleStatus.flags1 & BS_FLAGS1_2000000)) { if (!(target->flags & ACTOR_FLAG_NO_DMG_APPLY)) { target->currentHP -= damage; @@ -504,7 +504,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (event == EVENT_HIT_COMBO) { event = EVENT_HIT; } - if (event == EVENT_23) { + if (event == EVENT_UNKNOWN_TRIGGER) { event = EVENT_IMMUNE; } if (target->currentHP <= 0 && event == EVENT_IMMUNE) { @@ -520,7 +520,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { if (battleStatus->currentAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_JUMP)) { - if (targetPart->eventFlags & EVENT_FLAG_FLIPABLE) { + if (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) { if (event == EVENT_HIT) { event = EVENT_FLIP_TRIGGER; } @@ -533,11 +533,11 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) { if (battleStatus->currentAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_JUMP)) { - if (targetPart->eventFlags & EVENT_FLAG_FLIPABLE) { + if (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) { if (event == EVENT_HIT_COMBO) { event = EVENT_FLIP_TRIGGER; } - if (event == EVENT_23) { + if (event == EVENT_UNKNOWN_TRIGGER) { event = EVENT_FLIP_TRIGGER; } } @@ -550,7 +550,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { event = EVENT_BURN_HIT; } if (event == EVENT_DEATH) { - event = EVENT_41; + event = EVENT_FIRE_DEATH; } isFire = TRUE; } @@ -558,13 +558,13 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (gBattleStatus.flags1 & BS_FLAGS1_ATK_BLOCKED) { if (event == EVENT_HIT_COMBO) { - event = EVENT_24; + event = EVENT_18; } if (event == EVENT_HIT) { event = EVENT_BLOCK; } - if (event == EVENT_23) { - event = EVENT_24; + if (event == EVENT_UNKNOWN_TRIGGER) { + event = EVENT_18; } if (event == EVENT_IMMUNE) { event = EVENT_BLOCK; @@ -633,7 +633,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if (statusInflicted) { - if (event == EVENT_23) { + if (event == EVENT_UNKNOWN_TRIGGER) { event = EVENT_HIT_COMBO; } if (event == EVENT_IMMUNE) { @@ -675,7 +675,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { // immune star fx? func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, -3); } - } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_SMASH)) { + } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) { show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 1); func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage); } else { @@ -689,7 +689,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (!statusInflicted2 && !statusInflicted) { func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); } - } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_SMASH)) { + } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) { show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0); func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage); } else { @@ -720,7 +720,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { play_hit_sound(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, hitSound); } - if ((battleStatus->lastAttackDamage <= 0 && !statusInflicted2 && !isEnchanted) || targetPart->flags & PART_FLAG_2000) { + if ((battleStatus->lastAttackDamage <= 0 && !statusInflicted2 && !isEnchanted) || targetPart->flags & ACTOR_PART_FLAG_2000) { sfx_play_sound_at_position(SOUND_10C, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } @@ -783,7 +783,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { func_80266ADC(target); if (( attacker->staticStatus != STATUS_STATIC - && (target->staticStatus == STATUS_STATIC || (targetPart->eventFlags & EVENT_FLAG_ELECTRIFIED)) + && (target->staticStatus == STATUS_STATIC || (targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) ) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && !(battleStatus->currentAttackEventSuppression & 8) @@ -834,7 +834,7 @@ s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEven if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_HIT; } - if (dispatchEvent == EVENT_23) { + if (dispatchEvent == EVENT_UNKNOWN_TRIGGER) { dispatchEvent = EVENT_IMMUNE; } } @@ -1252,9 +1252,9 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) { s32 i; if (dropper->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { - spawnMode = ITEM_SPAWN_MODE_UNKNOWN_19; + spawnMode = ITEM_SPAWN_MODE_TOSS_FADE3; } else { - spawnMode = ITEM_SPAWN_MODE_UNKNOWN_17; + spawnMode = ITEM_SPAWN_MODE_TOSS_FADE1; } for (i = 0; i < numToDrop; i++) { diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index 2b1822c018..33f88c36a9 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -503,7 +503,7 @@ s8 check_conversation_trigger(void) { if (gPartnerActionStatus.actionState.b[0] != 0) { return FALSE; } - + encounter = NULL; npc = NULL; enemy = NULL; @@ -523,15 +523,15 @@ s8 check_conversation_trigger(void) { continue; } - if (encounterEnemy->flags & 0x80000020) { + if (encounterEnemy->flags & (ENEMY_FLAGS_80000000 | ENEMY_FLAGS_20)) { continue; } - if (!(encounterEnemy->flags & 1)) { + if (!(encounterEnemy->flags & ENEMY_FLAGS_1)) { continue; } - if ((encounterEnemy->flags & 0x8000000) || encounterEnemy->interactBytecode == NULL) { + if ((encounterEnemy->flags & ENEMY_FLAGS_8000000) || encounterEnemy->interactBytecode == NULL) { continue; } @@ -568,7 +568,7 @@ s8 check_conversation_trigger(void) { continue; } - if (!(encounterEnemy->flags & 0x10000) && encounterNpc->flags & 0x20000000) { + if (!(encounterEnemy->flags & ENEMY_FLAGS_10000) && encounterNpc->flags & 0x20000000) { xTemp = npcX; yTemp = npcY; zTemp = npcZ; @@ -590,7 +590,7 @@ s8 check_conversation_trigger(void) { } } - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { playerStatus->unk_C8 = npc; playerStatus->flags |= 0x2000000; if (playerStatus->pressedButtons & BUTTON_A) { diff --git a/src/23680.c b/src/23680.c index c0d9a89e7d..0d9c6cc3dc 100644 --- a/src/23680.c +++ b/src/23680.c @@ -38,7 +38,7 @@ s32 get_coin_drop_amount(Enemy* enemy) { amt += currentEncounter->coinsEarned; - if (enemy->flags & 0x840000) { + if (enemy->flags & (ENEMY_FLAGS_800000 | ENEMY_FLAGS_40000)) { amt = 0; } @@ -93,7 +93,7 @@ s32 func_80048F0C(void) { for (j = 0; j < encounter->count; j++) { Enemy* enemy = encounter->enemy[j]; - if (enemy != NULL && !(enemy->flags & 0x20)) { + if (enemy != NULL && !(enemy->flags & ENEMY_FLAGS_20)) { get_npc_unsafe(enemy->npcID); } } diff --git a/src/77480.c b/src/77480.c index b94ed16d93..1bf6d622b0 100644 --- a/src/77480.c +++ b/src/77480.c @@ -236,7 +236,7 @@ void update_player(void) { } } - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) { func_800EFD08(); } @@ -249,7 +249,7 @@ void update_player(void) { gameStatus->playerYaw = playerStatus->currentYaw; check_input_open_menus(); - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) { check_input_status_menu(); } @@ -307,14 +307,14 @@ void phys_update_standard(void) { check_input_midair_jump(); - if (playerStatus->actionState != ACTION_STATE_SLIDE) { + if (playerStatus->actionState != ACTION_STATE_SLIDING) { collision_main_lateral(); collision_check_player_overlaps(); if ( collision_main_above() < 0 && playerStatus->decorationList == 0 && - playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS + playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS ) { func_800E4F10(); } @@ -468,7 +468,7 @@ s32 enable_player_input(void) { void func_800E01DC(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_INTERACT_PROMPT) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) { playerStatus->flags |= 0x8000000; } } @@ -517,14 +517,14 @@ INCLUDE_ASM(s32, "77480", check_for_ispy); #endif void func_800E0330(void) { - if ((gPlayerStatusPtr->animFlags & PLAYER_ANIM_FLAG_100) && (D_8010C93C != NULL)) { + if ((gPlayerStatusPtr->animFlags & PLAYER_STATUS_ANIM_FLAGS_100) && (D_8010C93C != NULL)) { func_802B7000_E225B0(); } } void func_800E0374(void) { D_8010C93C = NULL; - gPlayerStatusPtr->animFlags &= ~PLAYER_ANIM_FLAG_100; + gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_100; } INCLUDE_ASM(s32, "77480", check_for_pulse_stone); diff --git a/src/7E9D0.c b/src/7E9D0.c index 9e45e98e08..f9ad1cb8ef 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -86,7 +86,7 @@ void set_action_state(s32 actionState) { actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN || actionState == ACTION_STATE_JUMP || actionState == ACTION_STATE_BOUNCE || actionState == ACTION_STATE_HOP || - actionState == ACTION_STATE_LAUNCH || actionState == ACTION_STATE_LAND_ON_SWITCH || + actionState == ACTION_STATE_LAUNCH || actionState == ACTION_STATE_LANDING_ON_SWITCH || actionState == ACTION_STATE_FALLING || actionState == ACTION_STATE_STEP_DOWN || actionState == ACTION_STATE_LAND || actionState == ACTION_STATE_STEP_DOWN_LAND ) { @@ -120,7 +120,7 @@ void set_action_state(s32 actionState) { } } - if (actionState == ACTION_STATE_SLIDE) { + if (actionState == ACTION_STATE_SLIDING) { playerStatus->flags |= 0x10; playerStatus->moveFrames = 0; playerStatus->flags &= ~0x4000; @@ -218,7 +218,7 @@ void check_input_spin(void) { Temp8010F250* temp_8010F250 = &D_8010F250; Temp8010F250* temp2 = temp_8010F250; - if (!(playerStatus->flags & (PLAYER_ANIM_FLAG_8BIT_MARIO | PLAYER_ANIM_FLAG_PEACH_PHYSICS)) && + if (!(playerStatus->flags & (PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO | PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) && !(playerStatus->animFlags & 1) && !(playerStatus->currentButtons & D_CBUTTONS) && !is_ability_active(ABILITY_SLOW_GO)) { @@ -260,9 +260,9 @@ void func_800E63A4(s32 arg0) { PlayerStatus* playerStatus = &gPlayerStatus; if (arg0 != 0) { - set_action_state(ACTION_STATE_SNEAKY_PARASOL); + set_action_state(ACTION_STATE_USE_SNEAKY_PARASOL); } else { - playerStatus->animFlags &= ~PLAYER_ANIM_FLAG_IN_DISGUISE; + playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE; gGameStatusPtr->peachFlags &= ~0x2; playerStatus->peachDisguise = 0; free_npc_by_index(D_8010C96C); @@ -282,7 +282,7 @@ void peach_check_for_parasol_input(void) { D_8010C92C--; if (D_8010C92C == 0) { if (gGameStatusPtr->peachFlags & 2) { - playerStatus->animFlags |= PLAYER_ANIM_FLAG_IN_DISGUISE; + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE; gGameStatusPtr->peachFlags |= 2; disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise); @@ -292,7 +292,7 @@ void peach_check_for_parasol_input(void) { } } } else if (gGameStatusPtr->peachFlags & 4 && playerStatus->pressedButtons & B_BUTTON) { - set_action_state(ACTION_STATE_SNEAKY_PARASOL); + set_action_state(ACTION_STATE_USE_SNEAKY_PARASOL); } } } diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index 7548f3640f..c79a43003c 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -126,7 +126,7 @@ void gravity_use_fall_parms(void) { } void phys_update_falling(void) { - if (gPlayerStatus.actionState != ACTION_STATE_LAND_ON_SWITCH && gPlayerStatus.actionState != ACTION_STATE_BOUNCE) { + if (gPlayerStatus.actionState != ACTION_STATE_LANDING_ON_SWITCH && gPlayerStatus.actionState != ACTION_STATE_BOUNCE) { s32* colliderID; gPlayerStatus.position.y = player_check_collision_below(func_800E34D8(), &colliderID); @@ -333,8 +333,8 @@ void func_800E4F10(void) { playerStatus->position.x = x; playerStatus->position.z = z; - if (tempB != 0 && temp < 0 && playerStatus->actionState != ACTION_STATE_18 && playerStatus->currentSpeed != 0.0f) { - set_action_state(ACTION_STATE_18); + if (tempB != 0 && temp < 0 && playerStatus->actionState != ACTION_STATE_STEP_UP_PEACH && playerStatus->currentSpeed != 0.0f) { + set_action_state(ACTION_STATE_STEP_UP_PEACH); } } diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index dc2466d985..51f873e9a5 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -950,7 +950,7 @@ s32 is_ability_active(s32 ability) { case ABILITY_FEELING_FINE: abilityMoveID = 0x43; break; - case ABILITY_ATTACK_F_X: + case ABILITY_ATTACK_FX: if (badgeMoveID == 0x54) { attackFXArray[attackFXIndex++] = 1; ret = -1; diff --git a/src/B4580.c b/src/B4580.c index bcf6a159a1..bd3bebe2ea 100644 --- a/src/B4580.c +++ b/src/B4580.c @@ -209,7 +209,7 @@ void reset_animator_list(void) { void delete_model_animator_node(AnimatorNode* node) { s32 i; - node->flags = 0; + node->flags = ANIMATOR_NODE_FLAGS_0; for (i = 0; i < ARRAY_COUNT(node->children); i++) { if (node->children[i] != NULL) { @@ -268,7 +268,7 @@ s32 create_model_animator(s8* animPos) { ASSERT(animator != NULL); - animator->flags = 0x40 | 0x10 | 0x4 | 0x2 | 0x1; + animator->flags = MODEL_ANIMATOR_FLAGS_40 | MODEL_ANIMATOR_FLAGS_10 | MODEL_ANIMATOR_FLAGS_4 | MODEL_ANIMATOR_FLAGS_2 | MODEL_ANIMATOR_FLAGS_1; animator->renderMode = RENDER_MODE_ALPHATEST; animator->nextUpdateTime = 1.0f; animator->timeScale = 1.0f; @@ -312,7 +312,7 @@ s32 create_mesh_animator(s32 animPos, s8* animBuffer) { ASSERT(animator != NULL); - animator->flags = 0x40 | 0x10 | 0x4 | 0x2 | 0x1; + animator->flags = MODEL_ANIMATOR_FLAGS_40 | MODEL_ANIMATOR_FLAGS_10 | MODEL_ANIMATOR_FLAGS_4 | MODEL_ANIMATOR_FLAGS_2 | MODEL_ANIMATOR_FLAGS_1; animator->renderMode = RENDER_MODE_ALPHATEST; animator->vertexArray = NULL; animator->fpRenderCallback = NULL; @@ -345,7 +345,7 @@ AnimatorNode* add_anim_node(ModelAnimator* animator, s32 parentNodeID, AnimatorN ret = heap_malloc(sizeof(*ret)); ASSERT(ret != NULL); - ret->flags = 0x10; + ret->flags = ANIMATOR_NODE_FLAGS_10; ret->displayList = nodeBP->displayList; ret->basePos.x = nodeBP->basePos.x; ret->basePos.y = nodeBP->basePos.y; @@ -417,11 +417,11 @@ void update_model_animator(s32 animatorID) { if (animator != NULL && animator->flags != 0) { s32 temp = 0; - if (!(animator->flags & 0x40000)) { - animator->flags &= ~0x40; + if (!(animator->flags & MODEL_ANIMATOR_FLAGS_40000)) { + animator->flags &= ~MODEL_ANIMATOR_FLAGS_40; animator->nextUpdateTime -= animator->timeScale; if (animator->nextUpdateTime <= 0.0f) { - if (!(animator->flags & 0x8000)) { + if (!(animator->flags & MODEL_ANIMATOR_FLAGS_8000)) { do { temp = step_model_animator(animator); } while (temp > 0); @@ -474,11 +474,11 @@ void update_model_animator_with_transform(s32 animatorID, Mtx* mtx) { if (animator != NULL && animator->flags != 0) { s32 temp = 0; - if (!(animator->flags & 0x40000)) { - animator->flags &= ~0x40; + if (!(animator->flags & MODEL_ANIMATOR_FLAGS_40000)) { + animator->flags &= ~MODEL_ANIMATOR_FLAGS_40; animator->nextUpdateTime -= animator->timeScale; if (animator->nextUpdateTime <= 0.0f) { - if (!(animator->flags & 0x8000)) { + if (!(animator->flags & MODEL_ANIMATOR_FLAGS_8000)) { do { temp = step_model_animator(animator); } while (temp > 0); @@ -527,7 +527,7 @@ void animator_update_model_transforms(ModelAnimator* animator, Mtx* rootTransfor Matrix4f flipMtx; if (animator->rootNode != NULL) { - switch (animator->flags & 0x700) { + switch (animator->flags & (MODEL_ANIMATOR_FLAGS_100 | MODEL_ANIMATOR_FLAGS_200 | MODEL_ANIMATOR_FLAGS_400)) { case 0x100: animator_make_mirrorZ(flipMtx); break; @@ -556,19 +556,19 @@ void animator_node_update_model_transform(ModelAnimator* animator, f32 (*flipMtx guMtxCatF(gAnimScaleMtx, gAnimRotMtx, gAnimRotScaleMtx); guMtxCatF(gAnimRotScaleMtx, gAnimTranslateMtx, sp10); - if (!(animator->flags & 0x20000)) { + if (!(animator->flags & MODEL_ANIMATOR_FLAGS_20000)) { guMtxCatF(sp10, flipMtx, sp10); } copy_matrix(sp10, node->mtx); - if (node->flags & 0x1000) { + if (node->flags & ANIMATOR_NODE_FLAGS_1000) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(node->fcData.modelID)); copy_matrix(sp10, model->transformMatrix); guMtxL2F(sp10, rootTransform); guMtxCatF(model->transformMatrix, sp10, model->transformMatrix); - model->flags |= 0x1000; + model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; } for (i = 0; i < ARRAY_COUNT(node->children); i++) { @@ -587,8 +587,8 @@ void render_animated_model(s32 animatorID, Mtx* rootTransform) { animatorID &= ~0x800; animator = (*gCurrentAnimMeshListPtr)[animatorID]; - if (animator != NULL && animator->flags != 0 && !(animator->flags & 0x40) && - animator->flags & (1 << gCurrentCamID) && !(animator->flags & 0x80)) + if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAGS_40) && + animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_80)) { animator->mtx = *rootTransform; animator->vertexArray = NULL; @@ -610,8 +610,8 @@ void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 animatorID &= ~0x800; animator = (*gCurrentAnimMeshListPtr)[animatorID]; - if (animator != NULL && animator->flags != 0 && !(animator->flags & 0x40) && - animator->flags & (1 << gCurrentCamID) && !(animator->flags & 0x80)) + if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAGS_40) && + animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_80)) { animator->mtx = *rootTransform; D_80153A60 = vtxSegment; @@ -758,7 +758,7 @@ void load_model_animator_node(StaticAnimatorNode* node, ModelAnimator* animator, if (node->modelID != 0) { newNode->fcData.modelID = node->modelID - 1; - newNode->flags |= 0x1000; + newNode->flags |= ANIMATOR_NODE_FLAGS_1000; } i = 0; @@ -825,7 +825,7 @@ void load_mesh_animator_tree(s32 index, StaticAnimatorNode** tree) { } load_mesh_animator_node(*gAnimTreeRoot, animator, 0, nodeIDs); - animator->flags |= 0x8000; + animator->flags |= MODEL_ANIMATOR_FLAGS_8000; } } diff --git a/src/C50A0.c b/src/C50A0.c index 648288bbdd..0af9ff3b0b 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -108,20 +108,20 @@ ItemEntity* get_item_entity(s32 itemEntityIndex) { void item_entity_disable_shadow(ItemEntity* itemEntity) { Shadow* shadow; - itemEntity->flags |= 0x40; + itemEntity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags |= 1; + shadow->flags |= SHADOW_FLAGS_1; } } void item_entity_enable_shadow(ItemEntity* itemEntity) { Shadow* shadow; - itemEntity->flags &= ~0x40; + itemEntity->flags &= ~ENTITY_FLAGS_CONTINUOUS_COLLISION; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags &= ~1; + shadow->flags &= ~SHADOW_FLAGS_1; } } @@ -250,12 +250,12 @@ void func_80133A94(s32 idx, s32 itemID) { item->itemID = itemID; - item->flags |= 0x4000; - item->flags &= ~0x40000; + item->flags |= ENTITY_FLAGS_4000; + item->flags &= ~ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; if (gItemTable[itemID].typeFlags & 0x1000) { - item->flags |= 0x40000; - item->flags &= ~0x4000; + item->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; + item->flags &= ~ENTITY_FLAGS_4000; } item_entity_load(item); @@ -270,7 +270,7 @@ void set_item_entity_flags(s32 index, s32 flags) { ItemEntity* itemEntity = D_801565A0[index]; itemEntity->flags |= flags; - if (itemEntity->flags & 0x200000) { + if (itemEntity->flags & ENTITY_FLAGS_200000) { D_801565A8 = 1; } } @@ -284,7 +284,7 @@ void clear_item_entity_flags(s32 index, s32 flags) { void func_801341B0(s32 index) { ItemEntity* itemEntity = D_801565A0[index]; gOverrideFlags |= 0x40; - itemEntity->flags |= 0x100; + itemEntity->flags |= ENTITY_FLAGS_100; } /// @returns TRUE when "you got X" popup is on-screen diff --git a/src/EF2680.c b/src/EF2680.c index 43fcf7a62b..098e23a269 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -232,7 +232,7 @@ ApiStatus func_8024299C_EF4FAC(Evt* script, s32 isInitialCall) { npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; npc->flags &= ~0x800; - enemy->flags |= 0x200000; + enemy->flags |= ENEMY_FLAGS_200000; npc->flags = (npc->flags & ~0x200) | 8; enemy->varTable[10] = 0; enemy->varTable[11] = -1; diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 68f386cb0e..7c2df65d53 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -758,33 +758,33 @@ void update_entities(void) { if (entity != NULL) { D_801512C0++; - if (!(entity->flags & 0x40000000)) { - if (entity->flags & 0x1000000) { - entity->flags &= ~0x1000000; - if (!(entity->flags & 0x8000)) { - entity->flags |= 0x2000000; + if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE)) { + if (entity->flags & ENTITY_FLAGS_BOUND_SCRIPT_DIRTY) { + entity->flags &= ~ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; + if (!(entity->flags & ENTITY_FLAGS_8000)) { + entity->flags |= ENTITY_FLAGS_2000000; } entity->boundScript = start_script(entity->boundScriptBytecode, 0xA, 0x20); } - if (entity->flags & 0x2000000) { + if (entity->flags & ENTITY_FLAGS_2000000) { if (does_script_exist(entity->boundScript->id)) { - if (entity->flags & 8) { + if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { update_model_animator(entity->virtualModelIndex); } else { exec_entity_model_commandlist(entity->virtualModelIndex); } - if (entity->flags & 0x2000) { + if (entity->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) { entity->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } - if (!(entity->flags & 0x10)) { + if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX)) { update_entity_transform_matrix(entity); } continue; } else { - entity->flags &= ~0x2000000; + entity->flags &= ~ENTITY_FLAGS_2000000; } } @@ -796,25 +796,25 @@ void update_entities(void) { if (entityCallback != NULL && entityCallback(entity) != 0) { entity->unk_07 = 0xA; - entity->flags |= 0x10000; + entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; } } } else { entity->unk_07--; - if (entity->flags & 0x40) { + if (entity->flags & ENTITY_FLAGS_CONTINUOUS_COLLISION) { if (entity->unk_07 == 0) { - entity->flags &= ~0x60; + entity->flags &= ~(ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_CONTINUOUS_COLLISION); } else { - entity->flags |= 0x20; + entity->flags |= ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX; } } else if (entity->unk_07 == 0) { - entity->flags &= ~0x10000; - entity->flags &= ~0x20000; + entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION; + entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT; entity->collisionFlags = 0; } } - if (entity->flags & 0x2000) { + if (entity->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) { entity->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } @@ -833,15 +833,15 @@ void update_entities(void) { } } - if (!(entity->flags & 0x10)) { + if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX)) { update_entity_transform_matrix(entity); } - if (!(entity->flags & 0x20)) { + if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX)) { update_entity_inverse_rotation_matrix(entity); } - if (entity->flags & 8) { + if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { update_model_animator(entity->virtualModelIndex); } else { exec_entity_model_commandlist(entity->virtualModelIndex); @@ -851,11 +851,11 @@ void update_entities(void) { update_entity_shadow_position(entity); } - if (entity->flags & 0x20000000) { + if (entity->flags & ENTITY_FLAGS_PENDING_INSTANCE_DELETE) { delete_entity(entity->listIndex); } - if (entity->flags & 0x4000000) { + if (entity->flags & ENTITY_FLAGS_PENDING_FULL_DELETE) { delete_entity_and_unload_data(entity->listIndex); } } @@ -877,20 +877,20 @@ void update_shadows(void) { if (shadow != NULL) { D_80151324++; - if (!(shadow->flags & 0x40000000)) { - if (shadow->flags & 0x2000) { + if (!(shadow->flags & SHADOW_FLAGS_40000000)) { + if (shadow->flags & SHADOW_FLAGS_2000) { shadow->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } update_shadow_transform_matrix(shadow); - if (shadow->flags & 8) { + if (shadow->flags & SHADOW_FLAGS_8) { update_model_animator(shadow->entityModelID); } else { exec_entity_model_commandlist(shadow->entityModelID); } - if (shadow->flags & 0x20000000) { + if (shadow->flags & SHADOW_FLAGS_20000000) { _delete_shadow(shadow->listIndex); } } @@ -949,7 +949,7 @@ s32 step_entity_commandlist(Entity* entity) { break; case 6: if (entity->boundScriptBytecode != NULL) { - entity->flags |= 0x1000000; + entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; } entity->scriptReadPos = args++; ret = TRUE; @@ -1013,7 +1013,7 @@ void render_entities(void) { if (entity != NULL) { if (!gGameStatusPtr->isBattle) { if (D_80151310 != 0 && - !(entity->flags & 0x80000) && + !(entity->flags & ENTITY_FLAGS_IGNORE_DISTANCE_CULLING) && dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, entity->position.x, @@ -1023,18 +1023,18 @@ void render_entities(void) { } if (D_80151310 == 1) { - if (!(entity->flags & 2)) { + if (!(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) { continue; } } else if (D_80151310 == 2) { - if (!(entity->flags & 0x40000)) { + if (!(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2)) { continue; } } } - if (!(entity->flags & 1)) { - if (entity->flags & 8) { + if (!(entity->flags & ENTITY_FLAGS_HIDDEN)) { + if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { if (D_8014AFB0 == 0xFF) { if (entity->renderSetupFunc != NULL) { set_animator_render_callback(entity->virtualModelIndex, entity->listIndex, entity->renderSetupFunc); @@ -1087,14 +1087,14 @@ void render_shadows(void) { Shadow* shadow = get_shadow_by_index(i); if (shadow != NULL) { - if (shadow->flags & 1) { - if (shadow->flags & 0x10000000) { + if (shadow->flags & SHADOW_FLAGS_1) { + if (shadow->flags & SHADOW_FLAGS_10000000) { shadow->unk_05 -= 20; if (shadow->unk_05 <= 20) { - shadow->flags |= 0x20000000; + shadow->flags |= SHADOW_FLAGS_20000000; } } - } else if (shadow->flags & 8) { + } else if (shadow->flags & SHADOW_FLAGS_8) { if (shadow->vertexArray == NULL) { render_animated_model(shadow->entityModelID, &shadow->transformMatrix); } else { @@ -1104,10 +1104,10 @@ void render_shadows(void) { shadow->vertexArray); } } else { - if (shadow->flags & 0x10000000) { + if (shadow->flags & SHADOW_FLAGS_10000000) { shadow->unk_05 -= 20; if (shadow->unk_05 <= 20) { - shadow->flags |= 0x20000000; + shadow->flags |= SHADOW_FLAGS_20000000; } } @@ -1164,7 +1164,7 @@ ShadowList* get_shadow_list(void) { s32 entity_start_script(Entity* entity) { if (entity->boundScriptBytecode != NULL) { - entity->flags |= 0x1000000; + entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; return 1; } return 0; @@ -1187,7 +1187,7 @@ void delete_entity(s32 entityIndex) { heap_free(entity->dataBuf); } - if (!(entity->flags & 8)) { + if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { free_entity_model_by_index(entity->virtualModelIndex); } else { delete_model_animator(get_animator_by_index(entity->virtualModelIndex)); @@ -1196,7 +1196,7 @@ void delete_entity(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= 0x10000000; + shadow->flags |= SHADOW_FLAGS_10000000; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1210,7 +1210,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { heap_free(entity->dataBuf); } - if (!(entity->flags & 8)) { + if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { free_entity_model_by_index(entity->virtualModelIndex); } else { delete_model_animator(get_animator_by_index(entity->virtualModelIndex)); @@ -1221,7 +1221,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= 0x10000000; + shadow->flags |= SHADOW_FLAGS_10000000; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1241,9 +1241,9 @@ s32 entity_get_collision_flags(Entity* entity) { s32 ret = 0; u32 flag; - if (entity->flags & 0x20000) { + if (entity->flags & ENTITY_FLAGS_BLOCK_BEING_HIT) { ret = 0x80; - entity->flags &= ~0x20000; + entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT; } flag = gCollisionStatus.currentFloor; @@ -1309,14 +1309,14 @@ s32 is_player_action_state(s8 actionState) { } void entity_set_render_script(Entity* entity, u32* commandList) { - if (!(entity->flags & 8)) { + if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { set_entity_model_render_command_list(entity->virtualModelIndex, commandList); } } void func_80110BF8(Entity* entity) { entity->unk_07 = 0; - entity->flags &= ~0x00010000; + entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION; } #ifdef NON_MATCHING @@ -1426,7 +1426,7 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { (*gCurrentShadowListPtr)[i] = shadow; mem_clear(shadow, sizeof(*shadow)); shadow->listIndex = i; - shadow->flags = data->flags | 0x80000000; + shadow->flags = data->flags | SHADOW_FLAGS_80000000; shadow->unk_05 = 0x80; shadow->unk_06 = 0x80; shadow->position.x = x; @@ -1437,7 +1437,7 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { shadow->scale.z = 1.0f; if (data->animModelNode != NULL) { - shadow->flags |= 8; + shadow->flags |= SHADOW_FLAGS_8; shadow->entityModelID = create_model_animator(data->unk_04); load_model_animator_tree(shadow->entityModelID, data->animModelNode); } else { @@ -1499,11 +1499,11 @@ ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall) { if (evt_get_variable(script, *script->ptrReadPos)) { Shadow* shadow; - entity->flags |= 4; + entity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= 0x400000; + shadow->flags |= SHADOW_FLAGS_400000; } else { - entity->flags &= ~4; + entity->flags &= ~ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } return ApiStatus_DONE2; @@ -1532,7 +1532,7 @@ ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall) { // TODO find proper struct for the dataBuf ((s16*)(entity->dataBuf))[16] = temp_s0; if (get_area_flag(temp_s0) != 0) { - entity->flags |= 0x20000000; + entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; } return ApiStatus_DONE2; } @@ -1672,7 +1672,7 @@ void update_entity_shadow_position(Entity* entity) { } else { u8 alphaTemp; - if (shadow->flags & 0x800000) { + if (shadow->flags & SHADOW_FLAGS_800000) { alphaTemp = 160; } else { alphaTemp = 128; @@ -1680,9 +1680,9 @@ void update_entity_shadow_position(Entity* entity) { shadow->unk_05 = alphaTemp; } - if (!(entity->flags & 4)) { - if (shadow->flags & 0x400000) { - shadow->flags &= ~0x400000; + if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) { + if (shadow->flags & SHADOW_FLAGS_400000) { + shadow->flags &= ~SHADOW_FLAGS_400000; } else { return; } @@ -1698,7 +1698,7 @@ void update_entity_shadow_position(Entity* entity) { origHitLength = hitLength; - if (shadow->flags & 0x200) { + if (shadow->flags & SHADOW_FLAGS_200) { hitLength = 212.5f; shadow->scale.x = entity->aabb.x / hitLength; shadow->scale.z = entity->aabb.z / hitLength; @@ -1717,15 +1717,15 @@ void update_entity_shadow_position(Entity* entity) { shadow->rotation.y = entity->rotation.y; if (entity->position.y < rayY) { - shadow->flags |= 0x40000000; + shadow->flags |= SHADOW_FLAGS_40000000; entity->position.y = rayY + 10.0f; } else { - shadow->flags &= ~0x40000000; + shadow->flags &= ~SHADOW_FLAGS_40000000; } - shadow->flags = (shadow->flags & ~1) | ((u16)entity->flags & 1); - if (!(entity->flags & 0x400) && origHitLength == 0.0f) { - shadow->flags |= 1; + shadow->flags = (shadow->flags & ~SHADOW_FLAGS_1) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN); + if (!(entity->flags & ENTITY_FLAGS_400) && origHitLength == 0.0f) { + shadow->flags |= SHADOW_FLAGS_1; } } else { entity->shadowPosY = 0.0f; @@ -2201,7 +2201,7 @@ void calculate_model_sizes(void) { bb->halfSizeX = (bb->maxX - bb->minX) * 0.5; bb->halfSizeY = (bb->maxY - bb->minY) * 0.5; bb->halfSizeZ = (bb->maxZ - bb->minZ) * 0.5; - model->flags |= 0x1000; + model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; } } } @@ -2284,7 +2284,7 @@ void render_transform_group_node(ModelNode* node) { if (groupTypeProp != NULL && groupTypeProp->data.s != 0) { model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); - if (!(model->flags & 2)) { + if (!(model->flags & MODEL_FLAGS_ENABLED)) { appendGfx_model_group(model); } mdl_currentTransformGroupChildIndex++; @@ -2316,7 +2316,7 @@ void render_transform_group_node(ModelNode* node) { } model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); - if (!(model->flags & 2)) { + if (!(model->flags & MODEL_FLAGS_ENABLED)) { appendGfx_model(model); } mdl_currentTransformGroupChildIndex++; @@ -2329,14 +2329,14 @@ void render_transform_group(ModelTransformGroup* group) { ModelTransformGroup* mtg = group; Gfx** gfx = &gMasterGfxPos; - if (!(mtg->flags & 4)) { + if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_4)) { mdl_currentTransformGroupChildIndex = mtg->minChildModelIndex; - if (!(mtg->flags & 0x2000)) { + if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) { gSPMatrix((*gfx)++, mtg->transformMtx, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); } render_transform_group_node(mtg->modelNode); - if (!(mtg->flags & 0x2000)) { + if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) { gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW); } gDPPipeSync((*gfx)++); @@ -2526,7 +2526,7 @@ void make_transform_group(u16 modelID) { } (*gCurrentTransformGroups)[i] = newMtg = heap_malloc(sizeof(ModelTransformGroup)); - newMtg->flags = 1; + newMtg->flags = MODEL_TRANSFORM_GROUP_FLAGS_1; newMtg->groupModelID = modelID; newMtg->minChildModelIndex = get_model_list_index_from_tree_index(D_80153374); newMtg->maxChildModelIndex = get_model_list_index_from_tree_index(D_80153376); @@ -2584,10 +2584,10 @@ void enable_transform_group(u16 modelID) { for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) { Model* model = get_model_from_list_index(i); - model->flags |= 0x8; + model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; if (model->currentMatrix != NULL) { - model->flags |= 0x1000; + model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; } } } @@ -2596,15 +2596,15 @@ void disable_transform_group(u16 modelID) { ModelTransformGroup* group = get_transform_group(get_transform_group_index(modelID)); s32 i; - group->flags |= 0x4; + group->flags |= MODEL_TRANSFORM_GROUP_FLAGS_4; for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) { Model* model = get_model_from_list_index(i); - model->flags &= ~0x8; + model->flags &= ~MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; if (model->currentMatrix != NULL) { - model->flags |= 0x1000; + model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; } } } @@ -2636,7 +2636,7 @@ void func_8011BAE8(void) { Model* model = (*gCurrentModels)[i]; if (model != NULL) { - model->flags &= ~0x0400; + model->flags &= ~MODEL_FLAGS_HAS_TRANSFORM_APPLIED; } } @@ -2644,7 +2644,7 @@ void func_8011BAE8(void) { ModelTransformGroup* transformGroup = (*gCurrentTransformGroups)[i]; if (transformGroup != NULL) { - transformGroup->flags &= ~0x0400; + transformGroup->flags &= ~MODEL_TRANSFORM_GROUP_FLAGS_400; } } } diff --git a/src/battle/area_kkj/6DBDA0.c b/src/battle/area_kkj/6DBDA0.c index 14780c75b1..c4da2ae147 100644 --- a/src/battle/area_kkj/6DBDA0.c +++ b/src/battle/area_kkj/6DBDA0.c @@ -87,7 +87,7 @@ ApiStatus func_8021849C_6DC23C(Evt* script, s32 isInitialCall) { playerStatus->actionState = ACTION_STATE_HAMMER; entity->staticData->unk_data_ptr2(entity); entity->unk_07 = 0xA; - entity->flags |= 0x10000; + entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; collisionStatus->lastWallHammered = -1; return ApiStatus_DONE2; diff --git a/src/battle/area_kmr_part_1/actor/goomba.c b/src/battle/area_kmr_part_1/actor/goomba.c index b3b1e0bf9e..4aacc17f6b 100644 --- a/src/battle/area_kmr_part_1/actor/goomba.c +++ b/src/battle/area_kmr_part_1/actor/goomba.c @@ -40,15 +40,15 @@ EvtSource N(init_802197AC); ActorPartDesc N(partsTable_802196C8)[] = { { - .flags = PART_FLAG_MULTI_TARGET, + .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, .idleAnimations = N(idleAnimations_80219714), .defenseTable = N(defenseTable_80219610), - .eventFlags = 0, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_0, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, .unk_1C = 246, }, }; diff --git a/src/battle/area_kmr_part_1/actor/paragoomba.c b/src/battle/area_kmr_part_1/actor/paragoomba.c index e61d53e4ef..e38317d922 100644 --- a/src/battle/area_kmr_part_1/actor/paragoomba.c +++ b/src/battle/area_kmr_part_1/actor/paragoomba.c @@ -76,51 +76,51 @@ EvtSource N(init_8021CDD8); ActorPartDesc N(partsTable_8021CC70)[] = { { - .flags = PART_FLAG_INVISIBLE | PART_FLAG_NO_TARGET, + .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, .idleAnimations = N(idleAnimations_8021E4EC), .defenseTable = N(defenseTable_8021CB00), - .eventFlags = 0, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_0, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, .unk_1C = 246, }, { - .flags = PART_FLAG_MULTI_TARGET, + .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 2, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, .idleAnimations = N(idleAnimations_8021CD28), .defenseTable = N(defenseTable_8021CB0C), - .eventFlags = EVENT_FLAG_GROUNDABLE, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, .unk_1C = 246, }, { - .flags = PART_FLAG_INVISIBLE | PART_FLAG_NO_TARGET, + .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 3, .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, .idleAnimations = N(idleAnimations_8021CDC0), .defenseTable = N(defenseTable_8021CB00), - .eventFlags = 0, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_0, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, .unk_1C = 246, }, { - .flags = PART_FLAG_INVISIBLE | PART_FLAG_NO_TARGET, + .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 4, .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, .idleAnimations = N(idleAnimations_8021CDCC), .defenseTable = N(defenseTable_8021CB00), - .eventFlags = 0, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_0, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, .unk_1C = 246, }, }; diff --git a/src/battle/area_kmr_part_1/actor/spiked_goomba.c b/src/battle/area_kmr_part_1/actor/spiked_goomba.c index 11fd99dba1..52b024eb38 100644 --- a/src/battle/area_kmr_part_1/actor/spiked_goomba.c +++ b/src/battle/area_kmr_part_1/actor/spiked_goomba.c @@ -40,15 +40,15 @@ EvtSource N(init_8021B16C); ActorPartDesc N(partsTable_8021B088)[] = { { - .flags = PART_FLAG_MULTI_TARGET, + .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, .idleAnimations = N(idleAnimations_8021B0D4), .defenseTable = N(defenseTable_8021AFD0), - .eventFlags = EVENT_FLAG_SPIKY_TOP, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, .unk_1C = 244, }, }; diff --git a/src/battle/item/pow_block.c b/src/battle/item/pow_block.c index 2ec1f70c71..12135b6e1e 100644 --- a/src/battle/item/pow_block.c +++ b/src/battle/item/pow_block.c @@ -25,7 +25,7 @@ ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A12E4_718B34)(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(script->varTable[10]); - entity->flags |= 0x20000000; + entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; return ApiStatus_DONE2; } diff --git a/src/battle/item/repel_gel.c b/src/battle/item/repel_gel.c index 84a27fc97c..ce2d5c73e4 100644 --- a/src/battle/item/repel_gel.c +++ b/src/battle/item/repel_gel.c @@ -9,7 +9,7 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) { inflict_status(player, STATUS_E, script->varTable[0]); player->status = 0; - part->flags |= 0x100; + part->flags |= ACTOR_PART_FLAG_100; return ApiStatus_DONE2; } diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/item/sleepy_sheep.c index 9080caf587..3a768272bf 100644 --- a/src/battle/item/sleepy_sheep.c +++ b/src/battle/item/sleepy_sheep.c @@ -180,7 +180,7 @@ ApiStatus N(func_802A1740_71ED90)(Evt* script, s32 isInitialCall) { Actor* targetActor = get_actor(target->actorID); ActorPart* targetPart = get_actor_part(targetActor, target->partID); - if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & 0x20)) { + if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY)) { targetActor->yaw += 33.0f; targetActor->yaw = clamp_angle(targetActor->yaw); } @@ -213,7 +213,7 @@ ApiStatus N(func_802A1848_71EE98)(Evt* script, s32 isInitialCall) { if (targetActor != NULL) { ActorPart* targetPart = get_actor_part(targetActor, target->partID); - if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & 0x20)) { + if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY)) { if (targetActor->yaw < 360.0f) { targetActor->yaw += 33.0f; if (targetActor->yaw >= 360.0f) { diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index d18047a8c7..0739c50cd2 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -276,7 +276,7 @@ ApiStatus N(func_802A1B14_731E14)(Evt* script, s32 isInitialCall) { inflict_status(player, STATUS_E, 3); player->status = 0; - part->flags |= 0x100; + part->flags |= ACTOR_PART_FLAG_100; return ApiStatus_DONE2; } diff --git a/src/battle/item/thunder_bolt.c b/src/battle/item/thunder_bolt.c index a886db9683..d13ad84dc8 100644 --- a/src/battle/item/thunder_bolt.c +++ b/src/battle/item/thunder_bolt.c @@ -19,7 +19,7 @@ ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) { scaleX = (actor->size.x + (actor->size.x >> 2)) * actor->scalingFactor; scaleY = (actor->size.y - 2) * actor->scalingFactor; - if (actor->flags & 0x8000) { + if (actor->flags & ACTOR_FLAG_8000) { posY -= actor->size.y / 2; } diff --git a/src/battle/item/thunder_rage.c b/src/battle/item/thunder_rage.c index f76e62a28d..910ddb0079 100644 --- a/src/battle/item/thunder_rage.c +++ b/src/battle/item/thunder_rage.c @@ -37,7 +37,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) { scaleX = (actor->size.x + (actor->size.x >> 2)) * actor->scalingFactor; scaleY = (actor->size.y - 2) * actor->scalingFactor; - if (actor->flags & 0x8000) { + if (actor->flags & ACTOR_FLAG_8000) { posY -= actor->size.y / 2; } diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 7a07af5b58..04d611de49 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -107,7 +107,7 @@ ApiStatus N(AverageTargetStatusChance)(Evt* script, s32 isInitialCall) { targetActorDescBaseStatusChance = 0; } - if (targetActorPart->eventFlags & 0x20) { + if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { targetActorDescBaseStatusChance = 0; } diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 9966cffef3..4d89ada20b 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -287,8 +287,8 @@ ActorPartDesc N(partsTable_802392A4)[] = { .opacity = 255, .idleAnimations = N(idleAnimations_802391B0), .defenseTable = N(defenseTable_802391EC), - .eventFlags = 0, - .elementImmunityFlags = 0, + .eventFlags = ACTOR_EVENT_FLAG_0, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0, }, }; diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index bf03b44a35..fae63fabbd 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -58,7 +58,7 @@ ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) { targetActorDescBaseStatusChance = 0; } - if (targetActorPart->eventFlags & 0x20) { + if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { targetActorDescBaseStatusChance = 0; } diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index ba3896b519..68288f647d 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -35,7 +35,7 @@ ApiStatus func_80238CE0_700A60(Evt* script, s32 isInitialCall) { airLiftChance = 0; } - if (targetActorPart->eventFlags & 0x20) { + if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { airLiftChance = 0; } diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index e7bd757d18..8a0e61f29c 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -105,7 +105,7 @@ ApiStatus func_80238784_704274(Evt* script, s32 isInitialCall) { if (targetActor->transStatus == 14) { statusChance = 0; } - if (targetActorPart->eventFlags & 0x20) { + if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { statusChance = 0; } @@ -178,7 +178,7 @@ ApiStatus N(AverageTargetParalyzeChance)(Evt* script, s32 isInitialCall) { targetActorDescBaseStatusChance = 0; } - if (targetActorPart->eventFlags & 0x20) { + if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { targetActorDescBaseStatusChance = 0; } diff --git a/src/battle/star/chill_out/7900D0.c b/src/battle/star/chill_out/7900D0.c index 7fb6c78fd2..0f81cb4dc3 100644 --- a/src/battle/star/chill_out/7900D0.c +++ b/src/battle/star/chill_out/7900D0.c @@ -35,13 +35,13 @@ ApiStatus func_802A163C_79070C(Evt* script, s32 isInitialCall) { Actor* actor = get_actor(script->owner1.actorID); Actor* target = get_actor(actor->targetActorID); ActorPart* part = get_actor_part(target, actor->targetPartIndex); - s32 flag1 = 0x400000; // these manual flag ones are necessary to match. once we figure out flags, we can add more - s32 flag2 = 0x80000; + s32 flag1 = ACTOR_FLAG_NO_DMG_APPLY; // these manual flag ones are necessary to match. once we figure out flags, we can add more + s32 flag2 = ACTOR_EVENT_FLAG_80000; script->varTable[0] = 0; - if ((target->flags & 0x4000) || (target->flags & flag1) || (target->flags & 0x2000) || - (part->eventFlags & 0x40000) || (part->eventFlags & flag2)) { + if ((target->flags & ACTOR_FLAG_TARGET_ONLY) || (target->flags & flag1) || (target->flags & ACTOR_FLAG_2000) || + (part->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) || (part->eventFlags & flag2)) { return ApiStatus_DONE2; } diff --git a/src/battle/star/up_and_away/7952E0.c b/src/battle/star/up_and_away/7952E0.c index a01d0a4cf6..47590264d7 100644 --- a/src/battle/star/up_and_away/7952E0.c +++ b/src/battle/star/up_and_away/7952E0.c @@ -48,7 +48,7 @@ ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall) { script->varTable[0] = 0; - if ((flags & 0x4000) == NULL && (flags & 0x400000) == NULL && (flags & 0x2000) == NULL && targetActor->staticActorData->upAndAwayChance != 0 && targetActor->staticActorData->upAndAwayChance >= rand_int(100)) { + if ((flags & ACTOR_FLAG_TARGET_ONLY) == NULL && (flags & ACTOR_FLAG_NO_DMG_APPLY) == NULL && (flags & ACTOR_FLAG_2000) == NULL && targetActor->staticActorData->upAndAwayChance != 0 && targetActor->staticActorData->upAndAwayChance >= rand_int(100)) { script->varTable[0] = 1; } diff --git a/src/e0b30_len_b80.c b/src/e0b30_len_b80.c index 7ccac55b09..83a74ab7bf 100644 --- a/src/e0b30_len_b80.c +++ b/src/e0b30_len_b80.c @@ -79,7 +79,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s if (!gGameStatusPtr->musicEnabled) { func_800559C4(musicSetting->songName); - musicSetting->flags &= ~1; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_1; return 1; } else { @@ -91,9 +91,9 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s if (musicSetting->songID == songID && musicSetting->variation == variation) { bgm_set_target_volume(volume); - if (musicSetting->flags & 4) { + if (musicSetting->flags & MUSIC_SETTINGS_FLAGS_4) { func_80055B80(musicSetting->songName); - musicSetting->flags &= ~4; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_4; } return 2; @@ -104,7 +104,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s musicSetting->variation = variation; musicSetting->fadeOutTime = fadeOutTime; musicSetting->unk_02 = 1; - musicSetting->flags &= ~2; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_2; return 1; } @@ -128,7 +128,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 if (!gGameStatusPtr->musicEnabled) { func_800559C4(musicSetting->songName); - musicSetting->flags &= ~1; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_1; return 1; } else { @@ -142,9 +142,9 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 musicSetting->unk_0E = arg5; musicSetting->songID = songID; musicSetting->variation = variation; - musicSetting->flags |= 0x20; + musicSetting->flags |= MUSIC_SETTINGS_FLAGS_20; musicSetting->unk_02 = 1; - musicSetting->flags &= ~2; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_2; return 1; } @@ -155,11 +155,11 @@ s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) { MusicSettings* musicSettings = gMusicSettings; MusicSettings* musicSetting = &musicSettings[playerIndex]; - if (!(musicSetting->flags & 1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; } - if (!(musicSetting->flags & 2)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_2)) { return 0; } @@ -182,7 +182,7 @@ s32 func_8014AB0C(s32 playerIndex, s16 arg1) { MusicSettings* musicSettings = gMusicSettings; MusicSettings* musicSetting = &musicSettings[playerIndex]; - if (!(musicSetting->flags & 1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; } @@ -193,7 +193,7 @@ s32 func_8014AB60(s32 playerIndex, s16 arg1) { MusicSettings* musicSettings = gMusicSettings; MusicSettings* musicSetting = &musicSettings[playerIndex]; - if (!(musicSetting->flags & 1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; } @@ -204,7 +204,7 @@ s32 func_8014ABB4(s32 playerIndex, s16 arg1) { MusicSettings* musicSettings = gMusicSettings; MusicSettings* musicSetting = &musicSettings[playerIndex]; - if (!(musicSetting->flags & 1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; } @@ -268,7 +268,7 @@ void bgm_pop_song(void) { MusicSettings* musicSetting = &gMusicSettings[0]; if (gGameStatusPtr->demoState == 0) { - musicSetting->flags |= 8; + musicSetting->flags |= MUSIC_SETTINGS_FLAGS_8; _bgm_set_song(0, musicSetting->unk_24, musicSetting->unk_28, 0, 8); } } @@ -280,7 +280,7 @@ void bgm_push_song(s32 songID, s32 variation) { musicSetting->unk_24 = musicSetting->songID; musicSetting->unk_28 = musicSetting->variation; musicSetting->unk_2C = musicSetting->songName; - musicSetting->flags |= 4; + musicSetting->flags |= MUSIC_SETTINGS_FLAGS_4; bgm_set_song(0, songID, variation, 500, 8); } } @@ -292,7 +292,7 @@ void bgm_pop_battle_song(void) { if (gOverrideFlags & 0x20000) { gOverrideFlags &= ~0x20000; } else { - musicSetting->flags |= 8; + musicSetting->flags |= MUSIC_SETTINGS_FLAGS_8; _bgm_set_song(0, musicSetting->unk_24, musicSetting->unk_28, 0, 8); func_80055590(0, 250); } @@ -307,7 +307,7 @@ void bgm_push_battle_song(void) { musicSetting->unk_24 = musicSetting->songID; musicSetting->unk_28 = musicSetting->variation; musicSetting->unk_2C = musicSetting->songName; - musicSetting->flags |= 4; + musicSetting->flags |= MUSIC_SETTINGS_FLAGS_4; bgm_set_song(0, musicSetting->unk_1C, musicSetting->unk_20, 500, 8); } } diff --git a/src/effects.c b/src/effects.c index 75380cd2f5..c7c3436ceb 100644 --- a/src/effects.c +++ b/src/effects.c @@ -329,8 +329,8 @@ void update_effects(void) { for (i = 0, effectGraphics = gEffectGraphicsData; i < ARRAY_COUNT(gEffectGraphicsData); i++, effectGraphics++) { if (effectGraphics->flags & FX_GRAPHICS_ENABLED) { - if (!(effectGraphics->flags & FX_GRAPHICS_2)) { - effectGraphics->flags |= FX_GRAPHICS_2; + if (!(effectGraphics->flags & FX_GRAPHICS_FLAGS_2)) { + effectGraphics->flags |= FX_GRAPHICS_FLAGS_2; effectGraphics->freeDelay = 3; } } @@ -339,18 +339,18 @@ void update_effects(void) { for (i = 0; i < ARRAY_COUNT(gEffectInstances); i++) { EffectInstance* effectInstance = gEffectInstances[i]; - if (effectInstance != NULL && (effectInstance->flags & 1)) { - effectInstance->effect->flags &= ~0x2; + if (effectInstance != NULL && (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1)) { + effectInstance->effect->flags &= ~FX_GRAPHICS_FLAGS_2; if (gGameStatusPtr->isBattle) { - if (effectInstance->flags & 4) { + if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) { effectInstance->effect->update(effectInstance); - effectInstance->flags |= 8; + effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8; } } else { - if (!(effectInstance->flags & 4)) { + if (!(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) { effectInstance->effect->update(effectInstance); - effectInstance->flags |= 8; + effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8; } } } @@ -358,7 +358,7 @@ void update_effects(void) { for (i = 0, effectGraphics = gEffectGraphicsData; i < ARRAY_COUNT(gEffectGraphicsData); i++, effectGraphics++) { if (effectGraphics->flags & FX_GRAPHICS_ENABLED) { - if (effectGraphics->flags & FX_GRAPHICS_2) { + if (effectGraphics->flags & FX_GRAPHICS_FLAGS_2) { if (effectGraphics->freeDelay != 0) { effectGraphics->freeDelay--; } else { @@ -401,15 +401,15 @@ void render_effects_UI(void) { EffectInstance* effectInstance = gEffectInstances[i]; if (effectInstance != NULL) { - if (effectInstance->flags & 1) { - if (effectInstance->flags & 8) { + if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1) { + if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_8) { void (*renderUI)(EffectInstance* effect); - if (gGameStatusPtr->isBattle && !(effectInstance->flags & 4)) { + if (gGameStatusPtr->isBattle && !(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) { continue; } - if (!gGameStatusPtr->isBattle && effectInstance->flags & 4) { + if (!gGameStatusPtr->isBattle && effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) { continue; } diff --git a/src/encounter_api.c b/src/encounter_api.c index 13707882b9..79467faf9b 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -131,7 +131,7 @@ void start_battle(Evt* script, s32 songID) { for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if ((enemy != NULL && ( - !(enemy->flags & 8) || enemy == currentEncounter->currentEnemy) + !(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy) ) && enemy->hitBytecode != NULL) { Evt* hitEvtInstance; enemy->encountered = TRUE; @@ -200,7 +200,7 @@ ApiStatus StartBossBattle(Evt* script, s32 isInitialCall) { for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if ((enemy != NULL && ( - !(enemy->flags & 8) || enemy == currentEncounter->currentEnemy) + !(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy) ) && enemy->hitBytecode != NULL) { Evt* hitEvtInstance; enemy->encountered = TRUE; diff --git a/src/entity.c b/src/entity.c index e37c6cbbea..f4e64d6770 100644 --- a/src/entity.c +++ b/src/entity.c @@ -81,7 +81,7 @@ s32 load_entity_model(s32* cmdList) { } ASSERT(newEntityModel != NULL); - newEntityModel->flags = 0x17; + newEntityModel->flags = (ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_10); newEntityModel->renderMode = 1; newEntityModel->displayList = NULL; newEntityModel->cmdListReadPos = cmdList; @@ -124,7 +124,7 @@ s32 ALT_load_entity_model(s32* cmdList) { newEntityModel->displayList = newDisplayList = heap_malloc(sizeof(Gfx) * 2); ASSERT(newDisplayList != NULL); - newEntityModel->flags = 0x417; + newEntityModel->flags = (ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_10 | ENTITY_MODEL_FLAGS_400); newEntityModel->renderMode = 1; newEntityModel->cmdListReadPos = cmdList; newEntityModel->nextFrameTime = 1.0f; @@ -150,9 +150,9 @@ void exec_entity_model_commandlist(s32 idx) { idx &= ~0x800; entityModel = (*gCurrentEntityModelList)[idx]; if (entityModel != NULL && (entityModel->flags)) { - if (!(entityModel->flags & 0x20)) { - if (!(entityModel->flags & 0x20000)) { - entityModel->flags &= ~0x100; + if (!(entityModel->flags & ENTITY_MODEL_FLAGS_20)) { + if (!(entityModel->flags & ENTITY_MODEL_FLAGS_20000)) { + entityModel->flags &= ~ENTITY_MODEL_FLAGS_100; entityModel->nextFrameTime -= entityModel->timeScale; if (entityModel->nextFrameTime <= 0.0f) { while (step_entity_model_commandlist(entityModel)); @@ -252,7 +252,7 @@ void free_entity_model_by_index(s32 idx) { EntityModel* entityModel = (*gCurrentEntityModelList)[index]; if (entityModel != NULL && entityModel->flags) { - if (entityModel->flags & 0x400) { + if (entityModel->flags & ENTITY_MODEL_FLAGS_400) { heap_free(entityModel->displayList); } { @@ -310,7 +310,7 @@ void func_80122F8C(s32 idx, s32 newFlags) { void func_80122FB8(s32 idx, s32 newFlags) { EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800]; - entityModel->flags = (entityModel->flags & ~0xF) | newFlags; + entityModel->flags = (entityModel->flags & ~(ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_8)) | newFlags; } void enable_entity_fog(void) { @@ -389,7 +389,7 @@ s32 create_generic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void) (*gCurrentDynamicEntityListPtr)[i] = newDynEntity = heap_malloc(sizeof(DynamicEntity)); ASSERT(newDynEntity != NULL); - newDynEntity->flags = 3; + newDynEntity->flags = ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1; newDynEntity->update = updateFunc; if (updateFunc == NULL) { newDynEntity->update = &stub_generic_entity_delegate; @@ -420,7 +420,7 @@ s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(voi (*gCurrentDynamicEntityListPtr)[i] = newDynEntity = heap_malloc(sizeof(DynamicEntity)); ASSERT(newDynEntity != NULL); - newDynEntity->flags = 7; + newDynEntity->flags = ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 | ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; newDynEntity->update = updateFunc; if (updateFunc == NULL) { newDynEntity->update = &stub_generic_entity_delegate; @@ -451,7 +451,7 @@ s32 create_generic_entity_backUI(void (*updateFunc)(void), void (*drawFunc)(void (*gCurrentDynamicEntityListPtr)[i] = newDynEntity = heap_malloc(sizeof(DynamicEntity)); ASSERT(newDynEntity != NULL); - newDynEntity->flags = 0xB; + newDynEntity->flags = ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 | ENTITY_FLAGS_HAS_ANIMATED_MODEL; newDynEntity->update = updateFunc; if (updateFunc == NULL) { newDynEntity->update = &stub_generic_entity_delegate; @@ -473,7 +473,7 @@ void update_generic_entities(void) { for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) { DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i]; if (entity != NULL) { - entity->flags &= ~2; + entity->flags &= ~ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1; entity->update(); } } @@ -484,8 +484,8 @@ void render_generic_entities_world(void) { for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) { DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i]; - if (entity != NULL && !(entity->flags & 2)) { - if (!(entity->flags & 4)) { + if (entity != NULL && !(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) { + if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) { entity->draw(); } } @@ -497,8 +497,8 @@ void render_generic_entities_frontUI(void) { for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) { DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i]; - if (entity != NULL && !(entity->flags & 2)) { - if (entity->flags & 4) { + if (entity != NULL && !(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) { + if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { entity->draw(); } } @@ -510,8 +510,8 @@ void render_generic_entities_backUI(void) { for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) { DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i]; - if (entity != NULL && !(entity->flags & 2)) { - if (entity->flags & 8) { + if (entity != NULL && !(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) { + if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { entity->draw(); } } diff --git a/src/entity/Block.c b/src/entity/Block.c index 891a266486..97dcd06bb3 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -59,7 +59,7 @@ s32 entity_base_block_idle(Entity* entity) { s32 ret = 0; if (is_block_on_ground(entity) != 0) { - if (entity->flags & 0x200000) { + if (entity->flags & ENTITY_FLAGS_200000) { ret = 1; entity_base_block_update_slow_sinking(entity); if (temp->unk_10 != -1) { @@ -79,7 +79,7 @@ void entity_base_block_init(Entity* entity) { temp->unk_10 = -1; temp->unk_14 = entity->position.y; temp->unk_0E = -1; - entity->flags &= ~0x200000; + entity->flags &= ~ENTITY_FLAGS_200000; } void entity_inactive_block_hit_init(Entity* entity) { @@ -152,7 +152,7 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) { set_entity_commandlist(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)), &D_802E9E54); - entity->flags |= 0x20000020; + entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -184,7 +184,7 @@ void entity_MulticoinBlock_idle(Entity* entity) { entity_base_block_idle(entity); if (temp->unk_03 != 0) { create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); - entity->flags |= 0x20000020; + entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -196,7 +196,7 @@ void entity_MulticoinBlock_check_if_inactive(Entity* entity) { if (temp->unk_0A != 0xFFFF) { if (get_global_flag(temp->unk_0A) != 0) { create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); - entity->flags |= 0x20000020; + entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } } @@ -333,7 +333,7 @@ s32 entity_init_HammerBlock_small(Entity* entity) { temp->unk_10 = -1; temp->unk_14 = entity->position.y; temp->unk_0E = -1; - entity->flags &= ~0x200000; + entity->flags &= ~ENTITY_FLAGS_200000; entity->scale.x = 0.5f; entity->scale.y = 0.5f; entity->scale.z = 0.5f; diff --git a/src/entity/Chest.c b/src/entity/Chest.c index e29dd1bc1d..02921c2bcf 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -63,7 +63,7 @@ INCLUDE_ASM(s32, "entity/Chest", entity_Chest_setupGfx); void entity_Chest_check_opened(Entity* entity) { Chest* data = (Chest*)entity->dataBuf; if ((data->unk_00 != 0xFFFF) && (get_global_flag(data->unk_00) != 0)) { - entity->flags |= 0x4000; + entity->flags |= ENTITY_FLAGS_4000; data->unk_10 = -1; data->unk_08 = -28.7f; set_entity_commandlist(entity, &D_802EAD7C); @@ -81,19 +81,19 @@ void entity_Chest_idle(Entity* entity) { if ((!(playerStatus->animFlags & 1)) && (!(entity->collisionFlags & 1)) && ((angle <= 40.0f) || (angle >= 320.0f))) { - entity->flags |= 0x1000; + entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; if ((playerStatus->animFlags & 0x10) && (entity->collisionFlags & 8)) { exec_entity_commandlist(entity); data = (Chest*)entity->dataBuf; data->unk_04 = 0; - entity->flags &= ~0x1000; + entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; if (data->unk_10 != 0) { disable_player_input(); } func_800EF3E4(); } } else { - entity->flags &= ~0x1000; + entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; } } @@ -140,7 +140,7 @@ void entity_Chest_close(Entity* entity) { data->unk_06--; if (data->unk_06 == 0) { data->unk_04++; - entity->flags |= 0x4000; + entity->flags |= ENTITY_FLAGS_4000; } break; case 4: diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index b789f5d3f8..9bc88bd1b2 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -37,7 +37,7 @@ void entity_HeartBlockContent__reset(Entity* entity) { entity->renderSetupFunc = entity_HeartBlockContent_setupGfx; entity->alpha = 255; temp_s0 = (struct802E4B10*)entity->dataBuf; - entity->flags |= 0x2000; + entity->flags |= ENTITY_FLAGS_ALWAYS_FACE_CAMERA; someEntity = get_entity_by_index(temp_s0->unk_00); if (temp_s0->unk_09 == 0) { @@ -135,7 +135,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { data->unk_14 -= 1.0f; if (data->unk_14 <= 2.0f) { data->unk_01++; - entity->flags &= ~0x2000; + entity->flags &= ~ENTITY_FLAGS_ALWAYS_FACE_CAMERA; data->unk_54 = -10.0f; entity_set_render_script(entity, &D_802EA744); entity->renderSetupFunc = &entity_HeartBlockContent_setupGfx; diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index fba41310de..550e5a026d 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -59,9 +59,9 @@ void entity_HitItemBlock_show_inactive(Entity* entity) { struct802E3F0C* temp = entity->dataBuf; someEntity = get_entity_by_index(temp->unk_12); - someEntity->flags &= ~1; + someEntity->flags &= ~ENTITY_FLAGS_HIDDEN; someShadow = get_shadow_by_index(someEntity->shadowIndex); - someShadow->flags &= ~1; + someShadow->flags &= ~SHADOW_FLAGS_1; } void entity_ItemBlock_check_if_inactive(Entity* entity) { @@ -104,16 +104,16 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { entityTemp = get_entity_by_index(entityIndex); entityTemp->flags |= 1; - if (entity->flags & 0x40000) { - entityTemp->flags |= 0x40000; + if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { + entityTemp->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } - if (entity->flags & 4) { - entityTemp->flags |= 4; + if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { + entityTemp->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } shadow = get_shadow_by_index(entityTemp->shadowIndex); - shadow->flags |= 0x400001; + shadow->flags |= (SHADOW_FLAGS_400000 |SHADOW_FLAGS_1); temp_s0 = is_block_on_ground(entity); entityType2 = get_entity_type(entity->listIndex); @@ -127,37 +127,37 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { entityTemp = get_entity_by_index(create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)); entityTemp->alpha = entity->alpha; - if ((entity->flags & 1) || (entity->alpha < 0xFF)) { + if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 0xFF)) { entityTemp->alpha = 0x20; } - if (entity->flags & 0x40000) { - entityTemp->flags |= 0x40000; + if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { + entityTemp->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } temp = entityTemp->dataBuf; temp->unk_12 = entityIndex; - if (entity->flags & 4) { - entityTemp->flags |= 4; + if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { + entityTemp->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } - entity->flags &= ~0x100; + entity->flags &= ~ENTITY_FLAGS_100; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= 0x10000001; + shadow->flags |= (SHADOW_FLAGS_10000000 | SHADOW_FLAGS_1); shadow = get_shadow_by_index(entityTemp->shadowIndex); - shadow->flags |= 0x400000; + shadow->flags |= SHADOW_FLAGS_400000; } void entity_HitItemBlock_hide(Entity* entity) { - entity->flags |= 1; - entity->flags &= ~0x100; + entity->flags |= ENTITY_FLAGS_HIDDEN; + entity->flags &= ~ENTITY_FLAGS_100; get_shadow_by_index(entity->shadowIndex)->flags |= 0x10000001; } s32 entity_TriggerBlock_start_bound_script(Entity* entity) { if (entity->boundScriptBytecode != NULL) { - entity->flags |= 0x1000000; + entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; return TRUE; } return FALSE; diff --git a/src/entity/Signpost.c b/src/entity/Signpost.c index 2769b2bcfd..14a37a3b3c 100644 --- a/src/entity/Signpost.c +++ b/src/entity/Signpost.c @@ -6,12 +6,12 @@ void entity_Signpost_idle(Entity* entity) { playerStatus->position.x, playerStatus->position.z))); if (!(playerStatus->animFlags & 1) && !(entity->collisionFlags & 1) && (val <= 40.0f || val >= 320.0f)) { - entity->flags |= 0x1000; - if ((playerStatus->animFlags & PLAYER_ANIM_FLAG_INTERACT_PROMPT) && (entity->collisionFlags & 8)) { + entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; + if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & 8)) { entity_start_script(entity); } } else { - entity->flags &= ~0x1000; + entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; playerStatus->unk_C6 = -1; } } diff --git a/src/entity/Switch.c b/src/entity/Switch.c index e6e8262e84..41309c9e1c 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -488,7 +488,7 @@ void entity_BlueSwitch_init(Entity* entity) { if (D_8015C7D0[0] == 1) { if (D_802EB3A0 != NULL) { temp->attachedEntity = D_802EB3A0; - entity->flags |= 1; + entity->flags |= ENTITY_FLAGS_HIDDEN; return; } } else { diff --git a/src/entity/jan_iwa/E2D730.c b/src/entity/jan_iwa/E2D730.c index ab5cc4e7b2..654f63a95c 100644 --- a/src/entity/jan_iwa/E2D730.c +++ b/src/entity/jan_iwa/E2D730.c @@ -100,8 +100,8 @@ void func_802BB648_E2DF78(Entity* entity) { structE2D730* data = (structE2D730*)entity->dataBuf; if ((gPlayerStatus.animFlags & 0x10) && (entity->collisionFlags & 0x48)) { - if (entity->flags & 0x1000) { - entity->flags &= ~0x1000; + if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { + entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; temp_a1_2 = (structE2D730*)get_entity_by_index(data->unk_04)->dataBuf; if (temp_a1_2->unk_00 == 0) { temp_a1_2->unk_00 = 1; diff --git a/src/entity/sbk_omo/E307C0.c b/src/entity/sbk_omo/E307C0.c index 321f47c5e7..52725449c0 100644 --- a/src/entity/sbk_omo/E307C0.c +++ b/src/entity/sbk_omo/E307C0.c @@ -87,7 +87,7 @@ void func_802BC558_E30EA8(Entity* entity) { INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC570_E30EC0); void func_802BC99C_E312EC(Entity* entity) { - if (!(entity->flags & 0x2000000)) { + if (!(entity->flags & ENTITY_FLAGS_2000000)) { exec_entity_commandlist(entity); } } diff --git a/src/evt/evt.c b/src/evt/evt.c index e85b41ee5f..63fbc274d1 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -1001,7 +1001,7 @@ ApiStatus evt_handle_bind(Evt* script) { Bytecode triggerOut = *args++; TriggerDefinition def; - def.flags = eventType | 0x1000000; + def.flags = eventType | TRIGGER_DEFINITION_FLAGS_1000000; def.flagIndex = evt_get_variable(script, colliderIDVar); def.colliderIndex = evt_get_variable_index(script, colliderIDVar); def.inputArg3 = a3; @@ -1120,7 +1120,7 @@ ApiStatus evt_handle_bind_lock(Evt* script) { s32 a5 = *args++; TriggerDefinition def; - def.flags = eventType | 0x1000000; + def.flags = eventType | TRIGGER_DEFINITION_FLAGS_1000000; def.flagIndex = evt_get_variable(script, colliderIDVar); def.colliderIndex = evt_get_variable_index(script, colliderIDVar); def.unk_1C = itemList; diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index ae53a8e22e..e9a2c60c5b 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -224,7 +224,7 @@ ApiStatus AddKeyItem(Evt* script, s32 isInitialCall) { s32 itemID = evt_get_variable(script, value); s32 i; - if (itemID == ITEM_FORTRESS_KEY) { + if (itemID == ITEM_KOOPA_FORTRESS_KEY) { playerData->fortressKeyCount++; return ApiStatus_DONE2; } diff --git a/src/evt/map_api.c b/src/evt/map_api.c index add44e2807..6742dbe971 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -23,9 +23,9 @@ ApiStatus TranslateModel(Evt* script, s32 isInitialCall) { z = evt_get_float_variable(script, *args++); model = get_model_from_list_index(modelIndex); - if (!(model->flags & 0x400)) { + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, x, y, z); - model->flags |= 0x1400; + model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); } else { Matrix4f mtx; @@ -46,9 +46,9 @@ ApiStatus RotateModel(Evt* script, s32 isInitialCall) { f32 z = evt_get_float_variable(script, *args++); Model* model = get_model_from_list_index(modelListIndex); - if (!(model->flags & 0x400)) { + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { guRotateF(model->transformMatrix, a, x, y, z); - model->flags |= 0x1400; + model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); } else { Matrix4f mtx; @@ -73,9 +73,9 @@ ApiStatus ScaleModel(Evt* script, s32 isInitialCall) { z = evt_get_float_variable(script, *args++); model = get_model_from_list_index(modelIndex); - if (!(model->flags & 0x400)) { + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { guScaleF(model->transformMatrix, x, y, z); - model->flags |= 0x1400; + model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); } else { Matrix4f mtx; @@ -100,7 +100,7 @@ ApiStatus InvalidateModelTransform(Evt* script, s32 isInitialCall) { Bytecode modelID = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); - model->flags &= ~0x400; + model->flags &= ~MODEL_FLAGS_HAS_TRANSFORM_APPLIED; return ApiStatus_DONE2; } @@ -137,7 +137,7 @@ ApiStatus SetTexPanner(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); set_tex_panner(model, var2); - model->flags |= 0x800; + model->flags |= MODEL_FLAGS_HAS_TEX_PANNER; return ApiStatus_DONE2; } @@ -148,9 +148,9 @@ ApiStatus SetCustomGfxEnabled(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); if (enable) { - model->flags |= 0x10; + model->flags |= MODEL_FLAGS_USES_CUSTOM_GFX; } else { - model->flags &= ~0x10; + model->flags &= ~MODEL_FLAGS_USES_CUSTOM_GFX; } return ApiStatus_DONE2; } @@ -167,7 +167,7 @@ ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall) { set_mdl_custom_gfx_set(model, var2, var3); if (var2 != -1) { - model->flags |= 0x10; + model->flags |= MODEL_FLAGS_USES_CUSTOM_GFX; } return ApiStatus_DONE2; } @@ -188,9 +188,9 @@ ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); if (flag) { - model->flags |= 0x800; + model->flags |= MODEL_FLAGS_HAS_TEX_PANNER; } else { - model->flags &= ~0x800; + model->flags &= ~MODEL_FLAGS_HAS_TEX_PANNER; } return ApiStatus_DONE2; } @@ -202,9 +202,9 @@ ApiStatus EnableModel(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(listIndex); if (flag != 0) { - model->flags &= ~0x2; + model->flags &= ~MODEL_FLAGS_ENABLED; } else { - model->flags |= 0x2; + model->flags |= MODEL_FLAGS_ENABLED; } return ApiStatus_DONE2; } @@ -318,10 +318,10 @@ ApiStatus TranslateGroup(Evt* script, s32 isInitialCall) { transformGroup = get_transform_group(index); - index = transformGroup->flags & 0x400; // TODO fix weird match + index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match if (!index) { guTranslateF(transformGroup->matrixB, x, y, z); - transformGroup->flags |= 0x1400; + transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); } else { Matrix4f mtx; @@ -352,9 +352,9 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) { transformGroup = get_transform_group(index); - if (!(transformGroup->flags & 0x400)) { + if (!(transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400)) { guRotateF(transformGroup->matrixB, a, x, y, z); - transformGroup->flags |= 0x1400; + transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); } else { Matrix4f mtx; @@ -385,10 +385,10 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { transformGroup = get_transform_group(index); - index = transformGroup->flags & 0x400; // TODO fix weird match + index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match if (!(index)) { guScaleF(transformGroup->matrixB, x, y, z); - transformGroup->flags |= 0x1400; + transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); } else { Matrix4f mtx; @@ -427,9 +427,9 @@ ApiStatus EnableGroup(Evt* script, s32 isInitialCall) { for (index = transformGroup->minChildModelIndex; index <= transformGroup->maxChildModelIndex; index++) { Model* model = get_model_from_list_index(index); if (flagUnset) { - model->flags &= ~0x2; + model->flags &= ~MODEL_FLAGS_ENABLED; } else { - model->flags |= 0x2; + model->flags |= MODEL_FLAGS_ENABLED; } } @@ -608,10 +608,10 @@ void set_zone_enabled(s32 zoneID, s32 enabled) { switch (enabled) { case 0: - unkStruct->flags |= 0x10000; + unkStruct->flags |= TEMP_SET_ZONE_ENABLED_FLAGS_10000; break; case 1: - unkStruct->flags &= ~0x10000; + unkStruct->flags &= ~TEMP_SET_ZONE_ENABLED_FLAGS_10000; break; } } @@ -628,10 +628,10 @@ ApiStatus SetZoneEnabled(Evt* script, s32 isInitialCall) { switch (enabled) { case FALSE: - unkStruct->flags |= 0x10000; + unkStruct->flags |= TEMP_SET_ZONE_ENABLED_FLAGS_10000; break; case TRUE: - unkStruct->flags &= ~0x10000; + unkStruct->flags &= ~TEMP_SET_ZONE_ENABLED_FLAGS_10000; break; } diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index 144f48cb49..4e3c8fade5 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -33,7 +33,7 @@ ApiStatus CreateNpc(Evt* script, s32 isInitialCall) { NpcBlueprint blueprint; Npc *npc; - blueprint.flags = 0; + blueprint.flags = NPC_FLAG_0; blueprint.initialAnim = initialAnim; blueprint.onUpdate = NULL; blueprint.onRender = NULL; diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 40752bca9a..676d24f02f 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -661,7 +661,7 @@ Trigger* bind_trigger(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 tr Trigger* trigger; TriggerDefinition def; - def.flags = flags | 0x1000000; + def.flags = flags | TRIGGER_DEFINITION_FLAGS_1000000; def.flagIndex = triggerFlagIndex; def.unk_14 = 0; def.function = evt_bound_script_trigger_handler; diff --git a/src/npc.c b/src/npc.c index 1fd0a61c23..991ae8e898 100644 --- a/src/npc.c +++ b/src/npc.c @@ -661,7 +661,7 @@ void enable_npc_shadow(Npc* npc) { if (!(npc->flags & NPC_FLAG_HAS_SHADOW)) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags &= ~1; + shadow->flags &= ~SHADOW_FLAGS_1; npc->flags = npc->flags | (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW); } } @@ -671,7 +671,7 @@ void disable_npc_shadow(Npc* npc) { if (npc->flags & NPC_FLAG_HAS_SHADOW) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags |= 1; + shadow->flags |= SHADOW_FLAGS_1; npc->flags &= ~NPC_FLAG_HAS_SHADOW; npc->flags &= ~NPC_FLAG_DIRTY_SHADOW; } @@ -1493,7 +1493,7 @@ void init_encounter_status(void) { currentEncounter->encounterList[i] = 0; } - currentEncounter->flags = 0; + currentEncounter->flags = ENCOUNTER_STATUS_FLAGS_0; currentEncounter->numEncounters = 0; currentEncounter->eFirstStrike = 0; currentEncounter->hitType = 0; @@ -1719,10 +1719,10 @@ void kill_enemy(Enemy* enemy) { } } - if (!(enemy->flags & 4)) { - if (!(enemy->flags & 8) || (enemy == encounterStatus->currentEnemy)) { - if (!(enemy->flags & 1)) { - if (!(enemy->flags & 0x10)) { + if (!(enemy->flags & ENEMY_FLAGS_4)) { + if (!(enemy->flags & ENEMY_FLAGS_8) || (enemy == encounterStatus->currentEnemy)) { + if (!(enemy->flags & ENEMY_FLAGS_1)) { + if (!(enemy->flags & ENEMY_FLAGS_10)) { COPY_set_defeated((s8)encounterStatus->mapID, encounter->encounterID + i); } } diff --git a/src/pause/135EE0.c b/src/pause/135EE0.c index f9d91b2719..3d84cd5055 100644 --- a/src/pause/135EE0.c +++ b/src/pause/135EE0.c @@ -40,7 +40,7 @@ void func_80242BAC(s32 windowID, s32 posX, s32 posY) { Window* window = &gWindows[i]; s8 parent = window->parent; - if ((parent == -1 || parent == 0x16) && (window->flags & 8)) { + if ((parent == -1 || parent == 0x16) && (window->flags & WINDOW_FLAGS_8)) { break; } } @@ -53,7 +53,7 @@ void func_80242BAC(s32 windowID, s32 posX, s32 posY) { gPauseMenuTargetPosY = posY; gPauseMenuCursorPosY = posY; - } else if ((window->flags & 8) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) { + } else if ((window->flags & WINDOW_FLAGS_88 == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) { gPauseMenuTargetPosX = posX; gPauseMenuCursorPosX = posX; gPauseMenuTargetPosY = posY; @@ -81,7 +81,7 @@ void func_80242D04(s32 windowID, s32 posX, s32 posY) { Window* window = &gWindows[i]; s8 parent = window->parent; - if ((parent == -1 || parent == 0x16) && (window->flags & 8)) { + if ((parent == -1 || parent == 0x16) && (window->flags & WINDOW_FLAGS_8)) { break; } } @@ -93,7 +93,7 @@ void func_80242D04(s32 windowID, s32 posX, s32 posY) { gPauseMenuCursorPosX = posX; gPauseMenuTargetPosY = posY; gPauseMenuCursorPosY = posY; - } else if ((window->flags & 8) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) { + } else if ((window->flags & WINDOW_FLAGS_8) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) { gPauseMenuTargetPosX = posX; gPauseMenuTargetPosY = posY; } diff --git a/src/state_battle.c b/src/state_battle.c index 4566ef9a29..b70b5f0056 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -101,7 +101,7 @@ void state_step_battle(void) { btl_save_world_cameras(); load_battle_section(); D_800A0904 = gPlayerStatusPtr->animFlags; - gPlayerStatusPtr->animFlags &= ~PLAYER_ANIM_FLAG_40; + gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_40; D_800A0908 = get_time_freeze_mode(); set_time_freeze_mode(TIME_FREEZE_NORMAL); gOverrideFlags &= ~0x8; diff --git a/src/state_file_select.c b/src/state_file_select.c index f2dd853fa9..9a2aead61a 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -366,7 +366,7 @@ void state_step_exit_file_select(void) { Window* window = &gWindows[i]; if (window->parent == 44 || window->parent == -1) { - flagSum += window->flags & 8; + flagSum += window->flags & WINDOW_FLAGS_8; } } diff --git a/src/trigger.c b/src/trigger.c index 4e5f2fe32e..f7e0fa899e 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -65,7 +65,7 @@ Trigger* create_trigger(TriggerDefinition* def) { ASSERT(ret != NULL); - ret->flags.flags = def->flags | 1; + ret->flags.flags = def->flags | TRIGGER_DEFINITION_FLAGS_1; ret->params1 = def->colliderIndex; ret->params2 = def->flagIndex; ret->unk_28 = def->unk_1C; diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 3ba279c0ef..0343b986b5 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -80,7 +80,7 @@ void func_802B6048_E24F18(s32 arg0) { exec_ShakeCamX(0, 2, s2temp, phi_f24); playFX_1D(0, xTemp, yTemp, zTemp, phi_s1, phi_s3, 0, (s2temp + 3) * 3); - switch (is_ability_active(ABILITY_ATTACK_F_X)) { + switch (is_ability_active(ABILITY_ATTACK_FX)) { case 1: soundID = 0x372; break; diff --git a/src/world/action/idle.c b/src/world/action/idle.c index b33540700a..330966ee04 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -21,7 +21,7 @@ void world_action_idle_update(void) { PlayerData* playerData = &gPlayerData; s32 wasMoving = FALSE; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { func_802B61E4_E23444(); return; } @@ -40,9 +40,9 @@ void world_action_idle_update(void) { playerStatus->currentSpeed = 0.0f; playerStatus->unk_8C = 0.0f; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { anim = 0x90002; - } else if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_HOLDING_ITEM)) { + } else if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT)) { anim = 0x10002; } else if ((s8)playerStatus->prevActionState == ACTION_STATE_IDLE) { anim = 0x60005; @@ -52,7 +52,7 @@ void world_action_idle_update(void) { suggest_player_anim_clearUnkFlag(anim); } - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_GET_STAR_SPIRIT) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_GET_STAR_SPIRIT) { set_action_state(ACTION_STATE_GET_STAR_SPIRIT); } else { f32 angle; @@ -96,7 +96,7 @@ void func_802B61E4_E23444(void) { playerStatus->currentSpeed = 0.0f; playerStatus->flags &= ~0xE; - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { if (!(gGameStatusPtr->peachFlags & 0x10)) { suggest_player_anim_clearUnkFlag(world_action_idle_peachAnims[gGameStatusPtr->peachAnimIdx]); } else { diff --git a/src/world/action/jump.c b/src/world/action/jump.c index 1fb066f8ff..9d817452fd 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -19,9 +19,9 @@ void func_802B6000_E24040(void) { phys_init_integrator_for_current_state(); - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { temp_v1 = 0x90005; - } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + } else if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { temp_v1 = 0x10007; } else { temp_v1 = 0x60009; @@ -47,7 +47,7 @@ void func_802B60B4_E240F4(void) { } if (playerStatus->actionState == ACTION_STATE_JUMP) { - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { sfx_play_sound_at_player(SOUND_JUMP_8BIT_MARIO, 0); } else { @@ -56,9 +56,9 @@ void func_802B60B4_E240F4(void) { } } - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { phi_a0 = 0x90005; - } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + } else if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { phi_a0 = 0x10007; } else { phi_a0 = 0x60009; @@ -97,7 +97,7 @@ void func_802B6198_E241D8(void) { playerStatus->flags |= 4; - if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { phi_a0 = 0x10008; } else { phi_a0 = 0x6000A; @@ -114,7 +114,7 @@ void func_802B6198_E241D8(void) { void func_802B6294_E242D4(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { func_802B647C_E244BC(); return; } @@ -125,9 +125,9 @@ void func_802B6294_E242D4(void) { playerStatus->flags &= ~0x8000000A; playerStatus->flags |= 4; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { phi_a0 = 0x90005; - } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + } else if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { phi_a0 = 0x10008; } else { phi_a0 = 0x6000A; @@ -149,7 +149,7 @@ void func_802B6348_E24388(void) { f32 sp30; f32 sp34; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { func_802B6508_E24548(); return; } @@ -185,7 +185,7 @@ void func_802B647C_E244BC(void) { playerStatus->flags &= ~0xA; playerStatus->flags |= 4; - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) { temp_v1 = 0x10008; } else { temp_v1 = 0xA0006; @@ -206,7 +206,7 @@ void func_802B6508_E24548(void) { playerStatus->flags |= 4; gCameras[0].moveFlags |= 1; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { suggest_player_anim_clearUnkFlag(0xA0006); } } diff --git a/src/world/action/super_boots.c b/src/world/action/super_boots.c index 6bd88a7659..f6681429b1 100644 --- a/src/world/action/super_boots.c +++ b/src/world/action/super_boots.c @@ -163,7 +163,7 @@ void func_802B6000_E26DE0(void) { } break; case 11: - set_action_state(ACTION_STATE_LAND_ON_SWITCH); + set_action_state(ACTION_STATE_LANDING_ON_SWITCH); playerStatus->fallState++; enable_player_input(); break; diff --git a/src/world/action/ultra_boots.c b/src/world/action/ultra_boots.c index 5ee069d0bc..93a1e57eec 100644 --- a/src/world/action/ultra_boots.c +++ b/src/world/action/ultra_boots.c @@ -158,7 +158,7 @@ void func_802B6000_E26710(void) { } break; case 11: - set_action_state(ACTION_STATE_LAND_ON_SWITCH); + set_action_state(ACTION_STATE_LANDING_ON_SWITCH); playerStatus->fallState++; enable_player_input(); break; diff --git a/src/world/action/use_spinning_flower.c b/src/world/action/use_spinning_flower.c index ada494e377..d76d1e6b0b 100644 --- a/src/world/action/use_spinning_flower.c +++ b/src/world/action/use_spinning_flower.c @@ -69,7 +69,7 @@ void func_802B60A4_E29514(void) { } else { D_802B6ED0 = -1; } - if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { suggest_player_anim_clearUnkFlag(0x1002B); } } @@ -122,7 +122,7 @@ void func_802B60A4_E29514(void) { D_802B6EF0 = 1.6f; playerStatus->flags |= 0x800000; } - if (gGameStatusPtr->pressedButtons & BUTTON_Z && !(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) { + if (gGameStatusPtr->pressedButtons & BUTTON_Z && !(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { suggest_player_anim_setUnkFlag(0x10007); playerStatus->fallState = 3; playerStatus->framesOnGround = 30; diff --git a/src/world/action/walk.c b/src/world/action/walk.c index 69f39a0d2b..5fa2a610b5 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -20,7 +20,7 @@ void func_802B6288_E23968(void) { s32 phi_s3; phi_s3 = 0; - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { func_802B6738_E23E18(); return; } @@ -34,10 +34,10 @@ void func_802B6288_E23968(void) { if (!(playerStatus->flags & 0x00004000)) { playerStatus->currentSpeed = playerStatus->runSpeed; } - if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { phi_a0 = 0x90003; } else { - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_HOLDING_ITEM)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT)) { phi_a0 = 0x10005; } else { phi_a0 = 0x60002; @@ -106,7 +106,7 @@ void func_802B6288_E23968(void) { } void func_802B6550_E23C30(void) { - if (!(gPlayerStatus.animFlags & PLAYER_ANIM_FLAG_IN_DISGUISE)) { + if (!(gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { if (!(gGameStatusPtr->peachFlags & 0x10)) { suggest_player_anim_clearUnkFlag(D_802B6910_E23FF0[gGameStatusPtr->peachAnimIdx]); return; @@ -166,7 +166,7 @@ void func_802B6738_E23E18(void) { playerStatus->currentSpeed = playerStatus->runSpeed; } - if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { gameStatus = gGameStatusPtr; if (!(gameStatus->peachFlags & 0x10)) { if (!gameStatus->peachAnimIdx) { diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index 9c50f77e4b..9573de55b3 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -100,7 +100,7 @@ StaticNpc N(npcGroup_802414CC) = { .pos = { -196.0f, 130.0f, 104.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .minCoinBonus = 1, @@ -133,7 +133,7 @@ StaticNpc N(npcGroup_802416BC) = { .pos = { 641.0f, 268.0f, 202.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .minCoinBonus = 1, @@ -166,7 +166,7 @@ StaticNpc N(npcGroup_802418AC) = { .pos = { 333.0f, 215.0f, 85.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, { ITEM_DRIED_SHROOM, 10, 0 }, .heartDrops = STANDARD_HEART_DROPS(2), diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index 97839bea7b..e9b9af85ac 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -146,9 +146,9 @@ ApiStatus N(func_80240B94_BDF924)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; @@ -463,7 +463,7 @@ EvtSource N(interact_8024254C) = SCRIPT({ EVT_VAR(0) = 118; EVT_VAR(1) = 1; await N(80241C6C); - AddKeyItem(ITEM_PACKAGE); + AddKeyItem(ITEM_KOOT_PACKAGE); EVT_MAP_VAR(0) = 0; EVT_SAVE_FLAG(1015) = 1; EVT_SAVE_FLAG(1020) = 0; @@ -720,7 +720,7 @@ StaticNpc N(npcGroup_80243378) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802424E0), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 36, 10, 185, 56, 10, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 479, 215, 198, 150 }, @@ -752,7 +752,7 @@ StaticNpc N(npcGroup_80243568) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802428A8), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -783,7 +783,7 @@ StaticNpc N(npcGroup_80243758) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802431A4), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 379, 10, 186, 399, 10, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 479, 215, 198, 150 }, @@ -815,7 +815,7 @@ StaticNpc N(npcGroup_80243948) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80243328), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -846,7 +846,7 @@ StaticNpc N(npcGroup_80243B38) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_8024334C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -919,7 +919,7 @@ StaticNpc N(npcGroup_80243F80)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243E90), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -948,7 +948,7 @@ StaticNpc N(npcGroup_80243F80)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243ECC), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -977,7 +977,7 @@ StaticNpc N(npcGroup_80243F80)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243F08), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1006,7 +1006,7 @@ StaticNpc N(npcGroup_80243F80)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243F44), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index adf4dbd526..e2ad32b53e 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -126,7 +126,7 @@ StaticNpc N(npcGroup_80243840) = { .pos = { -350.0f, 180.0f, 150.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, { ITEM_DRIED_SHROOM, 10, 0 }, .heartDrops = STANDARD_HEART_DROPS(2), @@ -160,7 +160,7 @@ StaticNpc N(npcGroup_80243A30) = { .pos = { 360.0f, 208.0f, 100.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, { ITEM_DRIED_SHROOM, 10, 0 }, .heartDrops = STANDARD_HEART_DROPS(2), @@ -194,7 +194,7 @@ StaticNpc N(npcGroup_80243C20) = { .pos = { 150.0f, 177.0f, 160.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .minCoinBonus = 1, @@ -227,7 +227,7 @@ StaticNpc N(npcGroup_80243E10) = { .pos = { 550.0f, 230.0f, 125.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .minCoinBonus = 1, @@ -377,9 +377,9 @@ ApiStatus N(func_80240B94_BE4344)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index a1ba62efa1..16ad145e22 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -329,7 +329,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80241FB8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 55, 10, 160, 75, 10, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 55, 195, 160, 50 }, @@ -360,7 +360,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80242008), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -390,7 +390,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024202C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -420,7 +420,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024212C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -450,7 +450,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802421EC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 350, 10, 197, 330, 10, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 185, 197, 50 }, @@ -795,7 +795,7 @@ StaticNpc N(npcGroup_802443AC) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80244358), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -869,7 +869,7 @@ StaticNpc N(npcGroup_802447E4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80244704), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -898,7 +898,7 @@ StaticNpc N(npcGroup_802447E4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_8024473C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -927,7 +927,7 @@ StaticNpc N(npcGroup_802447E4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80244774), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -956,7 +956,7 @@ StaticNpc N(npcGroup_802447E4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_802447AC), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1056,9 +1056,9 @@ ApiStatus N(func_80240B94_BE8774)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index bd0d68ab75..7a55fba669 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -696,7 +696,7 @@ StaticNpc N(npcGroup_80245D0C)[] = { .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000, .init = &N(init_80245090), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -726,7 +726,7 @@ StaticNpc N(npcGroup_80245D0C)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000, .init = &N(init_80245058), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -758,7 +758,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -788,7 +788,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -818,7 +818,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -848,7 +848,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -878,7 +878,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -908,7 +908,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -940,7 +940,7 @@ StaticNpc N(npcGroup_80246C8C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_80245164), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -970,7 +970,7 @@ StaticNpc N(npcGroup_80246E7C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, .init = &N(init_8024519C), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1009,7 +1009,7 @@ StaticNpc N(npcGroup_802470BC) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024706C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, .itemDrops = { { ITEM_DRIED_SHROOM, 10, 0 }, @@ -1046,7 +1046,7 @@ StaticNpc N(npcGroup_802472AC) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024706C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, .itemDrops = { { ITEM_DRIED_SHROOM, 10, 0 }, @@ -1083,7 +1083,7 @@ StaticNpc N(npcGroup_8024749C) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024706C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, .itemDrops = { { ITEM_DRIED_SHROOM, 10, 0 }, @@ -1120,7 +1120,7 @@ StaticNpc N(npcGroup_8024768C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80245C9C), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index 1907efed0f..e213073ff8 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -347,7 +347,7 @@ StaticNpc N(npcGroup_80241448) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80241288), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -377,7 +377,7 @@ StaticNpc N(npcGroup_80241638) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802413E8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_arn/arn_09/events.c b/src/world/area_arn/arn_09/events.c index 488a34e58f..0437247d49 100644 --- a/src/world/area_arn/arn_09/events.c +++ b/src/world/area_arn/arn_09/events.c @@ -148,7 +148,7 @@ StaticNpc N(npcGroup_80240784) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80240730), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index c831e82aae..16959fe48a 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -166,7 +166,7 @@ StaticNpc N(npcGroup_802407D8) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80240720), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -195,7 +195,7 @@ StaticNpc N(npcGroup_802409C8) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024076C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, { ITEM_DRIED_SHROOM, 10, 0 }, .heartDrops = STANDARD_HEART_DROPS(2), diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c index 0d9b5c1188..f8776ddedf 100644 --- a/src/world/area_arn/arn_11/events.c +++ b/src/world/area_arn/arn_11/events.c @@ -254,7 +254,7 @@ StaticNpc N(npcGroup_80240EEC) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_80240E70), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index 1e7c2dc8c8..57bd1d8d7e 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -166,7 +166,7 @@ StaticNpc N(npcGroup_802407DC) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80240710), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -195,7 +195,7 @@ StaticNpc N(npcGroup_802409CC) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024075C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, { ITEM_DRIED_SHROOM, 10, 0 }, .heartDrops = STANDARD_HEART_DROPS(2), diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index 784eed7acb..3000150469 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -167,7 +167,7 @@ StaticNpc N(npcGroup_802407EC) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80240720), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -196,7 +196,7 @@ StaticNpc N(npcGroup_802409DC) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024076C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, { ITEM_DRIED_SHROOM, 10, 0 }, .heartDrops = STANDARD_HEART_DROPS(2), diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index d41f5fcf37..43790200c6 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -418,7 +418,7 @@ StaticNpc N(npcGroup_80241FE4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_400000, .init = &N(init_80241F70), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -449,7 +449,7 @@ StaticNpc N(npcGroup_802421D4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80241F94), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -479,7 +479,7 @@ StaticNpc N(npcGroup_802423C4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80241FA4), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -509,7 +509,7 @@ StaticNpc N(npcGroup_802425B4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80241FB4), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -539,7 +539,7 @@ StaticNpc N(npcGroup_802427A4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80241FC4), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -569,7 +569,7 @@ StaticNpc N(npcGroup_80242994) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80241FD4), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -750,7 +750,7 @@ StaticNpc N(npcGroup_802434FC) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000, .init = &N(init_802434EC), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index c01ee15e8e..3d8a7b51f8 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -183,7 +183,7 @@ EvtSource N(enterDoubleDoor_80243A3C) = SCRIPT({ }); s32 N(itemList_80243C40)[] = { - ITEM_CASTLE_KEY1, + ITEM_TUBBA_CASTLE_KEY, ITEM_NONE, }; @@ -1287,9 +1287,9 @@ ApiStatus N(func_802430C0_C00940)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; @@ -1493,7 +1493,7 @@ StaticNpc N(npcGroup_80246090) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80245D80), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, @@ -1524,7 +1524,7 @@ StaticNpc N(npcGroup_80246280) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80245E44), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, @@ -1555,7 +1555,7 @@ StaticNpc N(npcGroup_80246470) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80245F08), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, @@ -1586,7 +1586,7 @@ StaticNpc N(npcGroup_80246660) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80245FCC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, @@ -1632,7 +1632,7 @@ StaticNpc N(npcGroup_80246880) = { .flags = NPC_FLAG_200000, .init = &N(init_80245784), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1663,7 +1663,7 @@ StaticNpc N(npcGroup_80246A70) = { .flags = NPC_FLAG_200000, .init = &N(init_80245814), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -1702,7 +1702,7 @@ StaticNpc N(npcGroup_80246C60) = { .flags = NPC_FLAG_200000, .init = &N(init_80245CF0), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index f0c7055775..6f44f136a9 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -275,7 +275,7 @@ StaticNpc N(npcGroup_80241E08)[] = { .pos = { -200.0f, 0.0f, 180.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -312,7 +312,7 @@ StaticNpc N(npcGroup_80241E08)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -344,7 +344,7 @@ StaticNpc N(npcGroup_802421E8)[] = { .pos = { 375.0f, 0.0f, 100.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -380,7 +380,7 @@ StaticNpc N(npcGroup_802421E8)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index ce96491c44..096025c4e2 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -169,7 +169,7 @@ EvtSource N(enterDoubleDoor_80242D1C) = SCRIPT({ }); s32 N(itemList_80242F28)[] = { - ITEM_CASTLE_KEY1, + ITEM_TUBBA_CASTLE_KEY, ITEM_NONE, }; @@ -527,7 +527,7 @@ StaticNpc N(npcGroup_80243DE8)[] = { .pos = { 180.0f, 0.0f, -122.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -563,7 +563,7 @@ StaticNpc N(npcGroup_80243DE8)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -595,7 +595,7 @@ StaticNpc N(npcGroup_802441C8)[] = { .pos = { -272.0f, 0.0f, -135.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -631,7 +631,7 @@ StaticNpc N(npcGroup_802441C8)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -664,7 +664,7 @@ StaticNpc N(npcGroup_802445A8)[] = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80243D94), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -700,7 +700,7 @@ StaticNpc N(npcGroup_802445A8)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -884,9 +884,9 @@ ApiStatus N(func_802416B4_C32B94)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index bd8809a10f..dba4e812b3 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -226,7 +226,7 @@ StaticNpc N(npcGroup_80243B28) = { .pos = { 70.0f, -220.0f, 186.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 70, -220, 186, 15, 40, -32767, 1, 80, -220, 170, 80, 150, 1 }, diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 2021ee1c7f..8c3d6a3aea 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -197,7 +197,7 @@ StaticNpc N(npcGroup_80241B4C)[] = { .pos = { 132.0f, -110.0f, 238.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -233,7 +233,7 @@ StaticNpc N(npcGroup_80241B4C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -265,7 +265,7 @@ StaticNpc N(npcGroup_80241F2C)[] = { .pos = { 503.0f, -210.0f, 225.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -301,7 +301,7 @@ StaticNpc N(npcGroup_80241F2C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 0e9d2b85be..9439529157 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -162,7 +162,7 @@ StaticNpc N(npcGroup_80240954) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802408FC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 8004cff008..ee334fbacd 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -184,7 +184,7 @@ StaticNpc N(npcGroup_80241A7C)[] = { .pos = { -500.0f, 0.0f, -240.0f }, .flags = NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -221,7 +221,7 @@ StaticNpc N(npcGroup_80241A7C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 4656080454..30d8e7e776 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -490,7 +490,7 @@ StaticNpc N(npcGroup_802450A0) = { .flags = NPC_FLAG_4 | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, .init = &N(init_80244E94), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -528,7 +528,7 @@ StaticNpc N(npcGroup_80245290)[] = { .pos = { -250.0f, 0.0f, 135.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -565,7 +565,7 @@ StaticNpc N(npcGroup_80245290)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -597,7 +597,7 @@ StaticNpc N(npcGroup_80245670)[] = { .pos = { 220.0f, 0.0f, 155.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -634,7 +634,7 @@ StaticNpc N(npcGroup_80245670)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -666,7 +666,7 @@ StaticNpc N(npcGroup_80245A50)[] = { .pos = { 825.0f, 100.0f, 200.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -703,7 +703,7 @@ StaticNpc N(npcGroup_80245A50)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -734,7 +734,7 @@ StaticNpc N(npcGroup_80245E30) = { .pos = { 75.0f, 310.0f, 85.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 75, 310, 85, 30, 0, -32767, 0, 75, 0, 85, 250, 55, 1, 1 }, @@ -764,7 +764,7 @@ StaticNpc N(npcGroup_80246020) = { .pos = { -451.0f, 310.0f, 81.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -451, 310, 81, 30, 0, -32767, 0, -310, 0, 175, 250, 145, 1, 1 }, @@ -849,7 +849,7 @@ StaticNpc N(npcGroup_80246528) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000 | NPC_FLAG_400000, .init = &N(init_802464C4), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, @@ -891,7 +891,7 @@ StaticNpc N(npcGroup_80246768) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS, .init = &N(init_80246728), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -1006,9 +1006,9 @@ ApiStatus N(func_80240B94_C40944)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 6905b63380..7a46f07e1f 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -417,7 +417,7 @@ StaticNpc N(npcGroup_80244920)[] = { .pos = { -350.0f, 0.0f, 180.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -454,7 +454,7 @@ StaticNpc N(npcGroup_80244920)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -495,7 +495,7 @@ StaticNpc N(npcGroup_80244D6C)[] = { .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80244D00), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -532,7 +532,7 @@ StaticNpc N(npcGroup_80244D6C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -563,7 +563,7 @@ StaticNpc N(npcGroup_8024514C) = { .pos = { -20.0f, 100.0f, 180.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -20, 100, 180, 40, 0, -32767, 0, -20, 100, 180, 250, 0, 0, 1 }, diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 2cc2a0a0c6..2956cd99ee 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -41,7 +41,7 @@ static s32 N(pad_19B4)[] = { }; s32 N(itemList_802419C0)[] = { - ITEM_CASTLE_KEY1, + ITEM_TUBBA_CASTLE_KEY, ITEM_NONE, }; @@ -358,7 +358,7 @@ StaticNpc N(npcGroup_802428C0) = { .flags = NPC_FLAG_100 | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, .init = &N(init_802427EC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -589,9 +589,9 @@ ApiStatus N(func_80241464_C50974)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 66bc059239..d7fa1bf25c 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -99,7 +99,7 @@ static s32 N(pad_1774)[] = { }; EvtSource N(80241780) = SCRIPT({ - MakeItemEntity(ITEM_CASTLE_KEY1, -235, 25, -165, 17, EVT_SAVE_FLAG(1069)); + MakeItemEntity(ITEM_TUBBA_CASTLE_KEY, -235, 25, -165, 17, EVT_SAVE_FLAG(1069)); }); static s32 N(pad_17B4)[] = { @@ -200,7 +200,7 @@ StaticNpc N(npcGroup_80241A4C)[] = { .pos = { -70.0f, 0.0f, -100.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -237,7 +237,7 @@ StaticNpc N(npcGroup_80241A4C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -269,7 +269,7 @@ StaticNpc N(npcGroup_80241E2C)[] = { .pos = { 0.0f, 0.0f, -235.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -305,7 +305,7 @@ StaticNpc N(npcGroup_80241E2C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -337,7 +337,7 @@ StaticNpc N(npcGroup_8024220C)[] = { .pos = { 70.0f, 0.0f, -100.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -373,7 +373,7 @@ StaticNpc N(npcGroup_8024220C)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -405,7 +405,7 @@ StaticNpc N(npcGroup_802425EC)[] = { .pos = { 140.0f, 0.0f, -235.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -441,7 +441,7 @@ StaticNpc N(npcGroup_802425EC)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -473,7 +473,7 @@ StaticNpc N(npcGroup_802429CC)[] = { .pos = { 210.0f, 0.0f, -100.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -509,7 +509,7 @@ StaticNpc N(npcGroup_802429CC)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -541,7 +541,7 @@ StaticNpc N(npcGroup_80242DAC)[] = { .pos = { 280.0f, 0.0f, -235.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -577,7 +577,7 @@ StaticNpc N(npcGroup_80242DAC)[] = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 77cec8908f..07efa0f367 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -575,7 +575,7 @@ StaticNpc N(npcGroup_802432D4) = { .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, .init = &N(init_80242924), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 5, 0, 0, 240, 175, 0, 240, 350, 0, 240, 525, 0, 240, 700, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 300, 0, 240, 1000, 250, 1, 1 }, @@ -606,7 +606,7 @@ StaticNpc N(npcGroup_802434C4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024329C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -738,9 +738,9 @@ ApiStatus N(func_80240B94_C56AD4)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index a0518ad747..972c1cc99b 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -1238,7 +1238,7 @@ NpcSettings N(npcSettings_80247788) = { .otherAI = &N(80247628), .onInteract = &N(8024769C), .aux = &N(8024771C), - .flags = 0x00000D01, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .level = 99, }; @@ -1250,7 +1250,7 @@ NpcSettings N(npcSettings_802477B4) = { .onInteract = &N(8024769C), .ai = &N(80247768), .aux = &N(8024771C), - .flags = 0x00000C01, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .level = 99, .unk_2A = 16, }; @@ -1909,7 +1909,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802481F8), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1939,7 +1939,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802483A8), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -235, 0, 160, 30, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, @@ -1970,7 +1970,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802484E0), .yaw = 61, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2000,7 +2000,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80248AE4), .yaw = 74, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2030,7 +2030,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80248CC8), .yaw = 257, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2060,7 +2060,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80249168), .yaw = 271, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2090,7 +2090,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024981C), .yaw = 180, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2120,7 +2120,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 00}, .yaw = 263, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2150,7 +2150,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80249ABC), .yaw = 257, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -120, 0, 134, 40, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, @@ -2181,7 +2181,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80249B10), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 40, 0, 105, -30, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 1 }, @@ -2215,7 +2215,7 @@ StaticNpc N(npcGroup_8024AE94)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802498C4), .yaw = 62, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2245,7 +2245,7 @@ StaticNpc N(npcGroup_8024AE94)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802498C4), .yaw = 63, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2275,7 +2275,7 @@ StaticNpc N(npcGroup_8024AE94)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802498C4), .yaw = 244, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2400,7 +2400,7 @@ EvtSource N(8024B7B0) = { EVT_SET(EVT_VAR(0), 119) EVT_SET(EVT_VAR(1), 1) EVT_EXEC_WAIT(N(8024B5B4)) - EVT_CALL(AddKeyItem, ITEM_RED_JAR) + EVT_CALL(AddKeyItem, ITEM_KOOT_RED_JAR) EVT_SET(EVT_SAVE_FLAG(758), 1) EVT_WAIT_FRAMES(20) EVT_CALL(func_802D2C14, 0) @@ -2999,9 +2999,9 @@ ApiStatus N(func_80241174_95C374)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 9f5672f93b..4c2c722b8d 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -1084,7 +1084,7 @@ NpcSettings N(npcSettings_802473B0) = { .otherAI = &N(80247250), .onInteract = &N(802472C4), .aux = &N(80247344), - .flags = 0x00000D01, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .level = 99, }; @@ -1096,7 +1096,7 @@ NpcSettings N(npcSettings_802473DC) = { .onInteract = &N(802472C4), .ai = &N(80247390), .aux = &N(80247344), - .flags = 0x00000C01, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .level = 99, .unk_2A = 0x10, }; @@ -2722,7 +2722,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BA50), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }, @@ -2753,7 +2753,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BBAC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, @@ -2784,7 +2784,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D04C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2814,7 +2814,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D790), .yaw = 180, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2844,7 +2844,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80247A80), .yaw = 180, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2874,7 +2874,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D130), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2904,7 +2904,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BCD4), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2934,7 +2934,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BD28), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2964,7 +2964,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BF10), .yaw = 180, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2994,7 +2994,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024C038), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -3024,7 +3024,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D3E8), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -3053,7 +3053,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 01}, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index b373389ff6..0a369cf796 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -1037,7 +1037,7 @@ StaticNpc N(npcGroup_80244E64) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80243474), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1068,7 +1068,7 @@ StaticNpc N(npcGroup_80245054)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243B7C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, -59, 0, -40, -80, 0, -40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, @@ -1099,7 +1099,7 @@ StaticNpc N(npcGroup_80245054)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243BB0), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 67, 0, 85, 97, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, @@ -1130,7 +1130,7 @@ StaticNpc N(npcGroup_80245054)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243BE4), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 90, 0, 410, 120, 0, 410, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, @@ -1161,7 +1161,7 @@ StaticNpc N(npcGroup_80245054)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243C18), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .movement = { 2, 200, 0, 430, 240, 0, 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, @@ -1194,7 +1194,7 @@ StaticNpc N(npcGroup_80245814) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_8024414C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1225,7 +1225,7 @@ StaticNpc N(npcGroup_80245A04) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80244BF4), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1255,7 +1255,7 @@ StaticNpc N(npcGroup_80245BF4) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80244DD0), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1375,7 +1375,7 @@ StaticNpc N(npcGroup_80246264)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80246170), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1404,7 +1404,7 @@ StaticNpc N(npcGroup_80246264)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802461E4), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1433,7 +1433,7 @@ StaticNpc N(npcGroup_80246264)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80246224), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -2135,9 +2135,9 @@ ApiStatus N(func_80240BD4_C9EAF4)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 32f2048ab5..3fa93f3b49 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -884,7 +884,7 @@ StaticNpc N(npcGroup_8024388C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80241DA4), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -915,7 +915,7 @@ StaticNpc N(npcGroup_80243A7C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80241E10), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -945,7 +945,7 @@ StaticNpc N(npcGroup_80243C6C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024338C), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -975,7 +975,7 @@ StaticNpc N(npcGroup_80243E5C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802434CC), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1005,7 +1005,7 @@ StaticNpc N(npcGroup_8024404C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024360C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1035,7 +1035,7 @@ StaticNpc N(npcGroup_8024423C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_8024374C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 429870677c..a00af24aad 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -471,7 +471,7 @@ StaticNpc N(npcGroup_8024291C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80242428), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index f5f26d6899..898364bb0a 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -579,7 +579,7 @@ StaticNpc N(npcGroup_80243C48) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243B20), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -609,7 +609,7 @@ StaticNpc N(npcGroup_80243E38) = { .pos = { 205.0f, 0.0f, -80.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -646,7 +646,7 @@ StaticNpc N(npcGroup_80244028) = { .pos = { 275.0f, 0.0f, -115.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -683,7 +683,7 @@ StaticNpc N(npcGroup_80244218) = { .pos = { -230.0f, 60.0f, -110.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -720,7 +720,7 @@ StaticNpc N(npcGroup_80244408) = { .pos = { -330.0f, 60.0f, -110.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -757,7 +757,7 @@ StaticNpc N(npcGroup_802445F8) = { .pos = { -430.0f, 60.0f, -110.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -794,7 +794,7 @@ StaticNpc N(npcGroup_802447E8) = { .pos = { -530.0f, 60.0f, -110.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -831,7 +831,7 @@ StaticNpc N(npcGroup_802449D8) = { .pos = { -630.0f, 60.0f, -110.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -888,7 +888,7 @@ StaticNpc N(npcGroup_80244CD4) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80244BC8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 20, .itemDrops = { { ITEM_HONEY_SYRUP, 24, 0 }, diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index d7870062e7..e3a7785df0 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -516,7 +516,7 @@ StaticNpc N(npcGroup_8024398C) = { .pos = { -350.0f, 0.0f, 40.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -553,7 +553,7 @@ StaticNpc N(npcGroup_80243B7C) = { .pos = { 260.0f, 0.0f, 75.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -590,7 +590,7 @@ StaticNpc N(npcGroup_80243D6C) = { .pos = { -50.0f, 55.0f, 90.0f }, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, @@ -629,7 +629,7 @@ StaticNpc N(npcGroup_80243F5C) = { .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243954), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 186c6c99ee..8080d1dca0 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -760,7 +760,7 @@ StaticNpc N(npcGroup_80243E64) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80243D78), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 37b386ac63..b4d514ae5b 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -751,7 +751,7 @@ StaticNpc N(npcGroup_80242CF4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_80242B58), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -788,7 +788,7 @@ StaticNpc N(npcGroup_80242CF4)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_80242C38), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index d2ff7290f6..fe132654dd 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -412,7 +412,7 @@ StaticNpc N(npcGroup_802425D8)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000, .init = &N(init_802423D0), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -441,7 +441,7 @@ StaticNpc N(npcGroup_802425D8)[] = { .pos = { -70.0f, 0.0f, 20.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 1c1e1d198e..98b4786e70 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -805,7 +805,7 @@ StaticNpc N(npcGroup_80246434) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_80246280), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -835,7 +835,7 @@ StaticNpc N(npcGroup_80246624) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802462D0), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -866,7 +866,7 @@ StaticNpc N(npcGroup_80246814) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80246370), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -896,7 +896,7 @@ StaticNpc N(npcGroup_80246A04) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802463B0), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -936,7 +936,7 @@ StaticNpc N(npcGroup_80246BF4) = { .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802463B0), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -976,7 +976,7 @@ StaticNpc N(npcGroup_80246DE4) = { .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802463E8), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1009,7 +1009,7 @@ StaticNpc N(npcGroup_80246FD4) = { .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802463E8), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1042,7 +1042,7 @@ StaticNpc N(npcGroup_802471C4) = { .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802463E8), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1075,7 +1075,7 @@ StaticNpc N(npcGroup_802473B4) = { .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802463E8), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1108,7 +1108,7 @@ StaticNpc N(npcGroup_802475A4) = { .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802463E8), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1141,7 +1141,7 @@ StaticNpc N(npcGroup_80247794) = { .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS, .init = &N(init_802463E8), .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1747,9 +1747,9 @@ ApiStatus N(func_8024262C_CC5E3C)(Evt* script, s32 isInitialCall) { script->functionTemp[1] = 0; fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } } @@ -1871,7 +1871,7 @@ ApiStatus N(func_80242A6C_CC627C)(Evt* script, s32 isInitialCall) { npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; npc->flags &= ~0x800; - enemy->flags |= 0x200000; + enemy->flags |= ENEMY_FLAGS_200000; npc->flags = (npc->flags & ~0x200) | 8; enemy->varTable[10] = 0; enemy->varTable[11] = -1; diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 574c222734..20deda9950 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -163,7 +163,7 @@ StaticNpc N(npcGroup_80244B20) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_4000, .init = &N(init_80244ADC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -193,7 +193,7 @@ StaticNpc N(npcGroup_80244D10) = { .pos = { -175.0f, 55.0f, 15.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c index a0c8b109f2..216d11d483 100644 --- a/src/world/area_flo/flo_15/CD06C0.c +++ b/src/world/area_flo/flo_15/CD06C0.c @@ -272,7 +272,7 @@ StaticNpc N(npcGroup_80240EE0)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000, .init = &N(init_80240CD0), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -302,7 +302,7 @@ StaticNpc N(npcGroup_80240EE0)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_8000, .init = &N(init_80240DB4), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 75c46c065b..9988d06912 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -47,7 +47,7 @@ StaticNpc N(npcGroup_802440F4) = { .pos = { 440.0f, 145.0f, 15.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 10, .itemDrops = { { ITEM_THUNDER_RAGE, 10, 0 }, @@ -83,7 +83,7 @@ StaticNpc N(npcGroup_802442E4) = { .pos = { 600.0f, 145.0f, 15.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 10, .itemDrops = { { ITEM_THUNDER_RAGE, 10, 0 }, diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index ca20849bfb..3ab4dc2807 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -389,7 +389,7 @@ StaticNpc N(npcGroup_80244688) = { .pos = { -185.0f, 90.0f, 10.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -428,7 +428,7 @@ StaticNpc N(npcGroup_80244878) = { .pos = { 200.0f, 90.0f, -25.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -467,7 +467,7 @@ StaticNpc N(npcGroup_80244A68) = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -499,7 +499,7 @@ StaticNpc N(npcGroup_80244C58) = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -531,7 +531,7 @@ StaticNpc N(npcGroup_80244E48) = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -563,7 +563,7 @@ StaticNpc N(npcGroup_80245038) = { .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .yaw = 0, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -1168,9 +1168,9 @@ ApiStatus N(func_802424D8_CD97B8)(Evt* script, s32 isInitialCall) { script->functionTemp[1] = 0; fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } } @@ -1292,7 +1292,7 @@ ApiStatus N(func_80242918_CD9BF8)(Evt* script, s32 isInitialCall) { npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; npc->flags &= ~0x800; - enemy->flags |= 0x200000; + enemy->flags |= ENEMY_FLAGS_200000; npc->flags = (npc->flags & ~0x200) | 8; enemy->varTable[10] = 0; enemy->varTable[11] = -1; diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 9d9146ee16..42b29c2126 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -1482,7 +1482,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245B90), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -1520,7 +1520,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245C04), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -1558,7 +1558,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245C78), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -1596,7 +1596,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245AA8), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, @@ -1634,7 +1634,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245B30), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, .itemDrops = { { ITEM_SUPER_SHROOM, 2, 0 }, diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 748d478d3b..c42c78dccf 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -789,7 +789,7 @@ StaticNpc N(npcGroup_80243804)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_802435E4), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -819,7 +819,7 @@ StaticNpc N(npcGroup_80243804)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_80243684), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -849,7 +849,7 @@ StaticNpc N(npcGroup_80243804)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, .init = &N(init_8024371C), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -887,7 +887,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -917,7 +917,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -947,7 +947,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -977,7 +977,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1007,7 +1007,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1037,7 +1037,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1067,7 +1067,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1097,7 +1097,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1127,7 +1127,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1157,7 +1157,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1187,7 +1187,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1217,7 +1217,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1247,7 +1247,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1277,7 +1277,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -1307,7 +1307,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802437A8), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c index 0a0c9162ba..16580b674c 100644 --- a/src/world/area_flo/flo_22/CEC240.c +++ b/src/world/area_flo/flo_22/CEC240.c @@ -170,7 +170,7 @@ StaticNpc N(npcGroup_80240A04) = { .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_80240740), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -200,7 +200,7 @@ StaticNpc N(npcGroup_80240BF4) = { .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, .init = &N(init_802409CC), .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index fe417da83a..f5d1bf3f38 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -349,7 +349,7 @@ StaticNpc N(npcGroup_80241F98) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80241E70), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -379,7 +379,7 @@ StaticNpc N(npcGroup_80242188) = { .pos = { 80.0f, 0.0f, 0.0f }, .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -410,7 +410,7 @@ StaticNpc N(npcGroup_80242378) = { .pos = { -320.0f, 0.0f, 0.0f }, .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 1, @@ -553,9 +553,9 @@ ApiStatus N(func_80240728_CEE988)(Evt* script, s32 isInitialCall) { script->functionTemp[1] = 0; fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } } diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index f1379137c6..080f9e4ee4 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -384,7 +384,7 @@ StaticNpc N(npcGroup_8024368C) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243564), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -414,7 +414,7 @@ StaticNpc N(npcGroup_8024387C) = { .pos = { -200.0f, 45.0f, 0.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 10, .itemDrops = { { ITEM_THUNDER_RAGE, 10, 0 }, @@ -450,7 +450,7 @@ StaticNpc N(npcGroup_80243A6C) = { .pos = { 150.0f, 55.0f, 0.0f }, .flags = NPC_FLAG_LOCK_ANIMS, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_MAPLE_SYRUP, 6, 0 }, diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index c17f77cb80..b7dde41327 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -62,9 +62,9 @@ ApiStatus N(func_80240B94_B84D14)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 42d5a4c915..08f5d17567 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -57,9 +57,9 @@ ApiStatus N(func_80240C44_ABBED4)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 20c921e69f..7f4c9a17b2 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -62,9 +62,9 @@ ApiStatus N(func_80240B94_AC5D04)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index 2a844ed305..f853b6942e 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -204,7 +204,7 @@ StaticNpc N(npcGroup_80241260) = { .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_400000, .init = &N(init_802411A8), .yaw = 45, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { @@ -271,7 +271,7 @@ EvtSource N(makeEntities) = SCRIPT({ MakeEntity(0x802EA0C4, 165, 0, 380, 20, MAKE_ENTITY_END); MakeEntity(0x802EA564, -170, 0, 370, 43, ITEM_COIN, MAKE_ENTITY_END); AssignBlockFlag(EVT_SAVE_FLAG(50)); - MakeEntity(0x802EAA54, 345, 75, -250, 0, ITEM_WATER, MAKE_ENTITY_END); + MakeEntity(0x802EAA54, 345, 75, -250, 0, ITEM_BAKING_WATER, MAKE_ENTITY_END); MakeItemEntity(ITEM_COIN, 345, 205, -250, 17, EVT_SAVE_FLAG(56)); MakeItemEntity(ITEM_COIN, 345, 230, -250, 17, EVT_SAVE_FLAG(57)); MakeItemEntity(ITEM_COIN, 345, 255, -250, 17, EVT_SAVE_FLAG(58)); diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index fcb5ad2f97..bad63998f2 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -150,7 +150,7 @@ StaticNpc N(goombaNpc) = { .flags = 0x00000C00, .init = N(GoombaInit), .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 10 } }, .heartDrops = GENEROUS_WHEN_LOW_HEART_DROPS(2), diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 5751ceb0a3..dcec04fc42 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -60,9 +60,9 @@ ApiStatus N(func_80240B94_A875E4)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 89e5c3ed7c..8600bf1019 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -57,9 +57,9 @@ ApiStatus N(func_80240C74_A8D6F4)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 221052171e..dfffa856f3 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -57,9 +57,9 @@ ApiStatus N(func_80243104_7EDE14)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 7b77cdd750..e1b01d71e0 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -74,9 +74,9 @@ ApiStatus N(func_80240E74_E0F614)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 08e2100d5f..dcabe9ac28 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -67,9 +67,9 @@ ApiStatus N(func_802418D8_9FC0C8)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 5c2ec3c012..dcd63305f2 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -70,9 +70,9 @@ ApiStatus N(func_80241100_DBE3B0)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index f7952f1600..e5136d0d48 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -67,9 +67,9 @@ ApiStatus N(func_80241AE0_DCE7B0)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 9555623fa4..15bbb8d3c7 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -59,9 +59,9 @@ ApiStatus N(func_80241AB4_D8ED04)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index 582e7f3546..7d61b01fde 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -36,7 +36,7 @@ StaticNpc N(npcGroup_80240388) = { .pos = { -40.0f, 0.0f, 160.0f }, .flags = NPC_FLAG_NO_Y_MOVEMENT, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_DRIED_FRUIT, 9, 0 }, @@ -73,7 +73,7 @@ StaticNpc N(npcGroup_80240578) = { .pos = { 245.0f, 0.0f, 75.0f }, .flags = NPC_FLAG_NO_Y_MOVEMENT, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_DRIED_FRUIT, 9, 0 }, diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c index d21c066d3a..0dc3b7d0e8 100644 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ b/src/world/area_sbk/sbk_01/929AD0.c @@ -36,7 +36,7 @@ StaticNpc N(npcGroup_802403F8) = { .pos = { 205.0f, 0.0f, -60.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_DRIED_FRUIT, 9, 0 }, @@ -73,7 +73,7 @@ StaticNpc N(npcGroup_802405E8) = { .pos = { -200.0f, 0.0f, 180.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, .itemDrops = { { ITEM_DRIED_FRUIT, 9, 0 }, diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 4e07d00536..db04759e83 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -67,9 +67,9 @@ ApiStatus N(func_80241448_9A2428)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 4adcc4dc35..7826048173 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -67,9 +67,9 @@ ApiStatus N(func_80241818_9A9C08)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; enemy->unk_B0 &= ~4; - } else if (enemy->flags & 0x40000000) { + } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~0x40000000; + enemy->flags &= ~ENEMY_FLAGS_40000000; } posX = npc->pos.x; diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c index dd61066a0f..846e8fa47f 100644 --- a/src/world/area_tst/tst_04/B1B570.c +++ b/src/world/area_tst/tst_04/B1B570.c @@ -86,7 +86,7 @@ void func_8024029C_B1B80C(void) { if (playerStatus->flags & 1) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= 0x200; + entityModel->flags |= MODEL_FLAGS_FLAG_200; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/B1CA50.c index 73c6354e9c..cb12366202 100644 --- a/src/world/area_tst/tst_11/B1CA50.c +++ b/src/world/area_tst/tst_11/B1CA50.c @@ -23,7 +23,7 @@ void func_8024003C_B1CA8C(void) { if (playerStatus->flags & 1) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= 0x200; + entityModel->flags |= MODEL_FLAGS_FLAG_200; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); @@ -74,7 +74,7 @@ void func_802402F4_B1CD44(void) { if (playerStatus->flags & 1) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= 0x200; + entityModel->flags |= MODEL_FLAGS_FLAG_200; get_screen_coords(gCurrentCamID, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z, &screenX, &screenY, &screenZ); diff --git a/src/world/common/SetEntityFlags100000.inc.c b/src/world/common/SetEntityFlags100000.inc.c index a69181d126..97ff977c0b 100644 --- a/src/world/common/SetEntityFlags100000.inc.c +++ b/src/world/common/SetEntityFlags100000.inc.c @@ -4,6 +4,6 @@ ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(script->varTable[0]); - entity->flags |= 0x100000; + entity->flags |= ENTITY_FLAGS_100000; return ApiStatus_DONE2; } diff --git a/src/world/common/UnkFunc31.inc.c b/src/world/common/UnkFunc31.inc.c index aa1fb3aef9..eb61ed688e 100644 --- a/src/world/common/UnkFunc31.inc.c +++ b/src/world/common/UnkFunc31.inc.c @@ -45,8 +45,8 @@ ApiStatus N(UnkAlphaFunc)(Evt* script, s32 isInitialCall) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* itemEntity = get_item_entity(i); - if (itemEntity != NULL && itemEntity->flags & 0x10) { - itemEntity->flags |= 0x8000000; + if (itemEntity != NULL && itemEntity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX) { + itemEntity->flags |= ENTITY_FLAGS_8000000; } } @@ -95,7 +95,7 @@ ApiStatus N(UnkFunc29)(Evt* script, s32 isInitialCall) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { Entity* entity = get_item_entity(i); if (entity != NULL && entity->flags & 0x10) { - entity->flags &= ~0x08000000; + entity->flags &= ~ENTITY_FLAGS_8000000; } } diff --git a/src/world/common/UnkFunc7.inc.c b/src/world/common/UnkFunc7.inc.c index d49114ff92..e42cabfaf8 100644 --- a/src/world/common/UnkFunc7.inc.c +++ b/src/world/common/UnkFunc7.inc.c @@ -13,7 +13,7 @@ ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 0; npc->duration = 0; npc->flags |= 0x102; - enemy->flags |= 0x1F300000; + enemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; npc->pos.x = 0.0f; npc->pos.y = -1000.0f; npc->pos.z = 0.0f; @@ -46,7 +46,7 @@ ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall) { enemy->unk_10.z = npc->pos.z; npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enemy->flags &= 0xE0EFFFFF; + enemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); npc->duration = 0; script->functionTemp[0] = 1; } @@ -60,7 +60,7 @@ ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall) { enemy->unk_07 = 0; } if (enemy2->varTable[0] == 4) { - enemy->flags |= 0x1F100000; + enemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; npc->pos.x = 0.0f; npc->pos.y = -1000.0f; npc->pos.z = 0.0f; diff --git a/src/world/common/UnkNpcAIFunc15.inc.c b/src/world/common/UnkNpcAIFunc15.inc.c index ac5b608077..e9974439a1 100644 --- a/src/world/common/UnkNpcAIFunc15.inc.c +++ b/src/world/common/UnkNpcAIFunc15.inc.c @@ -5,7 +5,7 @@ void N(UnkNpcAIFunc15)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi Npc* enemy = get_npc_unsafe(script->owner1.enemy->npcID); func_80049F7C(script, aiSettings, territory); - enemy->flags |= 0x800; + enemy->flags |= ENEMY_FLAGS_800; enemy->jumpVelocity = rand_int(5) + 10.0; enemy->jumpScale = 1.5f; enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); diff --git a/src/world/common/UnkNpcDurationFlagFunc3.inc.c b/src/world/common/UnkNpcDurationFlagFunc3.inc.c index 026b069eab..a26d109b9a 100644 --- a/src/world/common/UnkNpcDurationFlagFunc3.inc.c +++ b/src/world/common/UnkNpcDurationFlagFunc3.inc.c @@ -7,7 +7,7 @@ void N(UnkNpcDurationFlagFunc3)(Evt* script, NpcAISettings* aiSettings, EnemyTer npc->duration--; if (enemy->varTable[11] >= npc->duration) { - enemy->flags &= ~0x1F100000; + enemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); } if (npc->duration == 0) { npc->currentAnim.w = enemy->animList[10]; diff --git a/src/world/common/foliage.inc.c b/src/world/common/foliage.inc.c index c505e7bc54..218ad29f13 100644 --- a/src/world/common/foliage.inc.c +++ b/src/world/common/foliage.inc.c @@ -60,13 +60,13 @@ ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(modelListIndex); Matrix4f mtx; - if (!(model->flags & 0x400)) { + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, 0.0f, dy, 0.0f); N(foliage_setup_shear_mtx)(mtx, scale, dx, dz); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); guTranslateF(mtx, 0.0f, -dy, 0.0f); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); - model->flags |= 0x1400; + model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); } else { guTranslateF(mtx, 0.0f, dy, 0.0f); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); diff --git a/src/world/common/reflection.inc.c b/src/world/common/reflection.inc.c index efc6854720..49c27e057a 100644 --- a/src/world/common/reflection.inc.c +++ b/src/world/common/reflection.inc.c @@ -81,7 +81,7 @@ void N(reflection_setup_wall)(void) { if (playerStatus->flags & 1) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= 0x200; + entityModel->flags |= MODEL_FLAGS_FLAG_200; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); diff --git a/src/world/partners.c b/src/world/partners.c index 521888eb90..dfea74f6d1 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -331,7 +331,7 @@ void partner_create_npc(void) { blueprintPtr = &blueprint; dma_copy(partnerEntry->dmaStart, partnerEntry->dmaEnd, partnerEntry->dmaDest); - blueprint.flags = 0x4000100; + blueprint.flags = NPC_FLAG_PARTICLE | NPC_FLAG_100; blueprint.initialAnim = (*partner)->idle; blueprint.onUpdate = NULL; blueprint.onRender = NULL; diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index e1b60cc86a..cb71f84a9d 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -153,9 +153,9 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { Shop* shop = gGameStatusPtr->mapShop; s32 currentItemSlot = evt_get_variable(script, *script->ptrReadPos); - if (!(shop->flags & 8)) { + if (!(shop->flags & SHOP_FLAGS_8)) { shop->currentItemSlot = currentItemSlot; - shop->flags |= 1; + shop->flags |= SHOP_FLAGS_1; func_800E98EC(); shop->unk_358 = 5; @@ -170,7 +170,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { childScript->varTable[0] = currentItemSlot; D_80286520 = childScript; D_80286524 = childScript->id; - shop->flags |= 8; + shop->flags |= SHOP_FLAGS_8; return ApiStatus_BLOCK; } else { return ApiStatus_DONE2; @@ -179,7 +179,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - shop->flags &= ~0x8; + shop->flags &= ~SHOP_FLAGS_8; enable_player_static_collisions(); enable_player_input(); return ApiStatus_DONE2; @@ -325,7 +325,7 @@ void draw_shop_items(void) { f32 inX, inY, inZ; ShopItemEntity* shopItemEntities; - if (shop->flags & 1) { + if (shop->flags & SHOP_FLAGS_1) { set_window_update(10, basic_window_update); set_window_update(11, basic_window_update); } else { @@ -333,7 +333,7 @@ void draw_shop_items(void) { set_window_update(11, basic_hidden_window_update); } - if (shop->flags & 1) { + if (shop->flags & SHOP_FLAGS_1) { camera = &gCameras[gCurrentCameraID]; staticItems = shop->staticInventory; shopItemEntities = gGameStatusPtr->shopItemEntities; @@ -377,7 +377,7 @@ void draw_shop_items(void) { if (shop->unk_358 > 0) { shop->unk_358--; } else { - shop->flags &= ~0x1; + shop->flags &= ~SHOP_FLAGS_1; func_800E9900(); } } diff --git a/tools/__init__.py b/tools/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/star_rod_enum_to_decomp.py b/tools/star_rod_enum_to_decomp.py new file mode 100755 index 0000000000..73953afc83 --- /dev/null +++ b/tools/star_rod_enum_to_decomp.py @@ -0,0 +1,117 @@ +#!/usr/bin/python3 + +import argparse +import sys +import re +import os +from glob import glob + +parser = argparse.ArgumentParser(description='Convert a StarRod enum into an enum that is in decomp format') +parser.add_argument("query", help="StarRod enum file") +#parser.add_argument("-p", "--prefix", help="specify a prefix for the enum elements", type=str, required=False) +parser.add_argument("-r", "--recursive", help="recursively convert all files to enums", type=bool, required=False) + +args = parser.parse_args() + + +def create_enum(file_content, prefix, ordering): + ret = "" + max_size = 0 + + if ordering: + for (key, value) in re.findall(r'(\S+)\s+=\s+(\S+)', file_content): + if len(key) > max_size: + max_size = len(key) + else: + for (key, value) in re.findall(r'(\S+)\s+=\s+(\S+)', file_content): + if len(value) > max_size: + max_size = len(value) + + if prefix is not None: + max_size += len(prefix) + else: + prefix = "" + + for (key, value) in re.findall(r'(\S+)\s+=\s+(\S+)', file_content): + if ordering: + key = '_'.join(re.sub(r'([A-Z])', r' \1', key).split()).replace("H_P", "HP").replace("F_P", "FP").replace("J_P", "JP").replace("N_P_C", "NPC").replace("__", "_").replace("-", "") + key = prefix.upper() + '_{:<{width}}'.format(key, width=max_size + 2).upper() + ret += " " + key + " = 0x" + '{:>{fill}{width}}'.format(value, fill=0, width=8) + ",\n" + else: + value = '_'.join(re.sub(r'([A-Z])', r' \1', value).split()).replace("H_P", "HP").replace("F_P", "FP").replace("J_P", "JP").replace("N_P_C", "NPC").replace("__", "_").replace("-", "") + value = prefix.upper() + '_{:<{width}}'.format(value, width=max_size + 2).upper() + ret += " " + value + " = 0x" + '{:>{fill}{width}}'.format(key, fill=0, width=8) + ",\n" + + ret += "};\n" + + return ret + + +def single_translation(file_path): + ret = "" + + try: + file = open(file_path) + file_content = file.read() + file.close() + except: + print("File not found at the given path.") + return "t", "y" + + enum_namespace = re.search(r'(\w*)\s+%\s+namespace', file_content).group(1) + enum_name = re.search(r'(\w*)\s+%\s+library name', file_content).group(1) + reversed_order = re.search(r'(\w*)\s+%\s+reversed', file_content).group(1) + ret += "enum " + enum_name + " {\n" + + if reversed_order == "true": + ret += create_enum(file_content, enum_namespace, True) + else: + ret += create_enum(file_content, enum_namespace, False) + + return enum_name, ret + + +def recursive_translation(database_path): + ret = "" + + stuff = [f for f in glob(database_path + "/**/*.*", recursive=True) if f.endswith(".enum") or f.endswith(".flags")] + for element in stuff: + try: + file = open(element) + file_content = file.read() + file.close() + except: + continue + + enum_namespace = re.search(r'(\w*)\s+%\s+namespace', file_content).group(1) + enum_name = re.search(r'(\w*)\s+%\s+library name', file_content).group(1) + reversed_order = re.search(r'(\w*)\s+%\s+reversed', file_content).group(1) + ret += "enum " + enum_name + " {\n" + + if reversed_order == "true": + ret += create_enum(file_content, enum_namespace, True) + else: + ret += create_enum(file_content, enum_namespace, False) + + ret += "\n" + + return "enums_and_flags", ret + + +def main(args): + ret = "" + + if args.recursive: + enum_name, result = recursive_translation(args.query) + else: + enum_name, result = single_translation(args.query) + + ret += result + + file = open("" + enum_name + ".txt", "w+") + file.write(ret) + file.close() + + +if __name__ == "__main__": + main(parser.parse_args()) diff --git a/tools/update_evts.py b/tools/update_evts.py index d51eecfaf2..cd5df0846e 100755 --- a/tools/update_evts.py +++ b/tools/update_evts.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from disasm_script import ScriptDisassembler, get_constants +from .disasm_script import ScriptDisassembler, get_constants from glob import glob NAMESPACES = {