Skip to content

Commit

Permalink
Merge pull request #353 from lhearachel/pokedex-dependencies
Browse files Browse the repository at this point in the history
Refactor dependency chain for Pokedex text banks and data NARCs
  • Loading branch information
lhearachel authored Jan 31, 2025
2 parents 78805c4 + 7227044 commit 4e289b9
Show file tree
Hide file tree
Showing 31 changed files with 241 additions and 442 deletions.
58 changes: 0 additions & 58 deletions consts/meson.build

This file was deleted.

44 changes: 0 additions & 44 deletions consts/pokemon.json

This file was deleted.

114 changes: 0 additions & 114 deletions consts/trainer.json

This file was deleted.

3 changes: 3 additions & 0 deletions generated/footprint_sizes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FOOTPRINT_SMALL
FOOTPRINT_MEDIUM
FOOTPRINT_LARGE
10 changes: 10 additions & 0 deletions generated/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ metang_generators = {
'evolution_methods': { 'type': 'enum', 'tag': 'EvolutionMethod' },
'exp_rates': { 'type': 'enum', 'tag': 'ExpRate' },
'game_records': { 'type': 'enum', 'tag': 'GameRecord' },
'footprint_sizes': { 'type': 'enum', 'tag': 'FootprintSize' },
'gender_ratios': { 'type': 'enum', 'tag': 'GenderRatio' },
'genders': { 'type': 'enum', 'tag': 'Gender' },
'item_ai_categories': { 'type': 'enum', 'tag': 'ItemAICategory' },
Expand All @@ -58,7 +59,9 @@ metang_generators = {
'moves': { 'type': 'enum', 'tag': 'Move' },
'pal_park_land_area': { 'type': 'enum', 'tag': 'PalParkLandArea' },
'pal_park_water_area': { 'type': 'enum', 'tag': 'PalParkWaterArea' },
'pokemon_body_shapes': { 'type': 'enum', 'tag': 'PokemonBodyShape' },
'pokemon_colors': { 'type': 'enum', 'tag': 'PokemonColor' },
'pokemon_contest_types': { 'type': 'enum', 'tag': 'PokemonContestType' },
'pokemon_types': { 'type': 'enum', 'tag': 'PokemonType' },
'poketch_apps': { 'type': 'enum', 'tag': 'PoketchAppID' },
'save_types': { 'type': 'enum', 'tag': 'SaveType' },
Expand All @@ -67,9 +70,13 @@ metang_generators = {
'species': { 'type': 'enum', 'tag': 'Species' },
'species_data_params': { 'type': 'enum', 'tag': 'SpeciesDataParam' },
'text_banks': { 'type': 'enum', 'tag': 'TextBank' },
'trainer_classes': { 'type': 'enum', 'tag': 'TrainerClass' },
'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' },
}

c_consts_generators = []
py_consts_generators = []

foreach gen_key : metang_generators.keys()
gen_h = gen_key + '.h'
gen_py = gen_key + '.py'
Expand Down Expand Up @@ -106,3 +113,6 @@ endforeach

species_txt = files('species.txt')
text_banks_txt = files('text_banks.txt')

py_consts_env = environment()
py_consts_env.append('PYTHONPATH', meson.project_build_root())
15 changes: 15 additions & 0 deletions generated/pokemon_body_shapes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
SHAPE_QUADRUPED
SHAPE_BIPEDAL_TAILLESS
SHAPE_BIPEDAL_TAILED
SHAPE_SERPENTINE
SHAPE_MULTI_WINGED
SHAPE_WINGED
SHAPE_INSECTOID
SHAPE_HEAD_BASE
SHAPE_HEAD_ARMS
SHAPE_HEAD_LEGS
SHAPE_TENTACLES
SHAPE_FINS
SHAPE_HEAD
SHAPE_MULTI_BODY
NUM_BODY_SHAPES
6 changes: 6 additions & 0 deletions generated/pokemon_contest_types.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CONTEST_TYPE_COOL
CONTEST_TYPE_CUTE
CONTEST_TYPE_BEAUTY
CONTEST_TYPE_SMART
CONTEST_TYPE_TOUGH
CONTEST_TYPE_MAX
105 changes: 105 additions & 0 deletions generated/trainer_classes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
TRAINER_CLASS_PLAYER_MALE
TRAINER_CLASS_PLAYER_FEMALE
TRAINER_CLASS_YOUNGSTER
TRAINER_CLASS_LASS
TRAINER_CLASS_CAMPER
TRAINER_CLASS_PICNICKER
TRAINER_CLASS_BUG_CATCHER
TRAINER_CLASS_AROMA_LADY
TRAINER_CLASS_TWINS
TRAINER_CLASS_HIKER
TRAINER_CLASS_BATTLE_GIRL
TRAINER_CLASS_FISHERMAN
TRAINER_CLASS_CYCLIST_MALE
TRAINER_CLASS_CYCLIST_FEMALE
TRAINER_CLASS_BLACK_BELT
TRAINER_CLASS_ARTIST
TRAINER_CLASS_BREEDER_MALE
TRAINER_CLASS_BREEDER_FEMALE
TRAINER_CLASS_COWGIRL
TRAINER_CLASS_JOGGER
TRAINER_CLASS_POKEFAN_MALE
TRAINER_CLASS_POKEFAN_FEMALE
TRAINER_CLASS_POKE_KID
TRAINER_CLASS_YOUNG_COUPLE
TRAINER_CLASS_ACE_TRAINER_MALE
TRAINER_CLASS_ACE_TRAINER_FEMALE
TRAINER_CLASS_WAITRESS
TRAINER_CLASS_VETERAN
TRAINER_CLASS_NINJA_BOY
TRAINER_CLASS_DRAGON_TAMER
TRAINER_CLASS_BIRD_KEEPER
TRAINER_CLASS_DOUBLE_TEAM
TRAINER_CLASS_RICH_BOY
TRAINER_CLASS_LADY
TRAINER_CLASS_GENTLEMAN
TRAINER_CLASS_SOCIALITE
TRAINER_CLASS_BEAUTY
TRAINER_CLASS_COLLECTOR
TRAINER_CLASS_POLICEMAN
TRAINER_CLASS_RANGER_MALE
TRAINER_CLASS_RANGER_FEMALE
TRAINER_CLASS_SCIENTIST
TRAINER_CLASS_SWIMMER_MALE
TRAINER_CLASS_SWIMMER_FEMALE
TRAINER_CLASS_TUBER_MALE
TRAINER_CLASS_TUBER_FEMALE
TRAINER_CLASS_SAILOR
TRAINER_CLASS_SIS_AND_BRO
TRAINER_CLASS_RUIN_MANIAC
TRAINER_CLASS_PSYCHIC_MALE
TRAINER_CLASS_PSYCHIC_FEMALE
TRAINER_CLASS_PI
TRAINER_CLASS_GUITARIST
TRAINER_CLASS_ACE_TRAINER_SNOW_MALE
TRAINER_CLASS_ACE_TRAINER_SNOW_FEMALE
TRAINER_CLASS_SKIER_MALE
TRAINER_CLASS_SKIER_FEMALE
TRAINER_CLASS_ROUGHNECK
TRAINER_CLASS_CLOWN
TRAINER_CLASS_WORKER
TRAINER_CLASS_SCHOOL_KID_MALE
TRAINER_CLASS_SCHOOL_KID_FEMALE
TRAINER_CLASS_LEADER_ROARK
TRAINER_CLASS_RIVAL
TRAINER_CLASS_LEADER_BYRON
TRAINER_CLASS_ELITE_FOUR_AARON
TRAINER_CLASS_ELITE_FOUR_BERTHA
TRAINER_CLASS_ELITE_FOUR_FLINT
TRAINER_CLASS_ELITE_FOUR_LUCIAN
TRAINER_CLASS_CHAMPION_CYNTHIA
TRAINER_CLASS_BELLE_AND_PA
TRAINER_CLASS_RANCHER
TRAINER_CLASS_COMMANDER_MARS
TRAINER_CLASS_GALACTIC_GRUNT_MALE
TRAINER_CLASS_LEADER_GARDENIA
TRAINER_CLASS_LEADER_WAKE
TRAINER_CLASS_LEADER_MAYLENE
TRAINER_CLASS_LEADER_FANTINA
TRAINER_CLASS_LEADER_CANDICE
TRAINER_CLASS_LEADER_VOLKNER
TRAINER_CLASS_PARASOL_LADY
TRAINER_CLASS_WAITER
TRAINER_CLASS_INTERVIEWERS
TRAINER_CLASS_CAMERAMAN
TRAINER_CLASS_REPORTERS
TRAINER_CLASS_IDOL
TRAINER_CLASS_GALACTIC_BOSS
TRAINER_CLASS_COMMANDER_JUPITER
TRAINER_CLASS_COMMANDER_SATURN
TRAINER_CLASS_GALACTIC_GRUNT_FEMALE
TRAINER_CLASS_TRAINER_CHERYL
TRAINER_CLASS_TRAINER_RILEY
TRAINER_CLASS_TRAINER_MARLEY
TRAINER_CLASS_TRAINER_BUCK
TRAINER_CLASS_TRAINER_MIRA
TRAINER_CLASS_DP_PLAYER_MALE
TRAINER_CLASS_DP_PLAYER_FEMALE
TRAINER_CLASS_TOWER_TYCOON
TRAINER_CLASS_MAID
TRAINER_CLASS_HALL_MATRON
TRAINER_CLASS_FACTORY_HEAD
TRAINER_CLASS_ARCADE_STAR
TRAINER_CLASS_CASTLE_VALET
TRAINER_CLASS_DP_PLAYER_MALE_2
TRAINER_CLASS_DP_PLAYER_FEMALE_2
Loading

0 comments on commit 4e289b9

Please sign in to comment.