From 57328992ede9ebf4ece74bc7aa4efc6ca93632cb Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Wed, 12 Feb 2025 17:35:56 +0100 Subject: [PATCH] Move enums with system flags from `vars_flags.h` to generated files --- generated/first_arrival_to_zones.txt | 70 +++++++++++++++ generated/giratina_shadow_animations.txt | 3 + generated/meson.build | 5 +- generated/villa_furnitures.txt | 21 +++++ include/constants/savedata/vars_flags.h | 110 +---------------------- 5 files changed, 102 insertions(+), 107 deletions(-) create mode 100644 generated/first_arrival_to_zones.txt create mode 100644 generated/giratina_shadow_animations.txt create mode 100644 generated/villa_furnitures.txt diff --git a/generated/first_arrival_to_zones.txt b/generated/first_arrival_to_zones.txt new file mode 100644 index 0000000000..91fd97cb87 --- /dev/null +++ b/generated/first_arrival_to_zones.txt @@ -0,0 +1,70 @@ +FIRST_ARRIVAL_TWINLEAF_TOWN +FIRST_ARRIVAL_SANDGEM_TOWN +FIRST_ARRIVAL_FLOAROMA_TOWN +FIRST_ARRIVAL_SOLACEON_TOWN +FIRST_ARRIVAL_CELESTIC_TOWN +FIRST_ARRIVAL_SURVIVAL_AREA +FIRST_ARRIVAL_RESORT_AREA +FIRST_ARRIVAL_JUBILIFE_CITY +FIRST_ARRIVAL_CANALAVE_CITY +FIRST_ARRIVAL_OREBURGH_CITY +FIRST_ARRIVAL_ETERNA_CITY +FIRST_ARRIVAL_HEARTHOME_CITY +FIRST_ARRIVAL_PASTORIA_CITY +FIRST_ARRIVAL_VEILSTONE_CITY +FIRST_ARRIVAL_SUNYSHORE_CITY +FIRST_ARRIVAL_SNOWPOINT_CITY +FIRST_ARRIVAL_OUTSIDE_VICTORY_ROAD +FIRST_ARRIVAL_FIGHT_AREA +FIRST_ARRIVAL_OREBURGH_MINE +FIRST_ARRIVAL_VALLEY_WINDWORKS +FIRST_ARRIVAL_ETERNA_FOREST +FIRST_ARRIVAL_FUEGO_IRONWORKS +FIRST_ARRIVAL_MYSTERY_ZONE_D05 +FIRST_ARRIVAL_SPEAR_PILLAR +FIRST_ARRIVAL_MYSTERY_ZONE_D06 +FIRST_ARRIVAL_SOLACEON_RUINS +FIRST_ARRIVAL_VICTORY_ROAD +FIRST_ARRIVAL_PAL_PARK +FIRST_ARRIVAL_AMITY_SQUARE +FIRST_ARRIVAL_RAVAGED_PATH +FIRST_ARRIVAL_FLOAROMA_MEADOW +FIRST_ARRIVAL_OREBURGH_GATE +FIRST_ARRIVAL_FULLMOON_ISLAND +FIRST_ARRIVAL_STARK_MOUNTAIN_EXTERIOR +FIRST_ARRIVAL_STARK_MOUNTAIN_INTERIOR +FIRST_ARRIVAL_SENDOFF_SPRING_UNUSED +FIRST_ARRIVAL_TURNBACK_CAVE +FIRST_ARRIVAL_FLOWER_PARADISE +FIRST_ARRIVAL_SNOWPOINT_TEMPLE +FIRST_ARRIVAL_WAYWARD_CAVE +FIRST_ARRIVAL_RUIN_MANIAC_CAVE +FIRST_ARRIVAL_TROPHY_GARDEN +FIRST_ARRIVAL_IRON_ISLAND_EXTERIOR +FIRST_ARRIVAL_IRON_ISLAND_INTERIOR +FIRST_ARRIVAL_OLD_CHATEAU +FIRST_ARRIVAL_GALACTIC_HQ +FIRST_ARRIVAL_LAKE_VERITY_UNUSED +FIRST_ARRIVAL_VERITY_CAVERN +FIRST_ARRIVAL_LAKE_VALOR_UNUSED +FIRST_ARRIVAL_VALOR_CAVERN +FIRST_ARRIVAL_LAKE_ACUITY_UNUSED +FIRST_ARRIVAL_ACUITY_CAVERN +FIRST_ARRIVAL_NEWMOON_ISLAND +FIRST_ARRIVAL_BATTLE_PARK +FIRST_ARRIVAL_CYCLING_ROAD_UNUSED +FIRST_ARRIVAL_BERRY_MASTERS_HOUSE +FIRST_ARRIVAL_LOST_TOWER +FIRST_ARRIVAL_ROUTE_210_COFFEE_SHOP +FIRST_ARRIVAL_DRAGON_MASTERS_HOUSE +FIRST_ARRIVAL_POKEMON_MANSION +FIRST_ARRIVAL_ROUTE_212_MOVE_TUTOR +FIRST_ARRIVAL_DOCTOR_FOOTSTEPS_HOUSE +FIRST_ARRIVAL_VALOR_LAKEFRONT_RESTAURANT +FIRST_ARRIVAL_PIKACHU_FAN_CLUB +FIRST_ARRIVAL_POKEMON_SIZE_JUDGE +FIRST_ARRIVAL_THE_MEISTERS_HOUSE +FIRST_ARRIVAL_ROUTE_221 +FIRST_ARRIVAL_POKE_PARK_FRONT_GATE +FIRST_ARRIVAL_POKEMON_LEAGUE +FIRST_ARRIVAL_MAX diff --git a/generated/giratina_shadow_animations.txt b/generated/giratina_shadow_animations.txt new file mode 100644 index 0000000000..445faf0960 --- /dev/null +++ b/generated/giratina_shadow_animations.txt @@ -0,0 +1,3 @@ +GIRATINA_SHADOW_ANIM_LEFT_TO_RIGHT +GIRATINA_SHADOW_ANIM_BOTTOM_TO_TOP +GIRATINA_SHADOW_ANIM_MAX diff --git a/generated/meson.build b/generated/meson.build index ca23e9794d..2d7601b5a7 100644 --- a/generated/meson.build +++ b/generated/meson.build @@ -41,9 +41,11 @@ metang_generators = { 'evolution_methods': { 'type': 'enum', 'tag': 'EvolutionMethod' }, 'exp_rates': { 'type': 'enum', 'tag': 'ExpRate' }, 'game_records': { 'type': 'enum', 'tag': 'GameRecord' }, + 'first_arrival_to_zones': { 'type': 'enum', 'tag': 'FirstArrivalToZone' }, 'footprint_sizes': { 'type': 'enum', 'tag': 'FootprintSize' }, 'gender_ratios': { 'type': 'enum', 'tag': 'GenderRatio' }, 'genders': { 'type': 'enum', 'tag': 'Gender' }, + 'giratina_shadow_animations': {'type': 'enum', 'tag': 'GiratinaShadowAnimation'}, 'item_ai_categories': { 'type': 'enum', 'tag': 'ItemAICategory' }, 'item_battle_categories': { 'type': 'enum', 'tag': 'ItemBattleCategory' }, 'item_hold_effects': { 'type': 'enum', 'tag': 'ItemHoldEffect' }, @@ -73,7 +75,8 @@ metang_generators = { 'trainers': { 'type': 'enum', 'tag': 'Trainer' }, 'trainer_classes': { 'type': 'enum', 'tag': 'TrainerClass' }, 'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' }, - 'tutor_locations': {'type': 'enum', 'tag': 'TutorLocation'} + 'tutor_locations': {'type': 'enum', 'tag': 'TutorLocation'}, + 'villa_furnitures': {'type': 'enum', 'tag': 'VillaFurniture'} } c_consts_generators = [] diff --git a/generated/villa_furnitures.txt b/generated/villa_furnitures.txt new file mode 100644 index 0000000000..64bee0f5e1 --- /dev/null +++ b/generated/villa_furnitures.txt @@ -0,0 +1,21 @@ +VILLA_FURNITURE_UNK_00 +VILLA_FURNITURE_UNK_01 +VILLA_FURNITURE_UNK_02 +VILLA_FURNITURE_UNK_03 +VILLA_FURNITURE_UNK_04 +VILLA_FURNITURE_UNK_05 +VILLA_FURNITURE_UNK_06 +VILLA_FURNITURE_UNK_07 +VILLA_FURNITURE_UNK_08 +VILLA_FURNITURE_UNK_09 +VILLA_FURNITURE_UNK_10 +VILLA_FURNITURE_UNK_11 +VILLA_FURNITURE_UNK_12 +VILLA_FURNITURE_UNK_13 +VILLA_FURNITURE_UNK_14 +VILLA_FURNITURE_UNK_15 +VILLA_FURNITURE_UNK_16 +VILLA_FURNITURE_UNK_17 +VILLA_FURNITURE_UNK_18 +VILLA_FURNITURE_UNK_19 +VILLA_FURNITURE_MAX diff --git a/include/constants/savedata/vars_flags.h b/include/constants/savedata/vars_flags.h index cab778c040..2d0f5e6cc0 100644 --- a/include/constants/savedata/vars_flags.h +++ b/include/constants/savedata/vars_flags.h @@ -1,6 +1,10 @@ #ifndef POKEPLATINUM_CONSTANTS_VARS_AND_FLAGS_H #define POKEPLATINUM_CONSTANTS_VARS_AND_FLAGS_H +#include "generated/first_arrival_to_zones.h" +#include "generated/giratina_shadow_animations.h" +#include "generated/villa_furnitures.h" + #define SYSTEM_FLAGS_START 2400 #define FLAG_BAG_ACQUIRED (SYSTEM_FLAGS_START + 0) #define FLAG_HAS_PARTNER (SYSTEM_FLAGS_START + 1) @@ -60,31 +64,6 @@ #define SYSTEM_FLAGS_VILLA_FURNITURE_START (SYSTEM_FLAGS_START + 55) -enum VillaFurniture { - VILLA_FURNITURE_UNK_00 = 0, - VILLA_FURNITURE_UNK_01, - VILLA_FURNITURE_UNK_02, - VILLA_FURNITURE_UNK_03, - VILLA_FURNITURE_UNK_04, - VILLA_FURNITURE_UNK_05, - VILLA_FURNITURE_UNK_06, - VILLA_FURNITURE_UNK_07, - VILLA_FURNITURE_UNK_08, - VILLA_FURNITURE_UNK_09, - VILLA_FURNITURE_UNK_10, - VILLA_FURNITURE_UNK_11, - VILLA_FURNITURE_UNK_12, - VILLA_FURNITURE_UNK_13, - VILLA_FURNITURE_UNK_14, - VILLA_FURNITURE_UNK_15, - VILLA_FURNITURE_UNK_16, - VILLA_FURNITURE_UNK_17, - VILLA_FURNITURE_UNK_18, - VILLA_FURNITURE_UNK_19, - - VILLA_FURNITURE_MAX, -}; - #define SYSTEM_FLAGS_VILLA_VISITOR_START (SYSTEM_FLAGS_VILLA_FURNITURE_START + VILLA_FURNITURE_MAX) #define FLAG_VILLA_VISITOR_INSIDE (SYSTEM_FLAGS_VILLA_VISITOR_START + 0) #define FLAG_VILLA_VISITOR_OUTSIDE (SYSTEM_FLAGS_VILLA_VISITOR_START + 1) @@ -92,87 +71,6 @@ enum VillaFurniture { #define SYSTEM_FLAGS_GIRATINA_ANIM_START (FLAG_DISTORTION_WORLD_PUZZLE_FINISHED + 1) -enum GiratinaShadowAnimation { - GIRATINA_SHADOW_ANIM_LEFT_TO_RIGHT = 0, - GIRATINA_SHADOW_ANIM_BOTTOM_TO_TOP, - - GIRATINA_SHADOW_ANIM_MAX, -}; - #define SYSTEM_FLAGS_FIRST_ARRIVAL_TO_ZONE (SYSTEM_FLAGS_GIRATINA_ANIM_START + GIRATINA_SHADOW_ANIM_MAX) -enum FirstArrivalToZone { - FIRST_ARRIVAL_TWINLEAF_TOWN = 0, - FIRST_ARRIVAL_SANDGEM_TOWN, - FIRST_ARRIVAL_FLOAROMA_TOWN, - FIRST_ARRIVAL_SOLACEON_TOWN, - FIRST_ARRIVAL_CELESTIC_TOWN, - FIRST_ARRIVAL_SURVIVAL_AREA, - FIRST_ARRIVAL_RESORT_AREA, - FIRST_ARRIVAL_JUBILIFE_CITY, - FIRST_ARRIVAL_CANALAVE_CITY, - FIRST_ARRIVAL_OREBURGH_CITY, - FIRST_ARRIVAL_ETERNA_CITY, - FIRST_ARRIVAL_HEARTHOME_CITY, - FIRST_ARRIVAL_PASTORIA_CITY, - FIRST_ARRIVAL_VEILSTONE_CITY, - FIRST_ARRIVAL_SUNYSHORE_CITY, - FIRST_ARRIVAL_SNOWPOINT_CITY, - FIRST_ARRIVAL_OUTSIDE_VICTORY_ROAD, - FIRST_ARRIVAL_FIGHT_AREA, - FIRST_ARRIVAL_OREBURGH_MINE, - FIRST_ARRIVAL_VALLEY_WINDWORKS, - FIRST_ARRIVAL_ETERNA_FOREST, - FIRST_ARRIVAL_FUEGO_IRONWORKS, - FIRST_ARRIVAL_MYSTERY_ZONE_D05, - FIRST_ARRIVAL_SPEAR_PILLAR, - FIRST_ARRIVAL_MYSTERY_ZONE_D06, - FIRST_ARRIVAL_SOLACEON_RUINS, - FIRST_ARRIVAL_VICTORY_ROAD, - FIRST_ARRIVAL_PAL_PARK, - FIRST_ARRIVAL_AMITY_SQUARE, - FIRST_ARRIVAL_RAVAGED_PATH, - FIRST_ARRIVAL_FLOAROMA_MEADOW, - FIRST_ARRIVAL_OREBURGH_GATE, - FIRST_ARRIVAL_FULLMOON_ISLAND, - FIRST_ARRIVAL_STARK_MOUNTAIN_EXTERIOR, - FIRST_ARRIVAL_STARK_MOUNTAIN_INTERIOR, - FIRST_ARRIVAL_SENDOFF_SPRING_UNUSED, - FIRST_ARRIVAL_TURNBACK_CAVE, - FIRST_ARRIVAL_FLOWER_PARADISE, - FIRST_ARRIVAL_SNOWPOINT_TEMPLE, - FIRST_ARRIVAL_WAYWARD_CAVE, - FIRST_ARRIVAL_RUIN_MANIAC_CAVE, - FIRST_ARRIVAL_TROPHY_GARDEN, - FIRST_ARRIVAL_IRON_ISLAND_EXTERIOR, - FIRST_ARRIVAL_IRON_ISLAND_INTERIOR, - FIRST_ARRIVAL_OLD_CHATEAU, - FIRST_ARRIVAL_GALACTIC_HQ, - FIRST_ARRIVAL_LAKE_VERITY_UNUSED, - FIRST_ARRIVAL_VERITY_CAVERN, - FIRST_ARRIVAL_LAKE_VALOR_UNUSED, - FIRST_ARRIVAL_VALOR_CAVERN, - FIRST_ARRIVAL_LAKE_ACUITY_UNUSED, - FIRST_ARRIVAL_ACUITY_CAVERN, - FIRST_ARRIVAL_NEWMOON_ISLAND, - FIRST_ARRIVAL_BATTLE_PARK, - FIRST_ARRIVAL_CYCLING_ROAD_UNUSED, - FIRST_ARRIVAL_BERRY_MASTERS_HOUSE, - FIRST_ARRIVAL_LOST_TOWER, - FIRST_ARRIVAL_ROUTE_210_COFFEE_SHOP, - FIRST_ARRIVAL_DRAGON_MASTERS_HOUSE, - FIRST_ARRIVAL_POKEMON_MANSION, - FIRST_ARRIVAL_ROUTE_212_MOVE_TUTOR, - FIRST_ARRIVAL_DOCTOR_FOOTSTEPS_HOUSE, - FIRST_ARRIVAL_VALOR_LAKEFRONT_RESTAURANT, - FIRST_ARRIVAL_PIKACHU_FAN_CLUB, - FIRST_ARRIVAL_POKEMON_SIZE_JUDGE, - FIRST_ARRIVAL_THE_MEISTERS_HOUSE, - FIRST_ARRIVAL_ROUTE_221, - FIRST_ARRIVAL_POKE_PARK_FRONT_GATE, - FIRST_ARRIVAL_POKEMON_LEAGUE, - - FIRST_ARRIVAL_MAX, -}; - #endif // POKEPLATINUM_CONSTANTS_VARS_AND_FLAGS_H