From 2c410b8046413662dbb757151bb6f226dd2c5de8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 18 Jan 2025 16:58:41 -0800 Subject: [PATCH] Replace python scripts for packing species archives with C++ This new code is responsible for packing the following archives: - `pl_personal` -> basic information for each species: stats, types, etc. - `evo` -> evolution lines for each species - `wotbl` -> by-level learnsets for each species - `ppark` -> catching show data for each species - `height` -> y-offsets for front and back sprites for each species - `pl_poke_data` -> sprite-rendering data for each species: animation ID, frame data, shadow size and offsets, etc. Additionally, the following headers are generated: - `res/pokemon/tutorable_moves.h` -> A listing of moves taught by each tutor and how much each move costs to be tutored - `res/pokemon/species_learnsets_by_tutor.h` -> An array of bitmasks for each species designating which moves can be tutored to that species --- .gitignore | 1 + asm/macros/scrcmd.inc | 2 +- consts/catching_show.json | 34 - consts/meson.build | 6 +- consts/shadows.json | 13 - consts/tm_learnset.json | 111 --- gen_compile_commands.py | 394 +++++----- generated/catching_show_points_category.txt | 4 + generated/meson.build | 17 +- generated/pal_park_land_area.txt | 6 + generated/pal_park_water_area.txt | 5 + generated/shadow_sizes.txt | 4 + include/map_header.h | 4 +- .../struct_defs/archived_poke_sprite_data.h | 4 +- include/struct_defs/species.h | 19 +- include/tutor_movesets.h | 2 +- meson.build | 16 +- res/pokemon/abomasnow/data.json | 12 +- res/pokemon/abomasnow/meson.build | 2 +- res/pokemon/abra/data.json | 12 +- res/pokemon/abra/meson.build | 2 +- res/pokemon/absol/data.json | 12 +- res/pokemon/absol/meson.build | 2 +- res/pokemon/aerodactyl/data.json | 14 +- res/pokemon/aerodactyl/meson.build | 2 +- res/pokemon/aggron/data.json | 12 +- res/pokemon/aggron/meson.build | 2 +- res/pokemon/aipom/data.json | 12 +- res/pokemon/aipom/meson.build | 2 +- res/pokemon/alakazam/data.json | 12 +- res/pokemon/alakazam/meson.build | 2 +- res/pokemon/altaria/data.json | 12 +- res/pokemon/altaria/meson.build | 2 +- res/pokemon/ambipom/data.json | 12 +- res/pokemon/ambipom/meson.build | 2 +- res/pokemon/ampharos/data.json | 14 +- res/pokemon/ampharos/meson.build | 2 +- res/pokemon/anorith/data.json | 14 +- res/pokemon/anorith/meson.build | 2 +- res/pokemon/arbok/data.json | 12 +- res/pokemon/arbok/meson.build | 2 +- res/pokemon/arcanine/data.json | 12 +- res/pokemon/arcanine/meson.build | 2 +- res/pokemon/arceus/data.json | 12 +- res/pokemon/arceus/meson.build | 2 +- res/pokemon/ariados/data.json | 12 +- res/pokemon/ariados/meson.build | 2 +- res/pokemon/armaldo/data.json | 12 +- res/pokemon/armaldo/meson.build | 2 +- res/pokemon/aron/data.json | 12 +- res/pokemon/aron/meson.build | 2 +- res/pokemon/articuno/data.json | 14 +- res/pokemon/articuno/meson.build | 2 +- res/pokemon/azelf/data.json | 12 +- res/pokemon/azelf/meson.build | 2 +- res/pokemon/azumarill/data.json | 12 +- res/pokemon/azumarill/meson.build | 2 +- res/pokemon/azurill/data.json | 12 +- res/pokemon/azurill/meson.build | 2 +- res/pokemon/bad_egg/data.json | 6 +- res/pokemon/bad_egg/meson.build | 2 +- res/pokemon/bagon/data.json | 12 +- res/pokemon/bagon/meson.build | 2 +- res/pokemon/baltoy/data.json | 14 +- res/pokemon/baltoy/meson.build | 2 +- res/pokemon/banette/data.json | 14 +- res/pokemon/banette/meson.build | 2 +- res/pokemon/barboach/data.json | 12 +- res/pokemon/barboach/meson.build | 2 +- res/pokemon/bastiodon/data.json | 12 +- res/pokemon/bastiodon/meson.build | 2 +- res/pokemon/bayleef/data.json | 12 +- res/pokemon/bayleef/meson.build | 2 +- res/pokemon/beautifly/data.json | 12 +- res/pokemon/beautifly/meson.build | 2 +- res/pokemon/beedrill/data.json | 12 +- res/pokemon/beedrill/meson.build | 2 +- res/pokemon/beldum/data.json | 12 +- res/pokemon/beldum/meson.build | 2 +- res/pokemon/bellossom/data.json | 12 +- res/pokemon/bellossom/meson.build | 2 +- res/pokemon/bellsprout/data.json | 12 +- res/pokemon/bellsprout/meson.build | 2 +- res/pokemon/bibarel/data.json | 12 +- res/pokemon/bibarel/meson.build | 2 +- res/pokemon/bidoof/data.json | 14 +- res/pokemon/bidoof/meson.build | 2 +- res/pokemon/blastoise/data.json | 12 +- res/pokemon/blastoise/meson.build | 2 +- res/pokemon/blaziken/data.json | 12 +- res/pokemon/blaziken/meson.build | 2 +- res/pokemon/blissey/data.json | 12 +- res/pokemon/blissey/meson.build | 2 +- res/pokemon/bonsly/data.json | 12 +- res/pokemon/bonsly/meson.build | 2 +- res/pokemon/breloom/data.json | 12 +- res/pokemon/breloom/meson.build | 2 +- res/pokemon/bronzong/data.json | 12 +- res/pokemon/bronzong/meson.build | 2 +- res/pokemon/bronzor/data.json | 14 +- res/pokemon/bronzor/meson.build | 2 +- res/pokemon/budew/data.json | 14 +- res/pokemon/budew/meson.build | 2 +- res/pokemon/buizel/data.json | 12 +- res/pokemon/buizel/meson.build | 2 +- res/pokemon/bulbasaur/data.json | 12 +- res/pokemon/bulbasaur/meson.build | 2 +- res/pokemon/buneary/data.json | 12 +- res/pokemon/buneary/meson.build | 2 +- res/pokemon/burmy/data.json | 12 +- res/pokemon/burmy/meson.build | 2 +- res/pokemon/butterfree/data.json | 12 +- res/pokemon/butterfree/meson.build | 2 +- res/pokemon/cacnea/data.json | 12 +- res/pokemon/cacnea/meson.build | 2 +- res/pokemon/cacturne/data.json | 14 +- res/pokemon/cacturne/meson.build | 2 +- res/pokemon/camerupt/data.json | 12 +- res/pokemon/camerupt/meson.build | 2 +- res/pokemon/carnivine/data.json | 12 +- res/pokemon/carnivine/meson.build | 2 +- res/pokemon/carvanha/data.json | 12 +- res/pokemon/carvanha/meson.build | 2 +- res/pokemon/cascoon/data.json | 12 +- res/pokemon/cascoon/meson.build | 2 +- res/pokemon/castform/data.json | 12 +- res/pokemon/castform/meson.build | 2 +- res/pokemon/caterpie/data.json | 12 +- res/pokemon/caterpie/meson.build | 2 +- res/pokemon/celebi/data.json | 12 +- res/pokemon/celebi/meson.build | 2 +- res/pokemon/chansey/data.json | 14 +- res/pokemon/chansey/meson.build | 2 +- res/pokemon/charizard/data.json | 14 +- res/pokemon/charizard/meson.build | 2 +- res/pokemon/charmander/data.json | 12 +- res/pokemon/charmander/meson.build | 2 +- res/pokemon/charmeleon/data.json | 12 +- res/pokemon/charmeleon/meson.build | 2 +- res/pokemon/chatot/data.json | 14 +- res/pokemon/chatot/meson.build | 2 +- res/pokemon/cherrim/data.json | 14 +- res/pokemon/cherrim/meson.build | 2 +- res/pokemon/cherubi/data.json | 12 +- res/pokemon/cherubi/meson.build | 2 +- res/pokemon/chikorita/data.json | 12 +- res/pokemon/chikorita/meson.build | 2 +- res/pokemon/chimchar/data.json | 12 +- res/pokemon/chimchar/meson.build | 2 +- res/pokemon/chimecho/data.json | 12 +- res/pokemon/chimecho/meson.build | 2 +- res/pokemon/chinchou/data.json | 12 +- res/pokemon/chinchou/meson.build | 2 +- res/pokemon/chingling/data.json | 12 +- res/pokemon/chingling/meson.build | 2 +- res/pokemon/clamperl/data.json | 12 +- res/pokemon/clamperl/meson.build | 2 +- res/pokemon/claydol/data.json | 14 +- res/pokemon/claydol/meson.build | 2 +- res/pokemon/clefable/data.json | 12 +- res/pokemon/clefable/meson.build | 2 +- res/pokemon/clefairy/data.json | 12 +- res/pokemon/clefairy/meson.build | 2 +- res/pokemon/cleffa/data.json | 14 +- res/pokemon/cleffa/meson.build | 2 +- res/pokemon/cloyster/data.json | 12 +- res/pokemon/cloyster/meson.build | 2 +- res/pokemon/combee/data.json | 12 +- res/pokemon/combee/meson.build | 2 +- res/pokemon/combusken/data.json | 12 +- res/pokemon/combusken/meson.build | 2 +- res/pokemon/corphish/data.json | 12 +- res/pokemon/corphish/meson.build | 2 +- res/pokemon/corsola/data.json | 14 +- res/pokemon/corsola/meson.build | 2 +- res/pokemon/cradily/data.json | 12 +- res/pokemon/cradily/meson.build | 2 +- res/pokemon/cranidos/data.json | 12 +- res/pokemon/cranidos/meson.build | 2 +- res/pokemon/crawdaunt/data.json | 14 +- res/pokemon/crawdaunt/meson.build | 2 +- res/pokemon/cresselia/data.json | 12 +- res/pokemon/cresselia/meson.build | 2 +- res/pokemon/croagunk/data.json | 12 +- res/pokemon/croagunk/meson.build | 2 +- res/pokemon/crobat/data.json | 12 +- res/pokemon/crobat/meson.build | 2 +- res/pokemon/croconaw/data.json | 14 +- res/pokemon/croconaw/meson.build | 2 +- res/pokemon/cubone/data.json | 12 +- res/pokemon/cubone/meson.build | 2 +- res/pokemon/cyndaquil/data.json | 12 +- res/pokemon/cyndaquil/meson.build | 2 +- res/pokemon/darkrai/data.json | 12 +- res/pokemon/darkrai/meson.build | 2 +- res/pokemon/delcatty/data.json | 12 +- res/pokemon/delcatty/meson.build | 2 +- res/pokemon/delibird/data.json | 12 +- res/pokemon/delibird/meson.build | 2 +- res/pokemon/deoxys/data.json | 14 +- res/pokemon/deoxys/forms/attack/data.json | 6 +- res/pokemon/deoxys/forms/defense/data.json | 6 +- res/pokemon/deoxys/forms/speed/data.json | 6 +- res/pokemon/deoxys/meson.build | 2 +- res/pokemon/dewgong/data.json | 12 +- res/pokemon/dewgong/meson.build | 2 +- res/pokemon/dialga/data.json | 14 +- res/pokemon/dialga/meson.build | 2 +- res/pokemon/diglett/data.json | 14 +- res/pokemon/diglett/meson.build | 2 +- res/pokemon/ditto/data.json | 12 +- res/pokemon/ditto/meson.build | 2 +- res/pokemon/dodrio/data.json | 12 +- res/pokemon/dodrio/meson.build | 2 +- res/pokemon/doduo/data.json | 12 +- res/pokemon/doduo/meson.build | 2 +- res/pokemon/donphan/data.json | 12 +- res/pokemon/donphan/meson.build | 2 +- res/pokemon/dragonair/data.json | 12 +- res/pokemon/dragonair/meson.build | 2 +- res/pokemon/dragonite/data.json | 12 +- res/pokemon/dragonite/meson.build | 2 +- res/pokemon/drapion/data.json | 12 +- res/pokemon/drapion/meson.build | 2 +- res/pokemon/dratini/data.json | 14 +- res/pokemon/dratini/meson.build | 2 +- res/pokemon/drifblim/data.json | 12 +- res/pokemon/drifblim/meson.build | 2 +- res/pokemon/drifloon/data.json | 14 +- res/pokemon/drifloon/meson.build | 2 +- res/pokemon/drowzee/data.json | 12 +- res/pokemon/drowzee/meson.build | 2 +- res/pokemon/dugtrio/data.json | 12 +- res/pokemon/dugtrio/meson.build | 2 +- res/pokemon/dunsparce/data.json | 12 +- res/pokemon/dunsparce/meson.build | 2 +- res/pokemon/dusclops/data.json | 14 +- res/pokemon/dusclops/meson.build | 2 +- res/pokemon/dusknoir/data.json | 12 +- res/pokemon/dusknoir/meson.build | 2 +- res/pokemon/duskull/data.json | 12 +- res/pokemon/duskull/meson.build | 2 +- res/pokemon/dustox/data.json | 12 +- res/pokemon/dustox/meson.build | 2 +- res/pokemon/eevee/data.json | 12 +- res/pokemon/eevee/meson.build | 2 +- res/pokemon/egg/data.json | 6 +- res/pokemon/egg/meson.build | 2 +- res/pokemon/ekans/data.json | 12 +- res/pokemon/ekans/meson.build | 2 +- res/pokemon/electabuzz/data.json | 12 +- res/pokemon/electabuzz/meson.build | 2 +- res/pokemon/electivire/data.json | 12 +- res/pokemon/electivire/meson.build | 2 +- res/pokemon/electrike/data.json | 12 +- res/pokemon/electrike/meson.build | 2 +- res/pokemon/electrode/data.json | 12 +- res/pokemon/electrode/meson.build | 2 +- res/pokemon/elekid/data.json | 12 +- res/pokemon/elekid/meson.build | 2 +- res/pokemon/empoleon/data.json | 12 +- res/pokemon/empoleon/meson.build | 2 +- res/pokemon/entei/data.json | 12 +- res/pokemon/entei/meson.build | 2 +- res/pokemon/espeon/data.json | 12 +- res/pokemon/espeon/meson.build | 2 +- res/pokemon/exeggcute/data.json | 12 +- res/pokemon/exeggcute/meson.build | 2 +- res/pokemon/exeggutor/data.json | 14 +- res/pokemon/exeggutor/meson.build | 2 +- res/pokemon/exploud/data.json | 12 +- res/pokemon/exploud/meson.build | 2 +- res/pokemon/farfetchd/data.json | 16 +- res/pokemon/farfetchd/meson.build | 2 +- res/pokemon/fearow/data.json | 12 +- res/pokemon/fearow/meson.build | 2 +- res/pokemon/feebas/data.json | 14 +- res/pokemon/feebas/meson.build | 2 +- res/pokemon/feraligatr/data.json | 12 +- res/pokemon/feraligatr/meson.build | 2 +- res/pokemon/finneon/data.json | 12 +- res/pokemon/finneon/meson.build | 2 +- res/pokemon/flaaffy/data.json | 12 +- res/pokemon/flaaffy/meson.build | 2 +- res/pokemon/flareon/data.json | 12 +- res/pokemon/flareon/meson.build | 2 +- res/pokemon/floatzel/data.json | 12 +- res/pokemon/floatzel/meson.build | 2 +- res/pokemon/flygon/data.json | 14 +- res/pokemon/flygon/meson.build | 2 +- res/pokemon/form_registry.json | 104 +++ res/pokemon/forretress/data.json | 12 +- res/pokemon/forretress/meson.build | 2 +- res/pokemon/froslass/data.json | 12 +- res/pokemon/froslass/meson.build | 2 +- res/pokemon/furret/data.json | 12 +- res/pokemon/furret/meson.build | 2 +- res/pokemon/gabite/data.json | 12 +- res/pokemon/gabite/meson.build | 2 +- res/pokemon/gallade/data.json | 12 +- res/pokemon/gallade/meson.build | 2 +- res/pokemon/garchomp/data.json | 12 +- res/pokemon/garchomp/meson.build | 2 +- res/pokemon/gardevoir/data.json | 12 +- res/pokemon/gardevoir/meson.build | 2 +- res/pokemon/gastly/data.json | 12 +- res/pokemon/gastly/meson.build | 2 +- res/pokemon/gastrodon/data.json | 12 +- res/pokemon/gastrodon/meson.build | 2 +- res/pokemon/gengar/data.json | 12 +- res/pokemon/gengar/meson.build | 2 +- res/pokemon/geodude/data.json | 12 +- res/pokemon/geodude/meson.build | 2 +- res/pokemon/gible/data.json | 12 +- res/pokemon/gible/meson.build | 2 +- res/pokemon/girafarig/data.json | 12 +- res/pokemon/girafarig/meson.build | 2 +- res/pokemon/giratina/data.json | 12 +- res/pokemon/giratina/forms/origin/data.json | 6 +- res/pokemon/giratina/meson.build | 2 +- res/pokemon/glaceon/data.json | 12 +- res/pokemon/glaceon/meson.build | 2 +- res/pokemon/glalie/data.json | 12 +- res/pokemon/glalie/meson.build | 2 +- res/pokemon/glameow/data.json | 14 +- res/pokemon/glameow/meson.build | 2 +- res/pokemon/gligar/data.json | 12 +- res/pokemon/gligar/meson.build | 2 +- res/pokemon/gliscor/data.json | 12 +- res/pokemon/gliscor/meson.build | 2 +- res/pokemon/gloom/data.json | 12 +- res/pokemon/gloom/meson.build | 2 +- res/pokemon/golbat/data.json | 12 +- res/pokemon/golbat/meson.build | 2 +- res/pokemon/goldeen/data.json | 12 +- res/pokemon/goldeen/meson.build | 2 +- res/pokemon/golduck/data.json | 12 +- res/pokemon/golduck/meson.build | 2 +- res/pokemon/golem/data.json | 14 +- res/pokemon/golem/meson.build | 2 +- res/pokemon/gorebyss/data.json | 12 +- res/pokemon/gorebyss/meson.build | 2 +- res/pokemon/granbull/data.json | 12 +- res/pokemon/granbull/meson.build | 2 +- res/pokemon/graveler/data.json | 14 +- res/pokemon/graveler/meson.build | 2 +- res/pokemon/grimer/data.json | 14 +- res/pokemon/grimer/meson.build | 2 +- res/pokemon/grotle/data.json | 14 +- res/pokemon/grotle/meson.build | 2 +- res/pokemon/groudon/data.json | 12 +- res/pokemon/groudon/meson.build | 2 +- res/pokemon/grovyle/data.json | 12 +- res/pokemon/grovyle/meson.build | 2 +- res/pokemon/growlithe/data.json | 14 +- res/pokemon/growlithe/meson.build | 2 +- res/pokemon/grumpig/data.json | 12 +- res/pokemon/grumpig/meson.build | 2 +- res/pokemon/gulpin/data.json | 12 +- res/pokemon/gulpin/meson.build | 2 +- res/pokemon/gyarados/data.json | 12 +- res/pokemon/gyarados/meson.build | 2 +- res/pokemon/happiny/data.json | 14 +- res/pokemon/happiny/meson.build | 2 +- res/pokemon/hariyama/data.json | 14 +- res/pokemon/hariyama/meson.build | 2 +- res/pokemon/haunter/data.json | 12 +- res/pokemon/haunter/meson.build | 2 +- res/pokemon/heatran/data.json | 12 +- res/pokemon/heatran/meson.build | 2 +- res/pokemon/heracross/data.json | 12 +- res/pokemon/heracross/meson.build | 2 +- res/pokemon/hippopotas/data.json | 12 +- res/pokemon/hippopotas/meson.build | 2 +- res/pokemon/hippowdon/data.json | 12 +- res/pokemon/hippowdon/meson.build | 2 +- res/pokemon/hitmonchan/data.json | 12 +- res/pokemon/hitmonchan/meson.build | 2 +- res/pokemon/hitmonlee/data.json | 12 +- res/pokemon/hitmonlee/meson.build | 2 +- res/pokemon/hitmontop/data.json | 12 +- res/pokemon/hitmontop/meson.build | 2 +- res/pokemon/ho_oh/data.json | 12 +- res/pokemon/ho_oh/meson.build | 2 +- res/pokemon/honchkrow/data.json | 14 +- res/pokemon/honchkrow/meson.build | 2 +- res/pokemon/hoothoot/data.json | 14 +- res/pokemon/hoothoot/meson.build | 2 +- res/pokemon/hoppip/data.json | 12 +- res/pokemon/hoppip/meson.build | 2 +- res/pokemon/horsea/data.json | 12 +- res/pokemon/horsea/meson.build | 2 +- res/pokemon/houndoom/data.json | 12 +- res/pokemon/houndoom/meson.build | 2 +- res/pokemon/houndour/data.json | 12 +- res/pokemon/houndour/meson.build | 2 +- res/pokemon/huntail/data.json | 12 +- res/pokemon/huntail/meson.build | 2 +- res/pokemon/hypno/data.json | 12 +- res/pokemon/hypno/meson.build | 2 +- res/pokemon/igglybuff/data.json | 12 +- res/pokemon/igglybuff/meson.build | 2 +- res/pokemon/illumise/data.json | 12 +- res/pokemon/illumise/meson.build | 2 +- res/pokemon/infernape/data.json | 12 +- res/pokemon/infernape/meson.build | 2 +- res/pokemon/ivysaur/data.json | 14 +- res/pokemon/ivysaur/meson.build | 2 +- res/pokemon/jigglypuff/data.json | 12 +- res/pokemon/jigglypuff/meson.build | 2 +- res/pokemon/jirachi/data.json | 12 +- res/pokemon/jirachi/meson.build | 2 +- res/pokemon/jolteon/data.json | 12 +- res/pokemon/jolteon/meson.build | 2 +- res/pokemon/jumpluff/data.json | 12 +- res/pokemon/jumpluff/meson.build | 2 +- res/pokemon/jynx/data.json | 12 +- res/pokemon/jynx/meson.build | 2 +- res/pokemon/kabuto/data.json | 12 +- res/pokemon/kabuto/meson.build | 2 +- res/pokemon/kabutops/data.json | 14 +- res/pokemon/kabutops/meson.build | 2 +- res/pokemon/kadabra/data.json | 12 +- res/pokemon/kadabra/meson.build | 2 +- res/pokemon/kakuna/data.json | 12 +- res/pokemon/kakuna/meson.build | 2 +- res/pokemon/kangaskhan/data.json | 12 +- res/pokemon/kangaskhan/meson.build | 2 +- res/pokemon/kecleon/data.json | 14 +- res/pokemon/kecleon/meson.build | 2 +- res/pokemon/kingdra/data.json | 12 +- res/pokemon/kingdra/meson.build | 2 +- res/pokemon/kingler/data.json | 12 +- res/pokemon/kingler/meson.build | 2 +- res/pokemon/kirlia/data.json | 12 +- res/pokemon/kirlia/meson.build | 2 +- res/pokemon/koffing/data.json | 12 +- res/pokemon/koffing/meson.build | 2 +- res/pokemon/krabby/data.json | 12 +- res/pokemon/krabby/meson.build | 2 +- res/pokemon/kricketot/data.json | 12 +- res/pokemon/kricketot/meson.build | 2 +- res/pokemon/kricketune/data.json | 14 +- res/pokemon/kricketune/meson.build | 2 +- res/pokemon/kyogre/data.json | 12 +- res/pokemon/kyogre/meson.build | 2 +- res/pokemon/lairon/data.json | 12 +- res/pokemon/lairon/meson.build | 2 +- res/pokemon/lanturn/data.json | 14 +- res/pokemon/lanturn/meson.build | 2 +- res/pokemon/lapras/data.json | 14 +- res/pokemon/lapras/meson.build | 2 +- res/pokemon/larvitar/data.json | 14 +- res/pokemon/larvitar/meson.build | 2 +- res/pokemon/latias/data.json | 12 +- res/pokemon/latias/meson.build | 2 +- res/pokemon/latios/data.json | 14 +- res/pokemon/latios/meson.build | 2 +- res/pokemon/leafeon/data.json | 12 +- res/pokemon/leafeon/meson.build | 2 +- res/pokemon/ledian/data.json | 12 +- res/pokemon/ledian/meson.build | 2 +- res/pokemon/ledyba/data.json | 14 +- res/pokemon/ledyba/meson.build | 2 +- res/pokemon/lickilicky/data.json | 12 +- res/pokemon/lickilicky/meson.build | 2 +- res/pokemon/lickitung/data.json | 12 +- res/pokemon/lickitung/meson.build | 2 +- res/pokemon/lileep/data.json | 12 +- res/pokemon/lileep/meson.build | 2 +- res/pokemon/linoone/data.json | 12 +- res/pokemon/linoone/meson.build | 2 +- res/pokemon/lombre/data.json | 12 +- res/pokemon/lombre/meson.build | 2 +- res/pokemon/lopunny/data.json | 12 +- res/pokemon/lopunny/meson.build | 2 +- res/pokemon/lotad/data.json | 14 +- res/pokemon/lotad/meson.build | 2 +- res/pokemon/loudred/data.json | 12 +- res/pokemon/loudred/meson.build | 2 +- res/pokemon/lucario/data.json | 12 +- res/pokemon/lucario/meson.build | 2 +- res/pokemon/ludicolo/data.json | 14 +- res/pokemon/ludicolo/meson.build | 2 +- res/pokemon/lugia/data.json | 12 +- res/pokemon/lugia/meson.build | 2 +- res/pokemon/lumineon/data.json | 12 +- res/pokemon/lumineon/meson.build | 2 +- res/pokemon/lunatone/data.json | 12 +- res/pokemon/lunatone/meson.build | 2 +- res/pokemon/luvdisc/data.json | 14 +- res/pokemon/luvdisc/meson.build | 2 +- res/pokemon/luxio/data.json | 12 +- res/pokemon/luxio/meson.build | 2 +- res/pokemon/luxray/data.json | 12 +- res/pokemon/luxray/meson.build | 2 +- res/pokemon/machamp/data.json | 12 +- res/pokemon/machamp/meson.build | 2 +- res/pokemon/machoke/data.json | 12 +- res/pokemon/machoke/meson.build | 2 +- res/pokemon/machop/data.json | 12 +- res/pokemon/machop/meson.build | 2 +- res/pokemon/magby/data.json | 14 +- res/pokemon/magby/meson.build | 2 +- res/pokemon/magcargo/data.json | 12 +- res/pokemon/magcargo/meson.build | 2 +- res/pokemon/magikarp/data.json | 12 +- res/pokemon/magikarp/meson.build | 2 +- res/pokemon/magmar/data.json | 12 +- res/pokemon/magmar/meson.build | 2 +- res/pokemon/magmortar/data.json | 12 +- res/pokemon/magmortar/meson.build | 2 +- res/pokemon/magnemite/data.json | 12 +- res/pokemon/magnemite/meson.build | 2 +- res/pokemon/magneton/data.json | 12 +- res/pokemon/magneton/meson.build | 2 +- res/pokemon/magnezone/data.json | 12 +- res/pokemon/magnezone/meson.build | 2 +- res/pokemon/makuhita/data.json | 12 +- res/pokemon/makuhita/meson.build | 2 +- res/pokemon/mamoswine/data.json | 12 +- res/pokemon/mamoswine/meson.build | 2 +- res/pokemon/manaphy/data.json | 14 +- res/pokemon/manaphy/meson.build | 2 +- res/pokemon/manectric/data.json | 12 +- res/pokemon/manectric/meson.build | 2 +- res/pokemon/mankey/data.json | 12 +- res/pokemon/mankey/meson.build | 2 +- res/pokemon/mantine/data.json | 12 +- res/pokemon/mantine/meson.build | 2 +- res/pokemon/mantyke/data.json | 14 +- res/pokemon/mantyke/meson.build | 2 +- res/pokemon/mareep/data.json | 12 +- res/pokemon/mareep/meson.build | 2 +- res/pokemon/marill/data.json | 12 +- res/pokemon/marill/meson.build | 2 +- res/pokemon/marowak/data.json | 14 +- res/pokemon/marowak/meson.build | 2 +- res/pokemon/marshtomp/data.json | 12 +- res/pokemon/marshtomp/meson.build | 2 +- res/pokemon/masquerain/data.json | 12 +- res/pokemon/masquerain/meson.build | 2 +- res/pokemon/mawile/data.json | 12 +- res/pokemon/mawile/meson.build | 2 +- res/pokemon/medicham/data.json | 12 +- res/pokemon/medicham/meson.build | 2 +- res/pokemon/meditite/data.json | 12 +- res/pokemon/meditite/meson.build | 2 +- res/pokemon/meganium/data.json | 12 +- res/pokemon/meganium/meson.build | 2 +- res/pokemon/meowth/data.json | 12 +- res/pokemon/meowth/meson.build | 2 +- res/pokemon/meson.build | 740 +++--------------- res/pokemon/mesprit/data.json | 12 +- res/pokemon/mesprit/meson.build | 2 +- res/pokemon/metagross/data.json | 12 +- res/pokemon/metagross/meson.build | 2 +- res/pokemon/metang/data.json | 14 +- res/pokemon/metang/meson.build | 2 +- res/pokemon/metapod/data.json | 12 +- res/pokemon/metapod/meson.build | 2 +- res/pokemon/mew/data.json | 14 +- res/pokemon/mew/meson.build | 2 +- res/pokemon/mewtwo/data.json | 14 +- res/pokemon/mewtwo/meson.build | 2 +- res/pokemon/mightyena/data.json | 12 +- res/pokemon/mightyena/meson.build | 2 +- res/pokemon/milotic/data.json | 12 +- res/pokemon/milotic/meson.build | 2 +- res/pokemon/miltank/data.json | 14 +- res/pokemon/miltank/meson.build | 2 +- res/pokemon/mime_jr/data.json | 12 +- res/pokemon/mime_jr/meson.build | 2 +- res/pokemon/minun/data.json | 12 +- res/pokemon/minun/meson.build | 2 +- res/pokemon/misdreavus/data.json | 14 +- res/pokemon/misdreavus/meson.build | 2 +- res/pokemon/mismagius/data.json | 12 +- res/pokemon/mismagius/meson.build | 2 +- res/pokemon/moltres/data.json | 14 +- res/pokemon/moltres/meson.build | 2 +- res/pokemon/monferno/data.json | 12 +- res/pokemon/monferno/meson.build | 2 +- res/pokemon/mothim/data.json | 14 +- res/pokemon/mothim/meson.build | 2 +- res/pokemon/mr_mime/data.json | 12 +- res/pokemon/mr_mime/meson.build | 2 +- res/pokemon/mudkip/data.json | 12 +- res/pokemon/mudkip/meson.build | 2 +- res/pokemon/muk/data.json | 12 +- res/pokemon/muk/meson.build | 2 +- res/pokemon/munchlax/data.json | 12 +- res/pokemon/munchlax/meson.build | 2 +- res/pokemon/murkrow/data.json | 12 +- res/pokemon/murkrow/meson.build | 2 +- res/pokemon/natu/data.json | 12 +- res/pokemon/natu/meson.build | 2 +- res/pokemon/nidoking/data.json | 12 +- res/pokemon/nidoking/meson.build | 2 +- res/pokemon/nidoqueen/data.json | 12 +- res/pokemon/nidoqueen/meson.build | 2 +- res/pokemon/nidoran_f/data.json | 14 +- res/pokemon/nidoran_f/meson.build | 2 +- res/pokemon/nidoran_m/data.json | 14 +- res/pokemon/nidoran_m/meson.build | 2 +- res/pokemon/nidorina/data.json | 14 +- res/pokemon/nidorina/meson.build | 2 +- res/pokemon/nidorino/data.json | 12 +- res/pokemon/nidorino/meson.build | 2 +- res/pokemon/nincada/data.json | 12 +- res/pokemon/nincada/meson.build | 2 +- res/pokemon/ninetales/data.json | 12 +- res/pokemon/ninetales/meson.build | 2 +- res/pokemon/ninjask/data.json | 12 +- res/pokemon/ninjask/meson.build | 2 +- res/pokemon/noctowl/data.json | 12 +- res/pokemon/noctowl/meson.build | 2 +- res/pokemon/{000 => none}/data.json | 10 +- res/pokemon/{000 => none}/female_back.png | Bin res/pokemon/{000 => none}/female_back.png.key | Bin res/pokemon/{000 => none}/female_front.png | Bin .../{000 => none}/female_front.png.key | Bin res/pokemon/{000 => none}/icon.png | Bin res/pokemon/{000 => none}/male_back.png | Bin res/pokemon/{000 => none}/male_back.png.key | Bin res/pokemon/{000 => none}/male_front.png | Bin res/pokemon/{000 => none}/male_front.png.key | Bin res/pokemon/{000 => none}/meson.build | 2 +- res/pokemon/{000 => none}/normal_pal.NCLR | Bin res/pokemon/{000 => none}/shiny_pal.NCLR | Bin res/pokemon/{000 => none}/sprite_data.json | 0 res/pokemon/nosepass/data.json | 12 +- res/pokemon/nosepass/meson.build | 2 +- res/pokemon/numel/data.json | 12 +- res/pokemon/numel/meson.build | 2 +- res/pokemon/nuzleaf/data.json | 12 +- res/pokemon/nuzleaf/meson.build | 2 +- res/pokemon/octillery/data.json | 12 +- res/pokemon/octillery/meson.build | 2 +- res/pokemon/oddish/data.json | 12 +- res/pokemon/oddish/meson.build | 2 +- res/pokemon/omanyte/data.json | 14 +- res/pokemon/omanyte/meson.build | 2 +- res/pokemon/omastar/data.json | 14 +- res/pokemon/omastar/meson.build | 2 +- res/pokemon/onix/data.json | 12 +- res/pokemon/onix/meson.build | 2 +- res/pokemon/pachirisu/data.json | 12 +- res/pokemon/pachirisu/meson.build | 2 +- res/pokemon/palkia/data.json | 14 +- res/pokemon/palkia/meson.build | 2 +- res/pokemon/paras/data.json | 12 +- res/pokemon/paras/meson.build | 2 +- res/pokemon/parasect/data.json | 14 +- res/pokemon/parasect/meson.build | 2 +- res/pokemon/pelipper/data.json | 14 +- res/pokemon/pelipper/meson.build | 2 +- res/pokemon/persian/data.json | 14 +- res/pokemon/persian/meson.build | 2 +- res/pokemon/phanpy/data.json | 12 +- res/pokemon/phanpy/meson.build | 2 +- res/pokemon/phione/data.json | 12 +- res/pokemon/phione/meson.build | 2 +- res/pokemon/pichu/data.json | 12 +- res/pokemon/pichu/meson.build | 2 +- res/pokemon/pidgeot/data.json | 12 +- res/pokemon/pidgeot/meson.build | 2 +- res/pokemon/pidgeotto/data.json | 12 +- res/pokemon/pidgeotto/meson.build | 2 +- res/pokemon/pidgey/data.json | 12 +- res/pokemon/pidgey/meson.build | 2 +- res/pokemon/pikachu/data.json | 12 +- res/pokemon/pikachu/meson.build | 2 +- res/pokemon/piloswine/data.json | 12 +- res/pokemon/piloswine/meson.build | 2 +- res/pokemon/pineco/data.json | 14 +- res/pokemon/pineco/meson.build | 2 +- res/pokemon/pinsir/data.json | 14 +- res/pokemon/pinsir/meson.build | 2 +- res/pokemon/piplup/data.json | 12 +- res/pokemon/piplup/meson.build | 2 +- res/pokemon/plusle/data.json | 12 +- res/pokemon/plusle/meson.build | 2 +- res/pokemon/politoed/data.json | 12 +- res/pokemon/politoed/meson.build | 2 +- res/pokemon/poliwag/data.json | 12 +- res/pokemon/poliwag/meson.build | 2 +- res/pokemon/poliwhirl/data.json | 12 +- res/pokemon/poliwhirl/meson.build | 2 +- res/pokemon/poliwrath/data.json | 12 +- res/pokemon/poliwrath/meson.build | 2 +- res/pokemon/ponyta/data.json | 12 +- res/pokemon/ponyta/meson.build | 2 +- res/pokemon/poochyena/data.json | 14 +- res/pokemon/poochyena/meson.build | 2 +- res/pokemon/porygon/data.json | 14 +- res/pokemon/porygon/meson.build | 2 +- res/pokemon/porygon2/data.json | 12 +- res/pokemon/porygon2/meson.build | 2 +- res/pokemon/porygon_z/data.json | 12 +- res/pokemon/porygon_z/meson.build | 2 +- res/pokemon/primeape/data.json | 12 +- res/pokemon/primeape/meson.build | 2 +- res/pokemon/prinplup/data.json | 12 +- res/pokemon/prinplup/meson.build | 2 +- res/pokemon/probopass/data.json | 12 +- res/pokemon/probopass/meson.build | 2 +- res/pokemon/psyduck/data.json | 12 +- res/pokemon/psyduck/meson.build | 2 +- res/pokemon/pupitar/data.json | 12 +- res/pokemon/pupitar/meson.build | 2 +- res/pokemon/purugly/data.json | 12 +- res/pokemon/purugly/meson.build | 2 +- res/pokemon/quagsire/data.json | 14 +- res/pokemon/quagsire/meson.build | 2 +- res/pokemon/quilava/data.json | 12 +- res/pokemon/quilava/meson.build | 2 +- res/pokemon/qwilfish/data.json | 12 +- res/pokemon/qwilfish/meson.build | 2 +- res/pokemon/raichu/data.json | 12 +- res/pokemon/raichu/meson.build | 2 +- res/pokemon/raikou/data.json | 12 +- res/pokemon/raikou/meson.build | 2 +- res/pokemon/ralts/data.json | 14 +- res/pokemon/ralts/meson.build | 2 +- res/pokemon/rampardos/data.json | 12 +- res/pokemon/rampardos/meson.build | 2 +- res/pokemon/rapidash/data.json | 12 +- res/pokemon/rapidash/meson.build | 2 +- res/pokemon/raticate/data.json | 12 +- res/pokemon/raticate/meson.build | 2 +- res/pokemon/rattata/data.json | 12 +- res/pokemon/rattata/meson.build | 2 +- res/pokemon/rayquaza/data.json | 12 +- res/pokemon/rayquaza/meson.build | 2 +- res/pokemon/regice/data.json | 12 +- res/pokemon/regice/meson.build | 2 +- res/pokemon/regigigas/data.json | 14 +- res/pokemon/regigigas/meson.build | 2 +- res/pokemon/regirock/data.json | 12 +- res/pokemon/regirock/meson.build | 2 +- res/pokemon/registeel/data.json | 12 +- res/pokemon/registeel/meson.build | 2 +- res/pokemon/relicanth/data.json | 14 +- res/pokemon/relicanth/meson.build | 2 +- res/pokemon/remoraid/data.json | 12 +- res/pokemon/remoraid/meson.build | 2 +- res/pokemon/rhydon/data.json | 12 +- res/pokemon/rhydon/meson.build | 2 +- res/pokemon/rhyhorn/data.json | 12 +- res/pokemon/rhyhorn/meson.build | 2 +- res/pokemon/rhyperior/data.json | 12 +- res/pokemon/rhyperior/meson.build | 2 +- res/pokemon/riolu/data.json | 12 +- res/pokemon/riolu/meson.build | 2 +- res/pokemon/roselia/data.json | 14 +- res/pokemon/roselia/meson.build | 2 +- res/pokemon/roserade/data.json | 12 +- res/pokemon/roserade/meson.build | 2 +- res/pokemon/rotom/data.json | 12 +- res/pokemon/rotom/forms/fan/data.json | 6 +- res/pokemon/rotom/forms/frost/data.json | 6 +- res/pokemon/rotom/forms/heat/data.json | 6 +- res/pokemon/rotom/forms/mow/data.json | 6 +- res/pokemon/rotom/forms/wash/data.json | 6 +- res/pokemon/rotom/meson.build | 2 +- res/pokemon/sableye/data.json | 12 +- res/pokemon/sableye/meson.build | 2 +- res/pokemon/salamence/data.json | 12 +- res/pokemon/salamence/meson.build | 2 +- res/pokemon/sandshrew/data.json | 12 +- res/pokemon/sandshrew/meson.build | 2 +- res/pokemon/sandslash/data.json | 12 +- res/pokemon/sandslash/meson.build | 2 +- res/pokemon/sceptile/data.json | 12 +- res/pokemon/sceptile/meson.build | 2 +- res/pokemon/scizor/data.json | 12 +- res/pokemon/scizor/meson.build | 2 +- res/pokemon/scyther/data.json | 12 +- res/pokemon/scyther/meson.build | 2 +- res/pokemon/seadra/data.json | 12 +- res/pokemon/seadra/meson.build | 2 +- res/pokemon/seaking/data.json | 12 +- res/pokemon/seaking/meson.build | 2 +- res/pokemon/sealeo/data.json | 12 +- res/pokemon/sealeo/meson.build | 2 +- res/pokemon/seedot/data.json | 14 +- res/pokemon/seedot/meson.build | 2 +- res/pokemon/seel/data.json | 14 +- res/pokemon/seel/meson.build | 2 +- res/pokemon/sentret/data.json | 12 +- res/pokemon/sentret/meson.build | 2 +- res/pokemon/seviper/data.json | 12 +- res/pokemon/seviper/meson.build | 2 +- res/pokemon/sharpedo/data.json | 14 +- res/pokemon/sharpedo/meson.build | 2 +- res/pokemon/shaymin/data.json | 12 +- res/pokemon/shaymin/forms/sky/data.json | 6 +- res/pokemon/shaymin/meson.build | 2 +- res/pokemon/shedinja/data.json | 14 +- res/pokemon/shedinja/meson.build | 2 +- res/pokemon/shelgon/data.json | 12 +- res/pokemon/shelgon/meson.build | 2 +- res/pokemon/shellder/data.json | 12 +- res/pokemon/shellder/meson.build | 2 +- res/pokemon/shellos/data.json | 12 +- res/pokemon/shellos/meson.build | 2 +- res/pokemon/shieldon/data.json | 12 +- res/pokemon/shieldon/meson.build | 2 +- res/pokemon/shiftry/data.json | 12 +- res/pokemon/shiftry/meson.build | 2 +- res/pokemon/shinx/data.json | 12 +- res/pokemon/shinx/meson.build | 2 +- res/pokemon/shroomish/data.json | 12 +- res/pokemon/shroomish/meson.build | 2 +- res/pokemon/shuckle/data.json | 12 +- res/pokemon/shuckle/meson.build | 2 +- res/pokemon/shuppet/data.json | 12 +- res/pokemon/shuppet/meson.build | 2 +- res/pokemon/silcoon/data.json | 12 +- res/pokemon/silcoon/meson.build | 2 +- res/pokemon/skarmory/data.json | 12 +- res/pokemon/skarmory/meson.build | 2 +- res/pokemon/skiploom/data.json | 12 +- res/pokemon/skiploom/meson.build | 2 +- res/pokemon/skitty/data.json | 14 +- res/pokemon/skitty/meson.build | 2 +- res/pokemon/skorupi/data.json | 12 +- res/pokemon/skorupi/meson.build | 2 +- res/pokemon/skuntank/data.json | 12 +- res/pokemon/skuntank/meson.build | 2 +- res/pokemon/slaking/data.json | 14 +- res/pokemon/slaking/meson.build | 2 +- res/pokemon/slakoth/data.json | 12 +- res/pokemon/slakoth/meson.build | 2 +- res/pokemon/slowbro/data.json | 12 +- res/pokemon/slowbro/meson.build | 2 +- res/pokemon/slowking/data.json | 12 +- res/pokemon/slowking/meson.build | 2 +- res/pokemon/slowpoke/data.json | 12 +- res/pokemon/slowpoke/meson.build | 2 +- res/pokemon/slugma/data.json | 14 +- res/pokemon/slugma/meson.build | 2 +- res/pokemon/smeargle/data.json | 12 +- res/pokemon/smeargle/meson.build | 2 +- res/pokemon/smoochum/data.json | 12 +- res/pokemon/smoochum/meson.build | 2 +- res/pokemon/sneasel/data.json | 14 +- res/pokemon/sneasel/meson.build | 2 +- res/pokemon/snorlax/data.json | 12 +- res/pokemon/snorlax/meson.build | 2 +- res/pokemon/snorunt/data.json | 12 +- res/pokemon/snorunt/meson.build | 2 +- res/pokemon/snover/data.json | 12 +- res/pokemon/snover/meson.build | 2 +- res/pokemon/snubbull/data.json | 14 +- res/pokemon/snubbull/meson.build | 2 +- res/pokemon/solrock/data.json | 14 +- res/pokemon/solrock/meson.build | 2 +- res/pokemon/spearow/data.json | 12 +- res/pokemon/spearow/meson.build | 2 +- res/pokemon/spheal/data.json | 12 +- res/pokemon/spheal/meson.build | 2 +- res/pokemon/spinarak/data.json | 12 +- res/pokemon/spinarak/meson.build | 2 +- res/pokemon/spinda/data.json | 12 +- res/pokemon/spinda/meson.build | 2 +- res/pokemon/spiritomb/data.json | 12 +- res/pokemon/spiritomb/meson.build | 2 +- res/pokemon/spoink/data.json | 12 +- res/pokemon/spoink/meson.build | 2 +- res/pokemon/squirtle/data.json | 12 +- res/pokemon/squirtle/meson.build | 2 +- res/pokemon/stantler/data.json | 12 +- res/pokemon/stantler/meson.build | 2 +- res/pokemon/staraptor/data.json | 12 +- res/pokemon/staraptor/meson.build | 2 +- res/pokemon/staravia/data.json | 12 +- res/pokemon/staravia/meson.build | 2 +- res/pokemon/starly/data.json | 12 +- res/pokemon/starly/meson.build | 2 +- res/pokemon/starmie/data.json | 12 +- res/pokemon/starmie/meson.build | 2 +- res/pokemon/staryu/data.json | 12 +- res/pokemon/staryu/meson.build | 2 +- res/pokemon/steelix/data.json | 12 +- res/pokemon/steelix/meson.build | 2 +- res/pokemon/stunky/data.json | 14 +- res/pokemon/stunky/meson.build | 2 +- res/pokemon/sudowoodo/data.json | 12 +- res/pokemon/sudowoodo/meson.build | 2 +- res/pokemon/suicune/data.json | 12 +- res/pokemon/suicune/meson.build | 2 +- res/pokemon/sunflora/data.json | 12 +- res/pokemon/sunflora/meson.build | 2 +- res/pokemon/sunkern/data.json | 12 +- res/pokemon/sunkern/meson.build | 2 +- res/pokemon/surskit/data.json | 12 +- res/pokemon/surskit/meson.build | 2 +- res/pokemon/swablu/data.json | 14 +- res/pokemon/swablu/meson.build | 2 +- res/pokemon/swalot/data.json | 12 +- res/pokemon/swalot/meson.build | 2 +- res/pokemon/swampert/data.json | 12 +- res/pokemon/swampert/meson.build | 2 +- res/pokemon/swellow/data.json | 12 +- res/pokemon/swellow/meson.build | 2 +- res/pokemon/swinub/data.json | 12 +- res/pokemon/swinub/meson.build | 2 +- res/pokemon/taillow/data.json | 12 +- res/pokemon/taillow/meson.build | 2 +- res/pokemon/tangela/data.json | 12 +- res/pokemon/tangela/meson.build | 2 +- res/pokemon/tangrowth/data.json | 12 +- res/pokemon/tangrowth/meson.build | 2 +- res/pokemon/tauros/data.json | 12 +- res/pokemon/tauros/meson.build | 2 +- res/pokemon/teddiursa/data.json | 12 +- res/pokemon/teddiursa/meson.build | 2 +- res/pokemon/tentacool/data.json | 12 +- res/pokemon/tentacool/meson.build | 2 +- res/pokemon/tentacruel/data.json | 12 +- res/pokemon/tentacruel/meson.build | 2 +- res/pokemon/togekiss/data.json | 14 +- res/pokemon/togekiss/meson.build | 2 +- res/pokemon/togepi/data.json | 12 +- res/pokemon/togepi/meson.build | 2 +- res/pokemon/togetic/data.json | 12 +- res/pokemon/togetic/meson.build | 2 +- res/pokemon/torchic/data.json | 12 +- res/pokemon/torchic/meson.build | 2 +- res/pokemon/torkoal/data.json | 12 +- res/pokemon/torkoal/meson.build | 2 +- res/pokemon/torterra/data.json | 14 +- res/pokemon/torterra/meson.build | 2 +- res/pokemon/totodile/data.json | 12 +- res/pokemon/totodile/meson.build | 2 +- res/pokemon/toxicroak/data.json | 12 +- res/pokemon/toxicroak/meson.build | 2 +- res/pokemon/trapinch/data.json | 12 +- res/pokemon/trapinch/meson.build | 2 +- res/pokemon/treecko/data.json | 12 +- res/pokemon/treecko/meson.build | 2 +- res/pokemon/tropius/data.json | 12 +- res/pokemon/tropius/meson.build | 2 +- res/pokemon/turtwig/data.json | 12 +- res/pokemon/turtwig/meson.build | 2 +- res/pokemon/typhlosion/data.json | 12 +- res/pokemon/typhlosion/meson.build | 2 +- res/pokemon/tyranitar/data.json | 12 +- res/pokemon/tyranitar/meson.build | 2 +- res/pokemon/tyrogue/data.json | 12 +- res/pokemon/tyrogue/meson.build | 2 +- res/pokemon/umbreon/data.json | 14 +- res/pokemon/umbreon/meson.build | 2 +- res/pokemon/unown/data.json | 12 +- res/pokemon/unown/meson.build | 2 +- res/pokemon/ursaring/data.json | 12 +- res/pokemon/ursaring/meson.build | 2 +- res/pokemon/uxie/data.json | 12 +- res/pokemon/uxie/meson.build | 2 +- res/pokemon/vaporeon/data.json | 12 +- res/pokemon/vaporeon/meson.build | 2 +- res/pokemon/venomoth/data.json | 12 +- res/pokemon/venomoth/meson.build | 2 +- res/pokemon/venonat/data.json | 12 +- res/pokemon/venonat/meson.build | 2 +- res/pokemon/venusaur/data.json | 14 +- res/pokemon/venusaur/meson.build | 2 +- res/pokemon/vespiquen/data.json | 12 +- res/pokemon/vespiquen/meson.build | 2 +- res/pokemon/vibrava/data.json | 12 +- res/pokemon/vibrava/meson.build | 2 +- res/pokemon/victreebel/data.json | 12 +- res/pokemon/victreebel/meson.build | 2 +- res/pokemon/vigoroth/data.json | 12 +- res/pokemon/vigoroth/meson.build | 2 +- res/pokemon/vileplume/data.json | 12 +- res/pokemon/vileplume/meson.build | 2 +- res/pokemon/volbeat/data.json | 14 +- res/pokemon/volbeat/meson.build | 2 +- res/pokemon/voltorb/data.json | 14 +- res/pokemon/voltorb/meson.build | 2 +- res/pokemon/vulpix/data.json | 12 +- res/pokemon/vulpix/meson.build | 2 +- res/pokemon/wailmer/data.json | 12 +- res/pokemon/wailmer/meson.build | 2 +- res/pokemon/wailord/data.json | 14 +- res/pokemon/wailord/meson.build | 2 +- res/pokemon/walrein/data.json | 12 +- res/pokemon/walrein/meson.build | 2 +- res/pokemon/wartortle/data.json | 12 +- res/pokemon/wartortle/meson.build | 2 +- res/pokemon/weavile/data.json | 12 +- res/pokemon/weavile/meson.build | 2 +- res/pokemon/weedle/data.json | 12 +- res/pokemon/weedle/meson.build | 2 +- res/pokemon/weepinbell/data.json | 14 +- res/pokemon/weepinbell/meson.build | 2 +- res/pokemon/weezing/data.json | 12 +- res/pokemon/weezing/meson.build | 2 +- res/pokemon/whiscash/data.json | 12 +- res/pokemon/whiscash/meson.build | 2 +- res/pokemon/whismur/data.json | 12 +- res/pokemon/whismur/meson.build | 2 +- res/pokemon/wigglytuff/data.json | 12 +- res/pokemon/wigglytuff/meson.build | 2 +- res/pokemon/wingull/data.json | 12 +- res/pokemon/wingull/meson.build | 2 +- res/pokemon/wobbuffet/data.json | 12 +- res/pokemon/wobbuffet/meson.build | 2 +- res/pokemon/wooper/data.json | 12 +- res/pokemon/wooper/meson.build | 2 +- res/pokemon/wormadam/data.json | 12 +- res/pokemon/wormadam/forms/sandy/data.json | 6 +- res/pokemon/wormadam/forms/trash/data.json | 6 +- res/pokemon/wormadam/meson.build | 2 +- res/pokemon/wurmple/data.json | 14 +- res/pokemon/wurmple/meson.build | 2 +- res/pokemon/wynaut/data.json | 12 +- res/pokemon/wynaut/meson.build | 2 +- res/pokemon/xatu/data.json | 14 +- res/pokemon/xatu/meson.build | 2 +- res/pokemon/yanma/data.json | 12 +- res/pokemon/yanma/meson.build | 2 +- res/pokemon/yanmega/data.json | 12 +- res/pokemon/yanmega/meson.build | 2 +- res/pokemon/zangoose/data.json | 12 +- res/pokemon/zangoose/meson.build | 2 +- res/pokemon/zapdos/data.json | 14 +- res/pokemon/zapdos/meson.build | 2 +- res/pokemon/zigzagoon/data.json | 12 +- res/pokemon/zigzagoon/meson.build | 2 +- res/pokemon/zubat/data.json | 12 +- res/pokemon/zubat/meson.build | 2 +- src/catching_show.c | 19 +- src/map_header.c | 5 +- src/overlay005/ov5_021F77A8.c | 4 +- src/unk_0204C500.c | 2 +- subprojects/narc.wrap | 2 +- .../rapidjson_patch/gcc14fix.patch | 22 + subprojects/rapidjson.wrap | 15 + tools/datagen/datagen.h | 192 +++++ tools/datagen/datagen_species.cpp | 526 +++++++++++++ tools/datagen/meson.build | 39 + tools/json2bin/catching_show_data.py | 37 - tools/json2bin/evo.py | 132 ---- tools/json2bin/meson.build | 5 - tools/json2bin/pl_poke_data.py | 55 -- tools/json2bin/pokemon_personal_data.py | 109 --- tools/json2bin/pokemon_wotbl_data.py | 78 -- tools/meson.build | 4 +- tools/ordergen/forms.py | 101 +++ tools/ordergen/meson.build | 1 + tools/scripts/make_height.py | 68 -- tools/scripts/make_pl_pokegra.py | 6 +- tools/scripts/make_species_tables.py | 52 +- tools/scripts/make_tutorable_moves.py | 58 -- tools/scripts/meson.build | 2 - tools/scripts/migration/species_data.py | 50 +- 1060 files changed, 4564 insertions(+), 5716 deletions(-) delete mode 100644 consts/catching_show.json delete mode 100644 consts/shadows.json delete mode 100644 consts/tm_learnset.json create mode 100644 generated/catching_show_points_category.txt create mode 100644 generated/pal_park_land_area.txt create mode 100644 generated/pal_park_water_area.txt create mode 100644 generated/shadow_sizes.txt create mode 100644 res/pokemon/form_registry.json rename res/pokemon/{000 => none}/data.json (91%) rename res/pokemon/{000 => none}/female_back.png (100%) rename res/pokemon/{000 => none}/female_back.png.key (100%) rename res/pokemon/{000 => none}/female_front.png (100%) rename res/pokemon/{000 => none}/female_front.png.key (100%) rename res/pokemon/{000 => none}/icon.png (100%) rename res/pokemon/{000 => none}/male_back.png (100%) rename res/pokemon/{000 => none}/male_back.png.key (100%) rename res/pokemon/{000 => none}/male_front.png (100%) rename res/pokemon/{000 => none}/male_front.png.key (100%) rename res/pokemon/{000 => none}/meson.build (91%) rename res/pokemon/{000 => none}/normal_pal.NCLR (100%) rename res/pokemon/{000 => none}/shiny_pal.NCLR (100%) rename res/pokemon/{000 => none}/sprite_data.json (100%) create mode 100644 subprojects/packagefiles/rapidjson_patch/gcc14fix.patch create mode 100644 subprojects/rapidjson.wrap create mode 100644 tools/datagen/datagen.h create mode 100644 tools/datagen/datagen_species.cpp create mode 100644 tools/datagen/meson.build delete mode 100644 tools/json2bin/catching_show_data.py delete mode 100644 tools/json2bin/evo.py delete mode 100644 tools/json2bin/pl_poke_data.py delete mode 100644 tools/json2bin/pokemon_personal_data.py delete mode 100644 tools/json2bin/pokemon_wotbl_data.py create mode 100755 tools/ordergen/forms.py create mode 100644 tools/ordergen/meson.build delete mode 100644 tools/scripts/make_height.py delete mode 100644 tools/scripts/make_tutorable_moves.py diff --git a/.gitignore b/.gitignore index dd13be31fb..20656bb43a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ /subprojects/knarc/ /subprojects/narc/ /subprojects/metang/ +/subprojects/rapidjson-*/ # CLion folders .idea/ diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index e18537af26..787795594e 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1,9 +1,9 @@ #include "generated/items.h" #include "generated/moves.h" #include "generated/species.h" +#include "generated/catching_show_points_category.h" .include "macros/movement.inc" .include "consts/badges.inc" - .include "consts/catching_show.inc" .include "consts/game_records.inc" .include "consts/journal.inc" .include "consts/map.inc" diff --git a/consts/catching_show.json b/consts/catching_show.json deleted file mode 100644 index e10c87f2ac..0000000000 --- a/consts/catching_show.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "definitions": { - "@CatchingShowPointsCategory": { - "type": "enum", - "values": [ - "CATCHING_SHOW_CATCHING_POINTS", - "CATCHING_SHOW_TIME_POINTS", - "CATCHING_SHOW_TYPE_POINTS", - "CATCHING_SHOW_TOTAL_POINTS" - ] - }, - "@PalParkLandArea": { - "type": "enum", - "values": [ - "PAL_PARK_AREA_LAND_NONE", - "PAL_PARK_AREA_LAND_NORTH_WEST", - "PAL_PARK_AREA_LAND_NORTH_EAST", - "PAL_PARK_AREA_LAND_SOUTH_WEST", - "PAL_PARK_AREA_LAND_SOUTH_EAST", - "PAL_PARK_AREA_LAND_END" - ] - }, - "@PalParkWaterArea": { - "type": "enum", - "values": [ - "PAL_PARK_AREA_WATER_NONE", - "PAL_PARK_AREA_WATER_NORTH_WEST", - "PAL_PARK_AREA_WATER_NORTH_EAST", - "PAL_PARK_AREA_WATER_SOUTH_WEST", - "PAL_PARK_AREA_WATER_SOUTH_EAST" - ] - } - } -} diff --git a/consts/meson.build b/consts/meson.build index bfbe9b6756..113c2878b3 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -1,9 +1,11 @@ +# This must be moved here during the refactor to move all constants to metang. +constgen_py = find_program('constgen_py', native: true) + consts_manifest_basenames = [ 'badges', 'battle', 'battle_subscripts', 'btlcmd', - 'catching_show', 'game_records', 'gender', 'journal', @@ -14,8 +16,6 @@ consts_manifest_basenames = [ 'poketch', 'scrcmd', 'sdat', - 'shadows', - 'tm_learnset', 'trainer', 'trainer_ai', ] diff --git a/consts/shadows.json b/consts/shadows.json deleted file mode 100644 index c7b58c6b73..0000000000 --- a/consts/shadows.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "definitions": { - "@PokemonBattleShadowSize": { - "type": "enum", - "values": [ - "SHADOW_SIZE_NONE", - "SHADOW_SIZE_SMALL", - "SHADOW_SIZE_MEDIUM", - "SHADOW_SIZE_LARGE" - ] - } - } -} diff --git a/consts/tm_learnset.json b/consts/tm_learnset.json deleted file mode 100644 index 1a8ab1b4d4..0000000000 --- a/consts/tm_learnset.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "definitions": { - "@TMLearnsetFlags": { - "type": "flags", - "values": [ - "TM00", - "TM01", - "TM02", - "TM03", - "TM04", - "TM05", - "TM06", - "TM07", - "TM08", - "TM09", - "TM10", - "TM11", - "TM12", - "TM13", - "TM14", - "TM15", - "TM16", - "TM17", - "TM18", - "TM19", - "TM20", - "TM21", - "TM22", - "TM23", - "TM24", - "TM25", - "TM26", - "TM27", - "TM28", - "TM29", - "TM30", - "TM31", - "TM32", - "TM33", - "TM34", - "TM35", - "TM36", - "TM37", - "TM38", - "TM39", - "TM40", - "TM41", - "TM42", - "TM43", - "TM44", - "TM45", - "TM46", - "TM47", - "TM48", - "TM49", - "TM50", - "TM51", - "TM52", - "TM53", - "TM54", - "TM55", - "TM56", - "TM57", - "TM58", - "TM59", - "TM60", - "TM61", - "TM62", - "TM63", - "TM64", - "TM65", - "TM66", - "TM67", - "TM68", - "TM69", - "TM70", - "TM71", - "TM72", - "TM73", - "TM74", - "TM75", - "TM76", - "TM77", - "TM78", - "TM79", - "TM80", - "TM81", - "TM82", - "TM83", - "TM84", - "TM85", - "TM86", - "TM87", - "TM88", - "TM89", - "TM90", - "TM91", - "TM92", - "HM01", - "HM02", - "HM03", - "HM04", - "HM05", - "HM06", - "HM07", - "HM08" - ], - "composites": {} - } - } -} diff --git a/gen_compile_commands.py b/gen_compile_commands.py index a7f924ce18..7076833e37 100644 --- a/gen_compile_commands.py +++ b/gen_compile_commands.py @@ -2,234 +2,278 @@ import json import pathlib homedir = pathlib.Path(__file__).resolve().parent -builddir = homedir / 'build' +builddir = homedir / "build" arm7_c_flags = [ - 'arm-none-eabi-gcc', - '-c', - '-O3', - '-std=c99', - '-mcpu=arm7tdmi', - '-mfloat-abi=soft', - '-nostdinc', - '-D_NITRO', - '-DSDK_4M', - '-DSDK_ARM7', - '-DSDK_CODE_ARM', - '-DSDK_CW', - '-DSDK_CW_FORCE_EXPORT_SUPPORT', - '-DSDK_FINALROM', - '-DSDK_TS', + "arm-none-eabi-gcc", + "-c", + "-O3", + "-std=c99", + "-mcpu=arm7tdmi", + "-mfloat-abi=soft", + "-nostdinc", + "-D_NITRO", + "-DSDK_4M", + "-DSDK_ARM7", + "-DSDK_CODE_ARM", + "-DSDK_CW", + "-DSDK_CW_FORCE_EXPORT_SUPPORT", + "-DSDK_FINALROM", + "-DSDK_TS", ] arm9_c_flags = [ - 'arm-none-eabi-gcc', - '-c', - '-O3', - '-std=c99', - '-mcpu=arm946e-s', - '-mfloat-abi=soft', - '-nostdinc', - '-D_NITRO', - '-DLINK_PPWLOBBY', - '-DNNS_FINALROM', - '-DSDK_4M', - '-DSDK_ARM9', - '-DSDK_CODE_ARM', - '-DSDK_CW', - '-DSDK_CW_FORCE_EXPORT_SUPPORT', - '-DSDK_FINALROM', - '-DSDK_TS', - '-DPOKEPLATINUM_GENERATED_ENUM', - '-DPM_KEEP_ASSERTS', - '-DGAME_VERSION=PLATINUM', - '-DGAME_LANGUAGE=ENGLISH' + "arm-none-eabi-gcc", + "-c", + "-O3", + "-std=c99", + "-mcpu=arm946e-s", + "-mfloat-abi=soft", + "-nostdinc", + "-D_NITRO", + "-DLINK_PPWLOBBY", + "-DNNS_FINALROM", + "-DSDK_4M", + "-DSDK_ARM9", + "-DSDK_CODE_ARM", + "-DSDK_CW", + "-DSDK_CW_FORCE_EXPORT_SUPPORT", + "-DSDK_FINALROM", + "-DSDK_TS", + "-DPOKEPLATINUM_GENERATED_ENUM", + "-DPM_KEEP_ASSERTS", + "-DGAME_VERSION=PLATINUM", + "-DGAME_LANGUAGE=ENGLISH", ] asm_commands = [ { - 'directory': builddir, - 'arguments': [ - 'arm-none-eabi-as', - '-mcpu=arm946e-s', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": [ + "arm-none-eabi-as", + "-mcpu=arm946e-s", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'asm').rglob('*.s') + "file": file.resolve(), + } + for file in (homedir / "asm").rglob("*.s") ] nitrosdk_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/NitroSDK-4.2.30001').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/NitroSDK-4.2.30001").rglob("*.c") ] nitrosystem_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/NitroSystem-071126.1').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/NitroSystem-071126.1").rglob("*.c") ] nitrowifi_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - f'-I{homedir}/subprojects/NitroWiFi-2.1.30003/include', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + f"-I{homedir}/subprojects/NitroWiFi-2.1.30003/include", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/NitroWiFi-2.1.30003').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/NitroWiFi-2.1.30003").rglob("*.c") ] nitrodwc_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - f'-I{homedir}/subprojects/NitroWiFi-2.1.30003/include', - f'-I{homedir}/subprojects/NitroDWC-2.2.30008/include', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + f"-I{homedir}/subprojects/NitroWiFi-2.1.30003/include", + f"-I{homedir}/subprojects/NitroDWC-2.2.30008/include", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/NitroDWC-2.2.30008').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/NitroDWC-2.2.30008").rglob("*.c") ] libvct_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - f'-I{homedir}/subprojects/NitroWiFi-2.1.30003/include', - f'-I{homedir}/subprojects/NitroDWC-2.2.30008/include', - f'-I{homedir}/subprojects/libvct-1.3.1/include', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + f"-I{homedir}/subprojects/NitroWiFi-2.1.30003/include", + f"-I{homedir}/subprojects/NitroDWC-2.2.30008/include", + f"-I{homedir}/subprojects/libvct-1.3.1/include", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/libvct-1.3.1').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/libvct-1.3.1").rglob("*.c") ] libcrypto_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - f'-I{homedir}/subprojects/NitroWiFi-2.1.30003/include', - f'-I{homedir}/subprojects/NitroDWC-2.2.30008/include', - f'-I{homedir}/subprojects/libvct-1.3.1/include', - f'-I{homedir}/subprojects/libcrypto/include', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + f"-I{homedir}/subprojects/NitroWiFi-2.1.30003/include", + f"-I{homedir}/subprojects/NitroDWC-2.2.30008/include", + f"-I{homedir}/subprojects/libvct-1.3.1/include", + f"-I{homedir}/subprojects/libcrypto/include", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/libcrypto').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/libcrypto").rglob("*.c") ] ppwlobby_c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - f'-I{homedir}/subprojects/NitroWiFi-2.1.30003/include', - f'-I{homedir}/subprojects/NitroDWC-2.2.30008/include', - f'-I{homedir}/subprojects/libvct-1.3.1/include', - f'-I{homedir}/subprojects/libcrypto/include', - f'-I{homedir}/subprojects/ppwlobby/include', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + f"-I{homedir}/subprojects/NitroWiFi-2.1.30003/include", + f"-I{homedir}/subprojects/NitroDWC-2.2.30008/include", + f"-I{homedir}/subprojects/libvct-1.3.1/include", + f"-I{homedir}/subprojects/libcrypto/include", + f"-I{homedir}/subprojects/ppwlobby/include", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'subprojects/ppwlobby').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "subprojects/ppwlobby").rglob("*.c") ] c_commands = [ { - 'directory': builddir, - 'arguments': arm9_c_flags + [ - f'-I{homedir}/tools/cw/include/MSL_C', - f'-I{homedir}/tools/cw/include/MSL_Extras', - f'-I{homedir}/subprojects/NitroSDK-4.2.30001/include', - f'-I{builddir}/subprojects/NitroSDK-4.2.30001/gen', - f'-I{homedir}/subprojects/NitroSystem-071126.1/include', - f'-I{homedir}/subprojects/NitroWiFi-2.1.30003/include', - f'-I{homedir}/subprojects/NitroDWC-2.2.30008/include', - f'-I{homedir}/subprojects/libvct-1.3.1/include', - f'-I{homedir}/subprojects/libcrypto/include', - f'-I{homedir}/subprojects/ppwlobby/include', - f'-I{homedir}/lib/gds/include', - f'-I{homedir}/lib/spl/include', - f'-iquote{homedir}', - f'-iquote{homedir}/include', - f'-iquote{homedir}/build', # Meson includes this implicitly - f'-iquote{homedir}/build/res', # knarc-generated NAIX headers - f'-iquote{homedir}/build/res/text', # GMM-generated headers - f'-include{homedir}/include/pch/global_pch.h', - '-mthumb', - '-o', - file.with_suffix('.o'), - file.resolve() + "directory": builddir, + "arguments": arm9_c_flags + + [ + f"-I{homedir}/tools/cw/include/MSL_C", + f"-I{homedir}/tools/cw/include/MSL_Extras", + f"-I{homedir}/subprojects/NitroSDK-4.2.30001/include", + f"-I{builddir}/subprojects/NitroSDK-4.2.30001/gen", + f"-I{homedir}/subprojects/NitroSystem-071126.1/include", + f"-I{homedir}/subprojects/NitroWiFi-2.1.30003/include", + f"-I{homedir}/subprojects/NitroDWC-2.2.30008/include", + f"-I{homedir}/subprojects/libvct-1.3.1/include", + f"-I{homedir}/subprojects/libcrypto/include", + f"-I{homedir}/subprojects/ppwlobby/include", + f"-I{homedir}/lib/gds/include", + f"-I{homedir}/lib/spl/include", + f"-iquote{homedir}", + f"-iquote{homedir}/include", + f"-iquote{homedir}/build", # Meson includes this implicitly + f"-iquote{homedir}/build/res", # knarc-generated NAIX headers + f"-iquote{homedir}/build/res/text", # GMM-generated headers + f"-include{homedir}/include/pch/global_pch.h", + "-mthumb", + "-o", + file.with_suffix(".o"), + file.resolve(), ], - 'file': file.resolve() - } for file in (homedir / 'src').rglob('*.c') + "file": file.resolve(), + } + for file in (homedir / "src").rglob("*.c") ] -with open('compile_commands.json', 'w') as ofp: +datagen_cpp_commands = [ + { + "directory": builddir, + "arguments": [ + "g++", + f"-I{homedir}/subprojects/narc/lib/include", # NARC packing + f"-I{homedir}/subprojects/rapidjson-1.1.0/include", # JSON parser + f"-I{homedir}/tools/datagen", # base header file + f"-I{homedir}/include", # source includes + f"-I{builddir}", # metang-generated headers (constants) + "-std=c++17", + "-Wno-deprecated-declarations", + file.with_suffix(".o"), + file.resolve(), + ], + "file": file.resolve(), + } + for file in (homedir / "tools" / "datagen").rglob("*.cpp") +] + +with open("compile_commands.json", "w") as ofp: json.dump( - asm_commands + nitrosdk_c_commands + nitrosystem_c_commands - + nitrowifi_c_commands + nitrodwc_c_commands + libvct_c_commands - + libcrypto_c_commands + ppwlobby_c_commands + c_commands, + asm_commands + + nitrosdk_c_commands + + nitrosystem_c_commands + + nitrowifi_c_commands + + nitrodwc_c_commands + + libvct_c_commands + + libcrypto_c_commands + + ppwlobby_c_commands + + c_commands + + datagen_cpp_commands, ofp, default=str, - indent=4 + indent=4, ) diff --git a/generated/catching_show_points_category.txt b/generated/catching_show_points_category.txt new file mode 100644 index 0000000000..a56421bcc6 --- /dev/null +++ b/generated/catching_show_points_category.txt @@ -0,0 +1,4 @@ +CATCHING_SHOW_CATCHING_POINTS +CATCHING_SHOW_TIME_POINTS +CATCHING_SHOW_TYPE_POINTS +CATCHING_SHOW_TOTAL_POINTS diff --git a/generated/meson.build b/generated/meson.build index 9314575b27..eaf09ff018 100644 --- a/generated/meson.build +++ b/generated/meson.build @@ -1,5 +1,16 @@ +# This build file defines sets of constants which are used throughout the code +# base, both in the ROM's source code and in internal tooling. We generate these +# constants to ensure that they have a particular set of characteristics, are +# easily validated in data files representing them as strings, and can be easily +# parsed by simple string manipulations. + +# This must be declared here instead of in tools/meson.build, as some tools depend +# on metang-generated constants. +metang_exe = find_program('metang', native: true) + enum_generators = { 'abilities': ['--tag-name', 'Ability'], + 'catching_show_points_category': ['--tag-name', 'CatchingShowPointsCategory'], 'egg_groups': ['--tag-name', 'EggGroup'], 'evolution_methods': ['--tag-name', 'EvolutionMethod'], 'exp_rates': ['--tag-name', 'ExpRate'], @@ -7,8 +18,11 @@ enum_generators = { 'item_hold_effects': ['--tag-name', 'ItemHoldEffect'], 'items': ['--tag-name', 'Item'], 'moves': ['--tag-name', 'Move'], + 'pal_park_land_area': ['--tag-name', 'PalParkLandArea'], + 'pal_park_water_area': ['--tag-name', 'PalParkWaterArea'], 'pokemon_colors': ['--tag-name', 'PokemonColor'], 'pokemon_types': ['--tag-name', 'PokemonType'], + 'shadow_sizes': ['--tag-name', 'ShadowSize'], 'species': ['--tag-name', 'Species'], } @@ -35,10 +49,11 @@ foreach gen_key : enum_generators.keys() command: [ metang_exe, 'enum', gen_args, - '--guard', 'POKEPLATINUM_GENERATED', '--output', '@OUTPUT@', '--lang', 'py', '@INPUT@', ] ) endforeach + +species_txt = files('species.txt') diff --git a/generated/pal_park_land_area.txt b/generated/pal_park_land_area.txt new file mode 100644 index 0000000000..1e040b3c70 --- /dev/null +++ b/generated/pal_park_land_area.txt @@ -0,0 +1,6 @@ +PAL_PARK_AREA_LAND_NONE +PAL_PARK_AREA_LAND_NORTH_WEST +PAL_PARK_AREA_LAND_NORTH_EAST +PAL_PARK_AREA_LAND_SOUTH_WEST +PAL_PARK_AREA_LAND_SOUTH_EAST +PAL_PARK_AREA_LAND_END diff --git a/generated/pal_park_water_area.txt b/generated/pal_park_water_area.txt new file mode 100644 index 0000000000..dd099dca30 --- /dev/null +++ b/generated/pal_park_water_area.txt @@ -0,0 +1,5 @@ +PAL_PARK_AREA_WATER_NONE +PAL_PARK_AREA_WATER_NORTH_WEST +PAL_PARK_AREA_WATER_NORTH_EAST +PAL_PARK_AREA_WATER_SOUTH_WEST +PAL_PARK_AREA_WATER_SOUTH_EAST diff --git a/generated/shadow_sizes.txt b/generated/shadow_sizes.txt new file mode 100644 index 0000000000..949f738ea7 --- /dev/null +++ b/generated/shadow_sizes.txt @@ -0,0 +1,4 @@ +SHADOW_SIZE_NONE +SHADOW_SIZE_SMALL +SHADOW_SIZE_MEDIUM +SHADOW_SIZE_LARGE diff --git a/include/map_header.h b/include/map_header.h index c261d8e5ca..e4b2213657 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_MAP_HEADER_H #define POKEPLATINUM_MAP_HEADER_H +#include "generated/evolution_methods.h" + typedef struct { u8 unk_00; u8 unk_01; @@ -58,6 +60,6 @@ BOOL MapHeader_IsTrophyGarden(const u32 headerID); BOOL MapHeader_IsAmitySquare(const u32 headerID); BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID); BOOL MapHeader_IsPokemonCenter2F(const u32 headerID); -enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID); +enum EvolutionMethod MapHeader_GetMapEvolutionMethod(u32 headerID); #endif // POKEPLATINUM_MAP_HEADER_H diff --git a/include/struct_defs/archived_poke_sprite_data.h b/include/struct_defs/archived_poke_sprite_data.h index ad0ddaaaaa..c56840be9b 100644 --- a/include/struct_defs/archived_poke_sprite_data.h +++ b/include/struct_defs/archived_poke_sprite_data.h @@ -15,9 +15,9 @@ typedef struct PokeSpriteFaceData { typedef struct ArchivedPokeSpriteData { PokeSpriteFaceData faces[MAX_FACES]; ///< Data for each display-face of the Pokemon's sprite. - s8 yOffset; ///< Vertical offset of the Pokemon's sprite for either face. + s8 yOffset; ///< Additional vertical offset of the Pokemon's front-face sprite. s8 xOffsetShadow; ///< Horizontal offset for the shadow sprite beneath the Pokemon's sprite. - u8 shadowSize; ///< Size of the shadow sprite beneath the Pokemon's sprite. TODO: enum + u8 shadowSize; ///< Size of the shadow sprite beneath the Pokemon's sprite. } ArchivedPokeSpriteData; #endif // POKEPLATINUM_ARCHIVED_POKE_SPRITE_DATA_H diff --git a/include/struct_defs/species.h b/include/struct_defs/species.h index f9583492ce..094b70ccb1 100644 --- a/include/struct_defs/species.h +++ b/include/struct_defs/species.h @@ -63,10 +63,27 @@ typedef struct SpeciesEvolution { u16 targetSpecies; } SpeciesEvolution; +typedef struct SpeciesLearnsetEntry { + u16 move : 9; + u16 level : 7; +} SpeciesLearnsetEntry; + // This struct is not explicitly used; it is provided to document and enforce the size of // the learnset entries. typedef struct SpeciesLearnset { - ALIGN_4 u16 entries[MAX_LEARNSET_ENTRIES + 1]; + ALIGN_4 SpeciesLearnsetEntry entries[MAX_LEARNSET_ENTRIES + 1]; } SpeciesLearnset; +typedef struct SpeciesPalPark { + u8 landArea; + u8 waterArea; + u8 catchingPoints; + u8 rarity; + + union { + u8 asU8[2]; + u16 asU16; + } unused; +} SpeciesPalPark; + #endif // POKEPLATINUM_SPECIES_H diff --git a/include/tutor_movesets.h b/include/tutor_movesets.h index 5d7ff4f618..c95f683498 100644 --- a/include/tutor_movesets.h +++ b/include/tutor_movesets.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_TUTOR_MOVESETS_H #define POKEPLATINUM_TUTOR_MOVESETS_H -#include "consts/moves.h" +#include "generated/moves.h" enum TutorLocation { TUTOR_LOCATION_ROUTE_212 = 0, diff --git a/meson.build b/meson.build index cfc46227df..407a53a1a2 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,7 @@ fs = import('fs') ### INCLUDE PATHS ### ############################################################ public_includes = include_directories('include', 'asm', 'res') +toplevel_includes = include_directories('.') ############################################################ @@ -115,6 +116,13 @@ libsyscall_dep = dependency('libsyscall') ppwlobby_dep = dependency('ppwlobby') +############################################################ +### CONSTS ### +############################################################ +subdir('consts') +subdir('generated') + + ############################################################ ### TOOLS ### ############################################################ @@ -133,13 +141,6 @@ subdir('platinum.us') subdir('lib') -############################################################ -### CONSTS ### -############################################################ -subdir('consts') -subdir('generated') - - ############################################################ ### FILE SYSTEM ### ############################################################ @@ -161,6 +162,7 @@ main = executable('main', naix_headers, gen_species_headers, tutorable_moves_h, + species_learnsets_by_tutor_h, ], c_args: [ pokeplatinum_args, diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json index 322e28c863..de8c5a73da 100644 --- a/res/pokemon/abomasnow/data.json +++ b/res/pokemon/abomasnow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SNOW_WARNING", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_PUNCH" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 4, "entry_text": "They appear when the snow flowers\nbloom. When the petals fall, they\nretreat to places unknown again.", - "category": "Frost Tree Pok\u00e9mon" + "category": "Frost Tree Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2063 } -} \ No newline at end of file +} diff --git a/res/pokemon/abomasnow/meson.build b/res/pokemon/abomasnow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/abomasnow/meson.build +++ b/res/pokemon/abomasnow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json index 508e7bef95..abb429f210 100644 --- a/res/pokemon/abra/data.json +++ b/res/pokemon/abra/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_INNER_FOCUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TELEPORT" ] @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "Using its psychic power is such a\nstrain on its brain that it needs\nto sleep for 18 hours a day.", - "category": "Psi Pok\u00e9mon" + "category": "Psi Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/abra/meson.build b/res/pokemon/abra/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/abra/meson.build +++ b/res/pokemon/abra/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/absol/data.json b/res/pokemon/absol/data.json index 10dd9a571c..04f47697bd 100644 --- a/res/pokemon/absol/data.json +++ b/res/pokemon/absol/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_SUPER_LUCK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": true - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -145,13 +143,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "Rumored to sense disasters with its\nhorn, it became a target. It fled\ndeep into the mountains.", - "category": "Disaster Pok\u00e9mon" + "category": "Disaster Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4112 } -} \ No newline at end of file +} diff --git a/res/pokemon/absol/meson.build b/res/pokemon/absol/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/absol/meson.build +++ b/res/pokemon/absol/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/aerodactyl/data.json b/res/pokemon/aerodactyl/data.json index e33837070d..32539b52f1 100644 --- a/res/pokemon/aerodactyl/data.json +++ b/res/pokemon/aerodactyl/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_PRESSURE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -129,14 +127,14 @@ "pokemon_pos_f": 4, "trainer_pos_m": 9, "pokemon_pos_m": 4, - "entry_text": "A Pok\u00e9mon that roamed the skies\nin the dinosaur era. Its teeth are\nlike saw blades.", - "category": "Fossil Pok\u00e9mon" + "entry_text": "A Pokémon that roamed the skies\nin the dinosaur era. Its teeth are\nlike saw blades.", + "category": "Fossil Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4363 } -} \ No newline at end of file +} diff --git a/res/pokemon/aerodactyl/meson.build b/res/pokemon/aerodactyl/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/aerodactyl/meson.build +++ b/res/pokemon/aerodactyl/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/aggron/data.json b/res/pokemon/aggron/data.json index 5bfe9882ce..2848c149b5 100644 --- a/res/pokemon/aggron/data.json +++ b/res/pokemon/aggron/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -154,13 +152,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 6, "entry_text": "While seeking iron for food, it\ndigs tunnels by breaking through\nbedrock with its steel horns.", - "category": "Iron Armor Pok\u00e9mon" + "category": "Iron Armor Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2830 } -} \ No newline at end of file +} diff --git a/res/pokemon/aggron/meson.build b/res/pokemon/aggron/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/aggron/meson.build +++ b/res/pokemon/aggron/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json index ea34e14f4d..dc87c97b4d 100644 --- a/res/pokemon/aipom/data.json +++ b/res/pokemon/aipom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_PICKUP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It lives high among the treetops.\nIt can use its tail as freely and\ncleverly as its hands.", - "category": "Long Tail Pok\u00e9mon" + "category": "Long Tail Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/aipom/meson.build b/res/pokemon/aipom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/aipom/meson.build +++ b/res/pokemon/aipom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/alakazam/data.json b/res/pokemon/alakazam/data.json index d935d54d43..b7361be681 100644 --- a/res/pokemon/alakazam/data.json +++ b/res/pokemon/alakazam/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_INNER_FOCUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TELEPORT" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "The spoons clutched in its hands\nare said to have been created by\nits psychic powers.", - "category": "Psi Pok\u00e9mon" + "category": "Psi Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/alakazam/meson.build b/res/pokemon/alakazam/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/alakazam/meson.build +++ b/res/pokemon/alakazam/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/altaria/data.json b/res/pokemon/altaria/data.json index e3eb0a1705..a51b5c2c4e 100644 --- a/res/pokemon/altaria/data.json +++ b/res/pokemon/altaria/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PLUCK" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 0, "entry_text": "If it bonds with a person, it will\ngently envelop the friend with its\nsoft wings, then hum.", - "category": "Humming Pok\u00e9mon" + "category": "Humming Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4367 } -} \ No newline at end of file +} diff --git a/res/pokemon/altaria/meson.build b/res/pokemon/altaria/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/altaria/meson.build +++ b/res/pokemon/altaria/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ambipom/data.json b/res/pokemon/ambipom/data.json index c0431c9464..ca26869d41 100644 --- a/res/pokemon/ambipom/data.json +++ b/res/pokemon/ambipom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TECHNICIAN", "ABILITY_PICKUP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "Split into two, the tails are so\nadept at handling and doing things,\nAMBIPOM rarely uses its hands.", - "category": "Long Tail Pok\u00e9mon" + "category": "Long Tail Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/ambipom/meson.build b/res/pokemon/ambipom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ambipom/meson.build +++ b/res/pokemon/ambipom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ampharos/data.json b/res/pokemon/ampharos/data.json index a1fd492f1b..add262b26c 100644 --- a/res/pokemon/ampharos/data.json +++ b/res/pokemon/ampharos/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -116,14 +114,14 @@ "pokemon_pos_f": 8, "trainer_pos_m": 9, "pokemon_pos_m": 8, - "entry_text": "The tip of its tail shines brightly.\nIn the olden days, people sent\nsignals using the tail\u2019s light.", - "category": "Light Pok\u00e9mon" + "entry_text": "The tip of its tail shines brightly.\nIn the olden days, people sent\nsignals using the tail’s light.", + "category": "Light Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/ampharos/meson.build b/res/pokemon/ampharos/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ampharos/meson.build +++ b/res/pokemon/ampharos/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json index 363261ca42..1a5cf65547 100644 --- a/res/pokemon/anorith/data.json +++ b/res/pokemon/anorith/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 3, "trainer_pos_m": 9, "pokemon_pos_m": 3, - "entry_text": "A Pok\u00e9mon ancestor that was\nreanimated from a fossil. It lived\nin the sea and hunted with claws.", - "category": "Old Shrimp Pok\u00e9mon" + "entry_text": "A Pokémon ancestor that was\nreanimated from a fossil. It lived\nin the sea and hunted with claws.", + "category": "Old Shrimp Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 1035 } -} \ No newline at end of file +} diff --git a/res/pokemon/anorith/meson.build b/res/pokemon/anorith/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/anorith/meson.build +++ b/res/pokemon/anorith/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/arbok/data.json b/res/pokemon/arbok/data.json index 8ddedffecf..61c74bb285 100644 --- a/res/pokemon/arbok/data.json +++ b/res/pokemon/arbok/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_SHED_SKIN" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "The pattern on its belly is for\nintimidation. It constricts foes\nwhile they are frozen in fear.", - "category": "Cobra Pok\u00e9mon" + "category": "Cobra Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/arbok/meson.build b/res/pokemon/arbok/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/arbok/meson.build +++ b/res/pokemon/arbok/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/arcanine/data.json b/res/pokemon/arcanine/data.json index 2052d2de0f..f81a203f93 100644 --- a/res/pokemon/arcanine/data.json +++ b/res/pokemon/arcanine/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_FANG" ], @@ -105,13 +103,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 6, "entry_text": "Its proud and regal appearance\nhas captured the hearts of\npeople since long ago.", - "category": "Legendary Pok\u00e9mon" + "category": "Legendary Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/arcanine/meson.build b/res/pokemon/arcanine/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/arcanine/meson.build +++ b/res/pokemon/arcanine/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/arceus/data.json b/res/pokemon/arceus/data.json index 360d526685..179f5dac19 100644 --- a/res/pokemon/arceus/data.json +++ b/res/pokemon/arceus/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_MULTITYPE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SEISMIC_TOSS" ], @@ -172,13 +170,13 @@ "trainer_pos_m": 23, "pokemon_pos_m": 0, "entry_text": "It is said to have emerged from an\negg in a place where there was\nnothing, then shaped the world.", - "category": "Alpha Pok\u00e9mon" + "category": "Alpha Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/arceus/meson.build b/res/pokemon/arceus/meson.build index 5729469ab0..2827aa5e4d 100644 --- a/res/pokemon/arceus/meson.build +++ b/res/pokemon/arceus/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ariados/data.json b/res/pokemon/ariados/data.json index bf500d2cac..3db2fd7dcf 100644 --- a/res/pokemon/ariados/data.json +++ b/res/pokemon/ariados/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_INSOMNIA" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUG_BITE" ], @@ -107,13 +105,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "It attaches silk to its prey and\nsets it free. Later, it tracks the\nsilk to the prey and its friends.", - "category": "Long Leg Pok\u00e9mon" + "category": "Long Leg Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/ariados/meson.build b/res/pokemon/ariados/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ariados/meson.build +++ b/res/pokemon/ariados/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/armaldo/data.json b/res/pokemon/armaldo/data.json index 3fddc61bb2..29560fc273 100644 --- a/res/pokemon/armaldo/data.json +++ b/res/pokemon/armaldo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "It went ashore after evolving.\nIts entire body is clad in a sturdy\narmor.", - "category": "Plate Pok\u00e9mon" + "category": "Plate Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 1035 } -} \ No newline at end of file +} diff --git a/res/pokemon/armaldo/meson.build b/res/pokemon/armaldo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/armaldo/meson.build +++ b/res/pokemon/armaldo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json index d8dc0f7b07..e6d84892fc 100644 --- a/res/pokemon/aron/data.json +++ b/res/pokemon/aron/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It usually lives deep in mountains.\nHowever, hunger may drive it to\neat railroad tracks and cars.", - "category": "Iron Armor Pok\u00e9mon" + "category": "Iron Armor Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2830 } -} \ No newline at end of file +} diff --git a/res/pokemon/aron/meson.build b/res/pokemon/aron/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/aron/meson.build +++ b/res/pokemon/aron/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/articuno/data.json b/res/pokemon/articuno/data.json index 8c5990b038..97d996cf89 100644 --- a/res/pokemon/articuno/data.json +++ b/res/pokemon/articuno/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GUST" ], @@ -116,14 +114,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 7, "pokemon_pos_m": 0, - "entry_text": "A legendary bird Pok\u00e9mon.\nIt can create blizzards by\nfreezing moisture in the air.", - "category": "Freeze Pok\u00e9mon" + "entry_text": "A legendary bird Pokémon.\nIt can create blizzards by\nfreezing moisture in the air.", + "category": "Freeze Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4365 } -} \ No newline at end of file +} diff --git a/res/pokemon/articuno/meson.build b/res/pokemon/articuno/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/articuno/meson.build +++ b/res/pokemon/articuno/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/azelf/data.json b/res/pokemon/azelf/data.json index 2e70dbe2ad..30cb489edd 100644 --- a/res/pokemon/azelf/data.json +++ b/res/pokemon/azelf/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REST" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "When AZELF flew, people gained the\ndetermination to do things.\nIt was the birth of willpower.", - "category": "Willpower Pok\u00e9mon" + "category": "Willpower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/azelf/meson.build b/res/pokemon/azelf/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/azelf/meson.build +++ b/res/pokemon/azelf/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/azumarill/data.json b/res/pokemon/azumarill/data.json index 85004be3f1..b831a7beba 100644 --- a/res/pokemon/azumarill/data.json +++ b/res/pokemon/azumarill/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_HUGE_POWER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "It can spend all day in water,\nsince it can inhale and store\na large volume of air.", - "category": "Aqua Rabbit Pok\u00e9mon" + "category": "Aqua Rabbit Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/azumarill/meson.build b/res/pokemon/azumarill/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/azumarill/meson.build +++ b/res/pokemon/azumarill/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json index 111e828d57..7374f757ef 100644 --- a/res/pokemon/azurill/data.json +++ b/res/pokemon/azurill/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_HUGE_POWER" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -100,13 +98,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "Its tail bounces like a rubber ball.\nIt flings that tail around to fight\nopponents bigger than itself.", - "category": "Polka Dot Pok\u00e9mon" + "category": "Polka Dot Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/azurill/meson.build b/res/pokemon/azurill/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/azurill/meson.build +++ b/res/pokemon/azurill/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bad_egg/data.json b/res/pokemon/bad_egg/data.json index ff20c3c653..e10175f674 100644 --- a/res/pokemon/bad_egg/data.json +++ b/res/pokemon/bad_egg/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NONE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_EGG", - "flip": false - }, + "body_color": "MON_COLOR_EGG", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ] diff --git a/res/pokemon/bad_egg/meson.build b/res/pokemon/bad_egg/meson.build index 3905c21628..f3067386c5 100644 --- a/res/pokemon/bad_egg/meson.build +++ b/res/pokemon/bad_egg/meson.build @@ -1 +1 @@ -personal_files += files('data.json') +species_data_files += files('data.json') diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json index 03762327bc..07928b58e0 100644 --- a/res/pokemon/bagon/data.json +++ b/res/pokemon/bagon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_DRAGON", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_RAGE" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "Dreaming of one day flying, it\npractices by leaping off cliffs\nevery day.", - "category": "Rock Head Pok\u00e9mon" + "category": "Rock Head Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/bagon/meson.build b/res/pokemon/bagon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bagon/meson.build +++ b/res/pokemon/bagon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json index 2de986d548..97d4b78e9b 100644 --- a/res/pokemon/baltoy/data.json +++ b/res/pokemon/baltoy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONFUSION" ], @@ -127,14 +125,14 @@ "pokemon_pos_f": 26, "trainer_pos_m": 9, "pokemon_pos_m": 26, - "entry_text": "It moves by spinning on its foot.\nIt is a rare Pok\u00e9mon that was\ndiscovered in ancient ruins.", - "category": "Clay Doll Pok\u00e9mon" + "entry_text": "It moves by spinning on its foot.\nIt is a rare Pokémon that was\ndiscovered in ancient ruins.", + "category": "Clay Doll Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2568 } -} \ No newline at end of file +} diff --git a/res/pokemon/baltoy/meson.build b/res/pokemon/baltoy/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/baltoy/meson.build +++ b/res/pokemon/baltoy/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/banette/data.json b/res/pokemon/banette/data.json index dce8a99a45..2c541d4ba0 100644 --- a/res/pokemon/banette/data.json +++ b/res/pokemon/banette/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_FRISK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_KNOCK_OFF" ], @@ -126,14 +124,14 @@ "pokemon_pos_f": 13, "trainer_pos_m": 9, "pokemon_pos_m": 13, - "entry_text": "A doll that became a Pok\u00e9mon over\nits grudge from being junked. It\nseeks the child that disowned it.", - "category": "Marionette Pok\u00e9mon" + "entry_text": "A doll that became a Pokémon over\nits grudge from being junked. It\nseeks the child that disowned it.", + "category": "Marionette Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/banette/meson.build b/res/pokemon/banette/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/banette/meson.build +++ b/res/pokemon/banette/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json index a2ba148b92..53507d751a 100644 --- a/res/pokemon/barboach/data.json +++ b/res/pokemon/barboach/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_ANTICIPATION" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SLAP" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "Its slimy body is hard to grasp. In\none region, it is said to have been\nborn from hardened mud.", - "category": "Whiskers Pok\u00e9mon" + "category": "Whiskers Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/barboach/meson.build b/res/pokemon/barboach/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/barboach/meson.build +++ b/res/pokemon/barboach/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bastiodon/data.json b/res/pokemon/bastiodon/data.json index 257f2c1614..083a7d5ed6 100644 --- a/res/pokemon/bastiodon/data.json +++ b/res/pokemon/bastiodon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "When they lined up side by side, no\nfoe could break through. They\nshielded their young in that way.", - "category": "Shield Pok\u00e9mon" + "category": "Shield Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/bastiodon/meson.build b/res/pokemon/bastiodon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bastiodon/meson.build +++ b/res/pokemon/bastiodon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json index eae1c3b906..8e313d5a81 100644 --- a/res/pokemon/bayleef/data.json +++ b/res/pokemon/bayleef/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "The buds that ring its neck give\noff a spicy aroma that perks\npeople up.", - "category": "Leaf Pok\u00e9mon" + "category": "Leaf Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/bayleef/meson.build b/res/pokemon/bayleef/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bayleef/meson.build +++ b/res/pokemon/bayleef/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/beautifly/data.json b/res/pokemon/beautifly/data.json index 5ec954e0eb..0b5c305452 100644 --- a/res/pokemon/beautifly/data.json +++ b/res/pokemon/beautifly/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "Despite its looks, it is aggressive.\nIt jabs with its long, thin mouth if\ndisturbed while collecting pollen.", - "category": "Butterfly Pok\u00e9mon" + "category": "Butterfly Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/beautifly/meson.build b/res/pokemon/beautifly/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/beautifly/meson.build +++ b/res/pokemon/beautifly/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/beedrill/data.json b/res/pokemon/beedrill/data.json index 59ce9d32a7..20637d03b4 100644 --- a/res/pokemon/beedrill/data.json +++ b/res/pokemon/beedrill/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FURY_ATTACK" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "Its best attack involves flying\naround at high speed, striking with\npoison needles, then flying off.", - "category": "Poison Bee Pok\u00e9mon" + "category": "Poison Bee Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/beedrill/meson.build b/res/pokemon/beedrill/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/beedrill/meson.build +++ b/res/pokemon/beedrill/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json index a6441d6e9c..b92a886644 100644 --- a/res/pokemon/beldum/data.json +++ b/res/pokemon/beldum/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAKE_DOWN" ] @@ -69,13 +67,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "It converses with others by using\nmagnetic pulses. In a swarm, they\nmove in perfect unison.", - "category": "Iron Ball Pok\u00e9mon" + "category": "Iron Ball Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/beldum/meson.build b/res/pokemon/beldum/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/beldum/meson.build +++ b/res/pokemon/beldum/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bellossom/data.json b/res/pokemon/bellossom/data.json index 896d446334..31bb5b6812 100644 --- a/res/pokemon/bellossom/data.json +++ b/res/pokemon/bellossom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEAF_BLADE" ], @@ -103,13 +101,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "When the heavy rainfall season\nends, it is drawn out by warm\nsunlight to dance in the open.", - "category": "Flower Pok\u00e9mon" + "category": "Flower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/bellossom/meson.build b/res/pokemon/bellossom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bellossom/meson.build +++ b/res/pokemon/bellossom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json index c1d4da49bf..4393dc388e 100644 --- a/res/pokemon/bellsprout/data.json +++ b/res/pokemon/bellsprout/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_VINE_WHIP" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "It prefers hot and humid\nenvironments. It is quick at\ncapturing prey with its vines.", - "category": "Flower Pok\u00e9mon" + "category": "Flower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/bellsprout/meson.build b/res/pokemon/bellsprout/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bellsprout/meson.build +++ b/res/pokemon/bellsprout/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bibarel/data.json b/res/pokemon/bibarel/data.json index 420aa0595f..c2d2251f84 100644 --- a/res/pokemon/bibarel/data.json +++ b/res/pokemon/bibarel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SIMPLE", "ABILITY_UNAWARE" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "A river dammed by BIBAREL will\nnever overflow its banks, which\nis appreciated by people nearby.", - "category": "Beaver Pok\u00e9mon" + "category": "Beaver Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 773 } -} \ No newline at end of file +} diff --git a/res/pokemon/bibarel/meson.build b/res/pokemon/bibarel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bibarel/meson.build +++ b/res/pokemon/bibarel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json index 58578e9a23..6c56b25dc1 100644 --- a/res/pokemon/bidoof/data.json +++ b/res/pokemon/bidoof/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SIMPLE", "ABILITY_UNAWARE" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -121,14 +119,14 @@ "pokemon_pos_f": 25, "trainer_pos_m": 9, "pokemon_pos_m": 25, - "entry_text": "A comparison revealed that\nBIDOOF\u2019s front teeth grow at\nthe same rate as RATTATA\u2019s.", - "category": "Plump Mouse Pok\u00e9mon" + "entry_text": "A comparison revealed that\nBIDOOF’s front teeth grow at\nthe same rate as RATTATA’s.", + "category": "Plump Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/bidoof/meson.build b/res/pokemon/bidoof/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bidoof/meson.build +++ b/res/pokemon/bidoof/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/blastoise/data.json b/res/pokemon/blastoise/data.json index 77ca6ae434..dc4b9ac791 100644 --- a/res/pokemon/blastoise/data.json +++ b/res/pokemon/blastoise/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FLASH_CANNON" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 6, "pokemon_pos_m": 1, "entry_text": "The jets of water it spouts from\nthe rocket cannons on its shell\ncan punch through thick steel.", - "category": "Shellfish Pok\u00e9mon" + "category": "Shellfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/blastoise/meson.build b/res/pokemon/blastoise/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/blastoise/meson.build +++ b/res/pokemon/blastoise/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/blaziken/data.json b/res/pokemon/blaziken/data.json index fad5dfcc9a..3c83a67ea4 100644 --- a/res/pokemon/blaziken/data.json +++ b/res/pokemon/blaziken/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -133,13 +131,13 @@ "trainer_pos_m": 13, "pokemon_pos_m": 5, "entry_text": "Flames spout from its wrists,\nenveloping its knuckles. Its\npunches scorch its foes.", - "category": "Blaze Pok\u00e9mon" + "category": "Blaze Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2306 } -} \ No newline at end of file +} diff --git a/res/pokemon/blaziken/meson.build b/res/pokemon/blaziken/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/blaziken/meson.build +++ b/res/pokemon/blaziken/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/blissey/data.json b/res/pokemon/blissey/data.json index 90cd4362ab..dcb515dac3 100644 --- a/res/pokemon/blissey/data.json +++ b/res/pokemon/blissey/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_SERENE_GRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -144,13 +142,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "The eggs it lays are filled with\nhappiness. Eating even one bite\nwill bring a smile to anyone.", - "category": "Happiness Pok\u00e9mon" + "category": "Happiness Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/blissey/meson.build b/res/pokemon/blissey/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/blissey/meson.build +++ b/res/pokemon/blissey/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json index 5d2232b150..896164b7f7 100644 --- a/res/pokemon/bonsly/data.json +++ b/res/pokemon/bonsly/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FAKE_TEARS" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "It prefers an arid atmosphere. It\nleaks water that looks like tears\nwhen adjusting its moisture level.", - "category": "Bonsai Pok\u00e9mon" + "category": "Bonsai Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/bonsly/meson.build b/res/pokemon/bonsly/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bonsly/meson.build +++ b/res/pokemon/bonsly/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/breloom/data.json b/res/pokemon/breloom/data.json index edb249a929..f05cf80a39 100644 --- a/res/pokemon/breloom/data.json +++ b/res/pokemon/breloom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", "ABILITY_POISON_HEAL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "Its short arms stretch when it\nthrows punches. Its technique is\nequal to that of pro boxers.", - "category": "Mushroom Pok\u00e9mon" + "category": "Mushroom Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2305 } -} \ No newline at end of file +} diff --git a/res/pokemon/breloom/meson.build b/res/pokemon/breloom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/breloom/meson.build +++ b/res/pokemon/breloom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bronzong/data.json b/res/pokemon/bronzong/data.json index 43754b2ecc..7b45df18d5 100644 --- a/res/pokemon/bronzong/data.json +++ b/res/pokemon/bronzong/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_HEATPROOF" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SUNNY_DAY" ], @@ -130,13 +128,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "It brought rains by opening portals\nto another world. It was revered\nas a bringer of plentiful harvests.", - "category": "Bronze Bell Pok\u00e9mon" + "category": "Bronze Bell Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/bronzong/meson.build b/res/pokemon/bronzong/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/bronzong/meson.build +++ b/res/pokemon/bronzong/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json index 61d61a997c..6392ae0bfc 100644 --- a/res/pokemon/bronzor/data.json +++ b/res/pokemon/bronzor/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_HEATPROOF" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -123,14 +121,14 @@ "pokemon_pos_f": 65528, "trainer_pos_m": 9, "pokemon_pos_m": 65528, - "entry_text": "There are researchers who believe\nthis Pok\u00e9mon reflected like a mirror\nin the distant past.", - "category": "Bronze Pok\u00e9mon" + "entry_text": "There are researchers who believe\nthis Pokémon reflected like a mirror\nin the distant past.", + "category": "Bronze Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/bronzor/meson.build b/res/pokemon/bronzor/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/bronzor/meson.build +++ b/res/pokemon/bronzor/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json index ee7e047891..f06f435b25 100644 --- a/res/pokemon/budew/data.json +++ b/res/pokemon/budew/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_POISON_POINT" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": true - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -102,14 +100,14 @@ "pokemon_pos_f": 29, "trainer_pos_m": 9, "pokemon_pos_m": 29, - "entry_text": "Sensitive to changing temperature,\nthe bud is said to bloom when it\nfeels the sun\u2019s warm touch.", - "category": "Bud Pok\u00e9mon" + "entry_text": "Sensitive to changing temperature,\nthe bud is said to bloom when it\nfeels the sun’s warm touch.", + "category": "Bud Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/budew/meson.build b/res/pokemon/budew/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/budew/meson.build +++ b/res/pokemon/budew/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json index 980583dd19..efd7277a7d 100644 --- a/res/pokemon/buizel/data.json +++ b/res/pokemon/buizel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SONIC_BOOM" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "It spins its two tails like a screw\nto propel itself through water. The\ntails also slice clinging seaweed.", - "category": "Sea Weasel Pok\u00e9mon" + "category": "Sea Weasel Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/buizel/meson.build b/res/pokemon/buizel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/buizel/meson.build +++ b/res/pokemon/buizel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json index 01b43ceae4..b7826d9284 100644 --- a/res/pokemon/bulbasaur/data.json +++ b/res/pokemon/bulbasaur/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "For some time after its birth, it\ngrows by gaining nourishment from\nthe seed on its back.", - "category": "Seed Pok\u00e9mon" + "category": "Seed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/bulbasaur/meson.build b/res/pokemon/bulbasaur/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/bulbasaur/meson.build +++ b/res/pokemon/bulbasaur/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json index 1e864f7343..c4a7dad9fb 100644 --- a/res/pokemon/buneary/data.json +++ b/res/pokemon/buneary/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_KLUTZ" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "Its ears are always rolled up. They\ncan be forcefully extended to\nshatter even a large boulder.", - "category": "Rabbit Pok\u00e9mon" + "category": "Rabbit Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/buneary/meson.build b/res/pokemon/buneary/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/buneary/meson.build +++ b/res/pokemon/buneary/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/burmy/data.json b/res/pokemon/burmy/data.json index b129bfdb85..419da77673 100644 --- a/res/pokemon/burmy/data.json +++ b/res/pokemon/burmy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PROTECT" ], @@ -73,13 +71,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65530, "entry_text": "Even if it is born where there are\nno cocooning materials, it somehow\nalways ends up with a cloak.", - "category": "Bagworm Pok\u00e9mon" + "category": "Bagworm Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/burmy/meson.build b/res/pokemon/burmy/meson.build index 0571abc53c..0415c35641 100644 --- a/res/pokemon/burmy/meson.build +++ b/res/pokemon/burmy/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') burmy_sandy_icon = files('forms/sandy/icon.png') diff --git a/res/pokemon/butterfree/data.json b/res/pokemon/butterfree/data.json index 6d4238fab4..04459f16d4 100644 --- a/res/pokemon/butterfree/data.json +++ b/res/pokemon/butterfree/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_COMPOUND_EYES", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONFUSION" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "It loves the honey of flowers and\ncan locate flower patches that\nhave even tiny amounts of pollen.", - "category": "Butterfly Pok\u00e9mon" + "category": "Butterfly Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/butterfree/meson.build b/res/pokemon/butterfree/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/butterfree/meson.build +++ b/res/pokemon/butterfree/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json index 115ef2fb02..2ea59e864d 100644 --- a/res/pokemon/cacnea/data.json +++ b/res/pokemon/cacnea/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_STING" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "By storing water in its body, this\ndesert dweller can survive for 30\ndays without water.", - "category": "Cactus Pok\u00e9mon" + "category": "Cactus Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/cacnea/meson.build b/res/pokemon/cacnea/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cacnea/meson.build +++ b/res/pokemon/cacnea/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cacturne/data.json b/res/pokemon/cacturne/data.json index 2d46f589af..5846591a65 100644 --- a/res/pokemon/cacturne/data.json +++ b/res/pokemon/cacturne/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REVENGE" ], @@ -125,14 +123,14 @@ "pokemon_pos_f": 10, "trainer_pos_m": 9, "pokemon_pos_m": 10, - "entry_text": "It becomes active at night,\nseeking prey that is exhausted\nfrom the day\u2019s desert heat.", - "category": "Scarecrow Pok\u00e9mon" + "entry_text": "It becomes active at night,\nseeking prey that is exhausted\nfrom the day’s desert heat.", + "category": "Scarecrow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4097 } -} \ No newline at end of file +} diff --git a/res/pokemon/cacturne/meson.build b/res/pokemon/cacturne/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cacturne/meson.build +++ b/res/pokemon/cacturne/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/camerupt/data.json b/res/pokemon/camerupt/data.json index 29b7e1865c..138bafc92b 100644 --- a/res/pokemon/camerupt/data.json +++ b/res/pokemon/camerupt/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_MAGMA_ARMOR", "ABILITY_SOLID_ROCK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 3, "entry_text": "It has volcanoes on its back. If\nmagma builds up in its body, it\nshudders, then erupts violently.", - "category": "Eruption Pok\u00e9mon" + "category": "Eruption Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2050 } -} \ No newline at end of file +} diff --git a/res/pokemon/camerupt/meson.build b/res/pokemon/camerupt/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/camerupt/meson.build +++ b/res/pokemon/camerupt/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/carnivine/data.json b/res/pokemon/carnivine/data.json index b3114caf15..23c5d0365c 100644 --- a/res/pokemon/carnivine/data.json +++ b/res/pokemon/carnivine/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BIND" ], @@ -111,13 +109,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65533, "entry_text": "It binds itself to trees in marshes.\nIt attracts prey with its sweet-\nsmelling drool and gulps them down.", - "category": "Bug Catcher Pok\u00e9mon" + "category": "Bug Catcher Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3329 } -} \ No newline at end of file +} diff --git a/res/pokemon/carnivine/meson.build b/res/pokemon/carnivine/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/carnivine/meson.build +++ b/res/pokemon/carnivine/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json index 6cff8a259b..8ae3ba8ba8 100644 --- a/res/pokemon/carvanha/data.json +++ b/res/pokemon/carvanha/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_ROUGH_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65524, "entry_text": "They swarm any foe that invades\ntheir territory. Their sharp fangs\ncan tear out boat hulls.", - "category": "Savage Pok\u00e9mon" + "category": "Savage Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 4099 } -} \ No newline at end of file +} diff --git a/res/pokemon/carvanha/meson.build b/res/pokemon/carvanha/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/carvanha/meson.build +++ b/res/pokemon/carvanha/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json index 9d6be096b1..3eb7f50036 100644 --- a/res/pokemon/cascoon/data.json +++ b/res/pokemon/cascoon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HARDEN" ], @@ -66,13 +64,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "It never forgets any attack it\nendured while in the cocoon.\nAfter evolution, it seeks payback.", - "category": "Cocoon Pok\u00e9mon" + "category": "Cocoon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/cascoon/meson.build b/res/pokemon/cascoon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cascoon/meson.build +++ b/res/pokemon/cascoon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/castform/data.json b/res/pokemon/castform/data.json index 577c31063f..345d125587 100644 --- a/res/pokemon/castform/data.json +++ b/res/pokemon/castform/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_FORECAST", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65523, "entry_text": "Its appearance changes with the\nweather. Recently, its molecules\nwere found to be just like water.", - "category": "Weather Pok\u00e9mon" + "category": "Weather Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/castform/meson.build b/res/pokemon/castform/meson.build index 2511bbc1f6..d627fc9377 100644 --- a/res/pokemon/castform/meson.build +++ b/res/pokemon/castform/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json index 870137cf88..53b58078eb 100644 --- a/res/pokemon/caterpie/data.json +++ b/res/pokemon/caterpie/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -67,13 +65,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "It releases a stench from its red\nantenna to repel enemies. It\ngrows by molting repeatedly.", - "category": "Worm Pok\u00e9mon" + "category": "Worm Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/caterpie/meson.build b/res/pokemon/caterpie/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/caterpie/meson.build +++ b/res/pokemon/caterpie/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/celebi/data.json b/res/pokemon/celebi/data.json index 1929dc352f..2f67e8697e 100644 --- a/res/pokemon/celebi/data.json +++ b/res/pokemon/celebi/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEECH_SEED" ], @@ -133,13 +131,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65535, "entry_text": "It has the power to travel across\ntime, but it is said to appear only\nin peaceful times.", - "category": "Time Travel Pok\u00e9mon" + "category": "Time Travel Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 266 } -} \ No newline at end of file +} diff --git a/res/pokemon/celebi/meson.build b/res/pokemon/celebi/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/celebi/meson.build +++ b/res/pokemon/celebi/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json index 795d9dc658..90e7efd703 100644 --- a/res/pokemon/chansey/data.json +++ b/res/pokemon/chansey/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_SERENE_GRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -143,14 +141,14 @@ "pokemon_pos_f": 10, "trainer_pos_m": 9, "pokemon_pos_m": 10, - "entry_text": "A kindly Pok\u00e9mon that lays highly\nnutritious eggs and shares them\nwith injured Pok\u00e9mon or people.", - "category": "Egg Pok\u00e9mon" + "entry_text": "A kindly Pokémon that lays highly\nnutritious eggs and shares them\nwith injured Pokémon or people.", + "category": "Egg Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/chansey/meson.build b/res/pokemon/chansey/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/chansey/meson.build +++ b/res/pokemon/chansey/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/charizard/data.json b/res/pokemon/charizard/data.json index 88ac407b98..78a969026f 100644 --- a/res/pokemon/charizard/data.json +++ b/res/pokemon/charizard/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DRAGON_CLAW" ], @@ -134,14 +132,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "It is said that CHARIZARD\u2019s fire\nburns hotter if it has\nexperienced harsh battles.", - "category": "Flame Pok\u00e9mon" + "entry_text": "It is said that CHARIZARD’s fire\nburns hotter if it has\nexperienced harsh battles.", + "category": "Flame Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4354 } -} \ No newline at end of file +} diff --git a/res/pokemon/charizard/meson.build b/res/pokemon/charizard/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/charizard/meson.build +++ b/res/pokemon/charizard/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json index 479e6711a7..299f2f18b4 100644 --- a/res/pokemon/charmander/data.json +++ b/res/pokemon/charmander/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "The fire on the tip of its tail is a\nmeasure of its life. If healthy,\nits tail burns intensely.", - "category": "Lizard Pok\u00e9mon" + "category": "Lizard Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/charmander/meson.build b/res/pokemon/charmander/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/charmander/meson.build +++ b/res/pokemon/charmander/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json index ff61d3f382..b684a640cd 100644 --- a/res/pokemon/charmeleon/data.json +++ b/res/pokemon/charmeleon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "In the rocky mountains where\nCHARMELEON live, their fiery\ntails shine at night like stars.", - "category": "Flame Pok\u00e9mon" + "category": "Flame Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/charmeleon/meson.build b/res/pokemon/charmeleon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/charmeleon/meson.build +++ b/res/pokemon/charmeleon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chatot/data.json b/res/pokemon/chatot/data.json index 20e70470f7..d932c25f65 100644 --- a/res/pokemon/chatot/data.json +++ b/res/pokemon/chatot/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_TANGLED_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -107,14 +105,14 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "Its tongue is just like a human\u2019s.\nAs a result, it can cleverly mimic\nhuman speech.", - "category": "Music Note Pok\u00e9mon" + "entry_text": "Its tongue is just like a human’s.\nAs a result, it can cleverly mimic\nhuman speech.", + "category": "Music Note Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/chatot/meson.build b/res/pokemon/chatot/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/chatot/meson.build +++ b/res/pokemon/chatot/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cherrim/data.json b/res/pokemon/cherrim/data.json index 819b13738b..5cf443b8e0 100644 --- a/res/pokemon/cherrim/data.json +++ b/res/pokemon/cherrim/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_FLOWER_GIFT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -103,14 +101,14 @@ "pokemon_pos_f": 25, "trainer_pos_m": 9, "pokemon_pos_m": 25, - "entry_text": "If it senses strong sunlight, it\nopens its folded petals to absorb\nthe sun\u2019s rays with its whole body.", - "category": "Blossom Pok\u00e9mon" + "entry_text": "If it senses strong sunlight, it\nopens its folded petals to absorb\nthe sun’s rays with its whole body.", + "category": "Blossom Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/cherrim/meson.build b/res/pokemon/cherrim/meson.build index 405a9801ce..91544ea270 100644 --- a/res/pokemon/cherrim/meson.build +++ b/res/pokemon/cherrim/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json index 1588c27710..0e4090bc63 100644 --- a/res/pokemon/cherubi/data.json +++ b/res/pokemon/cherubi/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -106,13 +104,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "The small ball is not only filled with\nnutrients, it is also tasty. STARLY\ntry to peck it off.", - "category": "Cherry Pok\u00e9mon" + "category": "Cherry Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4364 } -} \ No newline at end of file +} diff --git a/res/pokemon/cherubi/meson.build b/res/pokemon/cherubi/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cherubi/meson.build +++ b/res/pokemon/cherubi/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json index 4482b3134c..3ce346aec5 100644 --- a/res/pokemon/chikorita/data.json +++ b/res/pokemon/chikorita/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "It uses the leaf on its head to\ndetermine the temperature and\nhumidity. It loves to sunbathe.", - "category": "Leaf Pok\u00e9mon" + "category": "Leaf Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/chikorita/meson.build b/res/pokemon/chikorita/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/chikorita/meson.build +++ b/res/pokemon/chikorita/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json index d380643b93..816dcc0f60 100644 --- a/res/pokemon/chimchar/data.json +++ b/res/pokemon/chimchar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": true - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It is very agile. Before going to\nsleep, it extinguishes the flame\non its tail to prevent fires.", - "category": "Chimp Pok\u00e9mon" + "category": "Chimp Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/chimchar/meson.build b/res/pokemon/chimchar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/chimchar/meson.build +++ b/res/pokemon/chimchar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chimecho/data.json b/res/pokemon/chimecho/data.json index acffbf55e0..7fa036f0eb 100644 --- a/res/pokemon/chimecho/data.json +++ b/res/pokemon/chimecho/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WRAP" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65523, "entry_text": "Its cries echo inside its hollow\nbody to emerge as beautiful notes\nfor startling and repelling foes.", - "category": "Wind Chime Pok\u00e9mon" + "category": "Wind Chime Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/chimecho/meson.build b/res/pokemon/chimecho/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/chimecho/meson.build +++ b/res/pokemon/chimecho/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json index ee3a0559d8..c61769adf4 100644 --- a/res/pokemon/chinchou/data.json +++ b/res/pokemon/chinchou/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_VOLT_ABSORB", "ABILITY_ILLUMINATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "It discharges positive and\nnegative electricity from its\nantenna tips to shock its foes.", - "category": "Angler Pok\u00e9mon" + "category": "Angler Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 1795 } -} \ No newline at end of file +} diff --git a/res/pokemon/chinchou/meson.build b/res/pokemon/chinchou/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/chinchou/meson.build +++ b/res/pokemon/chinchou/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json index 91f7817003..4c21923920 100644 --- a/res/pokemon/chingling/data.json +++ b/res/pokemon/chingling/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WRAP" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65527, "entry_text": "There is an orb inside its mouth.\nWhen it hops, the orb bounces all\nover and makes a ringing sound.", - "category": "Bell Pok\u00e9mon" + "category": "Bell Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1297 } -} \ No newline at end of file +} diff --git a/res/pokemon/chingling/meson.build b/res/pokemon/chingling/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/chingling/meson.build +++ b/res/pokemon/chingling/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json index dd91955993..806c53fd7b 100644 --- a/res/pokemon/clamperl/data.json +++ b/res/pokemon/clamperl/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SHELL_ARMOR", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CLAMP" ], @@ -103,13 +101,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It makes a single pearl during\nits lifetime. The pearl is said\nto amplify psychic power.", - "category": "Bivalve Pok\u00e9mon" + "category": "Bivalve Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/clamperl/meson.build b/res/pokemon/clamperl/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/clamperl/meson.build +++ b/res/pokemon/clamperl/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/claydol/data.json b/res/pokemon/claydol/data.json index a1531cfa0b..e57a96532b 100644 --- a/res/pokemon/claydol/data.json +++ b/res/pokemon/claydol/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TELEPORT" ], @@ -130,14 +128,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "An ancient clay figurine that came\nto life as a Pok\u00e9mon from exposure\nto a mysterious ray of light.", - "category": "Clay Doll Pok\u00e9mon" + "entry_text": "An ancient clay figurine that came\nto life as a Pokémon from exposure\nto a mysterious ray of light.", + "category": "Clay Doll Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2568 } -} \ No newline at end of file +} diff --git a/res/pokemon/claydol/meson.build b/res/pokemon/claydol/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/claydol/meson.build +++ b/res/pokemon/claydol/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/clefable/data.json b/res/pokemon/clefable/data.json index e8c776b867..e6c42a76a6 100644 --- a/res/pokemon/clefable/data.json +++ b/res/pokemon/clefable/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_MAGIC_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SING" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "It is very wary and rarely shows\nitself to people. Its ears can hear\na pin drop over half a mile away.", - "category": "Fairy Pok\u00e9mon" + "category": "Fairy Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/clefable/meson.build b/res/pokemon/clefable/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/clefable/meson.build +++ b/res/pokemon/clefable/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/clefairy/data.json b/res/pokemon/clefairy/data.json index 19d2efc92d..5e73b25ca0 100644 --- a/res/pokemon/clefairy/data.json +++ b/res/pokemon/clefairy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_MAGIC_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -148,13 +146,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "It is said that happiness will come\nto those who see a gathering of\nCLEFAIRY dancing under a full moon.", - "category": "Fairy Pok\u00e9mon" + "category": "Fairy Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/clefairy/meson.build b/res/pokemon/clefairy/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/clefairy/meson.build +++ b/res/pokemon/clefairy/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json index 891ef9b227..f2cad4fc2a 100644 --- a/res/pokemon/cleffa/data.json +++ b/res/pokemon/cleffa/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_MAGIC_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -116,14 +114,14 @@ "pokemon_pos_f": 29, "trainer_pos_m": 9, "pokemon_pos_m": 29, - "entry_text": "It is often seen when shooting\nstars fill the night skies. It\u2019s said\nto arrive riding on a shooting star.", - "category": "Star Shape Pok\u00e9mon" + "entry_text": "It is often seen when shooting\nstars fill the night skies. It’s said\nto arrive riding on a shooting star.", + "category": "Star Shape Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/cleffa/meson.build b/res/pokemon/cleffa/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cleffa/meson.build +++ b/res/pokemon/cleffa/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cloyster/data.json b/res/pokemon/cloyster/data.json index f5aafe7ae1..e120a0a4d5 100644 --- a/res/pokemon/cloyster/data.json +++ b/res/pokemon/cloyster/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SHELL_ARMOR", "ABILITY_SKILL_LINK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TOXIC_SPIKES" ], @@ -103,13 +101,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "It fights by keeping its shell\ntightly shut for protection and\nby shooting spikes to repel foes.", - "category": "Bivalve Pok\u00e9mon" + "category": "Bivalve Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 3331 } -} \ No newline at end of file +} diff --git a/res/pokemon/cloyster/meson.build b/res/pokemon/cloyster/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cloyster/meson.build +++ b/res/pokemon/cloyster/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/combee/data.json b/res/pokemon/combee/data.json index 019999fab3..ffcbaced81 100644 --- a/res/pokemon/combee/data.json +++ b/res/pokemon/combee/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HONEY_GATHER", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SWEET_SCENT" ], @@ -74,13 +72,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65528, "entry_text": "The trio is together from birth.\nIt constantly gathers honey from\nflowers to please VESPIQUEN.", - "category": "Tiny Bee Pok\u00e9mon" + "category": "Tiny Bee Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/combee/meson.build b/res/pokemon/combee/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/combee/meson.build +++ b/res/pokemon/combee/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json index 75d59608f3..8361b50fc2 100644 --- a/res/pokemon/combusken/data.json +++ b/res/pokemon/combusken/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "Its kicking mastery lets it loose\n10 kicks per second. It emits\nsharp cries to intimidate foes.", - "category": "Young Fowl Pok\u00e9mon" + "category": "Young Fowl Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2306 } -} \ No newline at end of file +} diff --git a/res/pokemon/combusken/meson.build b/res/pokemon/combusken/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/combusken/meson.build +++ b/res/pokemon/combusken/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json index 2ad1452e13..34cb2c26ef 100644 --- a/res/pokemon/corphish/data.json +++ b/res/pokemon/corphish/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "Its hardy vitality enables it to\nadapt to any environment. Its\npincers will never release prey.", - "category": "Ruffian Pok\u00e9mon" + "category": "Ruffian Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/corphish/meson.build b/res/pokemon/corphish/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/corphish/meson.build +++ b/res/pokemon/corphish/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/corsola/data.json b/res/pokemon/corsola/data.json index 5fd63ad6fd..6a0ecbeb3b 100644 --- a/res/pokemon/corsola/data.json +++ b/res/pokemon/corsola/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HUSTLE", "ABILITY_NATURAL_CURE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -122,14 +120,14 @@ "pokemon_pos_f": 23, "trainer_pos_m": 9, "pokemon_pos_m": 23, - "entry_text": "Many live in the clean seas of the\nsouth. They apparently can\u2019t live\nin polluted waters.", - "category": "Coral Pok\u00e9mon" + "entry_text": "Many live in the clean seas of the\nsouth. They apparently can’t live\nin polluted waters.", + "category": "Coral Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2819 } -} \ No newline at end of file +} diff --git a/res/pokemon/corsola/meson.build b/res/pokemon/corsola/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/corsola/meson.build +++ b/res/pokemon/corsola/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cradily/data.json b/res/pokemon/cradily/data.json index caef4ce0e0..0044b6ca10 100644 --- a/res/pokemon/cradily/data.json +++ b/res/pokemon/cradily/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SUCTION_CUPS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "It lives in the shallows of warm\nseas. When the tide goes out, it\ndigs up prey from beaches.", - "category": "Barnacle Pok\u00e9mon" + "category": "Barnacle Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 267 } -} \ No newline at end of file +} diff --git a/res/pokemon/cradily/meson.build b/res/pokemon/cradily/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cradily/meson.build +++ b/res/pokemon/cradily/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json index 91a59c668e..1e7961b189 100644 --- a/res/pokemon/cranidos/data.json +++ b/res/pokemon/cranidos/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_MOLD_BREAKER", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HEADBUTT" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "A lifelong jungle dweller from 100\nmillion years ago, it would snap\nobstructing trees with head butts.", - "category": "Head Butt Pok\u00e9mon" + "category": "Head Butt Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3595 } -} \ No newline at end of file +} diff --git a/res/pokemon/cranidos/meson.build b/res/pokemon/cranidos/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cranidos/meson.build +++ b/res/pokemon/cranidos/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/crawdaunt/data.json b/res/pokemon/crawdaunt/data.json index 7d3df01156..8320f23b1b 100644 --- a/res/pokemon/crawdaunt/data.json +++ b/res/pokemon/crawdaunt/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -130,14 +128,14 @@ "pokemon_pos_f": 12, "trainer_pos_m": 9, "pokemon_pos_m": 12, - "entry_text": "It is a ruffian that uses its\npincers to pick up and toss out\nother Pok\u00e9mon from its pond.", - "category": "Rogue Pok\u00e9mon" + "entry_text": "It is a ruffian that uses its\npincers to pick up and toss out\nother Pokémon from its pond.", + "category": "Rogue Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 4099 } -} \ No newline at end of file +} diff --git a/res/pokemon/crawdaunt/meson.build b/res/pokemon/crawdaunt/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/crawdaunt/meson.build +++ b/res/pokemon/crawdaunt/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cresselia/data.json b/res/pokemon/cresselia/data.json index f616c9cff0..5dc2634d4f 100644 --- a/res/pokemon/cresselia/data.json +++ b/res/pokemon/cresselia/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONFUSION" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 7, "pokemon_pos_m": 65533, "entry_text": "On nights around the quarter moon,\nthe aurora from its tail extends\nand undulates beautifully.", - "category": "Lunar Pok\u00e9mon" + "category": "Lunar Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/cresselia/meson.build b/res/pokemon/cresselia/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/cresselia/meson.build +++ b/res/pokemon/cresselia/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json index 1488241dfa..3526e680aa 100644 --- a/res/pokemon/croagunk/data.json +++ b/res/pokemon/croagunk/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_DRY_SKIN" ], "safari_flee_rate": 150, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "It rarely fights fairly, but that is\nstrictly to ensure survival. It is\npopular as a mascot.", - "category": "Toxic Mouth Pok\u00e9mon" + "category": "Toxic Mouth Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4108 } -} \ No newline at end of file +} diff --git a/res/pokemon/croagunk/meson.build b/res/pokemon/croagunk/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/croagunk/meson.build +++ b/res/pokemon/croagunk/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/crobat/data.json b/res/pokemon/crobat/data.json index 295357921b..45824dd50c 100644 --- a/res/pokemon/crobat/data.json +++ b/res/pokemon/crobat/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CROSS_POISON" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 13, "pokemon_pos_m": 65533, "entry_text": "The transformation of its legs into\nwings made it better at flying, but\nmore clumsy at walking.", - "category": "Bat Pok\u00e9mon" + "category": "Bat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4358 } -} \ No newline at end of file +} diff --git a/res/pokemon/crobat/meson.build b/res/pokemon/crobat/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/crobat/meson.build +++ b/res/pokemon/crobat/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json index 0834026fa6..5ab010b4fd 100644 --- a/res/pokemon/croconaw/data.json +++ b/res/pokemon/croconaw/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": true - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -128,14 +126,14 @@ "pokemon_pos_f": 13, "trainer_pos_m": 9, "pokemon_pos_m": 13, - "entry_text": "Once it bites down, it won\u2019t let go\nuntil it loses its fangs. New fangs\nquickly grow into place.", - "category": "Big Jaw Pok\u00e9mon" + "entry_text": "Once it bites down, it won’t let go\nuntil it loses its fangs. New fangs\nquickly grow into place.", + "category": "Big Jaw Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/croconaw/meson.build b/res/pokemon/croconaw/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/croconaw/meson.build +++ b/res/pokemon/croconaw/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cubone/data.json b/res/pokemon/cubone/data.json index 6d513aa697..8d7a9f156a 100644 --- a/res/pokemon/cubone/data.json +++ b/res/pokemon/cubone/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_LIGHTNING_ROD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "When it thinks of its dead mother,\nit cries. Its crying makes the\nskull it wears rattle hollowly.", - "category": "Lonely Pok\u00e9mon" + "category": "Lonely Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/cubone/meson.build b/res/pokemon/cubone/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cubone/meson.build +++ b/res/pokemon/cubone/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/cyndaquil/data.json b/res/pokemon/cyndaquil/data.json index 1dbe14d08f..d0a96dac14 100644 --- a/res/pokemon/cyndaquil/data.json +++ b/res/pokemon/cyndaquil/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "It has a timid nature. If it is\nstartled, the flames on its back\nburn more vigorously.", - "category": "Fire Mouse Pok\u00e9mon" + "category": "Fire Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/cyndaquil/meson.build b/res/pokemon/cyndaquil/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/cyndaquil/meson.build +++ b/res/pokemon/cyndaquil/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/darkrai/data.json b/res/pokemon/darkrai/data.json index bb73984a98..819127f5af 100644 --- a/res/pokemon/darkrai/data.json +++ b/res/pokemon/darkrai/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_BAD_DREAMS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_OMINOUS_WIND" ], @@ -138,13 +136,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "To protect itself, it afflicts those\naround it with nightmares. However,\nit means no harm.", - "category": "Pitch-Black Pok\u00e9mon" + "category": "Pitch-Black Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 3600 } -} \ No newline at end of file +} diff --git a/res/pokemon/darkrai/meson.build b/res/pokemon/darkrai/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/darkrai/meson.build +++ b/res/pokemon/darkrai/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/delcatty/data.json b/res/pokemon/delcatty/data.json index cfa72e54da..7e4801b6fe 100644 --- a/res/pokemon/delcatty/data.json +++ b/res/pokemon/delcatty/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NORMALIZE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FAKE_OUT" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "It is highly popular among female\nTrainers for its sublime fur.\nIt does not keep a nest.", - "category": "Prim Pok\u00e9mon" + "category": "Prim Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/delcatty/meson.build b/res/pokemon/delcatty/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/delcatty/meson.build +++ b/res/pokemon/delcatty/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/delibird/data.json b/res/pokemon/delibird/data.json index ac905d9bb0..70067415d2 100644 --- a/res/pokemon/delibird/data.json +++ b/res/pokemon/delibird/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", "ABILITY_HUSTLE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PRESENT" ] @@ -100,13 +98,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It carries food rolled up in its\ntail. It has the habit of sharing\nfood with people lost in mountains.", - "category": "Delivery Pok\u00e9mon" + "category": "Delivery Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4365 } -} \ No newline at end of file +} diff --git a/res/pokemon/delibird/meson.build b/res/pokemon/delibird/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/delibird/meson.build +++ b/res/pokemon/delibird/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/deoxys/data.json b/res/pokemon/deoxys/data.json index dacc29844f..7a988835c1 100644 --- a/res/pokemon/deoxys/data.json +++ b/res/pokemon/deoxys/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -142,14 +140,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "entry_text": "An alien virus that fell to earth\non a meteor underwent a DNA\nmutation to become this Pok\u00e9mon.", - "category": "DNA Pok\u00e9mon" + "entry_text": "An alien virus that fell to earth\non a meteor underwent a DNA\nmutation to become this Pokémon.", + "category": "DNA Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/deoxys/forms/attack/data.json b/res/pokemon/deoxys/forms/attack/data.json index c2f58d03a7..63614425a9 100644 --- a/res/pokemon/deoxys/forms/attack/data.json +++ b/res/pokemon/deoxys/forms/attack/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], diff --git a/res/pokemon/deoxys/forms/defense/data.json b/res/pokemon/deoxys/forms/defense/data.json index 44c3ef8c35..9f82a4d1d6 100644 --- a/res/pokemon/deoxys/forms/defense/data.json +++ b/res/pokemon/deoxys/forms/defense/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], diff --git a/res/pokemon/deoxys/forms/speed/data.json b/res/pokemon/deoxys/forms/speed/data.json index de1c0120f2..5256d46132 100644 --- a/res/pokemon/deoxys/forms/speed/data.json +++ b/res/pokemon/deoxys/forms/speed/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], diff --git a/res/pokemon/deoxys/meson.build b/res/pokemon/deoxys/meson.build index 1aeeebecee..1487a2885a 100644 --- a/res/pokemon/deoxys/meson.build +++ b/res/pokemon/deoxys/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') deoxys_attack_personal = files('forms/attack/data.json') deoxys_defense_personal = files('forms/defense/data.json') deoxys_speed_personal = files('forms/speed/data.json') diff --git a/res/pokemon/dewgong/data.json b/res/pokemon/dewgong/data.json index b457dfd458..7068b74431 100644 --- a/res/pokemon/dewgong/data.json +++ b/res/pokemon/dewgong/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_HYDRATION" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HEADBUTT" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 5, "pokemon_pos_m": 1, "entry_text": "In snow, the pure white coat\ncovering its body obscures it from\npredators.", - "category": "Sea Lion Pok\u00e9mon" + "category": "Sea Lion Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 3331 } -} \ No newline at end of file +} diff --git a/res/pokemon/dewgong/meson.build b/res/pokemon/dewgong/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dewgong/meson.build +++ b/res/pokemon/dewgong/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dialga/data.json b/res/pokemon/dialga/data.json index 2cc013dc1e..4dff0d0c09 100644 --- a/res/pokemon/dialga/data.json +++ b/res/pokemon/dialga/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DRAGON_BREATH" ], @@ -130,14 +128,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 26, "pokemon_pos_m": 2, - "entry_text": "A legendary Pok\u00e9mon of Sinnoh.\nIt is said that time flows when\nDIALGA\u2019s heart beats.", - "category": "Temporal Pok\u00e9mon" + "entry_text": "A legendary Pokémon of Sinnoh.\nIt is said that time flows when\nDIALGA’s heart beats.", + "category": "Temporal Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3854 } -} \ No newline at end of file +} diff --git a/res/pokemon/dialga/meson.build b/res/pokemon/dialga/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/dialga/meson.build +++ b/res/pokemon/dialga/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/diglett/data.json b/res/pokemon/diglett/data.json index 970c035034..46b1263290 100644 --- a/res/pokemon/diglett/data.json +++ b/res/pokemon/diglett/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_ARENA_TRAP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -111,14 +109,14 @@ "pokemon_pos_f": 32, "trainer_pos_m": 9, "pokemon_pos_m": 32, - "entry_text": "A Pok\u00e9mon that lives underground.\nBecause of its dark habitat, it is\nrepelled by bright sunlight.", - "category": "Mole Pok\u00e9mon" + "entry_text": "A Pokémon that lives underground.\nBecause of its dark habitat, it is\nrepelled by bright sunlight.", + "category": "Mole Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/diglett/meson.build b/res/pokemon/diglett/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/diglett/meson.build +++ b/res/pokemon/diglett/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ditto/data.json b/res/pokemon/ditto/data.json index 1babe2e950..9a62f39e28 100644 --- a/res/pokemon/ditto/data.json +++ b/res/pokemon/ditto/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_DITTO", "EGG_GROUP_DITTO" ], "abilities": [ "ABILITY_LIMBER", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRANSFORM" ] @@ -59,13 +57,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 30, "entry_text": "It has the ability to reconstitute\nits entire cellular structure to\ntransform into whatever it sees.", - "category": "Transform Pok\u00e9mon" + "category": "Transform Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/ditto/meson.build b/res/pokemon/ditto/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/ditto/meson.build +++ b/res/pokemon/ditto/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dodrio/data.json b/res/pokemon/dodrio/data.json index ff334814d6..c4551b9f06 100644 --- a/res/pokemon/dodrio/data.json +++ b/res/pokemon/dodrio/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PLUCK" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 12, "pokemon_pos_m": 2, "entry_text": "When DODUO evolves into this odd\nbreed, one of its heads splits into\ntwo. It runs at nearly 40 mph.", - "category": "Triple Bird Pok\u00e9mon" + "category": "Triple Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/dodrio/meson.build b/res/pokemon/dodrio/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dodrio/meson.build +++ b/res/pokemon/dodrio/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/doduo/data.json b/res/pokemon/doduo/data.json index 34a1797692..073d8f836b 100644 --- a/res/pokemon/doduo/data.json +++ b/res/pokemon/doduo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "The brains in its two heads appear\nto communicate emotions to each\nother with a telepathic power.", - "category": "Twin Bird Pok\u00e9mon" + "category": "Twin Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/doduo/meson.build b/res/pokemon/doduo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/doduo/meson.build +++ b/res/pokemon/doduo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/donphan/data.json b/res/pokemon/donphan/data.json index b62ce11870..d117c58d3d 100644 --- a/res/pokemon/donphan/data.json +++ b/res/pokemon/donphan/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_FANG" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "It attacks by curling up, then\nrolling into its foe. It can blow\napart a house in one hit.", - "category": "Armor Pok\u00e9mon" + "category": "Armor Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/donphan/meson.build b/res/pokemon/donphan/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/donphan/meson.build +++ b/res/pokemon/donphan/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dragonair/data.json b/res/pokemon/dragonair/data.json index ab0e2b81cf..bb986b060d 100644 --- a/res/pokemon/dragonair/data.json +++ b/res/pokemon/dragonair/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WRAP" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 4, "entry_text": "If its body takes on an aura, the\nweather changes instantly. It is\nsaid to live in seas and lakes.", - "category": "Dragon Pok\u00e9mon" + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/dragonair/meson.build b/res/pokemon/dragonair/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dragonair/meson.build +++ b/res/pokemon/dragonair/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dragonite/data.json b/res/pokemon/dragonite/data.json index ee731287ba..0c39d4b862 100644 --- a/res/pokemon/dragonite/data.json +++ b/res/pokemon/dragonite/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -150,13 +148,13 @@ "trainer_pos_m": 8, "pokemon_pos_m": 5, "entry_text": "It is said to make its home\nsomewhere in the sea. It guides\ncrews of shipwrecks to shore.", - "category": "Dragon Pok\u00e9mon" + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4367 } -} \ No newline at end of file +} diff --git a/res/pokemon/dragonite/meson.build b/res/pokemon/dragonite/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dragonite/meson.build +++ b/res/pokemon/dragonite/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/drapion/data.json b/res/pokemon/drapion/data.json index 540f53e471..378bce7eda 100644 --- a/res/pokemon/drapion/data.json +++ b/res/pokemon/drapion/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", "ABILITY_SNIPER" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_FANG" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "Possessing a sturdy build, it takes\npride in its strength, taking down\nfoes without using toxins.", - "category": "Ogre Scorp Pok\u00e9mon" + "category": "Ogre Scorp Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/drapion/meson.build b/res/pokemon/drapion/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/drapion/meson.build +++ b/res/pokemon/drapion/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index 2fd6ba654d..3115870f51 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WRAP" ], @@ -118,14 +116,14 @@ "pokemon_pos_f": 6, "trainer_pos_m": 5, "pokemon_pos_m": 6, - "entry_text": "It is called the \u201cMirage Pok\u00e9mon\u201d\nbecause so few have seen it.\nIts shed skin has been found.", - "category": "Dragon Pok\u00e9mon" + "entry_text": "It is called the “Mirage Pokémon”\nbecause so few have seen it.\nIts shed skin has been found.", + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/dratini/meson.build b/res/pokemon/dratini/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dratini/meson.build +++ b/res/pokemon/dratini/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/drifblim/data.json b/res/pokemon/drifblim/data.json index c70ed20fb7..286a003f37 100644 --- a/res/pokemon/drifblim/data.json +++ b/res/pokemon/drifblim/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_AFTERMATH", "ABILITY_UNBURDEN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONSTRICT" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65528, "entry_text": "At dusk, swarms of them are\ncarried aloft on winds. When\nnoticed, they suddenly vanish.", - "category": "Blimp Pok\u00e9mon" + "category": "Blimp Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/drifblim/meson.build b/res/pokemon/drifblim/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/drifblim/meson.build +++ b/res/pokemon/drifblim/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 32dddddc53..369dc3ba20 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_AFTERMATH", "ABILITY_UNBURDEN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONSTRICT" ], @@ -129,14 +127,14 @@ "pokemon_pos_f": 65522, "trainer_pos_m": 9, "pokemon_pos_m": 65522, - "entry_text": "Because of the way it floats\naimlessly, an old folktale calls it a\n\u201cSignpost for Wandering Spirits.\u201d", - "category": "Balloon Pok\u00e9mon" + "entry_text": "Because of the way it floats\naimlessly, an old folktale calls it a\n“Signpost for Wandering Spirits.”", + "category": "Balloon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/drifloon/meson.build b/res/pokemon/drifloon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/drifloon/meson.build +++ b/res/pokemon/drifloon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/drowzee/data.json b/res/pokemon/drowzee/data.json index 6a92b0129b..ef4ad1354f 100644 --- a/res/pokemon/drowzee/data.json +++ b/res/pokemon/drowzee/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_FOREWARN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "It can tell what people are\ndreaming by sniffing with its big\nnose. It loves fun dreams.", - "category": "Hypnosis Pok\u00e9mon" + "category": "Hypnosis Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/drowzee/meson.build b/res/pokemon/drowzee/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/drowzee/meson.build +++ b/res/pokemon/drowzee/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dugtrio/data.json b/res/pokemon/dugtrio/data.json index 4243fcc488..fffc5e2bed 100644 --- a/res/pokemon/dugtrio/data.json +++ b/res/pokemon/dugtrio/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_ARENA_TRAP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_NIGHT_SLASH" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "Its three heads move alternately,\ndriving it through tough soil to\ndepths of over 60 miles.", - "category": "Mole Pok\u00e9mon" + "category": "Mole Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/dugtrio/meson.build b/res/pokemon/dugtrio/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dugtrio/meson.build +++ b/res/pokemon/dugtrio/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dunsparce/data.json b/res/pokemon/dunsparce/data.json index 5615158ab5..8f2b0405e8 100644 --- a/res/pokemon/dunsparce/data.json +++ b/res/pokemon/dunsparce/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SERENE_GRACE", "ABILITY_RUN_AWAY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_RAGE" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "It digs into the ground with its\ntail and makes a mazelike nest.\nIt can fly just a little.", - "category": "Land Snake Pok\u00e9mon" + "category": "Land Snake Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/dunsparce/meson.build b/res/pokemon/dunsparce/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dunsparce/meson.build +++ b/res/pokemon/dunsparce/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dusclops/data.json b/res/pokemon/dusclops/data.json index 34e3633f22..9c388581b0 100644 --- a/res/pokemon/dusclops/data.json +++ b/res/pokemon/dusclops/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -142,14 +140,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "entry_text": "It seeks drifting will-o\u2019-the-wisps\nand sucks them into its empty body.\nWhat happens inside is a mystery.", - "category": "Beckon Pok\u00e9mon" + "entry_text": "It seeks drifting will-o’-the-wisps\nand sucks them into its empty body.\nWhat happens inside is a mystery.", + "category": "Beckon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/dusclops/meson.build b/res/pokemon/dusclops/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dusclops/meson.build +++ b/res/pokemon/dusclops/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dusknoir/data.json b/res/pokemon/dusknoir/data.json index 56ad72b51d..26d034aebc 100644 --- a/res/pokemon/dusknoir/data.json +++ b/res/pokemon/dusknoir/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -138,13 +136,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 6, "entry_text": "It is said to take lost spirits\ninto its pliant body and guide\nthem home.", - "category": "Gripper Pok\u00e9mon" + "category": "Gripper Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/dusknoir/meson.build b/res/pokemon/dusknoir/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dusknoir/meson.build +++ b/res/pokemon/dusknoir/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/duskull/data.json b/res/pokemon/duskull/data.json index fb91dc1bb4..de541a70f0 100644 --- a/res/pokemon/duskull/data.json +++ b/res/pokemon/duskull/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "It loves the crying of children. It\nstartles bad kids by passing\nthrough walls and making them cry.", - "category": "Requiem Pok\u00e9mon" + "category": "Requiem Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/duskull/meson.build b/res/pokemon/duskull/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/duskull/meson.build +++ b/res/pokemon/duskull/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/dustox/data.json b/res/pokemon/dustox/data.json index 6b72d076ea..dd09b2d25f 100644 --- a/res/pokemon/dustox/data.json +++ b/res/pokemon/dustox/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONFUSION" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65527, "entry_text": "Toxic powder is scattered with each\nflap. At night, it is known to strip\nleaves off trees lining boulevards.", - "category": "Poison Moth Pok\u00e9mon" + "category": "Poison Moth Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/dustox/meson.build b/res/pokemon/dustox/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/dustox/meson.build +++ b/res/pokemon/dustox/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/eevee/data.json b/res/pokemon/eevee/data.json index aee78cc4b5..4d8883aa0e 100644 --- a/res/pokemon/eevee/data.json +++ b/res/pokemon/eevee/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_ADAPTABILITY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 29, "entry_text": "Because its genetic makeup is\nirregular, it quickly changes its\nform due to a variety of causes.", - "category": "Evolution Pok\u00e9mon" + "category": "Evolution Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/eevee/meson.build b/res/pokemon/eevee/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/eevee/meson.build +++ b/res/pokemon/eevee/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/egg/data.json b/res/pokemon/egg/data.json index caddb82cf6..473f100fb4 100644 --- a/res/pokemon/egg/data.json +++ b/res/pokemon/egg/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NONE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_EGG", - "flip": false - }, + "body_color": "MON_COLOR_EGG", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ] diff --git a/res/pokemon/egg/meson.build b/res/pokemon/egg/meson.build index bb098d789a..e7223ae11f 100644 --- a/res/pokemon/egg/meson.build +++ b/res/pokemon/egg/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') manaphy_egg_icon = files('forms/manaphy/icon.png') diff --git a/res/pokemon/ekans/data.json b/res/pokemon/ekans/data.json index 59f7084f10..a331d4ec52 100644 --- a/res/pokemon/ekans/data.json +++ b/res/pokemon/ekans/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_SHED_SKIN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WRAP" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "It sneaks through grass without\nmaking a sound and strikes\nunsuspecting prey from behind.", - "category": "Snake Pok\u00e9mon" + "category": "Snake Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/ekans/meson.build b/res/pokemon/ekans/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ekans/meson.build +++ b/res/pokemon/ekans/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/electabuzz/data.json b/res/pokemon/electabuzz/data.json index 8faf92a227..ae788aea31 100644 --- a/res/pokemon/electabuzz/data.json +++ b/res/pokemon/electabuzz/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": true - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_QUICK_ATTACK" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "It windmills its arms to slightly\nboost its punches. Foes have been\nknown to escape in the meantime.", - "category": "Electric Pok\u00e9mon" + "category": "Electric Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/electabuzz/meson.build b/res/pokemon/electabuzz/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/electabuzz/meson.build +++ b/res/pokemon/electabuzz/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/electivire/data.json b/res/pokemon/electivire/data.json index 7caa8e3043..76935c51fd 100644 --- a/res/pokemon/electivire/data.json +++ b/res/pokemon/electivire/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_MOTOR_DRIVE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 13, "pokemon_pos_m": 7, "entry_text": "Heedless of enemy attacks, it\ncloses in, shoves its tails onto the\nfoe, then looses high voltage.", - "category": "Thunderbolt Pok\u00e9mon" + "category": "Thunderbolt Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/electivire/meson.build b/res/pokemon/electivire/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/electivire/meson.build +++ b/res/pokemon/electivire/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/electrike/data.json b/res/pokemon/electrike/data.json index 44862bd249..88d55c59a4 100644 --- a/res/pokemon/electrike/data.json +++ b/res/pokemon/electrike/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", "ABILITY_LIGHTNING_ROD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "Using electricity stored in its fur,\nit stimulates its muscles to\nheighten its reaction speed.", - "category": "Lightning Pok\u00e9mon" + "category": "Lightning Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/electrike/meson.build b/res/pokemon/electrike/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/electrike/meson.build +++ b/res/pokemon/electrike/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/electrode/data.json b/res/pokemon/electrode/data.json index 9e23242604..5abe46448b 100644 --- a/res/pokemon/electrode/data.json +++ b/res/pokemon/electrode/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_STATIC" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CHARGE" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 11, "entry_text": "It is known to drift on winds if it\nis bloated to bursting with stored\nelectricity.", - "category": "Ball Pok\u00e9mon" + "category": "Ball Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/electrode/meson.build b/res/pokemon/electrode/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/electrode/meson.build +++ b/res/pokemon/electrode/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/elekid/data.json b/res/pokemon/elekid/data.json index 574bf8b80a..82a37fe46c 100644 --- a/res/pokemon/elekid/data.json +++ b/res/pokemon/elekid/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": true - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_QUICK_ATTACK" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "A weak electric current flows\nbetween its horns. Sticking a hand\nthere shocks the unwary.", - "category": "Electric Pok\u00e9mon" + "category": "Electric Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/elekid/meson.build b/res/pokemon/elekid/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/elekid/meson.build +++ b/res/pokemon/elekid/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/empoleon/data.json b/res/pokemon/empoleon/data.json index 199f4aaaa8..461d3bd45e 100644 --- a/res/pokemon/empoleon/data.json +++ b/res/pokemon/empoleon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 3, "entry_text": "If anyone were to hurt its pride,\nit would slash them with wings that\ncan cleave through an ice floe.", - "category": "Emperor Pok\u00e9mon" + "category": "Emperor Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, "unused": 3587 } -} \ No newline at end of file +} diff --git a/res/pokemon/empoleon/meson.build b/res/pokemon/empoleon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/empoleon/meson.build +++ b/res/pokemon/empoleon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/entei/data.json b/res/pokemon/entei/data.json index 84503793d7..ac98f886aa 100644 --- a/res/pokemon/entei/data.json +++ b/res/pokemon/entei/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 3, "entry_text": "It is said that when it roars, a\nvolcano erupts somewhere around\nthe globe.", - "category": "Volcano Pok\u00e9mon" + "category": "Volcano Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/entei/meson.build b/res/pokemon/entei/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/entei/meson.build +++ b/res/pokemon/entei/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/espeon/data.json b/res/pokemon/espeon/data.json index 7574dfa55c..537883afa0 100644 --- a/res/pokemon/espeon/data.json +++ b/res/pokemon/espeon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_SYNCHRONIZE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "Its fur is so sensitive, it can\nsense minute shifts in the air\nand predict the weather.", - "category": "Sun Pok\u00e9mon" + "category": "Sun Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/espeon/meson.build b/res/pokemon/espeon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/espeon/meson.build +++ b/res/pokemon/espeon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/exeggcute/data.json b/res/pokemon/exeggcute/data.json index 346c8ca0d2..823ee2aa83 100644 --- a/res/pokemon/exeggcute/data.json +++ b/res/pokemon/exeggcute/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BARRAGE" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "Its six eggs converse using\ntelepathy. They can quickly gather\nif they become separated.", - "category": "Egg Pok\u00e9mon" + "category": "Egg Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2561 } -} \ No newline at end of file +} diff --git a/res/pokemon/exeggcute/meson.build b/res/pokemon/exeggcute/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/exeggcute/meson.build +++ b/res/pokemon/exeggcute/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/exeggutor/data.json b/res/pokemon/exeggutor/data.json index 842c805652..82fddd2646 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SEED_BOMB" ], @@ -111,14 +109,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 14, "pokemon_pos_m": 2, - "entry_text": "It is called \u201cThe Walking Jungle.\u201d\nIf a head grows too big, it falls\noff and becomes an EXEGGCUTE.", - "category": "Coconut Pok\u00e9mon" + "entry_text": "It is called “The Walking Jungle.”\nIf a head grows too big, it falls\noff and becomes an EXEGGCUTE.", + "category": "Coconut Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2561 } -} \ No newline at end of file +} diff --git a/res/pokemon/exeggutor/meson.build b/res/pokemon/exeggutor/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/exeggutor/meson.build +++ b/res/pokemon/exeggutor/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/exploud/data.json b/res/pokemon/exploud/data.json index 414fb56859..115598c335 100644 --- a/res/pokemon/exploud/data.json +++ b/res/pokemon/exploud/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -133,13 +131,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "Its howls can be heard over six\nmiles away. It emits all sorts of\nnoises from the ports on its body.", - "category": "Loud Noise Pok\u00e9mon" + "category": "Loud Noise Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/exploud/meson.build b/res/pokemon/exploud/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/exploud/meson.build +++ b/res/pokemon/exploud/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/farfetchd/data.json b/res/pokemon/farfetchd/data.json index b8aeec3838..f43028ce91 100644 --- a/res/pokemon/farfetchd/data.json +++ b/res/pokemon/farfetchd/data.json @@ -1,5 +1,5 @@ { - "name": "Farfetch\u2019d", + "name": "Farfetch’d", "base_stats": { "hp": 52, "attack": 65, @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_INNER_FOCUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_JAB" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 20, "trainer_pos_m": 9, "pokemon_pos_m": 20, - "entry_text": "It can\u2019t live without the stalk it\nholds. That\u2019s why it defends the\nstalk from attackers with its life.", - "category": "Wild Duck Pok\u00e9mon" + "entry_text": "It can’t live without the stalk it\nholds. That’s why it defends the\nstalk from attackers with its life.", + "category": "Wild Duck Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/farfetchd/meson.build b/res/pokemon/farfetchd/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/farfetchd/meson.build +++ b/res/pokemon/farfetchd/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/fearow/data.json b/res/pokemon/fearow/data.json index cf03478718..c2c6070f58 100644 --- a/res/pokemon/fearow/data.json +++ b/res/pokemon/fearow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PLUCK" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 0, "entry_text": "It has the stamina to fly all\nday on its broad wings. It\nfights by using its sharp beak.", - "category": "Beak Pok\u00e9mon" + "category": "Beak Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/fearow/meson.build b/res/pokemon/fearow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/fearow/meson.build +++ b/res/pokemon/fearow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/feebas/data.json b/res/pokemon/feebas/data.json index c6a7f801a8..1cf7cfd7b0 100644 --- a/res/pokemon/feebas/data.json +++ b/res/pokemon/feebas/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -95,14 +93,14 @@ "pokemon_pos_f": 65535, "trainer_pos_m": 9, "pokemon_pos_m": 65535, - "entry_text": "It is a shabby and ugly Pok\u00e9mon.\nHowever, it is very hardy and\ncan survive on little water.", - "category": "Fish Pok\u00e9mon" + "entry_text": "It is a shabby and ugly Pokémon.\nHowever, it is very hardy and\ncan survive on little water.", + "category": "Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/feebas/meson.build b/res/pokemon/feebas/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/feebas/meson.build +++ b/res/pokemon/feebas/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/feraligatr/data.json b/res/pokemon/feraligatr/data.json index e6e5677fa1..944a056df3 100644 --- a/res/pokemon/feraligatr/data.json +++ b/res/pokemon/feraligatr/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -135,13 +133,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 2, "entry_text": "It usually moves slowly, but it\ngoes at blinding speed when it\nattacks and bites prey.", - "category": "Big Jaw Pok\u00e9mon" + "category": "Big Jaw Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/feraligatr/meson.build b/res/pokemon/feraligatr/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/feraligatr/meson.build +++ b/res/pokemon/feraligatr/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/finneon/data.json b/res/pokemon/finneon/data.json index c50dcc2c9c..65b89d9b93 100644 --- a/res/pokemon/finneon/data.json +++ b/res/pokemon/finneon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_STORM_DRAIN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65534, "entry_text": "The line running down its side can\nstore sunlight. It shines vividly at\nnight.", - "category": "Wing Fish Pok\u00e9mon" + "category": "Wing Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3344 } -} \ No newline at end of file +} diff --git a/res/pokemon/finneon/meson.build b/res/pokemon/finneon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/finneon/meson.build +++ b/res/pokemon/finneon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/flaaffy/data.json b/res/pokemon/flaaffy/data.json index 589d591d94..324154436b 100644 --- a/res/pokemon/flaaffy/data.json +++ b/res/pokemon/flaaffy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "If its coat becomes fully charged\nwith electricity, its tail lights up.\nIt fires hair that zaps on impact.", - "category": "Wool Pok\u00e9mon" + "category": "Wool Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/flaaffy/meson.build b/res/pokemon/flaaffy/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/flaaffy/meson.build +++ b/res/pokemon/flaaffy/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/flareon/data.json b/res/pokemon/flareon/data.json index 29a3d4b9d9..5c1e2e10a0 100644 --- a/res/pokemon/flareon/data.json +++ b/res/pokemon/flareon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -111,13 +109,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "Inhaled air is heated in the flame\nsac in its body to an intense fire\nover 3,000 degrees Fahrenheit.", - "category": "Flame Pok\u00e9mon" + "category": "Flame Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/flareon/meson.build b/res/pokemon/flareon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/flareon/meson.build +++ b/res/pokemon/flareon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/floatzel/data.json b/res/pokemon/floatzel/data.json index 00dd39021e..3be67c2bd7 100644 --- a/res/pokemon/floatzel/data.json +++ b/res/pokemon/floatzel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "It is a common sight around\nfishing ports. It is known to\nrescue people and carry off prey.", - "category": "Sea Weasel Pok\u00e9mon" + "category": "Sea Weasel Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4364 } -} \ No newline at end of file +} diff --git a/res/pokemon/floatzel/meson.build b/res/pokemon/floatzel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/floatzel/meson.build +++ b/res/pokemon/floatzel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/flygon/data.json b/res/pokemon/flygon/data.json index 634790ea77..a9f6bf7baa 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_LEVITATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SONIC_BOOM" ], @@ -125,14 +123,14 @@ "pokemon_pos_f": 1, "trainer_pos_m": 16, "pokemon_pos_m": 1, - "entry_text": "It whips up sandstorms with\npowerful flaps of its wings. It is\nknown as \u201cThe Desert Spirit.\u201d", - "category": "Mystic Pok\u00e9mon" + "entry_text": "It whips up sandstorms with\npowerful flaps of its wings. It is\nknown as “The Desert Spirit.”", + "category": "Mystic Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3848 } -} \ No newline at end of file +} diff --git a/res/pokemon/flygon/meson.build b/res/pokemon/flygon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/flygon/meson.build +++ b/res/pokemon/flygon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/form_registry.json b/res/pokemon/form_registry.json new file mode 100644 index 0000000000..e39acadcf5 --- /dev/null +++ b/res/pokemon/form_registry.json @@ -0,0 +1,104 @@ +{ + "deoxys": { + "attack": "data", + "defense": "data", + "speed": "data", + "__shared_palette": true + }, + "unown": { + "b": "icon", + "c": "icon", + "d": "icon", + "e": "icon", + "f": "icon", + "g": "icon", + "h": "icon", + "i": "icon", + "j": "icon", + "k": "icon", + "l": "icon", + "m": "icon", + "n": "icon", + "o": "icon", + "p": "icon", + "q": "icon", + "r": "icon", + "s": "icon", + "t": "icon", + "u": "icon", + "v": "icon", + "w": "icon", + "x": "icon", + "y": "icon", + "z": "icon", + "exc": "icon", + "que": "icon", + "__shared_palette": true, + "__dupe_base_icon": true + }, + "castform": { + "sunny": "sprite", + "rainy": "sprite", + "snowy": "sprite", + "__all_back_then_front": true, + "__all_normal_then_shiny": true + }, + "burmy": { + "sandy": "icon", + "trash": "icon" + }, + "wormadam": { + "sandy": "data", + "trash": "data" + }, + "shellos": { + "east_sea": "icon", + "__all_back_then_front": true + }, + "gastrodon": { + "east_sea": "icon", + "__all_back_then_front": true + }, + "cherrim": { + "sunny": "sprite", + "__all_back_then_front": true, + "__all_normal_then_shiny": true + }, + "arceus": { + "fighting": "sprite", + "flying": "sprite", + "poison": "sprite", + "ground": "sprite", + "rock": "sprite", + "bug": "sprite", + "ghost": "sprite", + "steel": "sprite", + "mystery": "sprite", + "fire": "sprite", + "water": "sprite", + "grass": "sprite", + "electric": "sprite", + "psychic": "sprite", + "ice": "sprite", + "dragon": "sprite", + "dark": "sprite" + }, + "egg": { + "manaphy": "sprite", + "__front_only": true + }, + "giratina": { + "origin": "data", + "__last_sprite": true + }, + "shaymin": { + "sky": "data" + }, + "rotom": { + "heat": "data", + "wash": "data", + "frost": "data", + "fan": "data", + "mow": "data" + } +} diff --git a/res/pokemon/forretress/data.json b/res/pokemon/forretress/data.json index 63e7050c0d..0924d0cdc7 100644 --- a/res/pokemon/forretress/data.json +++ b/res/pokemon/forretress/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TOXIC_SPIKES" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "It is encased in a steel shell. Its\npeering eyes are all that can be\nseen of its mysterious innards.", - "category": "Bagworm Pok\u00e9mon" + "category": "Bagworm Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3588 } -} \ No newline at end of file +} diff --git a/res/pokemon/forretress/meson.build b/res/pokemon/forretress/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/forretress/meson.build +++ b/res/pokemon/forretress/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/froslass/data.json b/res/pokemon/froslass/data.json index 56991a9c93..afdcfd35da 100644 --- a/res/pokemon/froslass/data.json +++ b/res/pokemon/froslass/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_SNOW_CLOAK", "ABILITY_SNOW_CLOAK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWDER_SNOW" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "It freezes prey by blowing its -58\ndegrees F breath. It is said to\nthen secretly display its prey.", - "category": "Snow Land Pok\u00e9mon" + "category": "Snow Land Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3085 } -} \ No newline at end of file +} diff --git a/res/pokemon/froslass/meson.build b/res/pokemon/froslass/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/froslass/meson.build +++ b/res/pokemon/froslass/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/furret/data.json b/res/pokemon/furret/data.json index 953d282e1f..74051151ff 100644 --- a/res/pokemon/furret/data.json +++ b/res/pokemon/furret/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_KEEN_EYE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "The mother puts its offspring to\nsleep by curling up around them.\nIt corners foes with speed.", - "category": "Long Body Pok\u00e9mon" + "category": "Long Body Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/furret/meson.build b/res/pokemon/furret/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/furret/meson.build +++ b/res/pokemon/furret/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gabite/data.json b/res/pokemon/gabite/data.json index 334071771b..1f6b95a6b8 100644 --- a/res/pokemon/gabite/data.json +++ b/res/pokemon/gabite/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "It loves sparkly things. It seeks\ntreasures in caves and hoards the\nloot in its nest.", - "category": "Cave Pok\u00e9mon" + "category": "Cave Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4102 } -} \ No newline at end of file +} diff --git a/res/pokemon/gabite/meson.build b/res/pokemon/gabite/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gabite/meson.build +++ b/res/pokemon/gabite/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gallade/data.json b/res/pokemon/gallade/data.json index b08f62bf32..79a5749723 100644 --- a/res/pokemon/gallade/data.json +++ b/res/pokemon/gallade/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STEADFAST", "ABILITY_STEADFAST" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEAF_BLADE" ], @@ -150,13 +148,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "When trying to protect someone,\nit extends its elbows as if they\nwere swords and fights savagely.", - "category": "Blade Pok\u00e9mon" + "category": "Blade Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2314 } -} \ No newline at end of file +} diff --git a/res/pokemon/gallade/meson.build b/res/pokemon/gallade/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/gallade/meson.build +++ b/res/pokemon/gallade/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/garchomp/data.json b/res/pokemon/garchomp/data.json index d1aca84859..0324635cb9 100644 --- a/res/pokemon/garchomp/data.json +++ b/res/pokemon/garchomp/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_FANG" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 14, "pokemon_pos_m": 1, "entry_text": "It is said that when one runs at\nhigh speed, its wings create blades\nof wind that can fell nearby trees.", - "category": "Mach Pok\u00e9mon" + "category": "Mach Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 2310 } -} \ No newline at end of file +} diff --git a/res/pokemon/garchomp/meson.build b/res/pokemon/garchomp/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/garchomp/meson.build +++ b/res/pokemon/garchomp/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gardevoir/data.json b/res/pokemon/gardevoir/data.json index afbcfac8d9..436153b5a2 100644 --- a/res/pokemon/gardevoir/data.json +++ b/res/pokemon/gardevoir/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_TRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HEALING_WISH" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 2, "entry_text": "To protect its Trainer, it will\nexpend all its psychic power\nto create a small black hole.", - "category": "Embrace Pok\u00e9mon" + "category": "Embrace Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/gardevoir/meson.build b/res/pokemon/gardevoir/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gardevoir/meson.build +++ b/res/pokemon/gardevoir/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gastly/data.json b/res/pokemon/gastly/data.json index 80844822cc..3cfdf48eb7 100644 --- a/res/pokemon/gastly/data.json +++ b/res/pokemon/gastly/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HYPNOSIS" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65534, "entry_text": "Born from gases, anyone would\nfaint if engulfed by its gaseous\nbody, which contains poison.", - "category": "Gas Pok\u00e9mon" + "category": "Gas Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1548 } -} \ No newline at end of file +} diff --git a/res/pokemon/gastly/meson.build b/res/pokemon/gastly/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gastly/meson.build +++ b/res/pokemon/gastly/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gastrodon/data.json b/res/pokemon/gastrodon/data.json index 029289b8f7..307a5df706 100644 --- a/res/pokemon/gastrodon/data.json +++ b/res/pokemon/gastrodon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STICKY_HOLD", "ABILITY_STORM_DRAIN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SLAP" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "Long ago, its entire back was\nshielded with a sturdy shell. There\nare traces of it left in its cells.", - "category": "Sea Slug Pok\u00e9mon" + "category": "Sea Slug Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/gastrodon/meson.build b/res/pokemon/gastrodon/meson.build index 7657f2933c..dae3d97dee 100644 --- a/res/pokemon/gastrodon/meson.build +++ b/res/pokemon/gastrodon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') gastrodon_east_sea_icon = files('forms/east_sea/icon.png') diff --git a/res/pokemon/gengar/data.json b/res/pokemon/gengar/data.json index 42f84601ad..ce7bed1dc1 100644 --- a/res/pokemon/gengar/data.json +++ b/res/pokemon/gengar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HYPNOSIS" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65535, "entry_text": "The leer that floats in darkness\nbelongs to a GENGAR delighting in\ncasting curses on people.", - "category": "Shadow Pok\u00e9mon" + "category": "Shadow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1548 } -} \ No newline at end of file +} diff --git a/res/pokemon/gengar/meson.build b/res/pokemon/gengar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gengar/meson.build +++ b/res/pokemon/gengar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/geodude/data.json b/res/pokemon/geodude/data.json index 35136112e3..fba4097f23 100644 --- a/res/pokemon/geodude/data.json +++ b/res/pokemon/geodude/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "At rest, it looks just like a rock.\nCarelessly stepping on it will make\nit swing its fists angrily.", - "category": "Rock Pok\u00e9mon" + "category": "Rock Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/geodude/meson.build b/res/pokemon/geodude/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/geodude/meson.build +++ b/res/pokemon/geodude/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gible/data.json b/res/pokemon/gible/data.json index 1f401c00a1..5b6fb83da3 100644 --- a/res/pokemon/gible/data.json +++ b/res/pokemon/gible/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "It attacks using its huge mouth.\nWhile its attacks are powerful, it\nhurts itself out of clumsiness, too.", - "category": "Land Shark Pok\u00e9mon" + "category": "Land Shark Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1030 } -} \ No newline at end of file +} diff --git a/res/pokemon/gible/meson.build b/res/pokemon/gible/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gible/meson.build +++ b/res/pokemon/gible/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/girafarig/data.json b/res/pokemon/girafarig/data.json index 0b90c61dab..ed90b3752b 100644 --- a/res/pokemon/girafarig/data.json +++ b/res/pokemon/girafarig/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWER_SWAP" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "The head on its tail contains a\nsmall brain. It can instinctively\nfight even while facing backward.", - "category": "Long Neck Pok\u00e9mon" + "category": "Long Neck Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2565 } -} \ No newline at end of file +} diff --git a/res/pokemon/girafarig/meson.build b/res/pokemon/girafarig/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/girafarig/meson.build +++ b/res/pokemon/girafarig/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/giratina/data.json b/res/pokemon/giratina/data.json index 04bdfa78e2..4d2fb0e3ff 100644 --- a/res/pokemon/giratina/data.json +++ b/res/pokemon/giratina/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DRAGON_BREATH" ], @@ -135,7 +133,7 @@ "trainer_pos_m": 23, "pokemon_pos_m": 1, "entry_text": "It was banished for its violence.\nIt silently gazed upon the old\nworld from the Distortion World.", - "category": "Renegade Pok\u00e9mon" + "category": "Renegade Pokémon" }, { "height": 45, @@ -152,11 +150,11 @@ "entry_text": "It was banished for its violence.\nIt silently gazed upon the old\nworld from the Distortion World." } ], - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3852 } -} \ No newline at end of file +} diff --git a/res/pokemon/giratina/forms/origin/data.json b/res/pokemon/giratina/forms/origin/data.json index e5e2cc7a3d..91a0d42dbd 100644 --- a/res/pokemon/giratina/forms/origin/data.json +++ b/res/pokemon/giratina/forms/origin/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DRAGON_BREATH" ], diff --git a/res/pokemon/giratina/meson.build b/res/pokemon/giratina/meson.build index 17ae98d327..90214c310a 100644 --- a/res/pokemon/giratina/meson.build +++ b/res/pokemon/giratina/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') giratina_origin_personal = files('forms/origin/data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/glaceon/data.json b/res/pokemon/glaceon/data.json index b91c7b8596..b92456b3e7 100644 --- a/res/pokemon/glaceon/data.json +++ b/res/pokemon/glaceon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SNOW_CLOAK", "ABILITY_SNOW_CLOAK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "By controlling its body heat, it can\nfreeze the atmosphere around it\nto make a diamond-dust flurry.", - "category": "Fresh Snow Pok\u00e9mon" + "category": "Fresh Snow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3341 } -} \ No newline at end of file +} diff --git a/res/pokemon/glaceon/meson.build b/res/pokemon/glaceon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/glaceon/meson.build +++ b/res/pokemon/glaceon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/glalie/data.json b/res/pokemon/glalie/data.json index 0d0e8ac9e5..9bae598c49 100644 --- a/res/pokemon/glalie/data.json +++ b/res/pokemon/glalie/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_ICE_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWDER_SNOW" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65535, "entry_text": "It prevents prey from escaping by\ninstantaneously freezing moisture\nin the air.", - "category": "Face Pok\u00e9mon" + "category": "Face Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3341 } -} \ No newline at end of file +} diff --git a/res/pokemon/glalie/meson.build b/res/pokemon/glalie/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/glalie/meson.build +++ b/res/pokemon/glalie/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/glameow/data.json b/res/pokemon/glameow/data.json index a03304f649..dd68e07185 100644 --- a/res/pokemon/glameow/data.json +++ b/res/pokemon/glameow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIMBER", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FAKE_OUT" ], @@ -121,14 +119,14 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "It hides its spiteful tendency of\nhooking its claws into the nose of\nits Trainer if it isn\u2019t fed.", - "category": "Catty Pok\u00e9mon" + "entry_text": "It hides its spiteful tendency of\nhooking its claws into the nose of\nits Trainer if it isn’t fed.", + "category": "Catty Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4102 } -} \ No newline at end of file +} diff --git a/res/pokemon/glameow/meson.build b/res/pokemon/glameow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/glameow/meson.build +++ b/res/pokemon/glameow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gligar/data.json b/res/pokemon/gligar/data.json index 25f7d7b4f0..9530d8d0c8 100644 --- a/res/pokemon/gligar/data.json +++ b/res/pokemon/gligar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_SAND_VEIL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_STING" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65533, "entry_text": "It glides as if sliding. It startles\nfoes by clamping on to their faces,\nthen jabs with its poison stinger.", - "category": "FlyScorpion Pok\u00e9mon" + "category": "FlyScorpion Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4360 } -} \ No newline at end of file +} diff --git a/res/pokemon/gligar/meson.build b/res/pokemon/gligar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gligar/meson.build +++ b/res/pokemon/gligar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gliscor/data.json b/res/pokemon/gliscor/data.json index bd6c55cd58..2fc1df7178 100644 --- a/res/pokemon/gliscor/data.json +++ b/res/pokemon/gliscor/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_SAND_VEIL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_FANG" ], @@ -135,13 +133,13 @@ "trainer_pos_m": 10, "pokemon_pos_m": 0, "entry_text": "If it succeeds in catching even a\nfaint breeze properly, it can circle\nthe globe without flapping once.", - "category": "Fang Scorp Pok\u00e9mon" + "category": "Fang Scorp Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4360 } -} \ No newline at end of file +} diff --git a/res/pokemon/gliscor/meson.build b/res/pokemon/gliscor/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gliscor/meson.build +++ b/res/pokemon/gliscor/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gloom/data.json b/res/pokemon/gloom/data.json index d1686152ed..d14589bd72 100644 --- a/res/pokemon/gloom/data.json +++ b/res/pokemon/gloom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "The honey it drools from its mouth\nsmells so atrocious, it can curl\nnoses more than a mile away.", - "category": "Weed Pok\u00e9mon" + "category": "Weed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/gloom/meson.build b/res/pokemon/gloom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gloom/meson.build +++ b/res/pokemon/gloom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/golbat/data.json b/res/pokemon/golbat/data.json index 73dfd7e95c..d26c4ce59a 100644 --- a/res/pokemon/golbat/data.json +++ b/res/pokemon/golbat/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCREECH" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "Its sharp fangs puncture the\ntoughest of hides and have small\nholes for greedily sucking blood.", - "category": "Bat Pok\u00e9mon" + "category": "Bat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4358 } -} \ No newline at end of file +} diff --git a/res/pokemon/golbat/meson.build b/res/pokemon/golbat/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/golbat/meson.build +++ b/res/pokemon/golbat/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/goldeen/data.json b/res/pokemon/goldeen/data.json index 7e3a781e6a..14a691f4ae 100644 --- a/res/pokemon/goldeen/data.json +++ b/res/pokemon/goldeen/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_WATER_VEIL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "Though it appears very elegant\nwhen swimming with fins unfurled, it\ncan jab powerfully with its horn.", - "category": "Goldfish Pok\u00e9mon" + "category": "Goldfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/goldeen/meson.build b/res/pokemon/goldeen/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/goldeen/meson.build +++ b/res/pokemon/goldeen/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/golduck/data.json b/res/pokemon/golduck/data.json index d5e6c2ebd3..b7db62c3ee 100644 --- a/res/pokemon/golduck/data.json +++ b/res/pokemon/golduck/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", "ABILITY_CLOUD_NINE" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_AQUA_JET" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 8, "entry_text": "It is seen swimming dynamically and\nelegantly using its well-developed\nlimbs and flippers.", - "category": "Duck Pok\u00e9mon" + "category": "Duck Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/golduck/meson.build b/res/pokemon/golduck/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/golduck/meson.build +++ b/res/pokemon/golduck/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/golem/data.json b/res/pokemon/golem/data.json index cfb16ff0b9..1687348643 100644 --- a/res/pokemon/golem/data.json +++ b/res/pokemon/golem/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -124,14 +122,14 @@ "pokemon_pos_f": 7, "trainer_pos_m": 9, "pokemon_pos_m": 7, - "entry_text": "Even dynamite can\u2019t harm its hard,\nboulderlike body. It sheds its hide\njust once a year.", - "category": "Megaton Pok\u00e9mon" + "entry_text": "Even dynamite can’t harm its hard,\nboulderlike body. It sheds its hide\njust once a year.", + "category": "Megaton Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/golem/meson.build b/res/pokemon/golem/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/golem/meson.build +++ b/res/pokemon/golem/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gorebyss/data.json b/res/pokemon/gorebyss/data.json index e748c6ac24..17d528d866 100644 --- a/res/pokemon/gorebyss/data.json +++ b/res/pokemon/gorebyss/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WHIRLPOOL" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "It lives at the bottom of the sea.\nIn the springtime, its pink body\nturns more vivid for some reason.", - "category": "South Sea Pok\u00e9mon" + "category": "South Sea Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/gorebyss/meson.build b/res/pokemon/gorebyss/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gorebyss/meson.build +++ b/res/pokemon/gorebyss/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/granbull/data.json b/res/pokemon/granbull/data.json index 88c52ce6d8..7a065022eb 100644 --- a/res/pokemon/granbull/data.json +++ b/res/pokemon/granbull/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_QUICK_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "It is timid in spite of its looks.\nIf it becomes enraged, however,\nit will strike with its huge fangs.", - "category": "Fairy Pok\u00e9mon" + "category": "Fairy Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/granbull/meson.build b/res/pokemon/granbull/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/granbull/meson.build +++ b/res/pokemon/granbull/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/graveler/data.json b/res/pokemon/graveler/data.json index 4ec8b6d48d..1366d433fd 100644 --- a/res/pokemon/graveler/data.json +++ b/res/pokemon/graveler/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -120,14 +118,14 @@ "pokemon_pos_f": 10, "trainer_pos_m": 9, "pokemon_pos_m": 10, - "entry_text": "It rolls on mountain paths to move.\nOnce it builds momentum, no Pok\u00e9mon\ncan stop it without difficulty.", - "category": "Rock Pok\u00e9mon" + "entry_text": "It rolls on mountain paths to move.\nOnce it builds momentum, no Pokémon\ncan stop it without difficulty.", + "category": "Rock Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/graveler/meson.build b/res/pokemon/graveler/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/graveler/meson.build +++ b/res/pokemon/graveler/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/grimer/data.json b/res/pokemon/grimer/data.json index b8ddc879cf..6802f996c2 100644 --- a/res/pokemon/grimer/data.json +++ b/res/pokemon/grimer/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STENCH", "ABILITY_STICKY_HOLD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_GAS" ], @@ -122,14 +120,14 @@ "pokemon_pos_f": 17, "trainer_pos_m": 9, "pokemon_pos_m": 17, - "entry_text": "It was born when sludge in a dirty\nstream was exposed to the moon\u2019s\nX-rays. It appears among filth.", - "category": "Sludge Pok\u00e9mon" + "entry_text": "It was born when sludge in a dirty\nstream was exposed to the moon’s\nX-rays. It appears among filth.", + "category": "Sludge Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/grimer/meson.build b/res/pokemon/grimer/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/grimer/meson.build +++ b/res/pokemon/grimer/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/grotle/data.json b/res/pokemon/grotle/data.json index 8565e208a9..1a84ee7d3b 100644 --- a/res/pokemon/grotle/data.json +++ b/res/pokemon/grotle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 14, "trainer_pos_m": 9, "pokemon_pos_m": 14, - "entry_text": "It knows where pure water wells\nup. It carries fellow Pok\u00e9mon there\non its back.", - "category": "Grove Pok\u00e9mon" + "entry_text": "It knows where pure water wells\nup. It carries fellow Pokémon there\non its back.", + "category": "Grove Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/grotle/meson.build b/res/pokemon/grotle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/grotle/meson.build +++ b/res/pokemon/grotle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/groudon/data.json b/res/pokemon/groudon/data.json index 0efe9f3a67..f06112981c 100644 --- a/res/pokemon/groudon/data.json +++ b/res/pokemon/groudon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_DROUGHT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SHOT" ], @@ -133,13 +131,13 @@ "trainer_pos_m": 23, "pokemon_pos_m": 3, "entry_text": "It had been asleep in underground\nmagma ever since it fiercely\nfought KYOGRE long ago.", - "category": "Continent Pok\u00e9mon" + "category": "Continent Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/groudon/meson.build b/res/pokemon/groudon/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/groudon/meson.build +++ b/res/pokemon/groudon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/grovyle/data.json b/res/pokemon/grovyle/data.json index 7f2680998b..552f9c722e 100644 --- a/res/pokemon/grovyle/data.json +++ b/res/pokemon/grovyle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "It lives in dense jungles. While \nclosing in on its prey, it leaps\nfrom branch to branch.", - "category": "Wood Gecko Pok\u00e9mon" + "category": "Wood Gecko Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/grovyle/meson.build b/res/pokemon/grovyle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/grovyle/meson.build +++ b/res/pokemon/grovyle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/growlithe/data.json b/res/pokemon/growlithe/data.json index b0cb1c0670..75212d05a2 100644 --- a/res/pokemon/growlithe/data.json +++ b/res/pokemon/growlithe/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -113,14 +111,14 @@ "pokemon_pos_f": 20, "trainer_pos_m": 9, "pokemon_pos_m": 20, - "entry_text": "A Pok\u00e9mon with a loyal nature.\nIt will remain motionless until it is\ngiven an order by its Trainer.", - "category": "Puppy Pok\u00e9mon" + "entry_text": "A Pokémon with a loyal nature.\nIt will remain motionless until it is\ngiven an order by its Trainer.", + "category": "Puppy Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/growlithe/meson.build b/res/pokemon/growlithe/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/growlithe/meson.build +++ b/res/pokemon/growlithe/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/grumpig/data.json b/res/pokemon/grumpig/data.json index 6a393bc561..bcc4e40d3b 100644 --- a/res/pokemon/grumpig/data.json +++ b/res/pokemon/grumpig/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -135,13 +133,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It uses black pearls to amplify its\npsycho-power. It does an odd\ndance to gain control over foes.", - "category": "Manipulate Pok\u00e9mon" + "category": "Manipulate Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/grumpig/meson.build b/res/pokemon/grumpig/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/grumpig/meson.build +++ b/res/pokemon/grumpig/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gulpin/data.json b/res/pokemon/gulpin/data.json index 253dab534c..36b579fd0e 100644 --- a/res/pokemon/gulpin/data.json +++ b/res/pokemon/gulpin/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LIQUID_OOZE", "ABILITY_STICKY_HOLD" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "Almost all its body is its stomach.\nIts harsh digestive juices quickly\ndissolve anything it swallows.", - "category": "Stomach Pok\u00e9mon" + "category": "Stomach Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/gulpin/meson.build b/res/pokemon/gulpin/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gulpin/meson.build +++ b/res/pokemon/gulpin/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/gyarados/data.json b/res/pokemon/gyarados/data.json index 23540b9bd0..87ccd093a8 100644 --- a/res/pokemon/gyarados/data.json +++ b/res/pokemon/gyarados/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THRASH" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 22, "pokemon_pos_m": 0, "entry_text": "Once it begins to rampage, a\nGYARADOS will burn everything\ndown, even in a harsh storm.", - "category": "Atrocious Pok\u00e9mon" + "category": "Atrocious Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, "unused": 4355 } -} \ No newline at end of file +} diff --git a/res/pokemon/gyarados/meson.build b/res/pokemon/gyarados/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/gyarados/meson.build +++ b/res/pokemon/gyarados/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/happiny/data.json b/res/pokemon/happiny/data.json index e86676fbeb..cfea73e688 100644 --- a/res/pokemon/happiny/data.json +++ b/res/pokemon/happiny/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_SERENE_GRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "It likes to carry around a small\nrock. It may wander around others\u2019\nfeet and cause them to stumble.", - "category": "Playhouse Pok\u00e9mon" + "entry_text": "It likes to carry around a small\nrock. It may wander around others’\nfeet and cause them to stumble.", + "category": "Playhouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/happiny/meson.build b/res/pokemon/happiny/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/happiny/meson.build +++ b/res/pokemon/happiny/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hariyama/data.json b/res/pokemon/hariyama/data.json index 5438c05988..07ce95a09d 100644 --- a/res/pokemon/hariyama/data.json +++ b/res/pokemon/hariyama/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_GUTS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BRINE" ], @@ -125,14 +123,14 @@ "pokemon_pos_f": 4, "trainer_pos_m": 12, "pokemon_pos_m": 4, - "entry_text": "It loves to match power with\nbig-bodied Pok\u00e9mon. It can knock a\ntruck flying with its arm thrusts.", - "category": "Arm Thrust Pok\u00e9mon" + "entry_text": "It loves to match power with\nbig-bodied Pokémon. It can knock a\ntruck flying with its arm thrusts.", + "category": "Arm Thrust Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/hariyama/meson.build b/res/pokemon/hariyama/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/hariyama/meson.build +++ b/res/pokemon/hariyama/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/haunter/data.json b/res/pokemon/haunter/data.json index 215f643856..515f7d3743 100644 --- a/res/pokemon/haunter/data.json +++ b/res/pokemon/haunter/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HYPNOSIS" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65530, "entry_text": "It likes to lurk in the dark and tap\nshoulders with a gaseous hand. Its\ntouch causes endless shuddering.", - "category": "Gas Pok\u00e9mon" + "category": "Gas Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1548 } -} \ No newline at end of file +} diff --git a/res/pokemon/haunter/meson.build b/res/pokemon/haunter/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/haunter/meson.build +++ b/res/pokemon/haunter/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/heatran/data.json b/res/pokemon/heatran/data.json index c78125258f..2925e78d61 100644 --- a/res/pokemon/heatran/data.json +++ b/res/pokemon/heatran/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ANCIENT_POWER" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 7, "pokemon_pos_m": 1, "entry_text": "Its body is made of rugged steel.\nHowever, it is partially melted in\nspots because of its own heat.", - "category": "Lava Dome Pok\u00e9mon" + "category": "Lava Dome Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/heatran/meson.build b/res/pokemon/heatran/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/heatran/meson.build +++ b/res/pokemon/heatran/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/heracross/data.json b/res/pokemon/heracross/data.json index 8f84207083..14160ae922 100644 --- a/res/pokemon/heracross/data.json +++ b/res/pokemon/heracross/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_GUTS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_NIGHT_SLASH" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "It loves sweet honey. To keep all\nthe honey to itself, it hurls rivals\naway with its prized horn.", - "category": "Single Horn Pok\u00e9mon" + "category": "Single Horn Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2308 } -} \ No newline at end of file +} diff --git a/res/pokemon/heracross/meson.build b/res/pokemon/heracross/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/heracross/meson.build +++ b/res/pokemon/heracross/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hippopotas/data.json b/res/pokemon/hippopotas/data.json index fc12d8c019..e458ddef27 100644 --- a/res/pokemon/hippopotas/data.json +++ b/res/pokemon/hippopotas/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_STREAM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -107,13 +105,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "It shuts its nostrils tight then\ntravels through sand as if walking.\nThey form colonies of around ten.", - "category": "Hippo Pok\u00e9mon" + "category": "Hippo Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/hippopotas/meson.build b/res/pokemon/hippopotas/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/hippopotas/meson.build +++ b/res/pokemon/hippopotas/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hippowdon/data.json b/res/pokemon/hippowdon/data.json index d4fa984202..8c83b66404 100644 --- a/res/pokemon/hippowdon/data.json +++ b/res/pokemon/hippowdon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_STREAM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 10, "pokemon_pos_m": 3, "entry_text": "It is surprisingly quick to anger.\nIt holds its mouth agape as a\ndisplay of its strength.", - "category": "Heavyweight Pok\u00e9mon" + "category": "Heavyweight Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 4355 } -} \ No newline at end of file +} diff --git a/res/pokemon/hippowdon/meson.build b/res/pokemon/hippowdon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/hippowdon/meson.build +++ b/res/pokemon/hippowdon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hitmonchan/data.json b/res/pokemon/hitmonchan/data.json index c2ed97b401..69a84b11ea 100644 --- a/res/pokemon/hitmonchan/data.json +++ b/res/pokemon/hitmonchan/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_IRON_FIST" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REVENGE" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "The arm-twisting punches it throws\npulverize even concrete. It rests\nafter three minutes of fighting.", - "category": "Punching Pok\u00e9mon" + "category": "Punching Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/hitmonchan/meson.build b/res/pokemon/hitmonchan/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/hitmonchan/meson.build +++ b/res/pokemon/hitmonchan/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hitmonlee/data.json b/res/pokemon/hitmonlee/data.json index a41584fcd4..8de88e78b3 100644 --- a/res/pokemon/hitmonlee/data.json +++ b/res/pokemon/hitmonlee/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_LIMBER", "ABILITY_RECKLESS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REVENGE" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "Its legs can stretch double.\nFirst-time foes are startled by\nits extensible reach.", - "category": "Kicking Pok\u00e9mon" + "category": "Kicking Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/hitmonlee/meson.build b/res/pokemon/hitmonlee/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/hitmonlee/meson.build +++ b/res/pokemon/hitmonlee/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hitmontop/data.json b/res/pokemon/hitmontop/data.json index 40707e4d9a..bea7fbbd6d 100644 --- a/res/pokemon/hitmontop/data.json +++ b/res/pokemon/hitmontop/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_TECHNICIAN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REVENGE" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "It fights while spinning like a top.\nThe centrifugal force boosts its\ndestructive power by ten.", - "category": "Handstand Pok\u00e9mon" + "category": "Handstand Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/hitmontop/meson.build b/res/pokemon/hitmontop/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/hitmontop/meson.build +++ b/res/pokemon/hitmontop/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ho_oh/data.json b/res/pokemon/ho_oh/data.json index e0fa22bf42..581679815a 100644 --- a/res/pokemon/ho_oh/data.json +++ b/res/pokemon/ho_oh/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WHIRLWIND" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 21, "pokemon_pos_m": 0, "entry_text": "Its feathers are in seven colors.\nIt is said that anyone seeing it is\npromised eternal happiness.", - "category": "Rainbow Pok\u00e9mon" + "category": "Rainbow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4354 } -} \ No newline at end of file +} diff --git a/res/pokemon/ho_oh/meson.build b/res/pokemon/ho_oh/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/ho_oh/meson.build +++ b/res/pokemon/ho_oh/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/honchkrow/data.json b/res/pokemon/honchkrow/data.json index 69dda2c535..ea3deae05a 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_SUPER_LUCK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -116,14 +114,14 @@ "pokemon_pos_f": 18, "trainer_pos_m": 9, "pokemon_pos_m": 18, - "entry_text": "If one utters a deep cry, many\nMURKROW gather quickly. For this,\nit is called \u201cSummoner of Night.\u201d", - "category": "Big Boss Pok\u00e9mon" + "entry_text": "If one utters a deep cry, many\nMURKROW gather quickly. For this,\nit is called “Summoner of Night.”", + "category": "Big Boss Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4368 } -} \ No newline at end of file +} diff --git a/res/pokemon/honchkrow/meson.build b/res/pokemon/honchkrow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/honchkrow/meson.build +++ b/res/pokemon/honchkrow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hoothoot/data.json b/res/pokemon/hoothoot/data.json index 68782a6064..8e88899c9a 100644 --- a/res/pokemon/hoothoot/data.json +++ b/res/pokemon/hoothoot/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_KEEN_EYE" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -120,14 +118,14 @@ "pokemon_pos_f": 21, "trainer_pos_m": 9, "pokemon_pos_m": 21, - "entry_text": "It marks time precisely. Some\ncountries consider it to be a wise\nfriend, versed in the world\u2019s ways.", - "category": "Owl Pok\u00e9mon" + "entry_text": "It marks time precisely. Some\ncountries consider it to be a wise\nfriend, versed in the world’s ways.", + "category": "Owl Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/hoothoot/meson.build b/res/pokemon/hoothoot/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/hoothoot/meson.build +++ b/res/pokemon/hoothoot/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hoppip/data.json b/res/pokemon/hoppip/data.json index b3c17f1ae6..d133af8e49 100644 --- a/res/pokemon/hoppip/data.json +++ b/res/pokemon/hoppip/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65530, "entry_text": "It drifts on winds. It is said that\nwhen HOPPIP gather in fields and\nmountains, spring is on the way.", - "category": "Cottonweed Pok\u00e9mon" + "category": "Cottonweed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4353 } -} \ No newline at end of file +} diff --git a/res/pokemon/hoppip/meson.build b/res/pokemon/hoppip/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/hoppip/meson.build +++ b/res/pokemon/hoppip/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/horsea/data.json b/res/pokemon/horsea/data.json index 0d4d405895..478ffed66f 100644 --- a/res/pokemon/horsea/data.json +++ b/res/pokemon/horsea/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_SNIPER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65530, "entry_text": "It makes its nest in the shade of\ncorals. If it senses danger, it\nspits murky ink and flees.", - "category": "Dragon Pok\u00e9mon" + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/horsea/meson.build b/res/pokemon/horsea/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/horsea/meson.build +++ b/res/pokemon/horsea/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/houndoom/data.json b/res/pokemon/houndoom/data.json index 4297a921f3..f38c25b598 100644 --- a/res/pokemon/houndoom/data.json +++ b/res/pokemon/houndoom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_EARLY_BIRD", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_FANG" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "The flames it breathes when angry\ncontain toxins. If they cause a\nburn, it will hurt forever.", - "category": "Dark Pok\u00e9mon" + "category": "Dark Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 528 } -} \ No newline at end of file +} diff --git a/res/pokemon/houndoom/meson.build b/res/pokemon/houndoom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/houndoom/meson.build +++ b/res/pokemon/houndoom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/houndour/data.json b/res/pokemon/houndour/data.json index 92d1da12af..dcb9dbb79b 100644 --- a/res/pokemon/houndour/data.json +++ b/res/pokemon/houndour/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_EARLY_BIRD", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "It is smart enough to hunt in\npacks. It uses a variety of cries\nfor communicating with others.", - "category": "Dark Pok\u00e9mon" + "category": "Dark Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 528 } -} \ No newline at end of file +} diff --git a/res/pokemon/houndour/meson.build b/res/pokemon/houndour/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/houndour/meson.build +++ b/res/pokemon/houndour/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/huntail/data.json b/res/pokemon/huntail/data.json index 7442f9f8d7..9578383907 100644 --- a/res/pokemon/huntail/data.json +++ b/res/pokemon/huntail/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WHIRLPOOL" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 0, "entry_text": "It lives deep in the sea. With a\ntail shaped like a small fish, it\nattracts unsuspecting prey.", - "category": "Deep Sea Pok\u00e9mon" + "category": "Deep Sea Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/huntail/meson.build b/res/pokemon/huntail/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/huntail/meson.build +++ b/res/pokemon/huntail/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/hypno/data.json b/res/pokemon/hypno/data.json index 277818a9f3..69b88dc1f5 100644 --- a/res/pokemon/hypno/data.json +++ b/res/pokemon/hypno/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_FOREWARN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_NIGHTMARE" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "Seeing its swinging pendulum can\ninduce sleep in three seconds,\neven in someone who just woke up.", - "category": "Hypnosis Pok\u00e9mon" + "category": "Hypnosis Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/hypno/meson.build b/res/pokemon/hypno/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/hypno/meson.build +++ b/res/pokemon/hypno/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/igglybuff/data.json b/res/pokemon/igglybuff/data.json index be94be55e5..5997e6fda9 100644 --- a/res/pokemon/igglybuff/data.json +++ b/res/pokemon/igglybuff/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": true - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SING" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 29, "entry_text": "It has a soft and bouncy body.\nOnce it starts bouncing, it\nbecomes impossible to stop.", - "category": "Balloon Pok\u00e9mon" + "category": "Balloon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/igglybuff/meson.build b/res/pokemon/igglybuff/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/igglybuff/meson.build +++ b/res/pokemon/igglybuff/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/illumise/data.json b/res/pokemon/illumise/data.json index 86c7bf7699..a795eef925 100644 --- a/res/pokemon/illumise/data.json +++ b/res/pokemon/illumise/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_TINTED_LENS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "With its sweet aroma, it guides\nVOLBEAT to draw signs with light in\nthe night sky.", - "category": "Firefly Pok\u00e9mon" + "category": "Firefly Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/illumise/meson.build b/res/pokemon/illumise/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/illumise/meson.build +++ b/res/pokemon/illumise/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/infernape/data.json b/res/pokemon/infernape/data.json index 18d956c1be..ee92f2590f 100644 --- a/res/pokemon/infernape/data.json +++ b/res/pokemon/infernape/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 13, "entry_text": "It uses unique fighting moves with\nfire on its hands and feet. It will\ntake on any opponent.", - "category": "Flame Pok\u00e9mon" + "category": "Flame Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2306 } -} \ No newline at end of file +} diff --git a/res/pokemon/infernape/meson.build b/res/pokemon/infernape/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/infernape/meson.build +++ b/res/pokemon/infernape/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ivysaur/data.json b/res/pokemon/ivysaur/data.json index 6f881f8b29..5812cc322b 100644 --- a/res/pokemon/ivysaur/data.json +++ b/res/pokemon/ivysaur/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 17, "trainer_pos_m": 9, "pokemon_pos_m": 17, - "entry_text": "When the bud on its back starts\nswelling, a sweet aroma wafts to\nindicate the flower\u2019s coming bloom.", - "category": "Seed Pok\u00e9mon" + "entry_text": "When the bud on its back starts\nswelling, a sweet aroma wafts to\nindicate the flower’s coming bloom.", + "category": "Seed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/ivysaur/meson.build b/res/pokemon/ivysaur/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ivysaur/meson.build +++ b/res/pokemon/ivysaur/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/jigglypuff/data.json b/res/pokemon/jigglypuff/data.json index 9981f07954..d8c7b8f0f8 100644 --- a/res/pokemon/jigglypuff/data.json +++ b/res/pokemon/jigglypuff/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SING" ], @@ -139,13 +137,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "When it wavers its big, round\neyes, it begins singing a lullaby\nthat makes everyone drowsy.", - "category": "Balloon Pok\u00e9mon" + "category": "Balloon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/jigglypuff/meson.build b/res/pokemon/jigglypuff/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/jigglypuff/meson.build +++ b/res/pokemon/jigglypuff/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/jirachi/data.json b/res/pokemon/jirachi/data.json index 993a54ffa4..2f15a95c8c 100644 --- a/res/pokemon/jirachi/data.json +++ b/res/pokemon/jirachi/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SERENE_GRACE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WISH" ], @@ -137,13 +135,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65518, "entry_text": "It is said to have the ability to\ngrant any wish for just one week\nevery thousand years.", - "category": "Wish Pok\u00e9mon" + "category": "Wish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/jirachi/meson.build b/res/pokemon/jirachi/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/jirachi/meson.build +++ b/res/pokemon/jirachi/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/jolteon/data.json b/res/pokemon/jolteon/data.json index 55b2145794..18bd4eadb0 100644 --- a/res/pokemon/jolteon/data.json +++ b/res/pokemon/jolteon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VOLT_ABSORB", "ABILITY_VOLT_ABSORB" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "If agitated, it uses electricity to\nstraighten out its fur and launch\nit in small bunches.", - "category": "Lightning Pok\u00e9mon" + "category": "Lightning Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/jolteon/meson.build b/res/pokemon/jolteon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/jolteon/meson.build +++ b/res/pokemon/jolteon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/jumpluff/data.json b/res/pokemon/jumpluff/data.json index f6cb166af9..14b9b5791a 100644 --- a/res/pokemon/jumpluff/data.json +++ b/res/pokemon/jumpluff/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "Blown by seasonal winds, it\ncircles the globe, scattering\ncotton spores as it goes.", - "category": "Cottonweed Pok\u00e9mon" + "category": "Cottonweed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4353 } -} \ No newline at end of file +} diff --git a/res/pokemon/jumpluff/meson.build b/res/pokemon/jumpluff/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/jumpluff/meson.build +++ b/res/pokemon/jumpluff/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/jynx/data.json b/res/pokemon/jynx/data.json index 69029a353a..ccbe4c6a41 100644 --- a/res/pokemon/jynx/data.json +++ b/res/pokemon/jynx/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_FOREWARN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "Its cries sound like human speech.\nHowever, it is impossible to tell\nwhat it is trying to say.", - "category": "Human Shape Pok\u00e9mon" + "category": "Human Shape Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2573 } -} \ No newline at end of file +} diff --git a/res/pokemon/jynx/meson.build b/res/pokemon/jynx/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/jynx/meson.build +++ b/res/pokemon/jynx/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kabuto/data.json b/res/pokemon/kabuto/data.json index a9d6aa321d..66fbbda8cf 100644 --- a/res/pokemon/kabuto/data.json +++ b/res/pokemon/kabuto/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_BATTLE_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 24, "entry_text": "It is thought to have inhabited\nbeaches 300 million years ago.\nIt is protected by a stiff shell.", - "category": "Shellfish Pok\u00e9mon" + "category": "Shellfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 779 } -} \ No newline at end of file +} diff --git a/res/pokemon/kabuto/meson.build b/res/pokemon/kabuto/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kabuto/meson.build +++ b/res/pokemon/kabuto/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kabutops/data.json b/res/pokemon/kabutops/data.json index d0dacb7548..f74b55fcce 100644 --- a/res/pokemon/kabutops/data.json +++ b/res/pokemon/kabutops/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_BATTLE_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FEINT" ], @@ -130,14 +128,14 @@ "pokemon_pos_f": 9, "trainer_pos_m": 9, "pokemon_pos_m": 9, - "entry_text": "It is thought that this Pok\u00e9mon\ncame onto land because its\nprey adapted to life on land.", - "category": "Shellfish Pok\u00e9mon" + "entry_text": "It is thought that this Pokémon\ncame onto land because its\nprey adapted to life on land.", + "category": "Shellfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 779 } -} \ No newline at end of file +} diff --git a/res/pokemon/kabutops/meson.build b/res/pokemon/kabutops/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kabutops/meson.build +++ b/res/pokemon/kabutops/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kadabra/data.json b/res/pokemon/kadabra/data.json index efbf2a633b..b3149f33f2 100644 --- a/res/pokemon/kadabra/data.json +++ b/res/pokemon/kadabra/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_INNER_FOCUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TELEPORT" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 11, "entry_text": "It stares at its silver spoon to\nfocus its mind. It emits more alpha\nwaves while doing so.", - "category": "Psi Pok\u00e9mon" + "category": "Psi Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/kadabra/meson.build b/res/pokemon/kadabra/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kadabra/meson.build +++ b/res/pokemon/kadabra/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kakuna/data.json b/res/pokemon/kakuna/data.json index abc12a43e2..9848fbe3ca 100644 --- a/res/pokemon/kakuna/data.json +++ b/res/pokemon/kakuna/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HARDEN" ], @@ -66,13 +64,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "While awaiting evolution, it\nhides from predators under\nleaves and in nooks of branches.", - "category": "Cocoon Pok\u00e9mon" + "category": "Cocoon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/kakuna/meson.build b/res/pokemon/kakuna/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kakuna/meson.build +++ b/res/pokemon/kakuna/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kangaskhan/data.json b/res/pokemon/kangaskhan/data.json index b072fb4818..5d20929fde 100644 --- a/res/pokemon/kangaskhan/data.json +++ b/res/pokemon/kangaskhan/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_EARLY_BIRD", "ABILITY_SCRAPPY" ], "safari_flee_rate": 150, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_COMET_PUNCH" ], @@ -140,13 +138,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 0, "entry_text": "It raises its offspring in its belly\npouch. It lets the baby out to\nplay only when it feels safe.", - "category": "Parent Pok\u00e9mon" + "category": "Parent Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/kangaskhan/meson.build b/res/pokemon/kangaskhan/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/kangaskhan/meson.build +++ b/res/pokemon/kangaskhan/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kecleon/data.json b/res/pokemon/kecleon/data.json index 2ddd06ca74..a256425a05 100644 --- a/res/pokemon/kecleon/data.json +++ b/res/pokemon/kecleon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_COLOR_CHANGE", "ABILITY_NONE" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THIEF" ], @@ -143,14 +141,14 @@ "pokemon_pos_f": 15, "trainer_pos_m": 9, "pokemon_pos_m": 15, - "entry_text": "It can freely change its body\u2019s\ncolor. The zigzag pattern on its\nbelly doesn\u2019t change, however.", - "category": "Color Swap Pok\u00e9mon" + "entry_text": "It can freely change its body’s\ncolor. The zigzag pattern on its\nbelly doesn’t change, however.", + "category": "Color Swap Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/kecleon/meson.build b/res/pokemon/kecleon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kecleon/meson.build +++ b/res/pokemon/kecleon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kingdra/data.json b/res/pokemon/kingdra/data.json index 0bb8387bc7..e0198c1b4c 100644 --- a/res/pokemon/kingdra/data.json +++ b/res/pokemon/kingdra/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_SNIPER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_YAWN" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 12, "pokemon_pos_m": 2, "entry_text": "It lives in caves on the seafloor\nand creates giant whirlpools\nevery time it moves.", - "category": "Dragon Pok\u00e9mon" + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 3843 } -} \ No newline at end of file +} diff --git a/res/pokemon/kingdra/meson.build b/res/pokemon/kingdra/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kingdra/meson.build +++ b/res/pokemon/kingdra/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kingler/data.json b/res/pokemon/kingler/data.json index 781395f792..2eae770ae8 100644 --- a/res/pokemon/kingler/data.json +++ b/res/pokemon/kingler/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": true - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SPORT" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 11, "entry_text": "The larger pincer has 10,000-\nhorsepower strength. However, it\nis so heavy, it is difficult to aim.", - "category": "Pincer Pok\u00e9mon" + "category": "Pincer Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/kingler/meson.build b/res/pokemon/kingler/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kingler/meson.build +++ b/res/pokemon/kingler/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kirlia/data.json b/res/pokemon/kirlia/data.json index b310402891..2161741190 100644 --- a/res/pokemon/kirlia/data.json +++ b/res/pokemon/kirlia/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_TRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -138,13 +136,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "If its Trainer becomes happy, it\noverflows with energy, dancing\njoyously while spinning about.", - "category": "Emotion Pok\u00e9mon" + "category": "Emotion Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/kirlia/meson.build b/res/pokemon/kirlia/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kirlia/meson.build +++ b/res/pokemon/kirlia/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/koffing/data.json b/res/pokemon/koffing/data.json index fbb4b4b756..f66c292dd2 100644 --- a/res/pokemon/koffing/data.json +++ b/res/pokemon/koffing/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_GAS" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "Lighter-than-air gases in its body\nkeep it aloft. The gases not only\nsmell, they are also explosive.", - "category": "Poison Gas Pok\u00e9mon" + "category": "Poison Gas Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/koffing/meson.build b/res/pokemon/koffing/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/koffing/meson.build +++ b/res/pokemon/koffing/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/krabby/data.json b/res/pokemon/krabby/data.json index 03ef7fd2f7..7f16c4f703 100644 --- a/res/pokemon/krabby/data.json +++ b/res/pokemon/krabby/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SPORT" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 30, "entry_text": "It lives in burrows dug on sandy\nbeaches. Its pincers fully grow\nback if they are broken in battle.", - "category": "River Crab Pok\u00e9mon" + "category": "River Crab Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/krabby/meson.build b/res/pokemon/krabby/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/krabby/meson.build +++ b/res/pokemon/krabby/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kricketot/data.json b/res/pokemon/kricketot/data.json index befea05579..9f380aed39 100644 --- a/res/pokemon/kricketot/data.json +++ b/res/pokemon/kricketot/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -72,13 +70,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "Its legs are short. Whenever it\nstumbles, its stiff antennae clack\nwith a xylophone-like sound.", - "category": "Cricket Pok\u00e9mon" + "category": "Cricket Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/kricketot/meson.build b/res/pokemon/kricketot/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kricketot/meson.build +++ b/res/pokemon/kricketot/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kricketune/data.json b/res/pokemon/kricketune/data.json index aa638ccd9d..1a7a397b68 100644 --- a/res/pokemon/kricketune/data.json +++ b/res/pokemon/kricketune/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -108,14 +106,14 @@ "pokemon_pos_f": 17, "trainer_pos_m": 9, "pokemon_pos_m": 17, - "entry_text": "There is a village that hosts a\ncontest based on the amazingly\nvariable cries of this Pok\u00e9mon.", - "category": "Cricket Pok\u00e9mon" + "entry_text": "There is a village that hosts a\ncontest based on the amazingly\nvariable cries of this Pokémon.", + "category": "Cricket Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/kricketune/meson.build b/res/pokemon/kricketune/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/kricketune/meson.build +++ b/res/pokemon/kricketune/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/kyogre/data.json b/res/pokemon/kyogre/data.json index 840b8a74d9..c698394b75 100644 --- a/res/pokemon/kyogre/data.json +++ b/res/pokemon/kyogre/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_DRIZZLE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_PULSE" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 26, "pokemon_pos_m": 0, "entry_text": "It is said to have widened the\nseas by causing downpours. It had\nbeen asleep in a marine trench.", - "category": "Sea Basin Pok\u00e9mon" + "category": "Sea Basin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/kyogre/meson.build b/res/pokemon/kyogre/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/kyogre/meson.build +++ b/res/pokemon/kyogre/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lairon/data.json b/res/pokemon/lairon/data.json index d1ef487dc6..21d2655192 100644 --- a/res/pokemon/lairon/data.json +++ b/res/pokemon/lairon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "For food, it digs up iron ore. It\nsmashes its steely body against\nothers to fight over territory.", - "category": "Iron Armor Pok\u00e9mon" + "category": "Iron Armor Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2830 } -} \ No newline at end of file +} diff --git a/res/pokemon/lairon/meson.build b/res/pokemon/lairon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lairon/meson.build +++ b/res/pokemon/lairon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lanturn/data.json b/res/pokemon/lanturn/data.json index 97b34571a5..a7042fa9fd 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_VOLT_ABSORB", "ABILITY_ILLUMINATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -116,14 +114,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "entry_text": "LANTURN\u2019s light can shine up from\ngreat depths. It is nicknamed\n\u201cThe Deep-Sea Star.\u201d", - "category": "Light Pok\u00e9mon" + "entry_text": "LANTURN’s light can shine up from\ngreat depths. It is nicknamed\n“The Deep-Sea Star.”", + "category": "Light Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 1795 } -} \ No newline at end of file +} diff --git a/res/pokemon/lanturn/meson.build b/res/pokemon/lanturn/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lanturn/meson.build +++ b/res/pokemon/lanturn/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lapras/data.json b/res/pokemon/lapras/data.json index 89284b4df5..5083ee685d 100644 --- a/res/pokemon/lapras/data.json +++ b/res/pokemon/lapras/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SING" ], @@ -121,14 +119,14 @@ "pokemon_pos_f": 7, "trainer_pos_m": 16, "pokemon_pos_m": 7, - "entry_text": "It loves crossing the sea with\npeople and Pok\u00e9mon on its back.\nIt understands human speech.", - "category": "Transport Pok\u00e9mon" + "entry_text": "It loves crossing the sea with\npeople and Pokémon on its back.\nIt understands human speech.", + "category": "Transport Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, "unused": 3331 } -} \ No newline at end of file +} diff --git a/res/pokemon/lapras/meson.build b/res/pokemon/lapras/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lapras/meson.build +++ b/res/pokemon/lapras/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/larvitar/data.json b/res/pokemon/larvitar/data.json index 971509205e..1bef929dd7 100644 --- a/res/pokemon/larvitar/data.json +++ b/res/pokemon/larvitar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_GUTS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -119,14 +117,14 @@ "pokemon_pos_f": 21, "trainer_pos_m": 9, "pokemon_pos_m": 21, - "entry_text": "A Pok\u00e9mon that eats soil. Once it\nhas eaten a large mountain, it\ngoes to sleep so it can grow.", - "category": "Rock Skin Pok\u00e9mon" + "entry_text": "A Pokémon that eats soil. Once it\nhas eaten a large mountain, it\ngoes to sleep so it can grow.", + "category": "Rock Skin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/larvitar/meson.build b/res/pokemon/larvitar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/larvitar/meson.build +++ b/res/pokemon/larvitar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/latias/data.json b/res/pokemon/latias/data.json index 043d82938c..298e3d7fc5 100644 --- a/res/pokemon/latias/data.json +++ b/res/pokemon/latias/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PSYWAVE" ], @@ -141,13 +139,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65534, "entry_text": "Its body is covered with a down\nthat can refract light in such a\nway that it becomes invisible.", - "category": "Eon Pok\u00e9mon" + "category": "Eon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2575 } -} \ No newline at end of file +} diff --git a/res/pokemon/latias/meson.build b/res/pokemon/latias/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/latias/meson.build +++ b/res/pokemon/latias/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/latios/data.json b/res/pokemon/latios/data.json index 68a1883430..975c6b27b8 100644 --- a/res/pokemon/latios/data.json +++ b/res/pokemon/latios/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PSYWAVE" ], @@ -139,14 +137,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "A highly intelligent Pok\u00e9mon.\nBy folding back its wings in flight,\nit can overtake jet planes.", - "category": "Eon Pok\u00e9mon" + "entry_text": "A highly intelligent Pokémon.\nBy folding back its wings in flight,\nit can overtake jet planes.", + "category": "Eon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2575 } -} \ No newline at end of file +} diff --git a/res/pokemon/latios/meson.build b/res/pokemon/latios/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/latios/meson.build +++ b/res/pokemon/latios/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/leafeon/data.json b/res/pokemon/leafeon/data.json index dabe716470..9e008fae5a 100644 --- a/res/pokemon/leafeon/data.json +++ b/res/pokemon/leafeon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LEAF_GUARD", "ABILITY_LEAF_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "It basically does not fight. With\ncells similar to those of plants, it\ncan perform photosynthesis.", - "category": "Verdant Pok\u00e9mon" + "category": "Verdant Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/leafeon/meson.build b/res/pokemon/leafeon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/leafeon/meson.build +++ b/res/pokemon/leafeon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ledian/data.json b/res/pokemon/ledian/data.json index 2dbe7100b4..e913fc1385 100644 --- a/res/pokemon/ledian/data.json +++ b/res/pokemon/ledian/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "It uses starlight as energy. When\nmore stars appear at night, the\npatterns on its back grow larger.", - "category": "Five Star Pok\u00e9mon" + "category": "Five Star Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/ledian/meson.build b/res/pokemon/ledian/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ledian/meson.build +++ b/res/pokemon/ledian/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ledyba/data.json b/res/pokemon/ledyba/data.json index 2b17744720..8ff78f974d 100644 --- a/res/pokemon/ledyba/data.json +++ b/res/pokemon/ledyba/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -121,14 +119,14 @@ "pokemon_pos_f": 65531, "trainer_pos_m": 9, "pokemon_pos_m": 65531, - "entry_text": "It is so timid, it can\u2019t move if it\nisn\u2019t with a swarm of others. It\nconveys its feelings with scent.", - "category": "Five Star Pok\u00e9mon" + "entry_text": "It is so timid, it can’t move if it\nisn’t with a swarm of others. It\nconveys its feelings with scent.", + "category": "Five Star Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/ledyba/meson.build b/res/pokemon/ledyba/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ledyba/meson.build +++ b/res/pokemon/ledyba/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lickilicky/data.json b/res/pokemon/lickilicky/data.json index 415103f602..8d30a3eadf 100644 --- a/res/pokemon/lickilicky/data.json +++ b/res/pokemon/lickilicky/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_OBLIVIOUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LICK" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65535, "entry_text": "The long tongue is always soggy\nwith slobber. The saliva contains\na solvent that causes numbness.", - "category": "Licking Pok\u00e9mon" + "category": "Licking Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/lickilicky/meson.build b/res/pokemon/lickilicky/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lickilicky/meson.build +++ b/res/pokemon/lickilicky/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lickitung/data.json b/res/pokemon/lickitung/data.json index 76c82cdcee..883f0937be 100644 --- a/res/pokemon/lickitung/data.json +++ b/res/pokemon/lickitung/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_OBLIVIOUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LICK" ], @@ -138,13 +136,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "When it extends its over-six-foot-\nlong tongue, its tail quivers. There\nis a possibility they are connected.", - "category": "Licking Pok\u00e9mon" + "category": "Licking Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/lickitung/meson.build b/res/pokemon/lickitung/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lickitung/meson.build +++ b/res/pokemon/lickitung/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lileep/data.json b/res/pokemon/lileep/data.json index 4a92c02822..2bde6a9578 100644 --- a/res/pokemon/lileep/data.json +++ b/res/pokemon/lileep/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SUCTION_CUPS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "It lived on the seafloor 100\nmillion years ago and was\nreanimated scientifically.", - "category": "Sea Lily Pok\u00e9mon" + "category": "Sea Lily Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 267 } -} \ No newline at end of file +} diff --git a/res/pokemon/lileep/meson.build b/res/pokemon/lileep/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lileep/meson.build +++ b/res/pokemon/lileep/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/linoone/data.json b/res/pokemon/linoone/data.json index 3b42e32027..be7dc29b8c 100644 --- a/res/pokemon/linoone/data.json +++ b/res/pokemon/linoone/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", "ABILITY_GLUTTONY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SWITCHEROO" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "It charges prey at speeds over\n60 mph. However, because it can\nonly run straight, it often fails.", - "category": "Rushing Pok\u00e9mon" + "category": "Rushing Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/linoone/meson.build b/res/pokemon/linoone/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/linoone/meson.build +++ b/res/pokemon/linoone/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lombre/data.json b/res/pokemon/lombre/data.json index f180c5e705..80ef3c69b0 100644 --- a/res/pokemon/lombre/data.json +++ b/res/pokemon/lombre/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_RAIN_DISH" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "It has a mischievous spirit. If it\nspots an angler, it will tug on the\nfishing line to interfere.", - "category": "Jolly Pok\u00e9mon" + "category": "Jolly Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 259 } -} \ No newline at end of file +} diff --git a/res/pokemon/lombre/meson.build b/res/pokemon/lombre/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lombre/meson.build +++ b/res/pokemon/lombre/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lopunny/data.json b/res/pokemon/lopunny/data.json index 55e957c722..4ca24056e5 100644 --- a/res/pokemon/lopunny/data.json +++ b/res/pokemon/lopunny/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_KLUTZ" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MIRROR_COAT" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "The ears appear to be delicate. If\nthey are touched roughly, it kicks\nwith its graceful legs.", - "category": "Rabbit Pok\u00e9mon" + "category": "Rabbit Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/lopunny/meson.build b/res/pokemon/lopunny/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lopunny/meson.build +++ b/res/pokemon/lopunny/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lotad/data.json b/res/pokemon/lotad/data.json index 73959abcbc..56b3ba539c 100644 --- a/res/pokemon/lotad/data.json +++ b/res/pokemon/lotad/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_RAIN_DISH" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -113,14 +111,14 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "It looks like an aquatic plant and\nserves as a ferry to Pok\u00e9mon\nthat can\u2019t swim.", - "category": "Water Weed Pok\u00e9mon" + "entry_text": "It looks like an aquatic plant and\nserves as a ferry to Pokémon\nthat can’t swim.", + "category": "Water Weed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 30, "rarity": 50, "unused": 259 } -} \ No newline at end of file +} diff --git a/res/pokemon/lotad/meson.build b/res/pokemon/lotad/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lotad/meson.build +++ b/res/pokemon/lotad/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/loudred/data.json b/res/pokemon/loudred/data.json index b0c6c186e4..a9431eb035 100644 --- a/res/pokemon/loudred/data.json +++ b/res/pokemon/loudred/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 13, "entry_text": "The shock waves from its cries can\ntip over trucks. It stamps its\nfeet to power up.", - "category": "Big Voice Pok\u00e9mon" + "category": "Big Voice Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/loudred/meson.build b/res/pokemon/loudred/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/loudred/meson.build +++ b/res/pokemon/loudred/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lucario/data.json b/res/pokemon/lucario/data.json index eb0d9cf8ef..192e5ee69c 100644 --- a/res/pokemon/lucario/data.json +++ b/res/pokemon/lucario/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_STEADFAST", "ABILITY_INNER_FOCUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DARK_PULSE" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "A well-trained one can sense auras\nto identify and take in the feelings\nof creatures over half a mile away.", - "category": "Aura Pok\u00e9mon" + "category": "Aura Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/lucario/meson.build b/res/pokemon/lucario/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lucario/meson.build +++ b/res/pokemon/lucario/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ludicolo/data.json b/res/pokemon/ludicolo/data.json index d52d9a8021..1d7a86373d 100644 --- a/res/pokemon/ludicolo/data.json +++ b/res/pokemon/ludicolo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_RAIN_DISH" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -116,14 +114,14 @@ "pokemon_pos_f": 3, "trainer_pos_m": 9, "pokemon_pos_m": 3, - "entry_text": "If it hears festive music, all its\nmuscles fill with energy. It can\u2019t\nhelp breaking out into a dance.", - "category": "Carefree Pok\u00e9mon" + "entry_text": "If it hears festive music, all its\nmuscles fill with energy. It can’t\nhelp breaking out into a dance.", + "category": "Carefree Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 259 } -} \ No newline at end of file +} diff --git a/res/pokemon/ludicolo/meson.build b/res/pokemon/ludicolo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ludicolo/meson.build +++ b/res/pokemon/ludicolo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lugia/data.json b/res/pokemon/lugia/data.json index 4166df96cf..2a50057719 100644 --- a/res/pokemon/lugia/data.json +++ b/res/pokemon/lugia/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WHIRLWIND" ], @@ -144,13 +142,13 @@ "trainer_pos_m": 26, "pokemon_pos_m": 0, "entry_text": "It sleeps in a deep-sea trench.\nIf it flaps its wings, it is said to\ncause a 40-day storm.", - "category": "Diving Pok\u00e9mon" + "category": "Diving Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4362 } -} \ No newline at end of file +} diff --git a/res/pokemon/lugia/meson.build b/res/pokemon/lugia/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/lugia/meson.build +++ b/res/pokemon/lugia/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lumineon/data.json b/res/pokemon/lumineon/data.json index 890c30dc79..c31ad4088c 100644 --- a/res/pokemon/lumineon/data.json +++ b/res/pokemon/lumineon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_STORM_DRAIN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "It crawls along the seafloor using\nits long front fins like legs. It\ncompetes for food with LANTURN.", - "category": "Neon Pok\u00e9mon" + "category": "Neon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/lumineon/meson.build b/res/pokemon/lumineon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/lumineon/meson.build +++ b/res/pokemon/lumineon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/lunatone/data.json b/res/pokemon/lunatone/data.json index 8fe39ff751..494a4826d5 100644 --- a/res/pokemon/lunatone/data.json +++ b/res/pokemon/lunatone/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "Because it turns active on nights\nof the full moon, it is said to have\nsome link to the lunar phases.", - "category": "Meteorite Pok\u00e9mon" + "category": "Meteorite Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2571 } -} \ No newline at end of file +} diff --git a/res/pokemon/lunatone/meson.build b/res/pokemon/lunatone/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/lunatone/meson.build +++ b/res/pokemon/lunatone/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/luvdisc/data.json b/res/pokemon/luvdisc/data.json index 027ae33856..aac88990af 100644 --- a/res/pokemon/luvdisc/data.json +++ b/res/pokemon/luvdisc/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -103,14 +101,14 @@ "pokemon_pos_f": 65527, "trainer_pos_m": 9, "pokemon_pos_m": 65527, - "entry_text": "It lives in warm seas. It is said\nthat a couple finding this Pok\u00e9mon\nwill be blessed with eternal love.", - "category": "Rendezvous Pok\u00e9mon" + "entry_text": "It lives in warm seas. It is said\nthat a couple finding this Pokémon\nwill be blessed with eternal love.", + "category": "Rendezvous Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/luvdisc/meson.build b/res/pokemon/luvdisc/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/luvdisc/meson.build +++ b/res/pokemon/luvdisc/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/luxio/data.json b/res/pokemon/luxio/data.json index 541500ca03..606408e44e 100644 --- a/res/pokemon/luxio/data.json +++ b/res/pokemon/luxio/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RIVALRY", "ABILITY_INTIMIDATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "Strong electricity courses through\nthe tips of its sharp claws. A light\nscratch causes fainting in foes.", - "category": "Spark Pok\u00e9mon" + "category": "Spark Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/luxio/meson.build b/res/pokemon/luxio/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/luxio/meson.build +++ b/res/pokemon/luxio/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/luxray/data.json b/res/pokemon/luxray/data.json index ca23c9dbdc..41ab99cd51 100644 --- a/res/pokemon/luxray/data.json +++ b/res/pokemon/luxray/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RIVALRY", "ABILITY_INTIMIDATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "It can see clearly through walls\nto track down its prey and seek\nits lost young.", - "category": "Gleam Eyes Pok\u00e9mon" + "category": "Gleam Eyes Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/luxray/meson.build b/res/pokemon/luxray/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/luxray/meson.build +++ b/res/pokemon/luxray/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/machamp/data.json b/res/pokemon/machamp/data.json index 3ce0426b07..597fcee22d 100644 --- a/res/pokemon/machamp/data.json +++ b/res/pokemon/machamp/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_GUTS", "ABILITY_NO_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LOW_KICK" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 3, "entry_text": "Its four muscled arms slam foes\nwith powerful punches and chops\nat blinding speed.", - "category": "Superpower Pok\u00e9mon" + "category": "Superpower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/machamp/meson.build b/res/pokemon/machamp/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/machamp/meson.build +++ b/res/pokemon/machamp/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/machoke/data.json b/res/pokemon/machoke/data.json index e96cc94903..38e8d2835f 100644 --- a/res/pokemon/machoke/data.json +++ b/res/pokemon/machoke/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_GUTS", "ABILITY_NO_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": true - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_LOW_KICK" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "It happily carries heavy cargo to\ntoughen up. It willingly does hard\nwork for people.", - "category": "Superpower Pok\u00e9mon" + "category": "Superpower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/machoke/meson.build b/res/pokemon/machoke/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/machoke/meson.build +++ b/res/pokemon/machoke/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/machop/data.json b/res/pokemon/machop/data.json index fcf488136b..3b9c7b5f82 100644 --- a/res/pokemon/machop/data.json +++ b/res/pokemon/machop/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_GUTS", "ABILITY_NO_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LOW_KICK" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "Though small in stature, it is\npowerful enough to easily heft and\nthrow a number of GEODUDE at once.", - "category": "Superpower Pok\u00e9mon" + "category": "Superpower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/machop/meson.build b/res/pokemon/machop/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/machop/meson.build +++ b/res/pokemon/machop/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magby/data.json b/res/pokemon/magby/data.json index 58c5175e57..ac768ec1ae 100644 --- a/res/pokemon/magby/data.json +++ b/res/pokemon/magby/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_FLAME_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": true - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SMOG" ], @@ -112,14 +110,14 @@ "pokemon_pos_f": 20, "trainer_pos_m": 9, "pokemon_pos_m": 20, - "entry_text": "Its magma-like blood circulates\nthroughout its body. Its body\u2019s\nheat can top 1,100 degrees F.", - "category": "Live Coal Pok\u00e9mon" + "entry_text": "Its magma-like blood circulates\nthroughout its body. Its body’s\nheat can top 1,100 degrees F.", + "category": "Live Coal Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/magby/meson.build b/res/pokemon/magby/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/magby/meson.build +++ b/res/pokemon/magby/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magcargo/data.json b/res/pokemon/magcargo/data.json index f4e53698ca..e2d9b34a96 100644 --- a/res/pokemon/magcargo/data.json +++ b/res/pokemon/magcargo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_MAGMA_ARMOR", "ABILITY_FLAME_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_YAWN" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "Its body temperature is roughly\n18,000 degrees F. Flames spout\nfrom gaps in its hardened shell.", - "category": "Lava Pok\u00e9mon" + "category": "Lava Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2818 } -} \ No newline at end of file +} diff --git a/res/pokemon/magcargo/meson.build b/res/pokemon/magcargo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/magcargo/meson.build +++ b/res/pokemon/magcargo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magikarp/data.json b/res/pokemon/magikarp/data.json index 913bf50d63..a49ca6cf6f 100644 --- a/res/pokemon/magikarp/data.json +++ b/res/pokemon/magikarp/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -67,13 +65,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "A MAGIKARP living for many years\ncan leap a mountain using Splash.\nThe move remains useless, though.", - "category": "Fish Pok\u00e9mon" + "category": "Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 30, "rarity": 50, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/magikarp/meson.build b/res/pokemon/magikarp/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/magikarp/meson.build +++ b/res/pokemon/magikarp/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magmar/data.json b/res/pokemon/magmar/data.json index 76102d9d18..659050cf8a 100644 --- a/res/pokemon/magmar/data.json +++ b/res/pokemon/magmar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_FLAME_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SMOG" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "When it breathes deeply, heat\nwaves form around its body, making\nit hard to see clearly.", - "category": "Spitfire Pok\u00e9mon" + "category": "Spitfire Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/magmar/meson.build b/res/pokemon/magmar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/magmar/meson.build +++ b/res/pokemon/magmar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magmortar/data.json b/res/pokemon/magmortar/data.json index f39c42d4dd..0afb155705 100644 --- a/res/pokemon/magmortar/data.json +++ b/res/pokemon/magmortar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_FLAME_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": true - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_PUNCH" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "When launching 3,600 degrees F\nfireballs, its body takes on a\nwhitish hue from the intense heat.", - "category": "Blast Pok\u00e9mon" + "category": "Blast Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/magmortar/meson.build b/res/pokemon/magmortar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/magmortar/meson.build +++ b/res/pokemon/magmortar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magnemite/data.json b/res/pokemon/magnemite/data.json index 451c7f2a1d..44946946f4 100644 --- a/res/pokemon/magnemite/data.json +++ b/res/pokemon/magnemite/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_MAGNET_PULL", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_METAL_SOUND" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65522, "entry_text": "The faster the units at its sides\nrotate, the greater the magnetic\nforce they generate.", - "category": "Magnet Pok\u00e9mon" + "category": "Magnet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3591 } -} \ No newline at end of file +} diff --git a/res/pokemon/magnemite/meson.build b/res/pokemon/magnemite/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/magnemite/meson.build +++ b/res/pokemon/magnemite/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magneton/data.json b/res/pokemon/magneton/data.json index 34f7bb06c4..c20891a9f1 100644 --- a/res/pokemon/magneton/data.json +++ b/res/pokemon/magneton/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_MAGNET_PULL", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRI_ATTACK" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 0, "entry_text": "Many mysteriously appear when more\nsunspots dot the sun. They stop\nTV sets from displaying properly.", - "category": "Magnet Pok\u00e9mon" + "category": "Magnet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3591 } -} \ No newline at end of file +} diff --git a/res/pokemon/magneton/meson.build b/res/pokemon/magneton/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/magneton/meson.build +++ b/res/pokemon/magneton/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/magnezone/data.json b/res/pokemon/magnezone/data.json index 3bdf45adb9..8d9855140c 100644 --- a/res/pokemon/magnezone/data.json +++ b/res/pokemon/magnezone/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_MAGNET_PULL", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MIRROR_COAT" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "A group tried to use scientific\nmeans to make MAGNEZONE evolve,\nbut their efforts ended in failure.", - "category": "Magnet Area Pok\u00e9mon" + "category": "Magnet Area Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3591 } -} \ No newline at end of file +} diff --git a/res/pokemon/magnezone/meson.build b/res/pokemon/magnezone/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/magnezone/meson.build +++ b/res/pokemon/magnezone/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/makuhita/data.json b/res/pokemon/makuhita/data.json index 14555d3e05..920839f62e 100644 --- a/res/pokemon/makuhita/data.json +++ b/res/pokemon/makuhita/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_GUTS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 13, "entry_text": "It toughens its body by slamming\ninto thick trees. Many snapped\ntrees can be found near its nest.", - "category": "Guts Pok\u00e9mon" + "category": "Guts Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/makuhita/meson.build b/res/pokemon/makuhita/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/makuhita/meson.build +++ b/res/pokemon/makuhita/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mamoswine/data.json b/res/pokemon/mamoswine/data.json index 72190f764c..515093bd34 100644 --- a/res/pokemon/mamoswine/data.json +++ b/res/pokemon/mamoswine/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SNOW_CLOAK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ANCIENT_POWER" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 18, "pokemon_pos_m": 5, "entry_text": "A frozen one was dug up from\nsoil dating back 10,000 years. It\nwoke up to much amazement.", - "category": "Twin Tusk Pok\u00e9mon" + "category": "Twin Tusk Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2061 } -} \ No newline at end of file +} diff --git a/res/pokemon/mamoswine/meson.build b/res/pokemon/mamoswine/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mamoswine/meson.build +++ b/res/pokemon/mamoswine/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/manaphy/data.json b/res/pokemon/manaphy/data.json index c00d2d1f00..c3a8dafe5e 100644 --- a/res/pokemon/manaphy/data.json +++ b/res/pokemon/manaphy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HYDRATION", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_GLOW" ], @@ -121,14 +119,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "It is born with a wondrous power\nthat lets it bond with any kind of\nPok\u00e9mon.", - "category": "Seafaring Pok\u00e9mon" + "entry_text": "It is born with a wondrous power\nthat lets it bond with any kind of\nPokémon.", + "category": "Seafaring Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 100, "rarity": 1, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/manaphy/meson.build b/res/pokemon/manaphy/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/manaphy/meson.build +++ b/res/pokemon/manaphy/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/manectric/data.json b/res/pokemon/manectric/data.json index 7ac640099e..537a477cc0 100644 --- a/res/pokemon/manectric/data.json +++ b/res/pokemon/manectric/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", "ABILITY_LIGHTNING_ROD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_FANG" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "It discharges electricity from its\nmane. It creates a thundercloud\noverhead to drop lightning bolts.", - "category": "Discharge Pok\u00e9mon" + "category": "Discharge Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/manectric/meson.build b/res/pokemon/manectric/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/manectric/meson.build +++ b/res/pokemon/manectric/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mankey/data.json b/res/pokemon/mankey/data.json index d28b2ccc99..77d56918d8 100644 --- a/res/pokemon/mankey/data.json +++ b/res/pokemon/mankey/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", "ABILITY_ANGER_POINT" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_COVET" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "It lives in treetop colonies.\nIf one becomes enraged, the whole\ncolony rampages for no reason.", - "category": "Pig Monkey Pok\u00e9mon" + "category": "Pig Monkey Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/mankey/meson.build b/res/pokemon/mankey/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mankey/meson.build +++ b/res/pokemon/mankey/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mantine/data.json b/res/pokemon/mantine/data.json index 93858ca8e1..974fa401cb 100644 --- a/res/pokemon/mantine/data.json +++ b/res/pokemon/mantine/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_WATER_ABSORB" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PSYBEAM" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 65535, "entry_text": "While elegantly swimming in the sea,\nit ignores REMORAID that cling to\nits fins seeking food scraps.", - "category": "Kite Pok\u00e9mon" + "category": "Kite Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 4355 } -} \ No newline at end of file +} diff --git a/res/pokemon/mantine/meson.build b/res/pokemon/mantine/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mantine/meson.build +++ b/res/pokemon/mantine/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mantyke/data.json b/res/pokemon/mantyke/data.json index 6050e50341..6423438ea0 100644 --- a/res/pokemon/mantyke/data.json +++ b/res/pokemon/mantyke/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_WATER_ABSORB" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -111,14 +109,14 @@ "pokemon_pos_f": 65529, "trainer_pos_m": 9, "pokemon_pos_m": 65529, - "entry_text": "People organize tours to see this\nPok\u00e9mon frolic and skim the tops\nof waves with REMORAID.", - "category": "Kite Pok\u00e9mon" + "entry_text": "People organize tours to see this\nPokémon frolic and skim the tops\nof waves with REMORAID.", + "category": "Kite Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3593 } -} \ No newline at end of file +} diff --git a/res/pokemon/mantyke/meson.build b/res/pokemon/mantyke/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mantyke/meson.build +++ b/res/pokemon/mantyke/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mareep/data.json b/res/pokemon/mareep/data.json index b772d32a7b..e2139da309 100644 --- a/res/pokemon/mareep/data.json +++ b/res/pokemon/mareep/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -106,13 +104,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "Its fluffy coat swells to double\nwhen static electricity builds up.\nTouching it can be shocking.", - "category": "Wool Pok\u00e9mon" + "category": "Wool Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/mareep/meson.build b/res/pokemon/mareep/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mareep/meson.build +++ b/res/pokemon/mareep/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/marill/data.json b/res/pokemon/marill/data.json index 219f18b1ec..bc34f724d6 100644 --- a/res/pokemon/marill/data.json +++ b/res/pokemon/marill/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_HUGE_POWER" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "The oil-filled end of its tail floats\non water. It keeps MARILL from\ndrowning even in a strong current.", - "category": "Aqua Mouse Pok\u00e9mon" + "category": "Aqua Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/marill/meson.build b/res/pokemon/marill/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/marill/meson.build +++ b/res/pokemon/marill/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/marowak/data.json b/res/pokemon/marowak/data.json index 0a03c3f3db..f533b6878f 100644 --- a/res/pokemon/marowak/data.json +++ b/res/pokemon/marowak/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_LIGHTNING_ROD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -130,14 +128,14 @@ "pokemon_pos_f": 19, "trainer_pos_m": 9, "pokemon_pos_m": 19, - "entry_text": "From its birth, this savage Pok\u00e9mon\nconstantly holds bones. It is\nskilled in using them as weapons.", - "category": "Bone Keeper Pok\u00e9mon" + "entry_text": "From its birth, this savage Pokémon\nconstantly holds bones. It is\nskilled in using them as weapons.", + "category": "Bone Keeper Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/marowak/meson.build b/res/pokemon/marowak/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/marowak/meson.build +++ b/res/pokemon/marowak/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/marshtomp/data.json b/res/pokemon/marshtomp/data.json index 83d7a65f96..cb346875c1 100644 --- a/res/pokemon/marshtomp/data.json +++ b/res/pokemon/marshtomp/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 20, "entry_text": "Its sturdy legs give it sure\nfooting, even in mud. It\nburrows into dirt to sleep.", - "category": "Mud Fish Pok\u00e9mon" + "category": "Mud Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/marshtomp/meson.build b/res/pokemon/marshtomp/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/marshtomp/meson.build +++ b/res/pokemon/marshtomp/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/masquerain/data.json b/res/pokemon/masquerain/data.json index a98a105949..055b4b5a7f 100644 --- a/res/pokemon/masquerain/data.json +++ b/res/pokemon/masquerain/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_OMINOUS_WIND" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65533, "entry_text": "Its antennae have eye patterns\non them. Its four wings enable it\nto hover and fly in any direction.", - "category": "Eyeball Pok\u00e9mon" + "category": "Eyeball Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/masquerain/meson.build b/res/pokemon/masquerain/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/masquerain/meson.build +++ b/res/pokemon/masquerain/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mawile/data.json b/res/pokemon/mawile/data.json index f8e7d87a85..abea4b71f2 100644 --- a/res/pokemon/mawile/data.json +++ b/res/pokemon/mawile/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_INTIMIDATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "Attached to its head is a huge\nset of jaws formed by horns.\nIt can chew through iron beams.", - "category": "Deceiver Pok\u00e9mon" + "category": "Deceiver Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3598 } -} \ No newline at end of file +} diff --git a/res/pokemon/mawile/meson.build b/res/pokemon/mawile/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mawile/meson.build +++ b/res/pokemon/mawile/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/medicham/data.json b/res/pokemon/medicham/data.json index e84e786c60..e66473c8d6 100644 --- a/res/pokemon/medicham/data.json +++ b/res/pokemon/medicham/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_PURE_POWER", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -133,13 +131,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "It gains the ability to see the aura\nof its opponents by honing its mind\nthrough starvation.", - "category": "Meditate Pok\u00e9mon" + "category": "Meditate Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2569 } -} \ No newline at end of file +} diff --git a/res/pokemon/medicham/meson.build b/res/pokemon/medicham/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/medicham/meson.build +++ b/res/pokemon/medicham/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/meditite/data.json b/res/pokemon/meditite/data.json index c9ac72dbdb..4127aaf852 100644 --- a/res/pokemon/meditite/data.json +++ b/res/pokemon/meditite/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_PURE_POWER", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BIDE" ], @@ -130,13 +128,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It always trains deep in mountains.\nIt levitates when it heightens its\nspiritual power through meditation.", - "category": "Meditate Pok\u00e9mon" + "category": "Meditate Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2569 } -} \ No newline at end of file +} diff --git a/res/pokemon/meditite/meson.build b/res/pokemon/meditite/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/meditite/meson.build +++ b/res/pokemon/meditite/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/meganium/data.json b/res/pokemon/meganium/data.json index 201bbbdbec..ec90a2d79b 100644 --- a/res/pokemon/meganium/data.json +++ b/res/pokemon/meganium/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 0, "entry_text": "Its breath has the fantastic\nability to revive dead plants and\nflowers.", - "category": "Herb Pok\u00e9mon" + "category": "Herb Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/meganium/meson.build b/res/pokemon/meganium/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/meganium/meson.build +++ b/res/pokemon/meganium/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/meowth/data.json b/res/pokemon/meowth/data.json index 70f536310a..01fa3a7327 100644 --- a/res/pokemon/meowth/data.json +++ b/res/pokemon/meowth/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", "ABILITY_TECHNICIAN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "It is nocturnal in nature. If it\nspots something shiny, its eyes\nglitter brightly.", - "category": "Scratch Cat Pok\u00e9mon" + "category": "Scratch Cat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/meowth/meson.build b/res/pokemon/meowth/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/meowth/meson.build +++ b/res/pokemon/meowth/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build index 1cef7ba074..07f3fc65c5 100644 --- a/res/pokemon/meson.build +++ b/res/pokemon/meson.build @@ -1,14 +1,43 @@ +# This build file contains all definitions for building filesystem archives +# and source code data tables related to Pokemon data. Specifically, it handles: +# - Base Species Data: +# - pl_personal - base stats, abilities, types, etc. for each species +# - evo - evolution lines for each species +# - wotbl - moves learned by-level for each species +# - ppark - data related to the Catching Show for each species (e.g., where +# the species will spawn, its points value, etc.) +# - height - Y offsets applied to each species' front and back sprites +# - pl_poke_data - Sprite animation sequences, frame data, and shadow sizes +# applied to a species' front and back sprites +# - tutorable_moves.h - a table of moves which can be tutored, including the +# cost of each shard to tutor it and which tutor provides it; ordinarily, +# this might be move-level data, but it is kept here for simplicity in +# validating an individual species' learnset of tutorable moves. +# - species_learnsets_by_tutor.h - a table of bitmasks for each species which +# defines what tutorable moves they can learn. +# - Graphics: +# - pl_pokegra - front and back sprites for each species and gender +# - pl_otherpoke - front and back sprites for alternate forms +# - pl_poke_icon - party/box menu icons for each species and some alternate +# forms +# - Pokedex: +# - footprint_data.h - a table of footprint sizes for each Pokemon, as used by +# Dr. Footstep and the Pokedex +# - shinzukan - Sinnoh-to-National Pokedex mappings +# - pl_pokezukan - National-to-Sinnoh Pokedex mappings +# - zukan_data - Pokedex information for each species + ####################### ## SOURCE FILE LISTS ## ####################### -personal_files = [] +species_data_files = [] poke_icon_files = [] pokegra_files = [] otherpoke_index = {} # otherpoke uses a unique, non-uniform structure -# pl_poke_icon has some shared files that are listed at the beginning -# of the NARC. -poke_icon_shared = files( + +# 1. These static files must always exist. +icons_shared = files( '.shared/pl_poke_icon.pal', '.shared/pl_poke_icon_anim_01.json', '.shared/pl_poke_icon_cell_01.json', @@ -18,7 +47,7 @@ poke_icon_shared = files( '.shared/pl_poke_icon_cell_03.json', ) -otherpoke_shared = files( +form_sprites_shared = files( '.shared/substitute_back.png', '.shared/substitute_front.png', '.shared/substitute.pal', @@ -27,528 +56,57 @@ otherpoke_shared = files( ) sinnoh_pokedex = files('sinnoh_pokedex.json') - -move_tutors_json = files('move_tutors.json') - -tutorable_moves_h = custom_target('tutorable_moves.h', - input: move_tutors_json, - output: 'tutorable_moves.h', - command: [ - make_tutorable_moves_py, - '--schema', move_tutors_json, - '--output-dir', meson.current_build_dir(), - ] -) - pl_growtbl_files = files('.shared/exp_tables.csv') -# Process mons in national dex order -pokemon_subdirs = [ - '000', # Glitch pokemon "-----" aka DPBox, Invisible Shiny Bulbasau - 'bulbasaur', - 'ivysaur', - 'venusaur', - 'charmander', - 'charmeleon', - 'charizard', - 'squirtle', - 'wartortle', - 'blastoise', - 'caterpie', - 'metapod', - 'butterfree', - 'weedle', - 'kakuna', - 'beedrill', - 'pidgey', - 'pidgeotto', - 'pidgeot', - 'rattata', - 'raticate', - 'spearow', - 'fearow', - 'ekans', - 'arbok', - 'pikachu', - 'raichu', - 'sandshrew', - 'sandslash', - 'nidoran_f', - 'nidorina', - 'nidoqueen', - 'nidoran_m', - 'nidorino', - 'nidoking', - 'clefairy', - 'clefable', - 'vulpix', - 'ninetales', - 'jigglypuff', - 'wigglytuff', - 'zubat', - 'golbat', - 'oddish', - 'gloom', - 'vileplume', - 'paras', - 'parasect', - 'venonat', - 'venomoth', - 'diglett', - 'dugtrio', - 'meowth', - 'persian', - 'psyduck', - 'golduck', - 'mankey', - 'primeape', - 'growlithe', - 'arcanine', - 'poliwag', - 'poliwhirl', - 'poliwrath', - 'abra', - 'kadabra', - 'alakazam', - 'machop', - 'machoke', - 'machamp', - 'bellsprout', - 'weepinbell', - 'victreebel', - 'tentacool', - 'tentacruel', - 'geodude', - 'graveler', - 'golem', - 'ponyta', - 'rapidash', - 'slowpoke', - 'slowbro', - 'magnemite', - 'magneton', - 'farfetchd', - 'doduo', - 'dodrio', - 'seel', - 'dewgong', - 'grimer', - 'muk', - 'shellder', - 'cloyster', - 'gastly', - 'haunter', - 'gengar', - 'onix', - 'drowzee', - 'hypno', - 'krabby', - 'kingler', - 'voltorb', - 'electrode', - 'exeggcute', - 'exeggutor', - 'cubone', - 'marowak', - 'hitmonlee', - 'hitmonchan', - 'lickitung', - 'koffing', - 'weezing', - 'rhyhorn', - 'rhydon', - 'chansey', - 'tangela', - 'kangaskhan', - 'horsea', - 'seadra', - 'goldeen', - 'seaking', - 'staryu', - 'starmie', - 'mr_mime', - 'scyther', - 'jynx', - 'electabuzz', - 'magmar', - 'pinsir', - 'tauros', - 'magikarp', - 'gyarados', - 'lapras', - 'ditto', - 'eevee', - 'vaporeon', - 'jolteon', - 'flareon', - 'porygon', - 'omanyte', - 'omastar', - 'kabuto', - 'kabutops', - 'aerodactyl', - 'snorlax', - 'articuno', - 'zapdos', - 'moltres', - 'dratini', - 'dragonair', - 'dragonite', - 'mewtwo', - 'mew', - 'chikorita', - 'bayleef', - 'meganium', - 'cyndaquil', - 'quilava', - 'typhlosion', - 'totodile', - 'croconaw', - 'feraligatr', - 'sentret', - 'furret', - 'hoothoot', - 'noctowl', - 'ledyba', - 'ledian', - 'spinarak', - 'ariados', - 'crobat', - 'chinchou', - 'lanturn', - 'pichu', - 'cleffa', - 'igglybuff', - 'togepi', - 'togetic', - 'natu', - 'xatu', - 'mareep', - 'flaaffy', - 'ampharos', - 'bellossom', - 'marill', - 'azumarill', - 'sudowoodo', - 'politoed', - 'hoppip', - 'skiploom', - 'jumpluff', - 'aipom', - 'sunkern', - 'sunflora', - 'yanma', - 'wooper', - 'quagsire', - 'espeon', - 'umbreon', - 'murkrow', - 'slowking', - 'misdreavus', - 'unown', - 'wobbuffet', - 'girafarig', - 'pineco', - 'forretress', - 'dunsparce', - 'gligar', - 'steelix', - 'snubbull', - 'granbull', - 'qwilfish', - 'scizor', - 'shuckle', - 'heracross', - 'sneasel', - 'teddiursa', - 'ursaring', - 'slugma', - 'magcargo', - 'swinub', - 'piloswine', - 'corsola', - 'remoraid', - 'octillery', - 'delibird', - 'mantine', - 'skarmory', - 'houndour', - 'houndoom', - 'kingdra', - 'phanpy', - 'donphan', - 'porygon2', - 'stantler', - 'smeargle', - 'tyrogue', - 'hitmontop', - 'smoochum', - 'elekid', - 'magby', - 'miltank', - 'blissey', - 'raikou', - 'entei', - 'suicune', - 'larvitar', - 'pupitar', - 'tyranitar', - 'lugia', - 'ho_oh', - 'celebi', - 'treecko', - 'grovyle', - 'sceptile', - 'torchic', - 'combusken', - 'blaziken', - 'mudkip', - 'marshtomp', - 'swampert', - 'poochyena', - 'mightyena', - 'zigzagoon', - 'linoone', - 'wurmple', - 'silcoon', - 'beautifly', - 'cascoon', - 'dustox', - 'lotad', - 'lombre', - 'ludicolo', - 'seedot', - 'nuzleaf', - 'shiftry', - 'taillow', - 'swellow', - 'wingull', - 'pelipper', - 'ralts', - 'kirlia', - 'gardevoir', - 'surskit', - 'masquerain', - 'shroomish', - 'breloom', - 'slakoth', - 'vigoroth', - 'slaking', - 'nincada', - 'ninjask', - 'shedinja', - 'whismur', - 'loudred', - 'exploud', - 'makuhita', - 'hariyama', - 'azurill', - 'nosepass', - 'skitty', - 'delcatty', - 'sableye', - 'mawile', - 'aron', - 'lairon', - 'aggron', - 'meditite', - 'medicham', - 'electrike', - 'manectric', - 'plusle', - 'minun', - 'volbeat', - 'illumise', - 'roselia', - 'gulpin', - 'swalot', - 'carvanha', - 'sharpedo', - 'wailmer', - 'wailord', - 'numel', - 'camerupt', - 'torkoal', - 'spoink', - 'grumpig', - 'spinda', - 'trapinch', - 'vibrava', - 'flygon', - 'cacnea', - 'cacturne', - 'swablu', - 'altaria', - 'zangoose', - 'seviper', - 'lunatone', - 'solrock', - 'barboach', - 'whiscash', - 'corphish', - 'crawdaunt', - 'baltoy', - 'claydol', - 'lileep', - 'cradily', - 'anorith', - 'armaldo', - 'feebas', - 'milotic', - 'castform', - 'kecleon', - 'shuppet', - 'banette', - 'duskull', - 'dusclops', - 'tropius', - 'chimecho', - 'absol', - 'wynaut', - 'snorunt', - 'glalie', - 'spheal', - 'sealeo', - 'walrein', - 'clamperl', - 'huntail', - 'gorebyss', - 'relicanth', - 'luvdisc', - 'bagon', - 'shelgon', - 'salamence', - 'beldum', - 'metang', - 'metagross', - 'regirock', - 'regice', - 'registeel', - 'latias', - 'latios', - 'kyogre', - 'groudon', - 'rayquaza', - 'jirachi', - 'deoxys', - 'turtwig', - 'grotle', - 'torterra', - 'chimchar', - 'monferno', - 'infernape', - 'piplup', - 'prinplup', - 'empoleon', - 'starly', - 'staravia', - 'staraptor', - 'bidoof', - 'bibarel', - 'kricketot', - 'kricketune', - 'shinx', - 'luxio', - 'luxray', - 'budew', - 'roserade', - 'cranidos', - 'rampardos', - 'shieldon', - 'bastiodon', - 'burmy', - 'wormadam', - 'mothim', - 'combee', - 'vespiquen', - 'pachirisu', - 'buizel', - 'floatzel', - 'cherubi', - 'cherrim', - 'shellos', - 'gastrodon', - 'ambipom', - 'drifloon', - 'drifblim', - 'buneary', - 'lopunny', - 'mismagius', - 'honchkrow', - 'glameow', - 'purugly', - 'chingling', - 'stunky', - 'skuntank', - 'bronzor', - 'bronzong', - 'bonsly', - 'mime_jr', - 'happiny', - 'chatot', - 'spiritomb', - 'gible', - 'gabite', - 'garchomp', - 'munchlax', - 'riolu', - 'lucario', - 'hippopotas', - 'hippowdon', - 'skorupi', - 'drapion', - 'croagunk', - 'toxicroak', - 'carnivine', - 'finneon', - 'lumineon', - 'mantyke', - 'snover', - 'abomasnow', - 'weavile', - 'magnezone', - 'lickilicky', - 'rhyperior', - 'tangrowth', - 'electivire', - 'magmortar', - 'togekiss', - 'yanmega', - 'leafeon', - 'glaceon', - 'gliscor', - 'mamoswine', - 'porygon_z', - 'gallade', - 'probopass', - 'dusknoir', - 'froslass', - 'rotom', - 'uxie', - 'mesprit', - 'azelf', - 'dialga', - 'palkia', - 'heatran', - 'regigigas', - 'giratina', - 'cresselia', - 'phione', - 'manaphy', - 'darkrai', - 'shaymin', - 'arceus', - 'egg', - 'bad_egg' -] - -foreach pokemon : pokemon_subdirs - subdir(pokemon) +# 2. Register species and forms. The contents of each output file is a listing +# of subdirectories which contains some assets that must be compiled. +species_consts = fs.read(species_txt).splitlines() +species_dirnames = [] +foreach species : species_consts + species_dirnames += species.replace('SPECIES_', '').to_lower() endforeach +# This data file form_registry.json defines orderings of alternate forms in +# certain archives. Each species in the file is mapped to an object whose keys +# are the "names" of its alternate forms. Each form is then mapped to a type: +# - data, which denotes that the form has separate data entries (e.g., in +# pl_personal and wotbl) +# - icon, which denotes that the form has a unique box/party menu icon +# - sprite, which denotes that the form has a unique front and back sprite +# These types are hierarchical; data-type forms have unique icons and sprites, +# and icon-type forms have unique sprites. For example: +# - Deoxys-Attack has a unique base stats file, party/menu icon, and sprite. +# - Unown forms have unique party/menu icons and sprites, but not unique base +# stats. +# - Castform forms have only unique sprites. +form_registry = custom_target('form_registry', + output: [ + 'form_data.order', + 'form_icons.order', + 'form_sprites.order', + ], + input: files('form_registry.json'), + command: [ ordergen_forms_py, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@', '@OUTPUT2@' ], +) +form_data_order = form_registry[0] +form_icons_order = form_registry[1] +form_sprites_order = form_registry[2] + + +# 3. Walk species subdirectories; `species_dirnames` is the authority. +foreach species : species_dirnames + subdir(species) +endforeach + +# Stash the listing of species in an environment so that other processes can make +# use of it. +species_env = environment() +species_env.append('SPECIES', species_dirnames, separator: ';') + # Order of extra personal files for mon forms -personal_files += [ +# TODO: Move these into species directories after finishing the refactor +species_data_files += [ deoxys_attack_personal, deoxys_defense_personal, deoxys_speed_personal, @@ -620,53 +178,47 @@ foreach key : range(num_keys) endforeach -# Generate NARCs -wotbl_narc = custom_target('wotbl.narc', - output: 'wotbl.narc', - input: personal_files, - env: json2bin_env, - depends: [ py_consts_generators ], +# 4. Compile assets. Compilers take registries as inputs and declare dependencies +# on the actual source files. The former prevents command line bloat; the +# latter maintains that compilation must reoccur when source files change. +datagen_species_out = custom_target('datagen_species_out', + output: [ + 'pl_personal.narc', + 'evo.narc', + 'wotbl.narc', + 'ppark.narc', + 'height.narc', + 'pl_poke_data.narc', + 'tutorable_moves.h', + 'species_learnsets_by_tutor.h', + ], command: [ - pokemon_wotbl_data_py, - '--narc', narc_exe, - '--source-dir', '@CURRENT_SOURCE_DIR@', - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', - ] + datagen_species_exe, + meson.current_build_dir(), + meson.current_source_dir(), + form_data_order, + files('move_tutors.json'), + ], + env: species_env, + depend_files: [ + species_data_files, + ], ) +pl_personal_narc = datagen_species_out[0] +evo_narc = datagen_species_out[1] +wotbl_narc = datagen_species_out[2] +ppark_narc = datagen_species_out[3] +height_narc = datagen_species_out[4] +pl_poke_data_narc = datagen_species_out[5] +tutorable_moves_h = datagen_species_out[6] +species_learnsets_by_tutor_h = datagen_species_out[7] -pl_personal_narc = custom_target('pl_personal.narc', - output: 'pl_personal.narc', - input: personal_files, - env: json2bin_env, - depends: [ py_consts_generators ], - command: [ - pokemon_personal_data_py, - '--narc', narc_exe, - '--source-dir', '@CURRENT_SOURCE_DIR@', - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', - ] -) - -evo_narc = custom_target('evo.narc', - output: 'evo.narc', - input: personal_files, - env: json2bin_env, - depends: [ py_consts_generators ], - command: [ - evo_py, - '--narc', narc_exe, - '--source-dir', '@CURRENT_SOURCE_DIR@', - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', - ] -) +# OLD NARCs pl_poke_icon_narc = custom_target('pl_poke_icon.narc', output: 'pl_poke_icon.narc', input: [ - poke_icon_shared, + icons_shared, poke_icon_files ], command: [ @@ -690,7 +242,7 @@ pl_pokegra_narc = custom_target('pl_pokegra.narc', '--source-dir', '@CURRENT_SOURCE_DIR@', '--private-dir', '@PRIVATE_DIR@', '--output-dir', '@OUTDIR@', - pokemon_subdirs + species_dirnames, ] ) @@ -698,7 +250,7 @@ pl_otherpoke_narc = custom_target('pl_otherpoke.narc', output: 'pl_otherpoke.narc', input: [ otherpoke_files, - otherpoke_shared + form_sprites_shared, ], command: [ make_pl_otherpoke_py, @@ -709,42 +261,13 @@ pl_otherpoke_narc = custom_target('pl_otherpoke.narc', '--sprite-entries', '154', '--palette-entries', '94', otherpoke_files, - otherpoke_shared - ] -) - -height_narc = custom_target('height.narc', - output: 'height.narc', - input: personal_files, - env: json2bin_env, - depends: [ py_consts_generators ], - command: [ - make_height_py, - '--narc', narc_exe, - '--source-dir', '@CURRENT_SOURCE_DIR@', - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', - pokemon_subdirs - ] -) - -pl_poke_data_narc = custom_target('pl_poke_data.narc', - output: 'pl_poke_data.narc', - input: personal_files, - env: json2bin_env, - depends: [ py_consts_generators ], - command: [ - pl_poke_data_py, - '--narc', narc_exe, - '--source-dir', '@CURRENT_SOURCE_DIR@', - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', + form_sprites_shared, ] ) pl_pokezukan_narc = custom_target('pl_pokezukan.narc', output: 'pl_pokezukan.narc', - input: personal_files, + input: species_data_files, env: json2bin_env, command: [ make_pl_pokezukan_py, @@ -758,7 +281,7 @@ pl_pokezukan_narc = custom_target('pl_pokezukan.narc', shinzukan_narc = custom_target('shinzukan.narc', output: 'shinzukan.narc', - input: personal_files, + input: species_data_files, env: json2bin_env, command: [ make_shinzukan_py, @@ -784,7 +307,7 @@ pl_growtbl_narc = custom_target('pl_growtbl.narc', ) pokedex_data_srcs = files() -foreach pokemon : pokemon_subdirs +foreach pokemon : species_dirnames pokedex_data_srcs += files(pokemon / 'data.json') endforeach @@ -824,45 +347,30 @@ species_header_target = meson.current_build_dir() gen_species_headers = custom_target('gen_species_headers', output: [ - 'tutor_movesets.h', 'footprint_data.h', ], - input: personal_files, + input: species_data_files, env: json2bin_env, depends: [ py_consts_generators ], command: [ make_species_tables_py, - '--tutorable-moves', move_tutors_json, '--source-dir', '@CURRENT_SOURCE_DIR@', '--output-dir', species_header_target, ] ) -ppark_narc = custom_target('ppark.narc', - output: 'ppark.narc', - input: personal_files, - env: json2bin_env, - depends: [ py_consts_generators ], - command: [ - catching_show_data_py, - '--narc', narc_exe, - '--source-dir', '@CURRENT_SOURCE_DIR@', - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', - ] -) - nitrofs_files += pl_personal_narc nitrofs_files += evo_narc +nitrofs_files += wotbl_narc +nitrofs_files += ppark_narc +nitrofs_files += height_narc + nitrofs_files += pl_poke_icon_narc nitrofs_files += pl_pokegra_narc nitrofs_files += pl_otherpoke_narc -nitrofs_files += wotbl_narc -nitrofs_files += height_narc nitrofs_files += pl_poke_data_narc nitrofs_files += pl_pokezukan_narc nitrofs_files += shinzukan_narc nitrofs_files += pl_growtbl_narc nitrofs_files += pokedex_data_narc nitrofs_files += pokedex_data_giratina_altered_narc -nitrofs_files += ppark_narc diff --git a/res/pokemon/mesprit/data.json b/res/pokemon/mesprit/data.json index fe8c177edc..3a5e827528 100644 --- a/res/pokemon/mesprit/data.json +++ b/res/pokemon/mesprit/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REST" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "When MESPRIT flew, people learned\nthe joy and sadness of living.\nIt was the birth of emotions.", - "category": "Emotion Pok\u00e9mon" + "category": "Emotion Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/mesprit/meson.build b/res/pokemon/mesprit/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/mesprit/meson.build +++ b/res/pokemon/mesprit/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/metagross/data.json b/res/pokemon/metagross/data.json index 3b9425fcf1..3356c3202b 100644 --- a/res/pokemon/metagross/data.json +++ b/res/pokemon/metagross/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MAGNET_RISE" ], @@ -130,13 +128,13 @@ "trainer_pos_m": 14, "pokemon_pos_m": 9, "entry_text": "METANG combined to form it.\nWith four brains, it has the\nintelligence of a supercomputer.", - "category": "Iron Leg Pok\u00e9mon" + "category": "Iron Leg Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/metagross/meson.build b/res/pokemon/metagross/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/metagross/meson.build +++ b/res/pokemon/metagross/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/metang/data.json b/res/pokemon/metang/data.json index 29b120e2f1..1b3ca60292 100644 --- a/res/pokemon/metang/data.json +++ b/res/pokemon/metang/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MAGNET_RISE" ], @@ -133,14 +131,14 @@ "pokemon_pos_f": 65534, "trainer_pos_m": 9, "pokemon_pos_m": 65534, - "entry_text": "It is formed by two BELDUM joining\ntogether. Its steel body won\u2019t be\nscratched if it collides with a jet.", - "category": "Iron Claw Pok\u00e9mon" + "entry_text": "It is formed by two BELDUM joining\ntogether. Its steel body won’t be\nscratched if it collides with a jet.", + "category": "Iron Claw Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/metang/meson.build b/res/pokemon/metang/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/metang/meson.build +++ b/res/pokemon/metang/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/metapod/data.json b/res/pokemon/metapod/data.json index 639ec22973..d7458d4926 100644 --- a/res/pokemon/metapod/data.json +++ b/res/pokemon/metapod/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HARDEN" ], @@ -66,13 +64,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "A steel-hard shell protects its\ntender body. It quietly endures\nhardships while awaiting evolution.", - "category": "Cocoon Pok\u00e9mon" + "category": "Cocoon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/metapod/meson.build b/res/pokemon/metapod/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/metapod/meson.build +++ b/res/pokemon/metapod/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mew/data.json b/res/pokemon/mew/data.json index 2c515c1342..e53507c8b3 100644 --- a/res/pokemon/mew/data.json +++ b/res/pokemon/mew/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -209,14 +207,14 @@ "pokemon_pos_f": 65522, "trainer_pos_m": 9, "pokemon_pos_m": 65522, - "entry_text": "Because it can use all kinds of\nmoves, many scientists believe MEW\nto be the ancestor of Pok\u00e9mon.", - "category": "New Species Pok\u00e9mon" + "entry_text": "Because it can use all kinds of\nmoves, many scientists believe MEW\nto be the ancestor of Pokémon.", + "category": "New Species Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/mew/meson.build b/res/pokemon/mew/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/mew/meson.build +++ b/res/pokemon/mew/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mewtwo/data.json b/res/pokemon/mewtwo/data.json index 688a11117b..be89d34a77 100644 --- a/res/pokemon/mewtwo/data.json +++ b/res/pokemon/mewtwo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONFUSION" ], @@ -154,14 +152,14 @@ "pokemon_pos_f": 6, "trainer_pos_m": 16, "pokemon_pos_m": 6, - "entry_text": "A Pok\u00e9mon created by recombining\nMEW\u2019s genes. It\u2019s said to have the\nmost savage heart among Pok\u00e9mon.", - "category": "Genetic Pok\u00e9mon" + "entry_text": "A Pokémon created by recombining\nMEW’s genes. It’s said to have the\nmost savage heart among Pokémon.", + "category": "Genetic Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/mewtwo/meson.build b/res/pokemon/mewtwo/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/mewtwo/meson.build +++ b/res/pokemon/mewtwo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mightyena/data.json b/res/pokemon/mightyena/data.json index b6a1d39e8f..95ef6daf76 100644 --- a/res/pokemon/mightyena/data.json +++ b/res/pokemon/mightyena/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_QUICK_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "It chases down prey in a pack.\nIt will never disobey the commands\nof a skilled Trainer.", - "category": "Bite Pok\u00e9mon" + "category": "Bite Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4112 } -} \ No newline at end of file +} diff --git a/res/pokemon/mightyena/meson.build b/res/pokemon/mightyena/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mightyena/meson.build +++ b/res/pokemon/mightyena/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/milotic/data.json b/res/pokemon/milotic/data.json index 3852ebc6fd..a1cb29d5e1 100644 --- a/res/pokemon/milotic/data.json +++ b/res/pokemon/milotic/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_MARVEL_SCALE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_GUN" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 3, "entry_text": "Its lovely scales are described as\nrainbow colored. They change color\ndepending on the viewing angle.", - "category": "Tender Pok\u00e9mon" + "category": "Tender Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/milotic/meson.build b/res/pokemon/milotic/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/milotic/meson.build +++ b/res/pokemon/milotic/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/miltank/data.json b/res/pokemon/miltank/data.json index f65e2fd017..3e3d3a7c26 100644 --- a/res/pokemon/miltank/data.json +++ b/res/pokemon/miltank/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_SCRAPPY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -126,14 +124,14 @@ "pokemon_pos_f": 11, "trainer_pos_m": 9, "pokemon_pos_m": 11, - "entry_text": "It is said that kids who drink\nMILTANK\u2019s milk grow up to become\nhearty, healthy adults.", - "category": "Milk Cow Pok\u00e9mon" + "entry_text": "It is said that kids who drink\nMILTANK’s milk grow up to become\nhearty, healthy adults.", + "category": "Milk Cow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/miltank/meson.build b/res/pokemon/miltank/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/miltank/meson.build +++ b/res/pokemon/miltank/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mime_jr/data.json b/res/pokemon/mime_jr/data.json index 011a59adf3..d635b0abc1 100644 --- a/res/pokemon/mime_jr/data.json +++ b/res/pokemon/mime_jr/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_FILTER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TICKLE" ], @@ -135,13 +133,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 24, "entry_text": "It mimics the expressions and\nmotions of those it sees to\nunderstand the feelings of others.", - "category": "Mime Pok\u00e9mon" + "category": "Mime Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/mime_jr/meson.build b/res/pokemon/mime_jr/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mime_jr/meson.build +++ b/res/pokemon/mime_jr/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/minun/data.json b/res/pokemon/minun/data.json index 79678fb605..9d64624a55 100644 --- a/res/pokemon/minun/data.json +++ b/res/pokemon/minun/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_MINUS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "It cheers on friends. If its\nfriends are losing, its body lets\noff more and more sparks.", - "category": "Cheering Pok\u00e9mon" + "category": "Cheering Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/minun/meson.build b/res/pokemon/minun/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/minun/meson.build +++ b/res/pokemon/minun/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/misdreavus/data.json b/res/pokemon/misdreavus/data.json index 9a5440e447..09f09675ed 100644 --- a/res/pokemon/misdreavus/data.json +++ b/res/pokemon/misdreavus/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -126,14 +124,14 @@ "pokemon_pos_f": 65527, "trainer_pos_m": 9, "pokemon_pos_m": 65527, - "entry_text": "A Pok\u00e9mon that startles people in\nthe middle of the night. It gathers\nfear as its energy.", - "category": "Screech Pok\u00e9mon" + "entry_text": "A Pokémon that startles people in\nthe middle of the night. It gathers\nfear as its energy.", + "category": "Screech Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/misdreavus/meson.build b/res/pokemon/misdreavus/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/misdreavus/meson.build +++ b/res/pokemon/misdreavus/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mismagius/data.json b/res/pokemon/mismagius/data.json index 25b563352e..1c51fd0d23 100644 --- a/res/pokemon/mismagius/data.json +++ b/res/pokemon/mismagius/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LUCKY_CHANT" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "Its cry sounds like an incantation.\nIt is said the cry may rarely be\nimbued with happiness-giving power.", - "category": "Magical Pok\u00e9mon" + "category": "Magical Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/mismagius/meson.build b/res/pokemon/mismagius/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mismagius/meson.build +++ b/res/pokemon/mismagius/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/moltres/data.json b/res/pokemon/moltres/data.json index 33be496e0e..236242d61d 100644 --- a/res/pokemon/moltres/data.json +++ b/res/pokemon/moltres/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WING_ATTACK" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 1, "trainer_pos_m": 15, "pokemon_pos_m": 1, - "entry_text": "One of the legendary bird Pok\u00e9mon.\nIt is said that its appearance\nindicates the coming of spring.", - "category": "Flame Pok\u00e9mon" + "entry_text": "One of the legendary bird Pokémon.\nIt is said that its appearance\nindicates the coming of spring.", + "category": "Flame Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4354 } -} \ No newline at end of file +} diff --git a/res/pokemon/moltres/meson.build b/res/pokemon/moltres/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/moltres/meson.build +++ b/res/pokemon/moltres/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/monferno/data.json b/res/pokemon/monferno/data.json index 1f6393b8e8..a04ccf176f 100644 --- a/res/pokemon/monferno/data.json +++ b/res/pokemon/monferno/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": true - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -134,13 +132,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "It skillfully controls the intensity\nof the fire on its tail to keep its\nfoes at an ideal distance.", - "category": "Playful Pok\u00e9mon" + "category": "Playful Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2306 } -} \ No newline at end of file +} diff --git a/res/pokemon/monferno/meson.build b/res/pokemon/monferno/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/monferno/meson.build +++ b/res/pokemon/monferno/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mothim/data.json b/res/pokemon/mothim/data.json index 2c196b7f56..c0bf58e12e 100644 --- a/res/pokemon/mothim/data.json +++ b/res/pokemon/mothim/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 65525, "trainer_pos_m": 9, "pokemon_pos_m": 65525, - "entry_text": "While it loves floral honey, it won\u2019t\ngather any itself. Instead, it\nplots to steal some from COMBEE.", - "category": "Moth Pok\u00e9mon" + "entry_text": "While it loves floral honey, it won’t\ngather any itself. Instead, it\nplots to steal some from COMBEE.", + "category": "Moth Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/mothim/meson.build b/res/pokemon/mothim/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/mothim/meson.build +++ b/res/pokemon/mothim/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mr_mime/data.json b/res/pokemon/mr_mime/data.json index ffce3c5357..6ab2253f43 100644 --- a/res/pokemon/mr_mime/data.json +++ b/res/pokemon/mr_mime/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_FILTER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MAGICAL_LEAF" ], @@ -141,13 +139,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "It shapes an invisible wall in midair\nby minutely vibrating its fingertips\nto stop molecules in the air.", - "category": "Barrier Pok\u00e9mon" + "category": "Barrier Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/mr_mime/meson.build b/res/pokemon/mr_mime/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mr_mime/meson.build +++ b/res/pokemon/mr_mime/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/mudkip/data.json b/res/pokemon/mudkip/data.json index 86f4e24646..5e65f63d63 100644 --- a/res/pokemon/mudkip/data.json +++ b/res/pokemon/mudkip/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "To alert it, the fin on its head\nsenses the flow of water. It has\nthe strength to heft boulders.", - "category": "Mud Fish Pok\u00e9mon" + "category": "Mud Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/mudkip/meson.build b/res/pokemon/mudkip/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/mudkip/meson.build +++ b/res/pokemon/mudkip/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/muk/data.json b/res/pokemon/muk/data.json index c67e17c597..f881b1ed80 100644 --- a/res/pokemon/muk/data.json +++ b/res/pokemon/muk/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STENCH", "ABILITY_STICKY_HOLD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_GAS" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "A toxic fluid seeps from its body.\nThe fluid instantly kills plants and\ntrees on contact.", - "category": "Sludge Pok\u00e9mon" + "category": "Sludge Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/muk/meson.build b/res/pokemon/muk/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/muk/meson.build +++ b/res/pokemon/muk/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/munchlax/data.json b/res/pokemon/munchlax/data.json index c95c806c84..f6c4e73e27 100644 --- a/res/pokemon/munchlax/data.json +++ b/res/pokemon/munchlax/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PICKUP", "ABILITY_THICK_FAT" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_METRONOME" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "In its desperation to gulp down\nfood, it forgets about the food it\nhas hidden under its fur.", - "category": "Big Eater Pok\u00e9mon" + "category": "Big Eater Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2310 } -} \ No newline at end of file +} diff --git a/res/pokemon/munchlax/meson.build b/res/pokemon/munchlax/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/munchlax/meson.build +++ b/res/pokemon/munchlax/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/murkrow/data.json b/res/pokemon/murkrow/data.json index 0ed49fb979..33b30c9ff2 100644 --- a/res/pokemon/murkrow/data.json +++ b/res/pokemon/murkrow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_SUPER_LUCK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "If spotted, it will lure an unwary\nperson into chasing it, then lose\nthe pursuer on mountain trails.", - "category": "Darkness Pok\u00e9mon" + "category": "Darkness Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4368 } -} \ No newline at end of file +} diff --git a/res/pokemon/murkrow/meson.build b/res/pokemon/murkrow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/murkrow/meson.build +++ b/res/pokemon/murkrow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/natu/data.json b/res/pokemon/natu/data.json index 8813b5980f..09a7a0d330 100644 --- a/res/pokemon/natu/data.json +++ b/res/pokemon/natu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -130,13 +128,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 31, "entry_text": "It picks food from cactus plants,\ndeftly avoiding buds and spines.\nIt seems to skip about to move.", - "category": "Tiny Bird Pok\u00e9mon" + "category": "Tiny Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4362 } -} \ No newline at end of file +} diff --git a/res/pokemon/natu/meson.build b/res/pokemon/natu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/natu/meson.build +++ b/res/pokemon/natu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nidoking/data.json b/res/pokemon/nidoking/data.json index b90235d7f1..9e2e79105b 100644 --- a/res/pokemon/nidoking/data.json +++ b/res/pokemon/nidoking/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "One swing of its mighty tail can\nsnap a telephone pole as if it were\na matchstick.", - "category": "Drill Pok\u00e9mon" + "category": "Drill Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2054 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidoking/meson.build b/res/pokemon/nidoking/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/nidoking/meson.build +++ b/res/pokemon/nidoking/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nidoqueen/data.json b/res/pokemon/nidoqueen/data.json index fcbff8b5d6..76ddcc4b26 100644 --- a/res/pokemon/nidoqueen/data.json +++ b/res/pokemon/nidoqueen/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "Its entire body is armored with\nhard scales. It will protect the\nyoung in its burrow with its life.", - "category": "Drill Pok\u00e9mon" + "category": "Drill Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2054 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidoqueen/meson.build b/res/pokemon/nidoqueen/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/nidoqueen/meson.build +++ b/res/pokemon/nidoqueen/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nidoran_f/data.json b/res/pokemon/nidoran_f/data.json index b05900926a..fd141d80de 100644 --- a/res/pokemon/nidoran_f/data.json +++ b/res/pokemon/nidoran_f/data.json @@ -1,5 +1,5 @@ { - "name": "Nidoran\u2640", + "name": "Nidoran♀", "base_stats": { "hp": 55, "attack": 47, @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "While it does not prefer to fight,\neven one drop of the poison it\nsecretes from barbs can be fatal.", - "category": "Poison Pin Pok\u00e9mon" + "category": "Poison Pin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidoran_f/meson.build b/res/pokemon/nidoran_f/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/nidoran_f/meson.build +++ b/res/pokemon/nidoran_f/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nidoran_m/data.json b/res/pokemon/nidoran_m/data.json index c99b45839b..c449f8be17 100644 --- a/res/pokemon/nidoran_m/data.json +++ b/res/pokemon/nidoran_m/data.json @@ -1,5 +1,5 @@ { - "name": "Nidoran\u2642", + "name": "Nidoran♂", "base_stats": { "hp": 46, "attack": 57, @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It scans its surroundings by\nraising its ears out of the grass.\nIts toxic horn is for protection.", - "category": "Poison Pin Pok\u00e9mon" + "category": "Poison Pin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidoran_m/meson.build b/res/pokemon/nidoran_m/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/nidoran_m/meson.build +++ b/res/pokemon/nidoran_m/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nidorina/data.json b/res/pokemon/nidorina/data.json index 4fe94cb44c..6d92bab6b1 100644 --- a/res/pokemon/nidorina/data.json +++ b/res/pokemon/nidorina/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 19, "trainer_pos_m": 9, "pokemon_pos_m": 19, - "entry_text": "When it senses danger, it raises\nall the barbs on its body. These\nbarbs grow slower than NIDORINO\u2019s.", - "category": "Poison Pin Pok\u00e9mon" + "entry_text": "When it senses danger, it raises\nall the barbs on its body. These\nbarbs grow slower than NIDORINO’s.", + "category": "Poison Pin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidorina/meson.build b/res/pokemon/nidorina/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/nidorina/meson.build +++ b/res/pokemon/nidorina/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nidorino/data.json b/res/pokemon/nidorino/data.json index fe98dac6d9..6a1fecf2dc 100644 --- a/res/pokemon/nidorino/data.json +++ b/res/pokemon/nidorino/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "It has a violent disposition and\nstabs foes with its horn, which\noozes poison upon impact.", - "category": "Poison Pin Pok\u00e9mon" + "category": "Poison Pin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidorino/meson.build b/res/pokemon/nidorino/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/nidorino/meson.build +++ b/res/pokemon/nidorino/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nincada/data.json b/res/pokemon/nincada/data.json index 0d6156873f..7249252c3a 100644 --- a/res/pokemon/nincada/data.json +++ b/res/pokemon/nincada/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_COMPOUND_EYES", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It grows underground, sensing\nits surroundings using antennae\ninstead of its virtually blind eyes.", - "category": "Trainee Pok\u00e9mon" + "category": "Trainee Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2052 } -} \ No newline at end of file +} diff --git a/res/pokemon/nincada/meson.build b/res/pokemon/nincada/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/nincada/meson.build +++ b/res/pokemon/nincada/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ninetales/data.json b/res/pokemon/ninetales/data.json index 2b93665561..216ab0eaf5 100644 --- a/res/pokemon/ninetales/data.json +++ b/res/pokemon/ninetales/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_NASTY_PLOT" ], @@ -104,13 +102,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 9, "entry_text": "Its nine tails are said to be\nimbued with a mystic power.\nIt can live for a thousand years.", - "category": "Fox Pok\u00e9mon" + "category": "Fox Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/ninetales/meson.build b/res/pokemon/ninetales/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ninetales/meson.build +++ b/res/pokemon/ninetales/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ninjask/data.json b/res/pokemon/ninjask/data.json index 65537e861c..5c181340d9 100644 --- a/res/pokemon/ninjask/data.json +++ b/res/pokemon/ninjask/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SPEED_BOOST", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUG_BITE" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65534, "entry_text": "Because it moves so quickly, it\nsometimes becomes unseeable. It\ncongregates around tree sap.", - "category": "Ninja Pok\u00e9mon" + "category": "Ninja Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/ninjask/meson.build b/res/pokemon/ninjask/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ninjask/meson.build +++ b/res/pokemon/ninjask/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/noctowl/data.json b/res/pokemon/noctowl/data.json index 4bbae37855..b836c6d9c4 100644 --- a/res/pokemon/noctowl/data.json +++ b/res/pokemon/noctowl/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_KEEN_EYE" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SKY_ATTACK" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 3, "entry_text": "Its eyes are specially developed\nto enable it to see clearly even in\nmurky darkness and minimal light.", - "category": "Owl Pok\u00e9mon" + "category": "Owl Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/noctowl/meson.build b/res/pokemon/noctowl/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/noctowl/meson.build +++ b/res/pokemon/noctowl/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/000/data.json b/res/pokemon/none/data.json similarity index 91% rename from res/pokemon/000/data.json rename to res/pokemon/none/data.json index 5c643cdb58..54c0b5cf17 100644 --- a/res/pokemon/000/data.json +++ b/res/pokemon/none/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_NONE", "EGG_GROUP_NONE" ], "abilities": [ "ABILITY_NONE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ ], "by_tm": [ ] @@ -52,6 +50,6 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": null, - "category": "????? Pok\u00e9mon" + "category": "????? Pokémon" } -} \ No newline at end of file +} diff --git a/res/pokemon/000/female_back.png b/res/pokemon/none/female_back.png similarity index 100% rename from res/pokemon/000/female_back.png rename to res/pokemon/none/female_back.png diff --git a/res/pokemon/000/female_back.png.key b/res/pokemon/none/female_back.png.key similarity index 100% rename from res/pokemon/000/female_back.png.key rename to res/pokemon/none/female_back.png.key diff --git a/res/pokemon/000/female_front.png b/res/pokemon/none/female_front.png similarity index 100% rename from res/pokemon/000/female_front.png rename to res/pokemon/none/female_front.png diff --git a/res/pokemon/000/female_front.png.key b/res/pokemon/none/female_front.png.key similarity index 100% rename from res/pokemon/000/female_front.png.key rename to res/pokemon/none/female_front.png.key diff --git a/res/pokemon/000/icon.png b/res/pokemon/none/icon.png similarity index 100% rename from res/pokemon/000/icon.png rename to res/pokemon/none/icon.png diff --git a/res/pokemon/000/male_back.png b/res/pokemon/none/male_back.png similarity index 100% rename from res/pokemon/000/male_back.png rename to res/pokemon/none/male_back.png diff --git a/res/pokemon/000/male_back.png.key b/res/pokemon/none/male_back.png.key similarity index 100% rename from res/pokemon/000/male_back.png.key rename to res/pokemon/none/male_back.png.key diff --git a/res/pokemon/000/male_front.png b/res/pokemon/none/male_front.png similarity index 100% rename from res/pokemon/000/male_front.png rename to res/pokemon/none/male_front.png diff --git a/res/pokemon/000/male_front.png.key b/res/pokemon/none/male_front.png.key similarity index 100% rename from res/pokemon/000/male_front.png.key rename to res/pokemon/none/male_front.png.key diff --git a/res/pokemon/000/meson.build b/res/pokemon/none/meson.build similarity index 91% rename from res/pokemon/000/meson.build rename to res/pokemon/none/meson.build index 555a60de82..e29d8eac7b 100644 --- a/res/pokemon/000/meson.build +++ b/res/pokemon/none/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/000/normal_pal.NCLR b/res/pokemon/none/normal_pal.NCLR similarity index 100% rename from res/pokemon/000/normal_pal.NCLR rename to res/pokemon/none/normal_pal.NCLR diff --git a/res/pokemon/000/shiny_pal.NCLR b/res/pokemon/none/shiny_pal.NCLR similarity index 100% rename from res/pokemon/000/shiny_pal.NCLR rename to res/pokemon/none/shiny_pal.NCLR diff --git a/res/pokemon/000/sprite_data.json b/res/pokemon/none/sprite_data.json similarity index 100% rename from res/pokemon/000/sprite_data.json rename to res/pokemon/none/sprite_data.json diff --git a/res/pokemon/nosepass/data.json b/res/pokemon/nosepass/data.json index 384f778ff6..d578a88bc8 100644 --- a/res/pokemon/nosepass/data.json +++ b/res/pokemon/nosepass/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_STURDY", "ABILITY_MAGNET_PULL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "When endangered, it may protect\nitself by raising its magnetism and\ndrawing iron objects to its body.", - "category": "Compass Pok\u00e9mon" + "category": "Compass Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/nosepass/meson.build b/res/pokemon/nosepass/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/nosepass/meson.build +++ b/res/pokemon/nosepass/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/numel/data.json b/res/pokemon/numel/data.json index d48ae11c80..708907d2e4 100644 --- a/res/pokemon/numel/data.json +++ b/res/pokemon/numel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SIMPLE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "Its humped back stores intensely\nhot magma. In rain, the magma\ncools, slowing its movement.", - "category": "Numb Pok\u00e9mon" + "category": "Numb Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2050 } -} \ No newline at end of file +} diff --git a/res/pokemon/numel/meson.build b/res/pokemon/numel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/numel/meson.build +++ b/res/pokemon/numel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/nuzleaf/data.json b/res/pokemon/nuzleaf/data.json index 43c78ce206..ffcf2042b6 100644 --- a/res/pokemon/nuzleaf/data.json +++ b/res/pokemon/nuzleaf/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_RAZOR_LEAF" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "The sound of its grass flute makes\nits listeners uneasy. It lives deep\nin forests.", - "category": "Wily Pok\u00e9mon" + "category": "Wily Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4097 } -} \ No newline at end of file +} diff --git a/res/pokemon/nuzleaf/meson.build b/res/pokemon/nuzleaf/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/nuzleaf/meson.build +++ b/res/pokemon/nuzleaf/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/octillery/data.json b/res/pokemon/octillery/data.json index 558913c1ba..1989fa2482 100644 --- a/res/pokemon/octillery/data.json +++ b/res/pokemon/octillery/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SUCTION_CUPS", "ABILITY_SNIPER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GUNK_SHOT" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "It loves to lurk inside holes in\nrocks. It sometimes sprays ink on\nprey by sticking out only its mouth.", - "category": "Jet Pok\u00e9mon" + "category": "Jet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/octillery/meson.build b/res/pokemon/octillery/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/octillery/meson.build +++ b/res/pokemon/octillery/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/oddish/data.json b/res/pokemon/oddish/data.json index ee91ca67cd..f0298078c8 100644 --- a/res/pokemon/oddish/data.json +++ b/res/pokemon/oddish/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "It often plants its root feet in the\nground during the day and sows\nseeds as it walks about at night.", - "category": "Weed Pok\u00e9mon" + "category": "Weed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/oddish/meson.build b/res/pokemon/oddish/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/oddish/meson.build +++ b/res/pokemon/oddish/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/omanyte/data.json b/res/pokemon/omanyte/data.json index 1da1a132f6..25e33acafb 100644 --- a/res/pokemon/omanyte/data.json +++ b/res/pokemon/omanyte/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONSTRICT" ], @@ -118,14 +116,14 @@ "pokemon_pos_f": 28, "trainer_pos_m": 9, "pokemon_pos_m": 28, - "entry_text": "A Pok\u00e9mon that was resurrected\nfrom a fossil using modern science.\nIt swam in ancient seas.", - "category": "Spiral Pok\u00e9mon" + "entry_text": "A Pokémon that was resurrected\nfrom a fossil using modern science.\nIt swam in ancient seas.", + "category": "Spiral Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 779 } -} \ No newline at end of file +} diff --git a/res/pokemon/omanyte/meson.build b/res/pokemon/omanyte/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/omanyte/meson.build +++ b/res/pokemon/omanyte/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/omastar/data.json b/res/pokemon/omastar/data.json index 721ae21929..93b07bf8a6 100644 --- a/res/pokemon/omastar/data.json +++ b/res/pokemon/omastar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_SHELL_ARMOR" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONSTRICT" ], @@ -118,14 +116,14 @@ "pokemon_pos_f": 14, "trainer_pos_m": 9, "pokemon_pos_m": 14, - "entry_text": "It is thought that this Pok\u00e9mon\nbecame extinct because its spiral\nshell grew too large.", - "category": "Spiral Pok\u00e9mon" + "entry_text": "It is thought that this Pokémon\nbecame extinct because its spiral\nshell grew too large.", + "category": "Spiral Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 779 } -} \ No newline at end of file +} diff --git a/res/pokemon/omastar/meson.build b/res/pokemon/omastar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/omastar/meson.build +++ b/res/pokemon/omastar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/onix/data.json b/res/pokemon/onix/data.json index 5f7bf1c823..52bc139fbc 100644 --- a/res/pokemon/onix/data.json +++ b/res/pokemon/onix/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SPORT" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 25, "pokemon_pos_m": 1, "entry_text": "It burrows through the ground\nat a speed of 50 mph while\nfeeding on large boulders.\n", - "category": "Rock Snake Pok\u00e9mon" + "category": "Rock Snake Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/onix/meson.build b/res/pokemon/onix/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/onix/meson.build +++ b/res/pokemon/onix/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pachirisu/data.json b/res/pokemon/pachirisu/data.json index 1f61a87f97..7d2380daa1 100644 --- a/res/pokemon/pachirisu/data.json +++ b/res/pokemon/pachirisu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_PICKUP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "A pair may be seen rubbing their\ncheek pouches together in an\neffort to share stored electricity.", - "category": "EleSquirrel Pok\u00e9mon" + "category": "EleSquirrel Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/pachirisu/meson.build b/res/pokemon/pachirisu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pachirisu/meson.build +++ b/res/pokemon/pachirisu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/palkia/data.json b/res/pokemon/palkia/data.json index 01528abfb0..7d35f003f1 100644 --- a/res/pokemon/palkia/data.json +++ b/res/pokemon/palkia/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DRAGON_BREATH" ], @@ -132,14 +130,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 26, "pokemon_pos_m": 2, - "entry_text": "A legendary Pok\u00e9mon of Sinnoh.\nIt is said that space becomes more\nstable with PALKIA\u2019s every breath.", - "category": "Spatial Pok\u00e9mon" + "entry_text": "A legendary Pokémon of Sinnoh.\nIt is said that space becomes more\nstable with PALKIA’s every breath.", + "category": "Spatial Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3843 } -} \ No newline at end of file +} diff --git a/res/pokemon/palkia/meson.build b/res/pokemon/palkia/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/palkia/meson.build +++ b/res/pokemon/palkia/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/paras/data.json b/res/pokemon/paras/data.json index b0764bbe9c..4be102a987 100644 --- a/res/pokemon/paras/data.json +++ b/res/pokemon/paras/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", "ABILITY_DRY_SKIN" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 30, "entry_text": "Mushrooms named tochukaso grow\non its back. They grow along\nwith the host PARAS.", - "category": "Mushroom Pok\u00e9mon" + "category": "Mushroom Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 260 } -} \ No newline at end of file +} diff --git a/res/pokemon/paras/meson.build b/res/pokemon/paras/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/paras/meson.build +++ b/res/pokemon/paras/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/parasect/data.json b/res/pokemon/parasect/data.json index 7037e490c4..cd4ba1eede 100644 --- a/res/pokemon/parasect/data.json +++ b/res/pokemon/parasect/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", "ABILITY_DRY_SKIN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CROSS_POISON" ], @@ -113,14 +111,14 @@ "pokemon_pos_f": 18, "trainer_pos_m": 9, "pokemon_pos_m": 18, - "entry_text": "A mushroom grown larger than the\nhost\u2019s body controls PARASECT.\nIt scatters poisonous spores.", - "category": "Mushroom Pok\u00e9mon" + "entry_text": "A mushroom grown larger than the\nhost’s body controls PARASECT.\nIt scatters poisonous spores.", + "category": "Mushroom Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 260 } -} \ No newline at end of file +} diff --git a/res/pokemon/parasect/meson.build b/res/pokemon/parasect/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/parasect/meson.build +++ b/res/pokemon/parasect/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pelipper/data.json b/res/pokemon/pelipper/data.json index 47e149f326..6efe716023 100644 --- a/res/pokemon/pelipper/data.json +++ b/res/pokemon/pelipper/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -123,14 +121,14 @@ "pokemon_pos_f": 65531, "trainer_pos_m": 9, "pokemon_pos_m": 65531, - "entry_text": "It is a messenger of the skies,\ncarrying small Pok\u00e9mon and\neggs to safety in its bill.", - "category": "Water Bird Pok\u00e9mon" + "entry_text": "It is a messenger of the skies,\ncarrying small Pokémon and\neggs to safety in its bill.", + "category": "Water Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 4355 } -} \ No newline at end of file +} diff --git a/res/pokemon/pelipper/meson.build b/res/pokemon/pelipper/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pelipper/meson.build +++ b/res/pokemon/pelipper/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/persian/data.json b/res/pokemon/persian/data.json index f656041b1e..8e214e5d3a 100644 --- a/res/pokemon/persian/data.json +++ b/res/pokemon/persian/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIMBER", "ABILITY_TECHNICIAN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SWITCHEROO" ], @@ -129,14 +127,14 @@ "pokemon_pos_f": 16, "trainer_pos_m": 9, "pokemon_pos_m": 16, - "entry_text": "A very haughty Pok\u00e9mon. Among\nfans, the size of the jewel in its\nforehead is a topic of much talk.", - "category": "Classy Cat Pok\u00e9mon" + "entry_text": "A very haughty Pokémon. Among\nfans, the size of the jewel in its\nforehead is a topic of much talk.", + "category": "Classy Cat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/persian/meson.build b/res/pokemon/persian/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/persian/meson.build +++ b/res/pokemon/persian/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/phanpy/data.json b/res/pokemon/phanpy/data.json index bf0c59f5f6..e0d6f19df5 100644 --- a/res/pokemon/phanpy/data.json +++ b/res/pokemon/phanpy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ODOR_SLEUTH" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It is strong despite its compact\nsize. It can easily pick up and\ncarry an adult human on its back.", - "category": "Long Nose Pok\u00e9mon" + "category": "Long Nose Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/phanpy/meson.build b/res/pokemon/phanpy/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/phanpy/meson.build +++ b/res/pokemon/phanpy/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/phione/data.json b/res/pokemon/phione/data.json index d3beb228b7..98644cf850 100644 --- a/res/pokemon/phione/data.json +++ b/res/pokemon/phione/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HYDRATION", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "It drifts in warm seas. It always\nreturns to where it was born, no\nmatter how far it may have drifted.", - "category": "Sea Drifter Pok\u00e9mon" + "category": "Sea Drifter Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/phione/meson.build b/res/pokemon/phione/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/phione/meson.build +++ b/res/pokemon/phione/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pichu/data.json b/res/pokemon/pichu/data.json index 7524e0f169..bc052fd4fc 100644 --- a/res/pokemon/pichu/data.json +++ b/res/pokemon/pichu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_SHOCK" ], @@ -103,13 +101,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "The electric sacs in its cheeks are\nsmall. If even a little electricity\nleaks, it becomes shocked.", - "category": "Tiny Mouse Pok\u00e9mon" + "category": "Tiny Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/pichu/meson.build b/res/pokemon/pichu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pichu/meson.build +++ b/res/pokemon/pichu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pidgeot/data.json b/res/pokemon/pidgeot/data.json index a9132568e0..4aa2f99f8d 100644 --- a/res/pokemon/pidgeot/data.json +++ b/res/pokemon/pidgeot/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_TANGLED_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 6, "entry_text": "By flapping its wings with all its\nmight, PIDGEOT can make a gust of\nwind capable of bending tall trees.", - "category": "Bird Pok\u00e9mon" + "category": "Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/pidgeot/meson.build b/res/pokemon/pidgeot/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pidgeot/meson.build +++ b/res/pokemon/pidgeot/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pidgeotto/data.json b/res/pokemon/pidgeotto/data.json index 5a089d3af8..1425becb5d 100644 --- a/res/pokemon/pidgeotto/data.json +++ b/res/pokemon/pidgeotto/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_TANGLED_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "It flies over its wide territory in\nsearch of prey, downing it\nwith its highly developed claws.", - "category": "Bird Pok\u00e9mon" + "category": "Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/pidgeotto/meson.build b/res/pokemon/pidgeotto/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pidgeotto/meson.build +++ b/res/pokemon/pidgeotto/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pidgey/data.json b/res/pokemon/pidgey/data.json index 2300141056..ba89b6208d 100644 --- a/res/pokemon/pidgey/data.json +++ b/res/pokemon/pidgey/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_TANGLED_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 31, "entry_text": "It is docile and prefers to avoid\nconflict. If disturbed, however,\nit can ferociously strike back.", - "category": "Tiny Bird Pok\u00e9mon" + "category": "Tiny Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/pidgey/meson.build b/res/pokemon/pidgey/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pidgey/meson.build +++ b/res/pokemon/pidgey/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pikachu/data.json b/res/pokemon/pikachu/data.json index 750cddfde1..54ddab40a7 100644 --- a/res/pokemon/pikachu/data.json +++ b/res/pokemon/pikachu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_SHOCK" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "It occasionally uses an electric\nshock to recharge a fellow PIKACHU\nthat is in a weakened state.", - "category": "Mouse Pok\u00e9mon" + "category": "Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/pikachu/meson.build b/res/pokemon/pikachu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pikachu/meson.build +++ b/res/pokemon/pikachu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/piloswine/data.json b/res/pokemon/piloswine/data.json index 301299df23..eef7ba219c 100644 --- a/res/pokemon/piloswine/data.json +++ b/res/pokemon/piloswine/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SNOW_CLOAK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ANCIENT_POWER" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "Covered by a shaggy coat, it is\nstrong against the cold. Its tusks\nof ice thicken when it snows.", - "category": "Swine Pok\u00e9mon" + "category": "Swine Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2061 } -} \ No newline at end of file +} diff --git a/res/pokemon/piloswine/meson.build b/res/pokemon/piloswine/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/piloswine/meson.build +++ b/res/pokemon/piloswine/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pineco/data.json b/res/pokemon/pineco/data.json index 00b6ccdbfe..09242ff5ea 100644 --- a/res/pokemon/pineco/data.json +++ b/res/pokemon/pineco/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -114,14 +112,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "entry_text": "It looks just like a pinecone.\nIts shell protects it from bird\nPok\u00e9mon that peck it by mistake.", - "category": "Bagworm Pok\u00e9mon" + "entry_text": "It looks just like a pinecone.\nIts shell protects it from bird\nPokémon that peck it by mistake.", + "category": "Bagworm Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/pineco/meson.build b/res/pokemon/pineco/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pineco/meson.build +++ b/res/pokemon/pineco/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pinsir/data.json b/res/pokemon/pinsir/data.json index 29045e3316..478ec5d760 100644 --- a/res/pokemon/pinsir/data.json +++ b/res/pokemon/pinsir/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_MOLD_BREAKER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_VICE_GRIP" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 5, "trainer_pos_m": 9, "pokemon_pos_m": 5, - "entry_text": "It grips prey with its pincers\nuntil the prey is torn in half.\nWhat it can\u2019t tear, it tosses far.", - "category": "Stag Beetle Pok\u00e9mon" + "entry_text": "It grips prey with its pincers\nuntil the prey is torn in half.\nWhat it can’t tear, it tosses far.", + "category": "Stag Beetle Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/pinsir/meson.build b/res/pokemon/pinsir/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pinsir/meson.build +++ b/res/pokemon/pinsir/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/piplup/data.json b/res/pokemon/piplup/data.json index d53d5760c6..3ed637e4f5 100644 --- a/res/pokemon/piplup/data.json +++ b/res/pokemon/piplup/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "A poor walker, it often falls down.\nHowever, its strong pride makes it\npuff up its chest without a care.", - "category": "Penguin Pok\u00e9mon" + "category": "Penguin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/piplup/meson.build b/res/pokemon/piplup/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/piplup/meson.build +++ b/res/pokemon/piplup/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/plusle/data.json b/res/pokemon/plusle/data.json index 7ec05e0108..8e92e6aec8 100644 --- a/res/pokemon/plusle/data.json +++ b/res/pokemon/plusle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_PLUS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "It cheers on friends with pom-poms\nmade of sparks. It drains power\nfrom telephone poles.", - "category": "Cheering Pok\u00e9mon" + "category": "Cheering Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/plusle/meson.build b/res/pokemon/plusle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/plusle/meson.build +++ b/res/pokemon/plusle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/politoed/data.json b/res/pokemon/politoed/data.json index 35e3dcecf4..b342cc808c 100644 --- a/res/pokemon/politoed/data.json +++ b/res/pokemon/politoed/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", "ABILITY_DAMP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": true - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE_BEAM" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "It gathers groups of others as\ntheir leader. Its cries make\nPOLIWAG obey.", - "category": "Frog Pok\u00e9mon" + "category": "Frog Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/politoed/meson.build b/res/pokemon/politoed/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/politoed/meson.build +++ b/res/pokemon/politoed/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/poliwag/data.json b/res/pokemon/poliwag/data.json index 7ddb513eff..8b7858b8a0 100644 --- a/res/pokemon/poliwag/data.json +++ b/res/pokemon/poliwag/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", "ABILITY_DAMP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": true - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_WATER_SPORT" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "Its skin is so thin, its internal\norgans are visible. It has trouble\nwalking on its newly grown feet.", - "category": "Tadpole Pok\u00e9mon" + "category": "Tadpole Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/poliwag/meson.build b/res/pokemon/poliwag/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/poliwag/meson.build +++ b/res/pokemon/poliwag/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/poliwhirl/data.json b/res/pokemon/poliwhirl/data.json index 540bae9e9b..cc7364a1c8 100644 --- a/res/pokemon/poliwhirl/data.json +++ b/res/pokemon/poliwhirl/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", "ABILITY_DAMP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": true - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_WATER_SPORT" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "The spiral pattern on its belly\nsubtly undulates. Staring at it\ngradually causes drowsiness.", - "category": "Tadpole Pok\u00e9mon" + "category": "Tadpole Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/poliwhirl/meson.build b/res/pokemon/poliwhirl/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/poliwhirl/meson.build +++ b/res/pokemon/poliwhirl/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/poliwrath/data.json b/res/pokemon/poliwrath/data.json index c4071c8396..a87967d565 100644 --- a/res/pokemon/poliwrath/data.json +++ b/res/pokemon/poliwrath/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_WATER_ABSORB", "ABILITY_DAMP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": true - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE_BEAM" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "With its extremely tough muscles,\nit can keep swimming in the Pacific\nOcean without resting.", - "category": "Tadpole Pok\u00e9mon" + "category": "Tadpole Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, "unused": 2307 } -} \ No newline at end of file +} diff --git a/res/pokemon/poliwrath/meson.build b/res/pokemon/poliwrath/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/poliwrath/meson.build +++ b/res/pokemon/poliwrath/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ponyta/data.json b/res/pokemon/ponyta/data.json index 5fdb275e8b..e4e5e4243d 100644 --- a/res/pokemon/ponyta/data.json +++ b/res/pokemon/ponyta/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -106,13 +104,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "As a newborn, it can barely stand.\nHowever, through galloping, its\nlegs are made tougher and faster.", - "category": "Fire Horse Pok\u00e9mon" + "category": "Fire Horse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/ponyta/meson.build b/res/pokemon/ponyta/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ponyta/meson.build +++ b/res/pokemon/ponyta/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/poochyena/data.json b/res/pokemon/poochyena/data.json index 1c5213b4bd..e3e3e59fc3 100644 --- a/res/pokemon/poochyena/data.json +++ b/res/pokemon/poochyena/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_QUICK_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -114,14 +112,14 @@ "pokemon_pos_f": 26, "trainer_pos_m": 9, "pokemon_pos_m": 26, - "entry_text": "A Pok\u00e9mon with a persistent\nnature, it chases its chosen prey\nuntil the prey becomes exhausted.", - "category": "Bite Pok\u00e9mon" + "entry_text": "A Pokémon with a persistent\nnature, it chases its chosen prey\nuntil the prey becomes exhausted.", + "category": "Bite Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4112 } -} \ No newline at end of file +} diff --git a/res/pokemon/poochyena/meson.build b/res/pokemon/poochyena/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/poochyena/meson.build +++ b/res/pokemon/poochyena/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/porygon/data.json b/res/pokemon/porygon/data.json index 0268be1f41..eb9b699314 100644 --- a/res/pokemon/porygon/data.json +++ b/res/pokemon/porygon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_TRACE", "ABILITY_DOWNLOAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONVERSION_2" ], @@ -123,14 +121,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "A man-made Pok\u00e9mon created using\nadvanced scientific means. It can\nmove freely in cyberspace.", - "category": "Virtual Pok\u00e9mon" + "entry_text": "A man-made Pokémon created using\nadvanced scientific means. It can\nmove freely in cyberspace.", + "category": "Virtual Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/porygon/meson.build b/res/pokemon/porygon/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/porygon/meson.build +++ b/res/pokemon/porygon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/porygon2/data.json b/res/pokemon/porygon2/data.json index 837c24fafd..c58ac2af6e 100644 --- a/res/pokemon/porygon2/data.json +++ b/res/pokemon/porygon2/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_TRACE", "ABILITY_DOWNLOAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CONVERSION_2" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65529, "entry_text": "It was upgraded to enable the\nexploration of other planets.\nHowever, it failed to measure up.", - "category": "Virtual Pok\u00e9mon" + "category": "Virtual Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/porygon2/meson.build b/res/pokemon/porygon2/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/porygon2/meson.build +++ b/res/pokemon/porygon2/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/porygon_z/data.json b/res/pokemon/porygon_z/data.json index 5339e05723..e73286b0c3 100644 --- a/res/pokemon/porygon_z/data.json +++ b/res/pokemon/porygon_z/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ADAPTABILITY", "ABILITY_DOWNLOAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK_ROOM" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "Its programming was modified to\nenable work in alien dimensions.\nIt did not work as planned.", - "category": "Virtual Pok\u00e9mon" + "category": "Virtual Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/porygon_z/meson.build b/res/pokemon/porygon_z/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/porygon_z/meson.build +++ b/res/pokemon/porygon_z/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/primeape/data.json b/res/pokemon/primeape/data.json index a9c2488b4d..eb3f998512 100644 --- a/res/pokemon/primeape/data.json +++ b/res/pokemon/primeape/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", "ABILITY_ANGER_POINT" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FLING" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "It grows angry if you see its eyes\nand gets angrier if you run. If you\nbeat it, it gets even madder.", - "category": "Pig Monkey Pok\u00e9mon" + "category": "Pig Monkey Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/primeape/meson.build b/res/pokemon/primeape/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/primeape/meson.build +++ b/res/pokemon/primeape/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/prinplup/data.json b/res/pokemon/prinplup/data.json index 83d9514574..589ac1e993 100644 --- a/res/pokemon/prinplup/data.json +++ b/res/pokemon/prinplup/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "Because every PRINPLUP considers\nitself to be the most important,\nthey can never form a group.", - "category": "Penguin Pok\u00e9mon" + "category": "Penguin Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/prinplup/meson.build b/res/pokemon/prinplup/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/prinplup/meson.build +++ b/res/pokemon/prinplup/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/probopass/data.json b/res/pokemon/probopass/data.json index e7ce804dad..a1d0693da0 100644 --- a/res/pokemon/probopass/data.json +++ b/res/pokemon/probopass/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_STURDY", "ABILITY_MAGNET_PULL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MAGNET_RISE" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "It freely controls three small\nunits called Mini-Noses using\nmagnetic force.", - "category": "Compass Pok\u00e9mon" + "category": "Compass Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/probopass/meson.build b/res/pokemon/probopass/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/probopass/meson.build +++ b/res/pokemon/probopass/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/psyduck/data.json b/res/pokemon/psyduck/data.json index 7719da9c8e..f815458b4d 100644 --- a/res/pokemon/psyduck/data.json +++ b/res/pokemon/psyduck/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", "ABILITY_CLOUD_NINE" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_SPORT" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "Overwhelmed by enigmatic abilities,\nit suffers a constant headache. It\nsometimes uses mysterious powers.", - "category": "Duck Pok\u00e9mon" + "category": "Duck Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/psyduck/meson.build b/res/pokemon/psyduck/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/psyduck/meson.build +++ b/res/pokemon/psyduck/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/pupitar/data.json b/res/pokemon/pupitar/data.json index cf89b93f53..228a23a173 100644 --- a/res/pokemon/pupitar/data.json +++ b/res/pokemon/pupitar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "Its body is as hard as bedrock.\nBy venting pressurized gas, it can\nlaunch itself like a rocket.", - "category": "Hard Shell Pok\u00e9mon" + "category": "Hard Shell Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/pupitar/meson.build b/res/pokemon/pupitar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/pupitar/meson.build +++ b/res/pokemon/pupitar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/purugly/data.json b/res/pokemon/purugly/data.json index 5829cf82e9..af95eee235 100644 --- a/res/pokemon/purugly/data.json +++ b/res/pokemon/purugly/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FAKE_OUT" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It binds its body with its tails to\nmake itself look bigger. If it locks\neyes, it will glare ceaselessly.", - "category": "Tiger Cat Pok\u00e9mon" + "category": "Tiger Cat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4102 } -} \ No newline at end of file +} diff --git a/res/pokemon/purugly/meson.build b/res/pokemon/purugly/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/purugly/meson.build +++ b/res/pokemon/purugly/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/quagsire/data.json b/res/pokemon/quagsire/data.json index c24c49bae6..c3f2835cf2 100644 --- a/res/pokemon/quagsire/data.json +++ b/res/pokemon/quagsire/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", "ABILITY_WATER_ABSORB" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_GUN" ], @@ -122,14 +120,14 @@ "pokemon_pos_f": 6, "trainer_pos_m": 9, "pokemon_pos_m": 6, - "entry_text": "It has an easygoing nature. It\ndoesn\u2019t care if it bumps its head on\nboats and boulders while swimming.", - "category": "Water Fish Pok\u00e9mon" + "entry_text": "It has an easygoing nature. It\ndoesn’t care if it bumps its head on\nboats and boulders while swimming.", + "category": "Water Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/quagsire/meson.build b/res/pokemon/quagsire/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/quagsire/meson.build +++ b/res/pokemon/quagsire/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/quilava/data.json b/res/pokemon/quilava/data.json index b6b3b86686..8636e9fe79 100644 --- a/res/pokemon/quilava/data.json +++ b/res/pokemon/quilava/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "It intimidates foes with the heat\nof its flames. The fire burns more\nstrongly when it readies to fight.", - "category": "Volcano Pok\u00e9mon" + "category": "Volcano Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/quilava/meson.build b/res/pokemon/quilava/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/quilava/meson.build +++ b/res/pokemon/quilava/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/qwilfish/data.json b/res/pokemon/qwilfish/data.json index 91236bbd69..e7ad260332 100644 --- a/res/pokemon/qwilfish/data.json +++ b/res/pokemon/qwilfish/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_SWIFT_SWIM" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPIKES" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "It shoots the poison spines on its\nbody in all directions. Its round\nform makes it a poor swimmer.", - "category": "Balloon Pok\u00e9mon" + "category": "Balloon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 1539 } -} \ No newline at end of file +} diff --git a/res/pokemon/qwilfish/meson.build b/res/pokemon/qwilfish/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/qwilfish/meson.build +++ b/res/pokemon/qwilfish/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/raichu/data.json b/res/pokemon/raichu/data.json index 4644fd1ad2..7d5b973ffc 100644 --- a/res/pokemon/raichu/data.json +++ b/res/pokemon/raichu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_SHOCK" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "Its tail discharges electricity into\nthe ground, protecting it from\ngetting shocked.", - "category": "Mouse Pok\u00e9mon" + "category": "Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/raichu/meson.build b/res/pokemon/raichu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/raichu/meson.build +++ b/res/pokemon/raichu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/raikou/data.json b/res/pokemon/raikou/data.json index 83c2bc8fba..008292faf0 100644 --- a/res/pokemon/raikou/data.json +++ b/res/pokemon/raikou/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 3, "entry_text": "It is said to have fallen with\nlightning. It can fire thunderbolts\nfrom the rain clouds on its back.", - "category": "Thunder Pok\u00e9mon" + "category": "Thunder Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/raikou/meson.build b/res/pokemon/raikou/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/raikou/meson.build +++ b/res/pokemon/raikou/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/ralts/data.json b/res/pokemon/ralts/data.json index f0ea81cdbf..a69f45b924 100644 --- a/res/pokemon/ralts/data.json +++ b/res/pokemon/ralts/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_TRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -129,14 +127,14 @@ "pokemon_pos_f": 26, "trainer_pos_m": 9, "pokemon_pos_m": 26, - "entry_text": "If its horns capture the warm\nfeelings of people or Pok\u00e9mon,\nits body warms up slightly.", - "category": "Feeling Pok\u00e9mon" + "entry_text": "If its horns capture the warm\nfeelings of people or Pokémon,\nits body warms up slightly.", + "category": "Feeling Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/ralts/meson.build b/res/pokemon/ralts/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ralts/meson.build +++ b/res/pokemon/ralts/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rampardos/data.json b/res/pokemon/rampardos/data.json index d6e3886631..5e0da283ed 100644 --- a/res/pokemon/rampardos/data.json +++ b/res/pokemon/rampardos/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_MOLD_BREAKER", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HEADBUTT" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 3, "entry_text": "If two were to smash their heads\ntogether, their foot-thick skulls\nwould keep them from fainting.", - "category": "Head Butt Pok\u00e9mon" + "category": "Head Butt Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3595 } -} \ No newline at end of file +} diff --git a/res/pokemon/rampardos/meson.build b/res/pokemon/rampardos/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/rampardos/meson.build +++ b/res/pokemon/rampardos/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rapidash/data.json b/res/pokemon/rapidash/data.json index 6273733012..e0ac5e4185 100644 --- a/res/pokemon/rapidash/data.json +++ b/res/pokemon/rapidash/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_FLASH_FIRE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_JAB" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "When at an all-out gallop, its\nblazing mane sparkles, enhancing\nits beautiful appearance.", - "category": "Fire Horse Pok\u00e9mon" + "category": "Fire Horse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/rapidash/meson.build b/res/pokemon/rapidash/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/rapidash/meson.build +++ b/res/pokemon/rapidash/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/raticate/data.json b/res/pokemon/raticate/data.json index 3257e9ff8d..253acebb71 100644 --- a/res/pokemon/raticate/data.json +++ b/res/pokemon/raticate/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_GUTS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SWORDS_DANCE" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "It whittles its constantly growing\nfangs by gnawing on hard things.\nIt can chew apart cinder walls.", - "category": "Mouse Pok\u00e9mon" + "category": "Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/raticate/meson.build b/res/pokemon/raticate/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/raticate/meson.build +++ b/res/pokemon/raticate/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rattata/data.json b/res/pokemon/rattata/data.json index 335c163779..cd64dee515 100644 --- a/res/pokemon/rattata/data.json +++ b/res/pokemon/rattata/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_GUTS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "Cautious in the extreme, its\nhardy vitality lets it live in\nany kind of environment.", - "category": "Mouse Pok\u00e9mon" + "category": "Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/rattata/meson.build b/res/pokemon/rattata/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/rattata/meson.build +++ b/res/pokemon/rattata/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rayquaza/data.json b/res/pokemon/rayquaza/data.json index 7c9b85442d..bfed8b6c83 100644 --- a/res/pokemon/rayquaza/data.json +++ b/res/pokemon/rayquaza/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_AIR_LOCK", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TWISTER" ], @@ -139,13 +137,13 @@ "trainer_pos_m": 22, "pokemon_pos_m": 0, "entry_text": "It lives in the ozone layer far\nabove the clouds and cannot be\nseen from the ground.", - "category": "Sky High Pok\u00e9mon" + "category": "Sky High Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4367 } -} \ No newline at end of file +} diff --git a/res/pokemon/rayquaza/meson.build b/res/pokemon/rayquaza/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/rayquaza/meson.build +++ b/res/pokemon/rayquaza/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/regice/data.json b/res/pokemon/regice/data.json index ad12994719..68f115ac2b 100644 --- a/res/pokemon/regice/data.json +++ b/res/pokemon/regice/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_EXPLOSION" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 12, "pokemon_pos_m": 2, "entry_text": "Its body is made of ice from the\nice age. It controls frigid air of\n-328 degrees Fahrenheit.", - "category": "Iceberg Pok\u00e9mon" + "category": "Iceberg Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3341 } -} \ No newline at end of file +} diff --git a/res/pokemon/regice/meson.build b/res/pokemon/regice/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/regice/meson.build +++ b/res/pokemon/regice/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/regigigas/data.json b/res/pokemon/regigigas/data.json index 5ae258eeb3..9c7ae25932 100644 --- a/res/pokemon/regigigas/data.json +++ b/res/pokemon/regigigas/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SLOW_START", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_PUNCH" ], @@ -118,14 +116,14 @@ "pokemon_pos_f": 1, "trainer_pos_m": 23, "pokemon_pos_m": 1, - "entry_text": "It is said to have made Pok\u00e9mon\nthat look like itself from a special\nice mountain, rocks, and magma.", - "category": "Colossal Pok\u00e9mon" + "entry_text": "It is said to have made Pokémon\nthat look like itself from a special\nice mountain, rocks, and magma.", + "category": "Colossal Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/regigigas/meson.build b/res/pokemon/regigigas/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/regigigas/meson.build +++ b/res/pokemon/regigigas/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/regirock/data.json b/res/pokemon/regirock/data.json index d49f92ba3f..24948f8777 100644 --- a/res/pokemon/regirock/data.json +++ b/res/pokemon/regirock/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_EXPLOSION" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 12, "pokemon_pos_m": 1, "entry_text": "Its entire body is made of rock.\nIf any part chips off in battle, it\nattaches rocks to repair itself.", - "category": "Rock Peak Pok\u00e9mon" + "category": "Rock Peak Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/regirock/meson.build b/res/pokemon/regirock/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/regirock/meson.build +++ b/res/pokemon/regirock/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/registeel/data.json b/res/pokemon/registeel/data.json index a75932ec28..a22c05bc49 100644 --- a/res/pokemon/registeel/data.json +++ b/res/pokemon/registeel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_EXPLOSION" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 14, "pokemon_pos_m": 4, "entry_text": "Tempered by pressure underground\nover tens of thousands of years,\nits body cannot be scratched.", - "category": "Iron Pok\u00e9mon" + "category": "Iron Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3598 } -} \ No newline at end of file +} diff --git a/res/pokemon/registeel/meson.build b/res/pokemon/registeel/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/registeel/meson.build +++ b/res/pokemon/registeel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/relicanth/data.json b/res/pokemon/relicanth/data.json index 92ffee7935..d478cf7a04 100644 --- a/res/pokemon/relicanth/data.json +++ b/res/pokemon/relicanth/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 65529, "trainer_pos_m": 9, "pokemon_pos_m": 65529, - "entry_text": "A rare Pok\u00e9mon discovered during\na deep-sea exploration. It has not\nchanged in over 100 million years.", - "category": "Longevity Pok\u00e9mon" + "entry_text": "A rare Pokémon discovered during\na deep-sea exploration. It has not\nchanged in over 100 million years.", + "category": "Longevity Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 2819 } -} \ No newline at end of file +} diff --git a/res/pokemon/relicanth/meson.build b/res/pokemon/relicanth/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/relicanth/meson.build +++ b/res/pokemon/relicanth/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/remoraid/data.json b/res/pokemon/remoraid/data.json index 7b4c3d51d3..6e50ed4fd4 100644 --- a/res/pokemon/remoraid/data.json +++ b/res/pokemon/remoraid/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_HUSTLE", "ABILITY_SNIPER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_GUN" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "It forcefully squirts water. The\nwater jet never misses prey even\nif the REMORAID is deep in the sea.", - "category": "Jet Pok\u00e9mon" + "category": "Jet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/remoraid/meson.build b/res/pokemon/remoraid/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/remoraid/meson.build +++ b/res/pokemon/remoraid/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rhydon/data.json b/res/pokemon/rhydon/data.json index dcd38df3c1..f0339a2ca3 100644 --- a/res/pokemon/rhydon/data.json +++ b/res/pokemon/rhydon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIGHTNING_ROD", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HORN_ATTACK" ], @@ -149,13 +147,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 4, "entry_text": "Standing on its hind legs freed its\nforelegs and made it smarter. It is\nvery forgetful, however.", - "category": "Drill Pok\u00e9mon" + "category": "Drill Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2824 } -} \ No newline at end of file +} diff --git a/res/pokemon/rhydon/meson.build b/res/pokemon/rhydon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/rhydon/meson.build +++ b/res/pokemon/rhydon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rhyhorn/data.json b/res/pokemon/rhyhorn/data.json index 16dee71bf4..036f9a6e53 100644 --- a/res/pokemon/rhyhorn/data.json +++ b/res/pokemon/rhyhorn/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIGHTNING_ROD", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HORN_ATTACK" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "Its powerful tackles can destroy\nanything. However, it is too\nslow witted to help people work.", - "category": "Spikes Pok\u00e9mon" + "category": "Spikes Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2824 } -} \ No newline at end of file +} diff --git a/res/pokemon/rhyhorn/meson.build b/res/pokemon/rhyhorn/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/rhyhorn/meson.build +++ b/res/pokemon/rhyhorn/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rhyperior/data.json b/res/pokemon/rhyperior/data.json index 829c5f58cc..2d12d3b975 100644 --- a/res/pokemon/rhyperior/data.json +++ b/res/pokemon/rhyperior/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_LIGHTNING_ROD", "ABILITY_SOLID_ROCK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_JAB" ], @@ -147,13 +145,13 @@ "trainer_pos_m": 17, "pokemon_pos_m": 3, "entry_text": "It can launch a rock held in its\nhand like a missile by tightening\nthen expanding muscles instantly.", - "category": "Drill Pok\u00e9mon" + "category": "Drill Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2824 } -} \ No newline at end of file +} diff --git a/res/pokemon/rhyperior/meson.build b/res/pokemon/rhyperior/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/rhyperior/meson.build +++ b/res/pokemon/rhyperior/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/riolu/data.json b/res/pokemon/riolu/data.json index 6b5efae937..7032ee52c9 100644 --- a/res/pokemon/riolu/data.json +++ b/res/pokemon/riolu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_STEADFAST", "ABILITY_INNER_FOCUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_QUICK_ATTACK" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "It has the peculiar power of being\nable to see emotions such as joy\nand rage in the form of waves.", - "category": "Emanation Pok\u00e9mon" + "category": "Emanation Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/riolu/meson.build b/res/pokemon/riolu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/riolu/meson.build +++ b/res/pokemon/riolu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/roselia/data.json b/res/pokemon/roselia/data.json index a75875092c..ebe03c0d0b 100644 --- a/res/pokemon/roselia/data.json +++ b/res/pokemon/roselia/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_POISON_POINT" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": true - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 29, "trainer_pos_m": 9, "pokemon_pos_m": 29, - "entry_text": "The more healthy the ROSELIA, the\nmore pleasant its flowers\u2019 aroma.\nIts scent deeply relaxes people.", - "category": "Thorn Pok\u00e9mon" + "entry_text": "The more healthy the ROSELIA, the\nmore pleasant its flowers’ aroma.\nIts scent deeply relaxes people.", + "category": "Thorn Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/roselia/meson.build b/res/pokemon/roselia/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/roselia/meson.build +++ b/res/pokemon/roselia/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/roserade/data.json b/res/pokemon/roserade/data.json index fb2c180630..ef9a0f31ba 100644 --- a/res/pokemon/roserade/data.json +++ b/res/pokemon/roserade/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_POISON_POINT" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": true - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_WEATHER_BALL" ], @@ -103,13 +101,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "Each of its hands contains\ndifferent toxins, but both hands\ncan jab with near-fatal power.", - "category": "Bouquet Pok\u00e9mon" + "category": "Bouquet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/roserade/meson.build b/res/pokemon/roserade/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/roserade/meson.build +++ b/res/pokemon/roserade/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/rotom/data.json b/res/pokemon/rotom/data.json index 151c13019a..3ede264440 100644 --- a/res/pokemon/rotom/data.json +++ b/res/pokemon/rotom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65528, "entry_text": "Its electric-like body can enter\nsome kinds of machines and take\ncontrol in order to make mischief.", - "category": "Plasma Pok\u00e9mon" + "category": "Plasma Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3079 } -} \ No newline at end of file +} diff --git a/res/pokemon/rotom/forms/fan/data.json b/res/pokemon/rotom/forms/fan/data.json index 3b3a0a7d07..f79093d129 100644 --- a/res/pokemon/rotom/forms/fan/data.json +++ b/res/pokemon/rotom/forms/fan/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK" ], diff --git a/res/pokemon/rotom/forms/frost/data.json b/res/pokemon/rotom/forms/frost/data.json index 3b3a0a7d07..f79093d129 100644 --- a/res/pokemon/rotom/forms/frost/data.json +++ b/res/pokemon/rotom/forms/frost/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK" ], diff --git a/res/pokemon/rotom/forms/heat/data.json b/res/pokemon/rotom/forms/heat/data.json index 3b3a0a7d07..f79093d129 100644 --- a/res/pokemon/rotom/forms/heat/data.json +++ b/res/pokemon/rotom/forms/heat/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK" ], diff --git a/res/pokemon/rotom/forms/mow/data.json b/res/pokemon/rotom/forms/mow/data.json index 3b3a0a7d07..f79093d129 100644 --- a/res/pokemon/rotom/forms/mow/data.json +++ b/res/pokemon/rotom/forms/mow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK" ], diff --git a/res/pokemon/rotom/forms/wash/data.json b/res/pokemon/rotom/forms/wash/data.json index 3b3a0a7d07..f79093d129 100644 --- a/res/pokemon/rotom/forms/wash/data.json +++ b/res/pokemon/rotom/forms/wash/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TRICK" ], diff --git a/res/pokemon/rotom/meson.build b/res/pokemon/rotom/meson.build index 7d2498fd86..f530de2c88 100644 --- a/res/pokemon/rotom/meson.build +++ b/res/pokemon/rotom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') rotom_heat_personal = files('forms/heat/data.json') rotom_wash_personal = files('forms/wash/data.json') rotom_frost_personal = files('forms/frost/data.json') diff --git a/res/pokemon/sableye/data.json b/res/pokemon/sableye/data.json index 69602f5853..902ef3f7c8 100644 --- a/res/pokemon/sableye/data.json +++ b/res/pokemon/sableye/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_STALL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It hides in the darkness of caves.\nIts diet of gems has transformed\nits eyes into gemstones.", - "category": "Darkness Pok\u00e9mon" + "category": "Darkness Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3088 } -} \ No newline at end of file +} diff --git a/res/pokemon/sableye/meson.build b/res/pokemon/sableye/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sableye/meson.build +++ b/res/pokemon/sableye/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/salamence/data.json b/res/pokemon/salamence/data.json index 49c612eee1..a85ea69cd8 100644 --- a/res/pokemon/salamence/data.json +++ b/res/pokemon/salamence/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_DRAGON", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FIRE_FANG" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 5, "entry_text": "As a result of its long-held dream\nof flying, its cellular structure\nchanged, and wings grew out.", - "category": "Dragon Pok\u00e9mon" + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4367 } -} \ No newline at end of file +} diff --git a/res/pokemon/salamence/meson.build b/res/pokemon/salamence/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/salamence/meson.build +++ b/res/pokemon/salamence/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sandshrew/data.json b/res/pokemon/sandshrew/data.json index 05372b98be..93e534cddd 100644 --- a/res/pokemon/sandshrew/data.json +++ b/res/pokemon/sandshrew/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "To protect itself from attackers,\nit curls up into a ball. It lives in\narid regions with minimal rainfall.", - "category": "Mouse Pok\u00e9mon" + "category": "Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/sandshrew/meson.build b/res/pokemon/sandshrew/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sandshrew/meson.build +++ b/res/pokemon/sandshrew/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sandslash/data.json b/res/pokemon/sandslash/data.json index 1e96c5633e..eaf9880d02 100644 --- a/res/pokemon/sandslash/data.json +++ b/res/pokemon/sandslash/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It curls up, then rolls into foes\nwith its back. Its sharp spines\ninflict severe damage.", - "category": "Mouse Pok\u00e9mon" + "category": "Mouse Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/sandslash/meson.build b/res/pokemon/sandslash/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sandslash/meson.build +++ b/res/pokemon/sandslash/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sceptile/data.json b/res/pokemon/sceptile/data.json index 357f0c0812..74f49f192e 100644 --- a/res/pokemon/sceptile/data.json +++ b/res/pokemon/sceptile/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_NIGHT_SLASH" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "The leaves that grow on its arms\ncan slice down thick trees. It is\nwithout peer in jungle combat.", - "category": "Forest Pok\u00e9mon" + "category": "Forest Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/sceptile/meson.build b/res/pokemon/sceptile/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sceptile/meson.build +++ b/res/pokemon/sceptile/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/scizor/data.json b/res/pokemon/scizor/data.json index 9063351a2d..63c97c9337 100644 --- a/res/pokemon/scizor/data.json +++ b/res/pokemon/scizor/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_TECHNICIAN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BULLET_PUNCH" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 2, "entry_text": "It raises its pincers with eyelike\nmarkings for intimidation. It also\nswings them down dangerously.", - "category": "Pincer Pok\u00e9mon" + "category": "Pincer Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3588 } -} \ No newline at end of file +} diff --git a/res/pokemon/scizor/meson.build b/res/pokemon/scizor/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/scizor/meson.build +++ b/res/pokemon/scizor/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/scyther/data.json b/res/pokemon/scyther/data.json index 6602506f3d..5ad024c1b2 100644 --- a/res/pokemon/scyther/data.json +++ b/res/pokemon/scyther/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_TECHNICIAN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_VACUUM_WAVE" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 7, "entry_text": "The sharp scythes on its forearms\nbecome increasingly sharp by\ncutting through hard objects.", - "category": "Mantis Pok\u00e9mon" + "category": "Mantis Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/scyther/meson.build b/res/pokemon/scyther/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/scyther/meson.build +++ b/res/pokemon/scyther/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/seadra/data.json b/res/pokemon/seadra/data.json index 6f662186b5..0c385b4788 100644 --- a/res/pokemon/seadra/data.json +++ b/res/pokemon/seadra/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_POISON_POINT", "ABILITY_SNIPER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "Its spines provide protection.\nIts fins and bones are prized as\ntraditional medicine ingredients.", - "category": "Dragon Pok\u00e9mon" + "category": "Dragon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/seadra/meson.build b/res/pokemon/seadra/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/seadra/meson.build +++ b/res/pokemon/seadra/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/seaking/data.json b/res/pokemon/seaking/data.json index 24471357d6..6a30b2d815 100644 --- a/res/pokemon/seaking/data.json +++ b/res/pokemon/seaking/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_WATER_VEIL" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_JAB" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65533, "entry_text": "In autumn, its body becomes more\nfatty in preparing to propose to a\nmate. It takes on beautiful colors.", - "category": "Goldfish Pok\u00e9mon" + "category": "Goldfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/seaking/meson.build b/res/pokemon/seaking/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/seaking/meson.build +++ b/res/pokemon/seaking/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sealeo/data.json b/res/pokemon/sealeo/data.json index 21c399c197..e96fe6ee02 100644 --- a/res/pokemon/sealeo/data.json +++ b/res/pokemon/sealeo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_ICE_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWDER_SNOW" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It habitually spins things on its\nnose. By doing so, it learns\ntextures and odors.", - "category": "Ball Roll Pok\u00e9mon" + "category": "Ball Roll Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 781 } -} \ No newline at end of file +} diff --git a/res/pokemon/sealeo/meson.build b/res/pokemon/sealeo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sealeo/meson.build +++ b/res/pokemon/sealeo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/seedot/data.json b/res/pokemon/seedot/data.json index d24f710260..1859e76171 100644 --- a/res/pokemon/seedot/data.json +++ b/res/pokemon/seedot/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BIDE" ], @@ -105,14 +103,14 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "When it dangles from a tree\nbranch, it looks just like an acorn.\nIt enjoys scaring other Pok\u00e9mon.", - "category": "Acorn Pok\u00e9mon" + "entry_text": "When it dangles from a tree\nbranch, it looks just like an acorn.\nIt enjoys scaring other Pokémon.", + "category": "Acorn Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/seedot/meson.build b/res/pokemon/seedot/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/seedot/meson.build +++ b/res/pokemon/seedot/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/seel/data.json b/res/pokemon/seel/data.json index 7c6422fdfa..00ce9af3a6 100644 --- a/res/pokemon/seel/data.json +++ b/res/pokemon/seel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_HYDRATION" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HEADBUTT" ], @@ -113,14 +111,14 @@ "pokemon_pos_f": 13, "trainer_pos_m": 9, "pokemon_pos_m": 13, - "entry_text": "A Pok\u00e9mon that lives on icebergs.\nIt swims in the sea using the point\non its head to break up ice.", - "category": "Sea Lion Pok\u00e9mon" + "entry_text": "A Pokémon that lives on icebergs.\nIt swims in the sea using the point\non its head to break up ice.", + "category": "Sea Lion Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/seel/meson.build b/res/pokemon/seel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/seel/meson.build +++ b/res/pokemon/seel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sentret/data.json b/res/pokemon/sentret/data.json index baf5e20315..5f8a50c852 100644 --- a/res/pokemon/sentret/data.json +++ b/res/pokemon/sentret/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_KEEN_EYE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "It has a very nervous nature.\nIt stands up high on its tail so it\ncan scan wide areas.", - "category": "Scout Pok\u00e9mon" + "category": "Scout Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/sentret/meson.build b/res/pokemon/sentret/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sentret/meson.build +++ b/res/pokemon/sentret/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/seviper/data.json b/res/pokemon/seviper/data.json index 5e1f3d066f..3fe7592165 100644 --- a/res/pokemon/seviper/data.json +++ b/res/pokemon/seviper/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": true - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_WRAP" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 4, "pokemon_pos_m": 6, "entry_text": "For many generations, it has\nfeuded with ZANGOOSE. It whets its\nbladed tail on rocks for battle.", - "category": "Fang Snake Pok\u00e9mon" + "category": "Fang Snake Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/seviper/meson.build b/res/pokemon/seviper/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/seviper/meson.build +++ b/res/pokemon/seviper/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sharpedo/data.json b/res/pokemon/sharpedo/data.json index 24f04479f9..a017b290a7 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_ROUGH_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FEINT" ], @@ -127,14 +125,14 @@ "pokemon_pos_f": 65535, "trainer_pos_m": 15, "pokemon_pos_m": 65535, - "entry_text": "Its fangs rip through sheet iron.\nIt swims at 75 mph and is known as\n\u201cThe Bully of the Sea.\u201d", - "category": "Brutal Pok\u00e9mon" + "entry_text": "Its fangs rip through sheet iron.\nIt swims at 75 mph and is known as\n“The Bully of the Sea.”", + "category": "Brutal Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 4099 } -} \ No newline at end of file +} diff --git a/res/pokemon/sharpedo/meson.build b/res/pokemon/sharpedo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sharpedo/meson.build +++ b/res/pokemon/sharpedo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shaymin/data.json b/res/pokemon/shaymin/data.json index 43e6047346..1d5de2fe3b 100644 --- a/res/pokemon/shaymin/data.json +++ b/res/pokemon/shaymin/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWTH" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 32, "entry_text": "The flowers all over its body burst\ninto bloom if it is lovingly hugged\nand senses gratitude.", - "category": "Gratitude Pok\u00e9mon" + "category": "Gratitude Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/shaymin/forms/sky/data.json b/res/pokemon/shaymin/forms/sky/data.json index fcba4c4bcd..94022ebc3c 100644 --- a/res/pokemon/shaymin/forms/sky/data.json +++ b/res/pokemon/shaymin/forms/sky/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SERENE_GRACE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": true - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_GROWTH" ], diff --git a/res/pokemon/shaymin/meson.build b/res/pokemon/shaymin/meson.build index 1b96c78463..dbd05f664d 100644 --- a/res/pokemon/shaymin/meson.build +++ b/res/pokemon/shaymin/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') shaymin_sky_personal = files('forms/sky/data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shedinja/data.json b/res/pokemon/shedinja/data.json index c8b1ee4ac2..e14c4b2af8 100644 --- a/res/pokemon/shedinja/data.json +++ b/res/pokemon/shedinja/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_WONDER_GUARD", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -108,14 +106,14 @@ "pokemon_pos_f": 65533, "trainer_pos_m": 9, "pokemon_pos_m": 65533, - "entry_text": "A discarded bug shell that came to\nlife. Peering into the crack on its\nback is said to steal one\u2019s spirit.", - "category": "Shed Pok\u00e9mon" + "entry_text": "A discarded bug shell that came to\nlife. Peering into the crack on its\nback is said to steal one’s spirit.", + "category": "Shed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3076 } -} \ No newline at end of file +} diff --git a/res/pokemon/shedinja/meson.build b/res/pokemon/shedinja/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/shedinja/meson.build +++ b/res/pokemon/shedinja/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shelgon/data.json b/res/pokemon/shelgon/data.json index 0999d16113..c39980ecae 100644 --- a/res/pokemon/shelgon/data.json +++ b/res/pokemon/shelgon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_DRAGON", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_RAGE" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "Within its rugged shell, its cells\nhave begun changing. The shell\npeels off the instant it evolves.", - "category": "Endurance Pok\u00e9mon" + "category": "Endurance Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/shelgon/meson.build b/res/pokemon/shelgon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shelgon/meson.build +++ b/res/pokemon/shelgon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shellder/data.json b/res/pokemon/shellder/data.json index d495c02efd..a1330be115 100644 --- a/res/pokemon/shellder/data.json +++ b/res/pokemon/shellder/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_SHELL_ARMOR", "ABILITY_SKILL_LINK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 29, "entry_text": "It swims backward by opening and\nclosing its two shells. Its large\ntongue is always kept hanging out.", - "category": "Bivalve Pok\u00e9mon" + "category": "Bivalve Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/shellder/meson.build b/res/pokemon/shellder/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shellder/meson.build +++ b/res/pokemon/shellder/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shellos/data.json b/res/pokemon/shellos/data.json index 6d43d7abc4..7800402302 100644 --- a/res/pokemon/shellos/data.json +++ b/res/pokemon/shellos/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_STICKY_HOLD", "ABILITY_STORM_DRAIN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MUD_SLAP" ], @@ -105,13 +103,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "Beware of pushing strongly on\nits squishy body, as it makes a\nmysterious purple fluid ooze out.", - "category": "Sea Slug Pok\u00e9mon" + "category": "Sea Slug Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/shellos/meson.build b/res/pokemon/shellos/meson.build index 14b2f33e39..7c4c2e3914 100644 --- a/res/pokemon/shellos/meson.build +++ b/res/pokemon/shellos/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') shellos_east_sea_icon = files('forms/east_sea/icon.png') diff --git a/res/pokemon/shieldon/data.json b/res/pokemon/shieldon/data.json index abc5c20ab5..87f38af833 100644 --- a/res/pokemon/shieldon/data.json +++ b/res/pokemon/shieldon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "It is outstandingly armored. As a\nresult, it can eat grass and\nberries without having to fight.", - "category": "Shield Pok\u00e9mon" + "category": "Shield Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/shieldon/meson.build b/res/pokemon/shieldon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shieldon/meson.build +++ b/res/pokemon/shieldon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shiftry/data.json b/res/pokemon/shiftry/data.json index 0fafabd012..46a16c9c1f 100644 --- a/res/pokemon/shiftry/data.json +++ b/res/pokemon/shiftry/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FAINT_ATTACK" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "By flapping its leafy fan, it can\nwhip up gusts of 100 ft/second\nthat can level houses.", - "category": "Wicked Pok\u00e9mon" + "category": "Wicked Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4097 } -} \ No newline at end of file +} diff --git a/res/pokemon/shiftry/meson.build b/res/pokemon/shiftry/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shiftry/meson.build +++ b/res/pokemon/shiftry/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shinx/data.json b/res/pokemon/shinx/data.json index ffa6252e0b..19992ed7fe 100644 --- a/res/pokemon/shinx/data.json +++ b/res/pokemon/shinx/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_RIVALRY", "ABILITY_INTIMIDATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -111,13 +109,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 24, "entry_text": "The extension and contraction of\nits muscles generates electricity.\nIt glows when in trouble.", - "category": "Flash Pok\u00e9mon" + "category": "Flash Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/shinx/meson.build b/res/pokemon/shinx/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shinx/meson.build +++ b/res/pokemon/shinx/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shroomish/data.json b/res/pokemon/shroomish/data.json index e42dca712b..1a05c3c55e 100644 --- a/res/pokemon/shroomish/data.json +++ b/res/pokemon/shroomish/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_EFFECT_SPORE", "ABILITY_POISON_HEAL" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "It spouts poison spores from the\ntop of its head. These spores\ncause pain all over if inhaled.", - "category": "Mushroom Pok\u00e9mon" + "category": "Mushroom Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/shroomish/meson.build b/res/pokemon/shroomish/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shroomish/meson.build +++ b/res/pokemon/shroomish/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shuckle/data.json b/res/pokemon/shuckle/data.json index 0e50f7f5ff..d1e450bb03 100644 --- a/res/pokemon/shuckle/data.json +++ b/res/pokemon/shuckle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_STURDY", "ABILITY_GLUTTONY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WITHDRAW" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It stores berries in its shell.\nThe berries eventually ferment to\nbecome delicious juices.", - "category": "Mold Pok\u00e9mon" + "category": "Mold Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 2820 } -} \ No newline at end of file +} diff --git a/res/pokemon/shuckle/meson.build b/res/pokemon/shuckle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shuckle/meson.build +++ b/res/pokemon/shuckle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/shuppet/data.json b/res/pokemon/shuppet/data.json index 617aefa37f..caae9a923f 100644 --- a/res/pokemon/shuppet/data.json +++ b/res/pokemon/shuppet/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_INSOMNIA", "ABILITY_FRISK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_KNOCK_OFF" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "It loves vengeful emotions and\nhangs in rows under the eaves of\nhouses where vengeful people live.", - "category": "Puppet Pok\u00e9mon" + "category": "Puppet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/shuppet/meson.build b/res/pokemon/shuppet/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/shuppet/meson.build +++ b/res/pokemon/shuppet/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/silcoon/data.json b/res/pokemon/silcoon/data.json index 8ca018ac01..2616ff78da 100644 --- a/res/pokemon/silcoon/data.json +++ b/res/pokemon/silcoon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_HARDEN" ], @@ -66,13 +64,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "It wraps silk around the branches\nof a tree. It drinks rainwater on\nits silk while awaiting evolution.", - "category": "Cocoon Pok\u00e9mon" + "category": "Cocoon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/silcoon/meson.build b/res/pokemon/silcoon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/silcoon/meson.build +++ b/res/pokemon/silcoon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/skarmory/data.json b/res/pokemon/skarmory/data.json index 732d4c5f14..991d9b485b 100644 --- a/res/pokemon/skarmory/data.json +++ b/res/pokemon/skarmory/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 2, "entry_text": "Despite being clad entirely in\niron-hard armor, it flies at\nspeeds over 180 mph.", - "category": "Armor Bird Pok\u00e9mon" + "category": "Armor Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4366 } -} \ No newline at end of file +} diff --git a/res/pokemon/skarmory/meson.build b/res/pokemon/skarmory/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/skarmory/meson.build +++ b/res/pokemon/skarmory/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/skiploom/data.json b/res/pokemon/skiploom/data.json index a061298d65..144fc707c2 100644 --- a/res/pokemon/skiploom/data.json +++ b/res/pokemon/skiploom/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "It blooms when the weather warms.\nIt floats in the sky to soak up as\nmuch sunlight as possible.", - "category": "Cottonweed Pok\u00e9mon" + "category": "Cottonweed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4353 } -} \ No newline at end of file +} diff --git a/res/pokemon/skiploom/meson.build b/res/pokemon/skiploom/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/skiploom/meson.build +++ b/res/pokemon/skiploom/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/skitty/data.json b/res/pokemon/skitty/data.json index 22d94d2504..e2c97b679f 100644 --- a/res/pokemon/skitty/data.json +++ b/res/pokemon/skitty/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NORMALIZE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FAKE_OUT" ], @@ -128,14 +126,14 @@ "pokemon_pos_f": 21, "trainer_pos_m": 9, "pokemon_pos_m": 21, - "entry_text": "It can\u2019t stop itself from chasing\nmoving things, and it runs in a\ncircle, chasing its own tail.", - "category": "Kitten Pok\u00e9mon" + "entry_text": "It can’t stop itself from chasing\nmoving things, and it runs in a\ncircle, chasing its own tail.", + "category": "Kitten Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/skitty/meson.build b/res/pokemon/skitty/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/skitty/meson.build +++ b/res/pokemon/skitty/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/skorupi/data.json b/res/pokemon/skorupi/data.json index 566abe3dbf..ce2cc6a992 100644 --- a/res/pokemon/skorupi/data.json +++ b/res/pokemon/skorupi/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_BATTLE_ARMOR", "ABILITY_SNIPER" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 20, "entry_text": "As soon as the tail claws close,\nits needle tips secrete poison.\nIt can survive a year without food.", - "category": "Scorpion Pok\u00e9mon" + "category": "Scorpion Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/skorupi/meson.build b/res/pokemon/skorupi/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/skorupi/meson.build +++ b/res/pokemon/skorupi/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/skuntank/data.json b/res/pokemon/skuntank/data.json index 97df91817c..ed117c550a 100644 --- a/res/pokemon/skuntank/data.json +++ b/res/pokemon/skuntank/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STENCH", "ABILITY_AFTERMATH" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It attacks by spraying a horribly\nsmelly fluid from the tip of its tail.\nAttacks from above confound it.", - "category": "Skunk Pok\u00e9mon" + "category": "Skunk Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/skuntank/meson.build b/res/pokemon/skuntank/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/skuntank/meson.build +++ b/res/pokemon/skuntank/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/slaking/data.json b/res/pokemon/slaking/data.json index e81cbf9e9d..97cfee5beb 100644 --- a/res/pokemon/slaking/data.json +++ b/res/pokemon/slaking/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TRUANT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -129,14 +127,14 @@ "pokemon_pos_f": 5, "trainer_pos_m": 9, "pokemon_pos_m": 7, - "entry_text": "The world\u2019s laziest Pok\u00e9mon. When\nit is lounging, it is actually saving\nenergy for striking back.", - "category": "Lazy Pok\u00e9mon" + "entry_text": "The world’s laziest Pokémon. When\nit is lounging, it is actually saving\nenergy for striking back.", + "category": "Lazy Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/slaking/meson.build b/res/pokemon/slaking/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/slaking/meson.build +++ b/res/pokemon/slaking/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/slakoth/data.json b/res/pokemon/slakoth/data.json index b2f6ad7733..b92d0c79d3 100644 --- a/res/pokemon/slakoth/data.json +++ b/res/pokemon/slakoth/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_TRUANT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "It spends nearly all its time in a\nday sprawled out. Just seeing it\nmakes one drowsy.", - "category": "Slacker Pok\u00e9mon" + "category": "Slacker Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/slakoth/meson.build b/res/pokemon/slakoth/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/slakoth/meson.build +++ b/res/pokemon/slakoth/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/slowbro/data.json b/res/pokemon/slowbro/data.json index 0a809f1402..745d0c2a75 100644 --- a/res/pokemon/slowbro/data.json +++ b/res/pokemon/slowbro/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CURSE" ], @@ -141,13 +139,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "Though usually dim witted, it\nseems to become inspired if the\nSHELLDER on its tail bites down.", - "category": "Hermit Crab Pok\u00e9mon" + "category": "Hermit Crab Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2563 } -} \ No newline at end of file +} diff --git a/res/pokemon/slowbro/meson.build b/res/pokemon/slowbro/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/slowbro/meson.build +++ b/res/pokemon/slowbro/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/slowking/data.json b/res/pokemon/slowking/data.json index 7e74b0bcd1..b3e59df852 100644 --- a/res/pokemon/slowking/data.json +++ b/res/pokemon/slowking/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWER_GEM" ], @@ -141,13 +139,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 4, "entry_text": "Being bitten by SHELLDER gave it\nintelligence comparable to that of\naward-winning scientists.", - "category": "Royal Pok\u00e9mon" + "category": "Royal Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 2563 } -} \ No newline at end of file +} diff --git a/res/pokemon/slowking/meson.build b/res/pokemon/slowking/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/slowking/meson.build +++ b/res/pokemon/slowking/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/slowpoke/data.json b/res/pokemon/slowpoke/data.json index 05d801d5c8..2c8a586911 100644 --- a/res/pokemon/slowpoke/data.json +++ b/res/pokemon/slowpoke/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CURSE" ], @@ -138,13 +136,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "Although slow, it is skilled at\nfishing with its tail. It does not\nfeel pain if its tail is bitten.", - "category": "Dopey Pok\u00e9mon" + "category": "Dopey Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 2563 } -} \ No newline at end of file +} diff --git a/res/pokemon/slowpoke/meson.build b/res/pokemon/slowpoke/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/slowpoke/meson.build +++ b/res/pokemon/slowpoke/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/slugma/data.json b/res/pokemon/slugma/data.json index 2d35011415..2114022dd1 100644 --- a/res/pokemon/slugma/data.json +++ b/res/pokemon/slugma/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_MAGMA_ARMOR", "ABILITY_FLAME_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_YAWN" ], @@ -111,14 +109,14 @@ "pokemon_pos_f": 19, "trainer_pos_m": 9, "pokemon_pos_m": 19, - "entry_text": "Its body is made of magma.\nIf it doesn\u2019t keep moving, its\nbody will cool and harden.", - "category": "Lava Pok\u00e9mon" + "entry_text": "Its body is made of magma.\nIf it doesn’t keep moving, its\nbody will cool and harden.", + "category": "Lava Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/slugma/meson.build b/res/pokemon/slugma/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/slugma/meson.build +++ b/res/pokemon/slugma/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/smeargle/data.json b/res/pokemon/smeargle/data.json index 653640e62d..854b163ca6 100644 --- a/res/pokemon/smeargle/data.json +++ b/res/pokemon/smeargle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_TECHNICIAN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SKETCH" ], @@ -68,13 +66,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 15, "entry_text": "It marks its territory by using its\ntail like a paintbrush. There are\nmore than 5,000 different marks.", - "category": "Painter Pok\u00e9mon" + "category": "Painter Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/smeargle/meson.build b/res/pokemon/smeargle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/smeargle/meson.build +++ b/res/pokemon/smeargle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/smoochum/data.json b/res/pokemon/smoochum/data.json index 3e78996529..bb23b8ecf5 100644 --- a/res/pokemon/smoochum/data.json +++ b/res/pokemon/smoochum/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_FOREWARN" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "It tests everything by touching\nwith its lips, which remember\nwhat it likes and dislikes.", - "category": "Kiss Pok\u00e9mon" + "category": "Kiss Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2573 } -} \ No newline at end of file +} diff --git a/res/pokemon/smoochum/meson.build b/res/pokemon/smoochum/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/smoochum/meson.build +++ b/res/pokemon/smoochum/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sneasel/data.json b/res/pokemon/sneasel/data.json index 855f608cd3..902dad35dc 100644 --- a/res/pokemon/sneasel/data.json +++ b/res/pokemon/sneasel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_KEEN_EYE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": true - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -134,14 +132,14 @@ "pokemon_pos_f": 12, "trainer_pos_m": 9, "pokemon_pos_m": 12, - "entry_text": "A smart and sneaky Pok\u00e9mon. A pair\nmay work together to steal eggs by\nhaving one lure the parents away.", - "category": "Sharp Claw Pok\u00e9mon" + "entry_text": "A smart and sneaky Pokémon. A pair\nmay work together to steal eggs by\nhaving one lure the parents away.", + "category": "Sharp Claw Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3344 } -} \ No newline at end of file +} diff --git a/res/pokemon/sneasel/meson.build b/res/pokemon/sneasel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sneasel/meson.build +++ b/res/pokemon/sneasel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/snorlax/data.json b/res/pokemon/snorlax/data.json index 29f7d15344..71131ebd04 100644 --- a/res/pokemon/snorlax/data.json +++ b/res/pokemon/snorlax/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_IMMUNITY", "ABILITY_THICK_FAT" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -132,13 +130,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 7, "entry_text": "When its belly is full, it becomes\ntoo lethargic to even lift a finger,\nso it is safe to bounce on its belly.", - "category": "Sleeping Pok\u00e9mon" + "category": "Sleeping Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/snorlax/meson.build b/res/pokemon/snorlax/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/snorlax/meson.build +++ b/res/pokemon/snorlax/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/snorunt/data.json b/res/pokemon/snorunt/data.json index 9ba0767f0c..2f134a2638 100644 --- a/res/pokemon/snorunt/data.json +++ b/res/pokemon/snorunt/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_ICE_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWDER_SNOW" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "It is said that several SNORUNT\ngather under giant leaves and\nlive together in harmony.", - "category": "Snow Hat Pok\u00e9mon" + "category": "Snow Hat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3341 } -} \ No newline at end of file +} diff --git a/res/pokemon/snorunt/meson.build b/res/pokemon/snorunt/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/snorunt/meson.build +++ b/res/pokemon/snorunt/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/snover/data.json b/res/pokemon/snover/data.json index b7c6349fb5..fe074f35a2 100644 --- a/res/pokemon/snover/data.json +++ b/res/pokemon/snover/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_SNOW_WARNING", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POWDER_SNOW" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "Seemingly curious about people,\nthey gather around footsteps they\nfind on snowy mountains.", - "category": "Frost Tree Pok\u00e9mon" + "category": "Frost Tree Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2063 } -} \ No newline at end of file +} diff --git a/res/pokemon/snover/meson.build b/res/pokemon/snover/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/snover/meson.build +++ b/res/pokemon/snover/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/snubbull/data.json b/res/pokemon/snubbull/data.json index 4c02681f38..90ddcdde11 100644 --- a/res/pokemon/snubbull/data.json +++ b/res/pokemon/snubbull/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_RUN_AWAY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ICE_FANG" ], @@ -129,14 +127,14 @@ "pokemon_pos_f": 22, "trainer_pos_m": 9, "pokemon_pos_m": 22, - "entry_text": "Small Pok\u00e9mon flee from its scary\nface. It is, however, considered\nby women to be cute.", - "category": "Fairy Pok\u00e9mon" + "entry_text": "Small Pokémon flee from its scary\nface. It is, however, considered\nby women to be cute.", + "category": "Fairy Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/snubbull/meson.build b/res/pokemon/snubbull/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/snubbull/meson.build +++ b/res/pokemon/snubbull/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/solrock/data.json b/res/pokemon/solrock/data.json index 2f21ce2119..1080ad0875 100644 --- a/res/pokemon/solrock/data.json +++ b/res/pokemon/solrock/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -128,14 +126,14 @@ "pokemon_pos_f": 65528, "trainer_pos_m": 9, "pokemon_pos_m": 65528, - "entry_text": "A new Pok\u00e9mon species, rumored\nto be from the sun. It gives off\nlight while spinning.", - "category": "Meteorite Pok\u00e9mon" + "entry_text": "A new Pokémon species, rumored\nto be from the sun. It gives off\nlight while spinning.", + "category": "Meteorite Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2571 } -} \ No newline at end of file +} diff --git a/res/pokemon/solrock/meson.build b/res/pokemon/solrock/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/solrock/meson.build +++ b/res/pokemon/solrock/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/spearow/data.json b/res/pokemon/spearow/data.json index 9cb1091fce..c86eb0b7e8 100644 --- a/res/pokemon/spearow/data.json +++ b/res/pokemon/spearow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 30, "entry_text": "It flaps its small wings busily to\nfly. Using its beak, it searches\nin grass for prey.", - "category": "Tiny Bird Pok\u00e9mon" + "category": "Tiny Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/spearow/meson.build b/res/pokemon/spearow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/spearow/meson.build +++ b/res/pokemon/spearow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/spheal/data.json b/res/pokemon/spheal/data.json index 78bf7873f2..c6a1ee5c07 100644 --- a/res/pokemon/spheal/data.json +++ b/res/pokemon/spheal/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_ICE_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_DEFENSE_CURL" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 20, "entry_text": "It rolls across ice floes to reach\nshore because its body is poorly\nshaped for swimming.", - "category": "Clap Pok\u00e9mon" + "category": "Clap Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 781 } -} \ No newline at end of file +} diff --git a/res/pokemon/spheal/meson.build b/res/pokemon/spheal/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/spheal/meson.build +++ b/res/pokemon/spheal/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/spinarak/data.json b/res/pokemon/spinarak/data.json index f39713b3d5..e896ccf8c7 100644 --- a/res/pokemon/spinarak/data.json +++ b/res/pokemon/spinarak/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWARM", "ABILITY_INSOMNIA" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_STING" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "It sets a trap by spinning a web\nwith thin but strong silk. It waits\nmotionlessly for prey to arrive.", - "category": "String Spit Pok\u00e9mon" + "category": "String Spit Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/spinarak/meson.build b/res/pokemon/spinarak/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/spinarak/meson.build +++ b/res/pokemon/spinarak/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/spinda/data.json b/res/pokemon/spinda/data.json index 1a3615dfdf..0bda81bdd9 100644 --- a/res/pokemon/spinda/data.json +++ b/res/pokemon/spinda/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_TANGLED_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": true - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "No two SPINDA have the same\npattern of spots. Its tottering\nstep fouls the aim of foes.", - "category": "Spot Panda Pok\u00e9mon" + "category": "Spot Panda Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/spinda/meson.build b/res/pokemon/spinda/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/spinda/meson.build +++ b/res/pokemon/spinda/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/spiritomb/data.json b/res/pokemon/spiritomb/data.json index 69f0bb8def..a4464f0187 100644 --- a/res/pokemon/spiritomb/data.json +++ b/res/pokemon/spiritomb/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CURSE" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "Its constant mischief and misdeeds\nresulted in it being bound to an Odd\nKeystone by a mysterious spell.", - "category": "Forbidden Pok\u00e9mon" + "category": "Forbidden Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/spiritomb/meson.build b/res/pokemon/spiritomb/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/spiritomb/meson.build +++ b/res/pokemon/spiritomb/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/spoink/data.json b/res/pokemon/spoink/data.json index de4d449519..a0ff3b88c9 100644 --- a/res/pokemon/spoink/data.json +++ b/res/pokemon/spoink/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_OWN_TEMPO" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -126,13 +124,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 20, "entry_text": "It bounces constantly, using its\ntail like a spring. The shock of\nbouncing keeps its heart beating.", - "category": "Bounce Pok\u00e9mon" + "category": "Bounce Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/spoink/meson.build b/res/pokemon/spoink/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/spoink/meson.build +++ b/res/pokemon/spoink/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/squirtle/data.json b/res/pokemon/squirtle/data.json index aad5a73992..313d451a23 100644 --- a/res/pokemon/squirtle/data.json +++ b/res/pokemon/squirtle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 24, "entry_text": "It shelters itself in its shell,\nthen strikes back with spouts of\nwater at every opportunity.", - "category": "Tiny Turtle Pok\u00e9mon" + "category": "Tiny Turtle Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/squirtle/meson.build b/res/pokemon/squirtle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/squirtle/meson.build +++ b/res/pokemon/squirtle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/stantler/data.json b/res/pokemon/stantler/data.json index 5a44087969..56554b2173 100644 --- a/res/pokemon/stantler/data.json +++ b/res/pokemon/stantler/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_FRISK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 8, "pokemon_pos_m": 7, "entry_text": "Staring at its antlers creates\nan odd sensation as if one were\nbeing drawn into their centers.", - "category": "Big Horn Pok\u00e9mon" + "category": "Big Horn Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/stantler/meson.build b/res/pokemon/stantler/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/stantler/meson.build +++ b/res/pokemon/stantler/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/staraptor/data.json b/res/pokemon/staraptor/data.json index 25585f9f5b..74bdd3bc80 100644 --- a/res/pokemon/staraptor/data.json +++ b/res/pokemon/staraptor/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 12, "entry_text": "It never stops attacking even\nif it is injured. It fusses over the\nshape of its comb.", - "category": "Predator Pok\u00e9mon" + "category": "Predator Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/staraptor/meson.build b/res/pokemon/staraptor/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/staraptor/meson.build +++ b/res/pokemon/staraptor/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/staravia/data.json b/res/pokemon/staravia/data.json index ffe0078275..48fee80ac9 100644 --- a/res/pokemon/staravia/data.json +++ b/res/pokemon/staravia/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 24, "entry_text": "Recognizing their own weakness,\nthey always live in a group. When\nalone, a STARAVIA cries noisily.", - "category": "Starling Pok\u00e9mon" + "category": "Starling Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/staravia/meson.build b/res/pokemon/staravia/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/staravia/meson.build +++ b/res/pokemon/staravia/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/starly/data.json b/res/pokemon/starly/data.json index f8b4365915..48156705f8 100644 --- a/res/pokemon/starly/data.json +++ b/res/pokemon/starly/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -111,13 +109,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 29, "entry_text": "Because they are weak individually,\nthey form groups. However, they\nbicker if the group grows too big.", - "category": "Starling Pok\u00e9mon" + "category": "Starling Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/starly/meson.build b/res/pokemon/starly/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/starly/meson.build +++ b/res/pokemon/starly/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/starmie/data.json b/res/pokemon/starmie/data.json index f9d0c6bb47..8d2f9e5801 100644 --- a/res/pokemon/starmie/data.json +++ b/res/pokemon/starmie/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_ILLUMINATE", "ABILITY_NATURAL_CURE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_GUN" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 13, "entry_text": "At the center of its body is a red\ncore, which sends mysterious\nradio signals into the night sky.", - "category": "Mysterious Pok\u00e9mon" + "category": "Mysterious Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2563 } -} \ No newline at end of file +} diff --git a/res/pokemon/starmie/meson.build b/res/pokemon/starmie/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/starmie/meson.build +++ b/res/pokemon/starmie/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/staryu/data.json b/res/pokemon/staryu/data.json index 4698522bcd..17c9c3d76f 100644 --- a/res/pokemon/staryu/data.json +++ b/res/pokemon/staryu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_ILLUMINATE", "ABILITY_NATURAL_CURE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": true - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 19, "entry_text": "If its body is torn, it can grow\nback if the red core remains.\nThe core flashes at midnight.", - "category": "Star Shape Pok\u00e9mon" + "category": "Star Shape Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/staryu/meson.build b/res/pokemon/staryu/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/staryu/meson.build +++ b/res/pokemon/staryu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/steelix/data.json b/res/pokemon/steelix/data.json index 7e42dc2fa7..c201260588 100644 --- a/res/pokemon/steelix/data.json +++ b/res/pokemon/steelix/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_FANG" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 21, "pokemon_pos_m": 4, "entry_text": "It is thought its body transformed\nas a result of iron accumulating\ninternally from swallowing soil.", - "category": "Iron Snake Pok\u00e9mon" + "category": "Iron Snake Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2062 } -} \ No newline at end of file +} diff --git a/res/pokemon/steelix/meson.build b/res/pokemon/steelix/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/steelix/meson.build +++ b/res/pokemon/steelix/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/stunky/data.json b/res/pokemon/stunky/data.json index 0c82911e18..18c624db21 100644 --- a/res/pokemon/stunky/data.json +++ b/res/pokemon/stunky/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_STENCH", "ABILITY_AFTERMATH" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -118,14 +116,14 @@ "pokemon_pos_f": 9, "trainer_pos_m": 9, "pokemon_pos_m": 9, - "entry_text": "It sprays a foul fluid from its\nrear. Its stench spreads over a\nmile radius, driving Pok\u00e9mon away.", - "category": "Skunk Pok\u00e9mon" + "entry_text": "It sprays a foul fluid from its\nrear. Its stench spreads over a\nmile radius, driving Pokémon away.", + "category": "Skunk Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/stunky/meson.build b/res/pokemon/stunky/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/stunky/meson.build +++ b/res/pokemon/stunky/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sudowoodo/data.json b/res/pokemon/sudowoodo/data.json index d5d8eb2250..c40f31d450 100644 --- a/res/pokemon/sudowoodo/data.json +++ b/res/pokemon/sudowoodo/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WOOD_HAMMER" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 11, "entry_text": "To avoid being attacked, it does\nnothing but mimic a tree. It hates\nwater and flees from rain.", - "category": "Imitation Pok\u00e9mon" + "category": "Imitation Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/sudowoodo/meson.build b/res/pokemon/sudowoodo/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sudowoodo/meson.build +++ b/res/pokemon/sudowoodo/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/suicune/data.json b/res/pokemon/suicune/data.json index 320284fb62..76010dc8ba 100644 --- a/res/pokemon/suicune/data.json +++ b/res/pokemon/suicune/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 9, "entry_text": "It races around the world to\npurify fouled water. It dashes\naway with the north wind.", - "category": "Aurora Pok\u00e9mon" + "category": "Aurora Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/suicune/meson.build b/res/pokemon/suicune/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/suicune/meson.build +++ b/res/pokemon/suicune/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sunflora/data.json b/res/pokemon/sunflora/data.json index cd58829b7f..e05c795cdb 100644 --- a/res/pokemon/sunflora/data.json +++ b/res/pokemon/sunflora/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_SOLAR_POWER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "It gets energy from warm sunlight\nand is known for its habit of\nmoving in pursuit of it.", - "category": "Sun Pok\u00e9mon" + "category": "Sun Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/sunflora/meson.build b/res/pokemon/sunflora/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sunflora/meson.build +++ b/res/pokemon/sunflora/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/sunkern/data.json b/res/pokemon/sunkern/data.json index b735c977f5..3657a9985d 100644 --- a/res/pokemon/sunkern/data.json +++ b/res/pokemon/sunkern/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_SOLAR_POWER" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ABSORB" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "It suddenly falls out of the sky in\nthe morning. A year after a cold\nsummer, their population explodes.", - "category": "Seed Pok\u00e9mon" + "category": "Seed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/sunkern/meson.build b/res/pokemon/sunkern/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/sunkern/meson.build +++ b/res/pokemon/sunkern/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/surskit/data.json b/res/pokemon/surskit/data.json index 0efa855526..aa1995bab2 100644 --- a/res/pokemon/surskit/data.json +++ b/res/pokemon/surskit/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SWIFT_SWIM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BUBBLE" ], @@ -107,13 +105,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "It appears as if it is skating on\nwater. It draws prey with a sweet\nscent from the tip of its head.", - "category": "Pond Skater Pok\u00e9mon" + "category": "Pond Skater Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 772 } -} \ No newline at end of file +} diff --git a/res/pokemon/surskit/meson.build b/res/pokemon/surskit/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/surskit/meson.build +++ b/res/pokemon/surskit/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/swablu/data.json b/res/pokemon/swablu/data.json index eb7321380e..0de45c3fa9 100644 --- a/res/pokemon/swablu/data.json +++ b/res/pokemon/swablu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 65522, "trainer_pos_m": 9, "pokemon_pos_m": 65522, - "entry_text": "It can\u2019t relax if it or its\nsurroundings are not clean.\nIt wipes off dirt with its wings.", - "category": "Cotton Bird Pok\u00e9mon" + "entry_text": "It can’t relax if it or its\nsurroundings are not clean.\nIt wipes off dirt with its wings.", + "category": "Cotton Bird Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/swablu/meson.build b/res/pokemon/swablu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/swablu/meson.build +++ b/res/pokemon/swablu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/swalot/data.json b/res/pokemon/swalot/data.json index 41d6a696fe..75da849f67 100644 --- a/res/pokemon/swalot/data.json +++ b/res/pokemon/swalot/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LIQUID_OOZE", "ABILITY_STICKY_HOLD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 3, "entry_text": "It swallows anything whole.\nIt sweats toxic fluids from its\nfollicles to douse foes.", - "category": "Poison Bag Pok\u00e9mon" + "category": "Poison Bag Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/swalot/meson.build b/res/pokemon/swalot/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/swalot/meson.build +++ b/res/pokemon/swalot/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/swampert/data.json b/res/pokemon/swampert/data.json index 9c36021144..12014cb2f8 100644 --- a/res/pokemon/swampert/data.json +++ b/res/pokemon/swampert/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 4, "entry_text": "It can swim while towing a large\nship. It bashes down foes with a\nswing of its thick arms.", - "category": "Mud Fish Pok\u00e9mon" + "category": "Mud Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/swampert/meson.build b/res/pokemon/swampert/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/swampert/meson.build +++ b/res/pokemon/swampert/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/swellow/data.json b/res/pokemon/swellow/data.json index 52dd876ebd..6829c71c6d 100644 --- a/res/pokemon/swellow/data.json +++ b/res/pokemon/swellow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_GUTS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PLUCK" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "It circles the sky in search of\nprey. When it spots one, it dives\nsteeply to catch the prey.", - "category": "Swallow Pok\u00e9mon" + "category": "Swallow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/swellow/meson.build b/res/pokemon/swellow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/swellow/meson.build +++ b/res/pokemon/swellow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/swinub/data.json b/res/pokemon/swinub/data.json index e6d4ab8459..a623749e45 100644 --- a/res/pokemon/swinub/data.json +++ b/res/pokemon/swinub/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SNOW_CLOAK" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "It has a very sensitive nose. It\ncan locate mushrooms, berries, and\neven hot springs buried under ice.", - "category": "Pig Pok\u00e9mon" + "category": "Pig Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2061 } -} \ No newline at end of file +} diff --git a/res/pokemon/swinub/meson.build b/res/pokemon/swinub/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/swinub/meson.build +++ b/res/pokemon/swinub/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/taillow/data.json b/res/pokemon/taillow/data.json index c84416b549..57606ecddc 100644 --- a/res/pokemon/taillow/data.json +++ b/res/pokemon/taillow/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_GUTS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -110,13 +108,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65519, "entry_text": "It has a gutsy spirit that makes\nit bravely take on tough foes. It\nflies in search of warm climates.", - "category": "TinySwallow Pok\u00e9mon" + "category": "TinySwallow Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/taillow/meson.build b/res/pokemon/taillow/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/taillow/meson.build +++ b/res/pokemon/taillow/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tangela/data.json b/res/pokemon/tangela/data.json index 92a61b17ba..3250f3a74f 100644 --- a/res/pokemon/tangela/data.json +++ b/res/pokemon/tangela/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], "safari_flee_rate": 90, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_INGRAIN" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "The blue vines shrouding its body\nare covered in a growth of fine\nhair. It is known to be ticklish.", - "category": "Vine Pok\u00e9mon" + "category": "Vine Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/tangela/meson.build b/res/pokemon/tangela/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/tangela/meson.build +++ b/res/pokemon/tangela/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tangrowth/data.json b/res/pokemon/tangrowth/data.json index 8d7a176c6d..6f2ee49dd6 100644 --- a/res/pokemon/tangrowth/data.json +++ b/res/pokemon/tangrowth/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_INGRAIN" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 2, "entry_text": "Its arms are made of plants that\nbind themselves to things. They\ngrow back right away if cut.", - "category": "Vine Pok\u00e9mon" + "category": "Vine Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/tangrowth/meson.build b/res/pokemon/tangrowth/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/tangrowth/meson.build +++ b/res/pokemon/tangrowth/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tauros/data.json b/res/pokemon/tauros/data.json index 2a098828de..e38dc1d211 100644 --- a/res/pokemon/tauros/data.json +++ b/res/pokemon/tauros/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_ANGER_POINT" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 0, "entry_text": "Once it takes aim at its foe, it\nmakes a headlong charge. It is\nfamous for its violent nature.", - "category": "Wild Bull Pok\u00e9mon" + "category": "Wild Bull Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/tauros/meson.build b/res/pokemon/tauros/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/tauros/meson.build +++ b/res/pokemon/tauros/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/teddiursa/data.json b/res/pokemon/teddiursa/data.json index 68f9bd6f09..2c98dbb1e1 100644 --- a/res/pokemon/teddiursa/data.json +++ b/res/pokemon/teddiursa/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", "ABILITY_QUICK_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": true - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_COVET" ], @@ -129,13 +127,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "It lets honey soak into its paws\nso it can lick them all the time.\nEvery set of paws tastes unique.", - "category": "Little Bear Pok\u00e9mon" + "category": "Little Bear Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/teddiursa/meson.build b/res/pokemon/teddiursa/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/teddiursa/meson.build +++ b/res/pokemon/teddiursa/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tentacool/data.json b/res/pokemon/tentacool/data.json index a13127146b..3a2f579b49 100644 --- a/res/pokemon/tentacool/data.json +++ b/res/pokemon/tentacool/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_LIQUID_OOZE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_STING" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65533, "entry_text": "Because its body is almost entirely\ncomposed of water, it shrivels up if\nit is washed ashore.", - "category": "Jellyfish Pok\u00e9mon" + "category": "Jellyfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 30, "rarity": 50, "unused": 1539 } -} \ No newline at end of file +} diff --git a/res/pokemon/tentacool/meson.build b/res/pokemon/tentacool/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/tentacool/meson.build +++ b/res/pokemon/tentacool/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tentacruel/data.json b/res/pokemon/tentacruel/data.json index 87eab67249..a059507ca1 100644 --- a/res/pokemon/tentacruel/data.json +++ b/res/pokemon/tentacruel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_3", "EGG_GROUP_WATER_3" ], "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_LIQUID_OOZE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_STING" ], @@ -112,13 +110,13 @@ "trainer_pos_m": 4, "pokemon_pos_m": 65535, "entry_text": "It extends its 80 tentacles to\nform an encircling poisonous net\nthat is difficult to escape.", - "category": "Jellyfish Pok\u00e9mon" + "category": "Jellyfish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 1539 } -} \ No newline at end of file +} diff --git a/res/pokemon/tentacruel/meson.build b/res/pokemon/tentacruel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/tentacruel/meson.build +++ b/res/pokemon/tentacruel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/togekiss/data.json b/res/pokemon/togekiss/data.json index 8e8994b503..df9336745e 100644 --- a/res/pokemon/togekiss/data.json +++ b/res/pokemon/togekiss/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HUSTLE", "ABILITY_SERENE_GRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": true - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SKY_ATTACK" ], @@ -124,14 +122,14 @@ "pokemon_pos_f": 65534, "trainer_pos_m": 9, "pokemon_pos_m": 65534, - "entry_text": "It shares many blessings with\npeople who respect one another\u2019s\nrights and avoid needless strife.", - "category": "Jubilee Pok\u00e9mon" + "entry_text": "It shares many blessings with\npeople who respect one another’s\nrights and avoid needless strife.", + "category": "Jubilee Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/togekiss/meson.build b/res/pokemon/togekiss/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/togekiss/meson.build +++ b/res/pokemon/togekiss/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/togepi/data.json b/res/pokemon/togepi/data.json index d285d7d471..33d83def2a 100644 --- a/res/pokemon/togepi/data.json +++ b/res/pokemon/togepi/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_HUSTLE", "ABILITY_SERENE_GRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 29, "entry_text": "It transforms the kindness and joy\nof others into happiness, which it\nstores in its shell.", - "category": "Spike Ball Pok\u00e9mon" + "category": "Spike Ball Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/togepi/meson.build b/res/pokemon/togepi/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/togepi/meson.build +++ b/res/pokemon/togepi/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/togetic/data.json b/res/pokemon/togetic/data.json index 4459013b36..af21282e26 100644 --- a/res/pokemon/togetic/data.json +++ b/res/pokemon/togetic/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_HUSTLE", "ABILITY_SERENE_GRACE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MAGICAL_LEAF" ], @@ -142,13 +140,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "To share its happiness, it flies\naround the world seeking kind-\nhearted people.", - "category": "Happiness Pok\u00e9mon" + "category": "Happiness Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/togetic/meson.build b/res/pokemon/togetic/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/togetic/meson.build +++ b/res/pokemon/togetic/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/torchic/data.json b/res/pokemon/torchic/data.json index 7dfe8218b8..f2cfaca4d9 100644 --- a/res/pokemon/torchic/data.json +++ b/res/pokemon/torchic/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "A fire burns inside, so it feels\nvery warm to hug. It launches\nfireballs of 1,800 degrees F.", - "category": "Chick Pok\u00e9mon" + "category": "Chick Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/torchic/meson.build b/res/pokemon/torchic/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/torchic/meson.build +++ b/res/pokemon/torchic/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/torkoal/data.json b/res/pokemon/torkoal/data.json index 6b798672a9..64eab8a146 100644 --- a/res/pokemon/torkoal/data.json +++ b/res/pokemon/torkoal/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_WHITE_SMOKE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_EMBER" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 20, "entry_text": "It burns coal inside its shell for\nenergy. It blows out black soot if\nit is endangered.", - "category": "Coal Pok\u00e9mon" + "category": "Coal Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/torkoal/meson.build b/res/pokemon/torkoal/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/torkoal/meson.build +++ b/res/pokemon/torkoal/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/torterra/data.json b/res/pokemon/torterra/data.json index 470d321d4e..1cccda8740 100644 --- a/res/pokemon/torterra/data.json +++ b/res/pokemon/torterra/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": true - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_WOOD_HAMMER" ], @@ -126,14 +124,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 16, "pokemon_pos_m": 0, - "entry_text": "Some Pok\u00e9mon are born on a\nTORTERRA\u2019s back and spend their\nentire life there.", - "category": "Continent Pok\u00e9mon" + "entry_text": "Some Pokémon are born on a\nTORTERRA’s back and spend their\nentire life there.", + "category": "Continent Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2049 } -} \ No newline at end of file +} diff --git a/res/pokemon/torterra/meson.build b/res/pokemon/torterra/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/torterra/meson.build +++ b/res/pokemon/torterra/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/totodile/data.json b/res/pokemon/totodile/data.json index 16286c5e12..3aab69c935 100644 --- a/res/pokemon/totodile/data.json +++ b/res/pokemon/totodile/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 25, "entry_text": "It has the habit of biting anything\nwith its developed jaws. Even its\nTrainer needs to be careful.", - "category": "Big Jaw Pok\u00e9mon" + "category": "Big Jaw Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/totodile/meson.build b/res/pokemon/totodile/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/totodile/meson.build +++ b/res/pokemon/totodile/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/toxicroak/data.json b/res/pokemon/toxicroak/data.json index 15e8fed35c..8763e8c21b 100644 --- a/res/pokemon/toxicroak/data.json +++ b/res/pokemon/toxicroak/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_HUMAN_LIKE", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_DRY_SKIN" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ASTONISH" ], @@ -135,13 +133,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 11, "entry_text": "It has a poison sac at its throat.\nWhen it croaks, the stored poison\nis churned for greater potency.", - "category": "Toxic Mouth Pok\u00e9mon" + "category": "Toxic Mouth Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3329 } -} \ No newline at end of file +} diff --git a/res/pokemon/toxicroak/meson.build b/res/pokemon/toxicroak/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/toxicroak/meson.build +++ b/res/pokemon/toxicroak/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/trapinch/data.json b/res/pokemon/trapinch/data.json index 46e0137d59..d46a445aee 100644 --- a/res/pokemon/trapinch/data.json +++ b/res/pokemon/trapinch/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_ARENA_TRAP" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_BITE" ], @@ -109,13 +107,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 21, "entry_text": "It makes a conical pit in desert\nsand and lies in wait at the bottom\nfor prey to come tumbling down.", - "category": "Ant Pit Pok\u00e9mon" + "category": "Ant Pit Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/trapinch/meson.build b/res/pokemon/trapinch/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/trapinch/meson.build +++ b/res/pokemon/trapinch/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/treecko/data.json b/res/pokemon/treecko/data.json index 256f738266..87c692024e 100644 --- a/res/pokemon/treecko/data.json +++ b/res/pokemon/treecko/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -123,13 +121,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": "The soles of its feet are covered\nby countless tiny spikes, enabling\nit to walk on walls and ceilings.", - "category": "Wood Gecko Pok\u00e9mon" + "category": "Wood Gecko Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/treecko/meson.build b/res/pokemon/treecko/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/treecko/meson.build +++ b/res/pokemon/treecko/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tropius/data.json b/res/pokemon/tropius/data.json index 81fede5408..c6f7020294 100644 --- a/res/pokemon/tropius/data.json +++ b/res/pokemon/tropius/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_SOLAR_POWER" ], "safari_flee_rate": 60, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEER" ], @@ -120,13 +118,13 @@ "trainer_pos_m": 15, "pokemon_pos_m": 0, "entry_text": "Delicious fruits grew out from\naround its neck because it always\nate the same kind of fruit.", - "category": "Fruit Pok\u00e9mon" + "category": "Fruit Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4353 } -} \ No newline at end of file +} diff --git a/res/pokemon/tropius/meson.build b/res/pokemon/tropius/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/tropius/meson.build +++ b/res/pokemon/tropius/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/turtwig/data.json b/res/pokemon/turtwig/data.json index 875d26ed14..7eadeab0db 100644 --- a/res/pokemon/turtwig/data.json +++ b/res/pokemon/turtwig/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 28, "entry_text": "The shell on its back is made of\nsoil. On a very healthy TURTWIG,\nthe shell should feel moist.", - "category": "Tiny Leaf Pok\u00e9mon" + "category": "Tiny Leaf Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/turtwig/meson.build b/res/pokemon/turtwig/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/turtwig/meson.build +++ b/res/pokemon/turtwig/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/typhlosion/data.json b/res/pokemon/typhlosion/data.json index 0bce311aad..94d54006ef 100644 --- a/res/pokemon/typhlosion/data.json +++ b/res/pokemon/typhlosion/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GYRO_BALL" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 3, "entry_text": "It attacks using blasts of fire.\nIt creates heat shimmers with\nintense fire to hide itself.", - "category": "Volcano Pok\u00e9mon" + "category": "Volcano Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/typhlosion/meson.build b/res/pokemon/typhlosion/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/typhlosion/meson.build +++ b/res/pokemon/typhlosion/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tyranitar/data.json b/res/pokemon/tyranitar/data.json index 7d93378957..f2802a5f3d 100644 --- a/res/pokemon/tyranitar/data.json +++ b/res/pokemon/tyranitar/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], "abilities": [ "ABILITY_SAND_STREAM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_THUNDER_FANG" ], @@ -149,13 +147,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 3, "entry_text": "If it rampages, it knocks down\nmountains and buries rivers. Maps\nmust be redrawn afterward.", - "category": "Armor Pok\u00e9mon" + "category": "Armor Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4107 } -} \ No newline at end of file +} diff --git a/res/pokemon/tyranitar/meson.build b/res/pokemon/tyranitar/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/tyranitar/meson.build +++ b/res/pokemon/tyranitar/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/tyrogue/data.json b/res/pokemon/tyrogue/data.json index 37d629ea03..57aebc475c 100644 --- a/res/pokemon/tyrogue/data.json +++ b/res/pokemon/tyrogue/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_GUTS", "ABILITY_STEADFAST" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -111,13 +109,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 18, "entry_text": "It is famous for its eagerness to\nfight and always nurses injuries\nfrom challenging larger foes.", - "category": "Scuffle Pok\u00e9mon" + "category": "Scuffle Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/tyrogue/meson.build b/res/pokemon/tyrogue/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/tyrogue/meson.build +++ b/res/pokemon/tyrogue/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/umbreon/data.json b/res/pokemon/umbreon/data.json index 8465bcf222..3fa4106017 100644 --- a/res/pokemon/umbreon/data.json +++ b/res/pokemon/umbreon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_SYNCHRONIZE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -113,14 +111,14 @@ "pokemon_pos_f": 15, "trainer_pos_m": 9, "pokemon_pos_m": 15, - "entry_text": "When exposed to the moon\u2019s aura,\nthe rings on its body glow faintly\nand it gains a mysterious power.", - "category": "Moonlight Pok\u00e9mon" + "entry_text": "When exposed to the moon’s aura,\nthe rings on its body glow faintly\nand it gains a mysterious power.", + "category": "Moonlight Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4112 } -} \ No newline at end of file +} diff --git a/res/pokemon/umbreon/meson.build b/res/pokemon/umbreon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/umbreon/meson.build +++ b/res/pokemon/umbreon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/unown/data.json b/res/pokemon/unown/data.json index a3ee9b5212..972dcc26db 100644 --- a/res/pokemon/unown/data.json +++ b/res/pokemon/unown/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": true - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_HIDDEN_POWER" ] @@ -59,13 +57,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "When alone, nothing happens.\nHowever, if there are two or more,\nan odd power is said to emerge.", - "category": "Symbol Pok\u00e9mon" + "category": "Symbol Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/unown/meson.build b/res/pokemon/unown/meson.build index b4febbc09e..c23dca364f 100644 --- a/res/pokemon/unown/meson.build +++ b/res/pokemon/unown/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') unown_a_icon = files('icon.png') # We actually need this for later diff --git a/res/pokemon/ursaring/data.json b/res/pokemon/ursaring/data.json index 0f8cef5688..53e997a4c6 100644 --- a/res/pokemon/ursaring/data.json +++ b/res/pokemon/ursaring/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_GUTS", "ABILITY_QUICK_FEET" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_COVET" ], @@ -130,13 +128,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "In its territory, it leaves\nscratches on trees that bear\ndelicious berries or fruits.", - "category": "Hibernator Pok\u00e9mon" + "category": "Hibernator Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/ursaring/meson.build b/res/pokemon/ursaring/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/ursaring/meson.build +++ b/res/pokemon/ursaring/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/uxie/data.json b/res/pokemon/uxie/data.json index 9b4c538eeb..57b01734a2 100644 --- a/res/pokemon/uxie/data.json +++ b/res/pokemon/uxie/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_REST" ], @@ -128,13 +126,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "When UXIE flew, people gained the\nability to solve problems.\nIt was the birth of knowledge.", - "category": "Knowledge Pok\u00e9mon" + "category": "Knowledge Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/uxie/meson.build b/res/pokemon/uxie/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/uxie/meson.build +++ b/res/pokemon/uxie/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/vaporeon/data.json b/res/pokemon/vaporeon/data.json index 855a89fd51..d5cb4196d2 100644 --- a/res/pokemon/vaporeon/data.json +++ b/res/pokemon/vaporeon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_WATER_ABSORB", "ABILITY_WATER_ABSORB" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TAIL_WHIP" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 10, "entry_text": "Its cell composition is similar\nto water molecules. As a result,\nit can melt away into water.", - "category": "Bubble Jet Pok\u00e9mon" + "category": "Bubble Jet Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/vaporeon/meson.build b/res/pokemon/vaporeon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/vaporeon/meson.build +++ b/res/pokemon/vaporeon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/venomoth/data.json b/res/pokemon/venomoth/data.json index aaf42c9480..42dcb81ac8 100644 --- a/res/pokemon/venomoth/data.json +++ b/res/pokemon/venomoth/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_TINTED_LENS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SILVER_WIND" ], @@ -117,13 +115,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65530, "entry_text": "It flutters its wings to scatter\ndustlike scales. The scales leach\ntoxins if they contact skin.", - "category": "Poison Moth Pok\u00e9mon" + "category": "Poison Moth Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/venomoth/meson.build b/res/pokemon/venomoth/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/venomoth/meson.build +++ b/res/pokemon/venomoth/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/venonat/data.json b/res/pokemon/venonat/data.json index 83fc7791c3..555b0782a8 100644 --- a/res/pokemon/venonat/data.json +++ b/res/pokemon/venonat/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_COMPOUND_EYES", "ABILITY_TINTED_LENS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -108,13 +106,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 20, "entry_text": "Its big eyes are actually clusters\nof tiny eyes. At night, its kind is\ndrawn by light.", - "category": "Insect Pok\u00e9mon" + "category": "Insect Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/venonat/meson.build b/res/pokemon/venonat/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/venonat/meson.build +++ b/res/pokemon/venonat/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/venusaur/data.json b/res/pokemon/venusaur/data.json index e576bf929f..f052228a67 100644 --- a/res/pokemon/venusaur/data.json +++ b/res/pokemon/venusaur/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 1, "trainer_pos_m": 8, "pokemon_pos_m": 1, - "entry_text": "After a rainy day, the flower on\nits back smells stronger. The\nscent attracts other Pok\u00e9mon.", - "category": "Seed Pok\u00e9mon" + "entry_text": "After a rainy day, the flower on\nits back smells stronger. The\nscent attracts other Pokémon.", + "category": "Seed Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/venusaur/meson.build b/res/pokemon/venusaur/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/venusaur/meson.build +++ b/res/pokemon/venusaur/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/vespiquen/data.json b/res/pokemon/vespiquen/data.json index 77d3c93bb8..9a3fffcef8 100644 --- a/res/pokemon/vespiquen/data.json +++ b/res/pokemon/vespiquen/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SWEET_SCENT" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "It releases various pheromones\nto make the grubs in its body do\nits bidding while fighting foes.", - "category": "Beehive Pok\u00e9mon" + "category": "Beehive Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/vespiquen/meson.build b/res/pokemon/vespiquen/meson.build index 48ada0869c..8cb858c18a 100644 --- a/res/pokemon/vespiquen/meson.build +++ b/res/pokemon/vespiquen/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/vibrava/data.json b/res/pokemon/vibrava/data.json index 56c50cff15..9513d5b3eb 100644 --- a/res/pokemon/vibrava/data.json +++ b/res/pokemon/vibrava/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_LEVITATE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SONIC_BOOM" ], @@ -122,13 +120,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "It violently shudders its wings,\ngenerating ultrasonic waves to\ninduce headaches in people.", - "category": "Vibration Pok\u00e9mon" + "category": "Vibration Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3848 } -} \ No newline at end of file +} diff --git a/res/pokemon/vibrava/meson.build b/res/pokemon/vibrava/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/vibrava/meson.build +++ b/res/pokemon/vibrava/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/victreebel/data.json b/res/pokemon/victreebel/data.json index 48ff3fd314..1fb1c25a46 100644 --- a/res/pokemon/victreebel/data.json +++ b/res/pokemon/victreebel/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_STOCKPILE" ], @@ -104,13 +102,13 @@ "trainer_pos_m": 2, "pokemon_pos_m": 4, "entry_text": "It pools in its mouth a fluid with\na honeylike scent, which is really\nan acid that dissolves anything.", - "category": "Flycatcher Pok\u00e9mon" + "category": "Flycatcher Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/victreebel/meson.build b/res/pokemon/victreebel/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/victreebel/meson.build +++ b/res/pokemon/victreebel/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/vigoroth/data.json b/res/pokemon/vigoroth/data.json index b3440a5702..4148d8d4be 100644 --- a/res/pokemon/vigoroth/data.json +++ b/res/pokemon/vigoroth/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_VITAL_SPIRIT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -131,13 +129,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 1, "entry_text": "Its heart beats at a tenfold\ntempo, so it cannot sit still for\neven a moment.", - "category": "Wild Monkey Pok\u00e9mon" + "category": "Wild Monkey Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/vigoroth/meson.build b/res/pokemon/vigoroth/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/vigoroth/meson.build +++ b/res/pokemon/vigoroth/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/vileplume/data.json b/res/pokemon/vileplume/data.json index 678ebd481a..00e4875776 100644 --- a/res/pokemon/vileplume/data.json +++ b/res/pokemon/vileplume/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_MEGA_DRAIN" ], @@ -100,13 +98,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 14, "entry_text": "Its petals are the largest in the\nworld. As it walks, it scatters\nextremely allergenic pollen.", - "category": "Flower Pok\u00e9mon" + "category": "Flower Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/vileplume/meson.build b/res/pokemon/vileplume/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/vileplume/meson.build +++ b/res/pokemon/vileplume/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/volbeat/data.json b/res/pokemon/volbeat/data.json index 153b917b24..6606401fed 100644 --- a/res/pokemon/volbeat/data.json +++ b/res/pokemon/volbeat/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_HUMAN_LIKE" ], "abilities": [ "ABILITY_ILLUMINATE", "ABILITY_SWARM" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_FLASH" ], @@ -120,14 +118,14 @@ "pokemon_pos_f": 21, "trainer_pos_m": 9, "pokemon_pos_m": 21, - "entry_text": "It communicates with others by\nlighting up its rear at night. It\nloves ILLUMISE\u2019s sweet aroma.", - "category": "Firefly Pok\u00e9mon" + "entry_text": "It communicates with others by\nlighting up its rear at night. It\nloves ILLUMISE’s sweet aroma.", + "category": "Firefly Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/volbeat/meson.build b/res/pokemon/volbeat/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/volbeat/meson.build +++ b/res/pokemon/volbeat/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/voltorb/data.json b/res/pokemon/voltorb/data.json index 8b7cbeab81..bd918d32e4 100644 --- a/res/pokemon/voltorb/data.json +++ b/res/pokemon/voltorb/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_STATIC" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CHARGE" ], @@ -112,14 +110,14 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "It looks just like a Pok\u00e9 Ball.\nIt is dangerous because it may\nelectrocute or explode on touch.", - "category": "Ball Pok\u00e9mon" + "entry_text": "It looks just like a Poké Ball.\nIt is dangerous because it may\nelectrocute or explode on touch.", + "category": "Ball Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/voltorb/meson.build b/res/pokemon/voltorb/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/voltorb/meson.build +++ b/res/pokemon/voltorb/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/vulpix/data.json b/res/pokemon/vulpix/data.json index 59fb65c06b..937eedc187 100644 --- a/res/pokemon/vulpix/data.json +++ b/res/pokemon/vulpix/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_EMBER" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "It controls balls of fire. As it\ngrows, its six tails split from\ntheir tips to make more tails.", - "category": "Fox Pok\u00e9mon" + "category": "Fox Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/vulpix/meson.build b/res/pokemon/vulpix/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/vulpix/meson.build +++ b/res/pokemon/vulpix/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wailmer/data.json b/res/pokemon/wailmer/data.json index af066feef9..079fce953c 100644 --- a/res/pokemon/wailmer/data.json +++ b/res/pokemon/wailmer/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_WATER_VEIL", "ABILITY_OBLIVIOUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -116,13 +114,13 @@ "trainer_pos_m": 16, "pokemon_pos_m": 9, "entry_text": "On sunny days, it lands on beaches\nto bounce like a ball and play.\nIt spouts water from its nose.", - "category": "Ball Whale Pok\u00e9mon" + "category": "Ball Whale Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/wailmer/meson.build b/res/pokemon/wailmer/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wailmer/meson.build +++ b/res/pokemon/wailmer/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wailord/data.json b/res/pokemon/wailord/data.json index 8ec5f20b3b..9cc68fa867 100644 --- a/res/pokemon/wailord/data.json +++ b/res/pokemon/wailord/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_WATER_VEIL", "ABILITY_OBLIVIOUS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -115,14 +113,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 18, "pokemon_pos_m": 1, - "entry_text": "The biggest of all Pok\u00e9mon.\nIt can dive to a depth of almost\n10,000 feet on only one breath.", - "category": "Float Whale Pok\u00e9mon" + "entry_text": "The biggest of all Pokémon.\nIt can dive to a depth of almost\n10,000 feet on only one breath.", + "category": "Float Whale Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/wailord/meson.build b/res/pokemon/wailord/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wailord/meson.build +++ b/res/pokemon/wailord/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/walrein/data.json b/res/pokemon/walrein/data.json index ddabcef095..5596327dbe 100644 --- a/res/pokemon/walrein/data.json +++ b/res/pokemon/walrein/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_THICK_FAT", "ABILITY_ICE_BODY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_CRUNCH" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "It shatters ice with its big tusks.\nIts thick blubber repels not only\nthe cold, but also enemy attacks.", - "category": "Ice Break Pok\u00e9mon" + "category": "Ice Break Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, "unused": 781 } -} \ No newline at end of file +} diff --git a/res/pokemon/walrein/meson.build b/res/pokemon/walrein/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/walrein/meson.build +++ b/res/pokemon/walrein/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wartortle/data.json b/res/pokemon/wartortle/data.json index f86c7fa44f..eb93620e64 100644 --- a/res/pokemon/wartortle/data.json +++ b/res/pokemon/wartortle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -124,13 +122,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 17, "entry_text": "It is said to live 10,000 years.\nIts furry tail is popular as a\nsymbol of longevity.", - "category": "Turtle Pok\u00e9mon" + "category": "Turtle Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/wartortle/meson.build b/res/pokemon/wartortle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wartortle/meson.build +++ b/res/pokemon/wartortle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/weavile/data.json b/res/pokemon/weavile/data.json index 45a9493604..8f20397702 100644 --- a/res/pokemon/weavile/data.json +++ b/res/pokemon/weavile/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_PRESSURE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLACK", - "flip": false - }, + "body_color": "MON_COLOR_BLACK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_EMBARGO" ], @@ -136,13 +134,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 13, "entry_text": "Evolution made it even more\ndevious. It communicates by clawing\nsigns in boulders.", - "category": "Sharp Claw Pok\u00e9mon" + "category": "Sharp Claw Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2063 } -} \ No newline at end of file +} diff --git a/res/pokemon/weavile/meson.build b/res/pokemon/weavile/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/weavile/meson.build +++ b/res/pokemon/weavile/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/weedle/data.json b/res/pokemon/weedle/data.json index f9d7290682..86034c7657 100644 --- a/res/pokemon/weedle/data.json +++ b/res/pokemon/weedle/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_STING" ], @@ -67,13 +65,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "It eats its weight in leaves every\nday. It fends off attackers with\nthe needle on its head.", - "category": "Hairy Bug Pok\u00e9mon" + "category": "Hairy Bug Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/weedle/meson.build b/res/pokemon/weedle/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/weedle/meson.build +++ b/res/pokemon/weedle/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/weepinbell/data.json b/res/pokemon/weepinbell/data.json index e66af89788..6436bc70c5 100644 --- a/res/pokemon/weepinbell/data.json +++ b/res/pokemon/weepinbell/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_VINE_WHIP" ], @@ -113,14 +111,14 @@ "pokemon_pos_f": 16, "trainer_pos_m": 9, "pokemon_pos_m": 16, - "entry_text": "A Pok\u00e9mon that appears to be a\nplant. It captures unwary prey by\ndousing them with a toxic powder.", - "category": "Flycatcher Pok\u00e9mon" + "entry_text": "A Pokémon that appears to be a\nplant. It captures unwary prey by\ndousing them with a toxic powder.", + "category": "Flycatcher Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/weepinbell/meson.build b/res/pokemon/weepinbell/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/weepinbell/meson.build +++ b/res/pokemon/weepinbell/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/weezing/data.json b/res/pokemon/weezing/data.json index d29b82d0b5..812349fade 100644 --- a/res/pokemon/weezing/data.json +++ b/res/pokemon/weezing/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POISON_GAS" ], @@ -115,13 +113,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65526, "entry_text": "It grows by feeding on gases\nreleased by garbage. Though very\nrare, triplets have been found.", - "category": "Poison Gas Pok\u00e9mon" + "category": "Poison Gas Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/weezing/meson.build b/res/pokemon/weezing/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/weezing/meson.build +++ b/res/pokemon/weezing/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/whiscash/data.json b/res/pokemon/whiscash/data.json index 882ac5379b..4a2b8820d5 100644 --- a/res/pokemon/whiscash/data.json +++ b/res/pokemon/whiscash/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_WATER_2" ], "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_ANTICIPATION" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_ZEN_HEADBUTT" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 2, "entry_text": "It is extremely protective of its\nterritory. If any foe approaches,\nit attacks using vicious tremors.", - "category": "Whiskers Pok\u00e9mon" + "category": "Whiskers Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/whiscash/meson.build b/res/pokemon/whiscash/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/whiscash/meson.build +++ b/res/pokemon/whiscash/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/whismur/data.json b/res/pokemon/whismur/data.json index 5ca6206c68..314387ef43 100644 --- a/res/pokemon/whismur/data.json +++ b/res/pokemon/whismur/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_POUND" ], @@ -114,13 +112,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 23, "entry_text": "Usually, its cries are like quiet\nmurmurs. If frightened, it shrieks\nat the same volume as a jet plane.", - "category": "Whisper Pok\u00e9mon" + "category": "Whisper Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/whismur/meson.build b/res/pokemon/whismur/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/whismur/meson.build +++ b/res/pokemon/whismur/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wigglytuff/data.json b/res/pokemon/wigglytuff/data.json index 380a9229e1..de451ecfc5 100644 --- a/res/pokemon/wigglytuff/data.json +++ b/res/pokemon/wigglytuff/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PINK", - "flip": false - }, + "body_color": "MON_COLOR_PINK", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SING" ], @@ -127,13 +125,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 16, "entry_text": "Its fine fur feels sublime to the\ntouch. It can expand its body by\ninhaling air.", - "category": "Balloon Pok\u00e9mon" + "category": "Balloon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/wigglytuff/meson.build b/res/pokemon/wigglytuff/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wigglytuff/meson.build +++ b/res/pokemon/wigglytuff/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wingull/data.json b/res/pokemon/wingull/data.json index 3b6d8ccb84..3ac06609ae 100644 --- a/res/pokemon/wingull/data.json +++ b/res/pokemon/wingull/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": false - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_GROWL" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65534, "entry_text": "It soars high in the sky, riding on\nupdrafts like a glider. It carries\nfood tucked in its bill.", - "category": "Seagull Pok\u00e9mon" + "category": "Seagull Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 30, "rarity": 50, "unused": 4355 } -} \ No newline at end of file +} diff --git a/res/pokemon/wingull/meson.build b/res/pokemon/wingull/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wingull/meson.build +++ b/res/pokemon/wingull/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wobbuffet/data.json b/res/pokemon/wobbuffet/data.json index 09e001d2b7..0d6838a200 100644 --- a/res/pokemon/wobbuffet/data.json +++ b/res/pokemon/wobbuffet/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], "abilities": [ "ABILITY_SHADOW_TAG", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_COUNTER" ], @@ -62,13 +60,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "It desperately tries to keep its\nblack tail hidden. It is said to be\nproof the tail hides a secret.", - "category": "Patient Pok\u00e9mon" + "category": "Patient Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/wobbuffet/meson.build b/res/pokemon/wobbuffet/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wobbuffet/meson.build +++ b/res/pokemon/wobbuffet/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wooper/data.json b/res/pokemon/wooper/data.json index fc3046a4bf..287974c66b 100644 --- a/res/pokemon/wooper/data.json +++ b/res/pokemon/wooper/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_DAMP", "ABILITY_WATER_ABSORB" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_WATER_GUN" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 26, "entry_text": "When walking on land, it covers its\nbody with a poisonous film that\nkeeps its skin from dehydrating.", - "category": "Water Fish Pok\u00e9mon" + "category": "Water Fish Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/wooper/meson.build b/res/pokemon/wooper/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wooper/meson.build +++ b/res/pokemon/wooper/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wormadam/data.json b/res/pokemon/wormadam/data.json index c5f34f175d..332f62cdd1 100644 --- a/res/pokemon/wormadam/data.json +++ b/res/pokemon/wormadam/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -113,13 +111,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65524, "entry_text": "When evolving, its body takes in\nsurrounding materials. As a result,\nthere are many body variations.", - "category": "Bagworm Pok\u00e9mon" + "category": "Bagworm Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 260 } -} \ No newline at end of file +} diff --git a/res/pokemon/wormadam/forms/sandy/data.json b/res/pokemon/wormadam/forms/sandy/data.json index 75f1c652fa..9f8e72fdf2 100644 --- a/res/pokemon/wormadam/forms/sandy/data.json +++ b/res/pokemon/wormadam/forms/sandy/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], diff --git a/res/pokemon/wormadam/forms/trash/data.json b/res/pokemon/wormadam/forms/trash/data.json index 39129c1625..c5479bda09 100644 --- a/res/pokemon/wormadam/forms/trash/data.json +++ b/res/pokemon/wormadam/forms/trash/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GRAY", - "flip": false - }, + "body_color": "MON_COLOR_GRAY", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], diff --git a/res/pokemon/wormadam/meson.build b/res/pokemon/wormadam/meson.build index 50893f7f00..942716de85 100644 --- a/res/pokemon/wormadam/meson.build +++ b/res/pokemon/wormadam/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') wormadam_sandy_personal = files('forms/sandy/data.json') wormadam_trash_personal = files('forms/trash/data.json') diff --git a/res/pokemon/wurmple/data.json b/res/pokemon/wurmple/data.json index fbee5425c6..7c5f996722 100644 --- a/res/pokemon/wurmple/data.json +++ b/res/pokemon/wurmple/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -72,14 +70,14 @@ "pokemon_pos_f": 27, "trainer_pos_m": 9, "pokemon_pos_m": 27, - "entry_text": "Often targeted by bird Pok\u00e9mon,\nit desperately resists by releasing\npoison from its tail spikes.", - "category": "Worm Pok\u00e9mon" + "entry_text": "Often targeted by bird Pokémon,\nit desperately resists by releasing\npoison from its tail spikes.", + "category": "Worm Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/wurmple/meson.build b/res/pokemon/wurmple/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wurmple/meson.build +++ b/res/pokemon/wurmple/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/wynaut/data.json b/res/pokemon/wynaut/data.json index ec3bba742d..0fc2deab98 100644 --- a/res/pokemon/wynaut/data.json +++ b/res/pokemon/wynaut/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_SHADOW_TAG", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BLUE", - "flip": false - }, + "body_color": "MON_COLOR_BLUE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_SPLASH" ], @@ -71,13 +69,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 24, "entry_text": "It grows strong by pushing up\nagainst others en masse.\nIt loves eating sweet fruit.", - "category": "Bright Pok\u00e9mon" + "category": "Bright Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/wynaut/meson.build b/res/pokemon/wynaut/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/wynaut/meson.build +++ b/res/pokemon/wynaut/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/xatu/data.json b/res/pokemon/xatu/data.json index d5c9af3971..40106e12ab 100644 --- a/res/pokemon/xatu/data.json +++ b/res/pokemon/xatu/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_EARLY_BIRD" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -128,14 +126,14 @@ "pokemon_pos_f": 4, "trainer_pos_m": 9, "pokemon_pos_m": 4, - "entry_text": "This odd Pok\u00e9mon can see both\nthe past and the future. It eyes\nthe sun\u2019s movement all day.", - "category": "Mystic Pok\u00e9mon" + "entry_text": "This odd Pokémon can see both\nthe past and the future. It eyes\nthe sun’s movement all day.", + "category": "Mystic Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4362 } -} \ No newline at end of file +} diff --git a/res/pokemon/xatu/meson.build b/res/pokemon/xatu/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/xatu/meson.build +++ b/res/pokemon/xatu/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/yanma/data.json b/res/pokemon/yanma/data.json index 4e3b715460..ae3b65dd0e 100644 --- a/res/pokemon/yanma/data.json +++ b/res/pokemon/yanma/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SPEED_BOOST", "ABILITY_COMPOUND_EYES" ], "safari_flee_rate": 120, - "sprite": { - "color": "MON_COLOR_RED", - "flip": false - }, + "body_color": "MON_COLOR_RED", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -119,13 +117,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65531, "entry_text": "It can hover in one spot by\nflapping its wings at high speed. It\nflits about to guard its territory.", - "category": "Clear Wing Pok\u00e9mon" + "category": "Clear Wing Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/yanma/meson.build b/res/pokemon/yanma/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/yanma/meson.build +++ b/res/pokemon/yanma/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/yanmega/data.json b/res/pokemon/yanmega/data.json index 1d17762ba2..71cb8226c5 100644 --- a/res/pokemon/yanmega/data.json +++ b/res/pokemon/yanmega/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], "abilities": [ "ABILITY_SPEED_BOOST", "ABILITY_TINTED_LENS" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_GREEN", - "flip": false - }, + "body_color": "MON_COLOR_GREEN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_NIGHT_SLASH" ], @@ -121,13 +119,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65532, "entry_text": "Its jaw power is incredible. It is\nadept at biting apart foes while\nflying by at high speed.", - "category": "Ogre Darner Pok\u00e9mon" + "category": "Ogre Darner Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/yanmega/meson.build b/res/pokemon/yanmega/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/yanmega/meson.build +++ b/res/pokemon/yanmega/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/zangoose/data.json b/res/pokemon/zangoose/data.json index 4774ea5eae..771cf4ea85 100644 --- a/res/pokemon/zangoose/data.json +++ b/res/pokemon/zangoose/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_IMMUNITY", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_WHITE", - "flip": true - }, + "body_color": "MON_COLOR_WHITE", + "flip_sprite": true, "learnset": { "by_level": [ [ 1, "MOVE_SCRATCH" ], @@ -137,13 +135,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 8, "entry_text": "It has feuded with SEVIPER for\nmany generations. Its sharp claws\nare its biggest weapons.", - "category": "Cat Ferret Pok\u00e9mon" + "category": "Cat Ferret Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/zangoose/meson.build b/res/pokemon/zangoose/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/zangoose/meson.build +++ b/res/pokemon/zangoose/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/zapdos/data.json b/res/pokemon/zapdos/data.json index 847035e6e4..1ea4a4b479 100644 --- a/res/pokemon/zapdos/data.json +++ b/res/pokemon/zapdos/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_YELLOW", - "flip": false - }, + "body_color": "MON_COLOR_YELLOW", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_PECK" ], @@ -117,14 +115,14 @@ "pokemon_pos_f": 0, "trainer_pos_m": 5, "pokemon_pos_m": 0, - "entry_text": "A legendary Pok\u00e9mon that is said\nto live in thunderclouds. It freely\ncontrols lightning bolts.", - "category": "Electric Pok\u00e9mon" + "entry_text": "A legendary Pokémon that is said\nto live in thunderclouds. It freely\ncontrols lightning bolts.", + "category": "Electric Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4359 } -} \ No newline at end of file +} diff --git a/res/pokemon/zapdos/meson.build b/res/pokemon/zapdos/meson.build index 4613471504..10cfdd7305 100644 --- a/res/pokemon/zapdos/meson.build +++ b/res/pokemon/zapdos/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/zigzagoon/data.json b/res/pokemon/zigzagoon/data.json index 4ef4b5e628..4fc760f048 100644 --- a/res/pokemon/zigzagoon/data.json +++ b/res/pokemon/zigzagoon/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], "abilities": [ "ABILITY_PICKUP", "ABILITY_GLUTTONY" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_BROWN", - "flip": false - }, + "body_color": "MON_COLOR_BROWN", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_TACKLE" ], @@ -125,13 +123,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 27, "entry_text": "It walks in zigzag fashion. It is\ngood at finding items in the\ngrass and even in the ground.", - "category": "TinyRaccoon Pok\u00e9mon" + "category": "TinyRaccoon Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/zigzagoon/meson.build b/res/pokemon/zigzagoon/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/zigzagoon/meson.build +++ b/res/pokemon/zigzagoon/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/res/pokemon/zubat/data.json b/res/pokemon/zubat/data.json index b1469e537d..6a6b0661f8 100644 --- a/res/pokemon/zubat/data.json +++ b/res/pokemon/zubat/data.json @@ -30,10 +30,8 @@ "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], "safari_flee_rate": 0, - "sprite": { - "color": "MON_COLOR_PURPLE", - "flip": false - }, + "body_color": "MON_COLOR_PURPLE", + "flip_sprite": false, "learnset": { "by_level": [ [ 1, "MOVE_LEECH_LIFE" ], @@ -118,13 +116,13 @@ "trainer_pos_m": 9, "pokemon_pos_m": 65525, "entry_text": "It checks its surroundings and\nlocation using reflections of the\nultrasonic waves from its mouth.", - "category": "Bat Pok\u00e9mon" + "category": "Bat Pokémon" }, - "catching_show_data": { + "catching_show": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4358 } -} \ No newline at end of file +} diff --git a/res/pokemon/zubat/meson.build b/res/pokemon/zubat/meson.build index 8f46adb877..60c965be07 100644 --- a/res/pokemon/zubat/meson.build +++ b/res/pokemon/zubat/meson.build @@ -1,4 +1,4 @@ -personal_files += files('data.json') +species_data_files += files('data.json') poke_icon_files += files('icon.png') diff --git a/src/catching_show.c b/src/catching_show.c index 4e35453def..c98cf2b0b1 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -5,8 +5,8 @@ #include "constants/battle.h" #include "constants/species.h" -#include "consts/catching_show.h" #include "consts/game_records.h" +#include "generated/pal_park_land_area.h" #include "struct_decls/struct_02024440_decl.h" @@ -21,6 +21,7 @@ #include "narc.h" #include "pokemon.h" #include "rtc.h" +#include "species.h" #include "unk_0202EEC0.h" #include "unk_02054D00.h" @@ -31,14 +32,6 @@ #define DIFFERENT_TYPE_BONUS 200 #define MAX_TIME_SECONDS 1000 -typedef struct PalParkSpecies { - u8 landArea; - u8 waterArea; - u8 catchingPoints; - u8 rarity; - u8 unused[2]; -} PalParkSpecies; - static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow); static void UpdateBattleResultInternal(FieldSystem *fieldSystem, FieldBattleDTO *dto, CatchingShow *catchingShow); static BOOL TryStartEncounter(FieldSystem *fieldSystem, CatchingShow *catchingShow, int playerX, int playerY); @@ -119,19 +112,19 @@ int CatchingShow_GetTypePoints(FieldSystem *fieldSystem) return CalculateTypePoints(&sCatchingShow); } -static void BufferSpeciesData(u32 species, PalParkSpecies *speciesData) +static void BufferSpeciesData(u32 species, SpeciesPalPark *speciesData) { GF_ASSERT(0 < species && species <= NATIONAL_DEX_COUNT); - int speciesOffset = (species - 1) * sizeof(PalParkSpecies); + int speciesOffset = (species - 1) * sizeof(SpeciesPalPark); - NARC_ReadFromMemberByIndexPair(speciesData, NARC_INDEX_ARC__PPARK, 0, speciesOffset, sizeof(PalParkSpecies)); + NARC_ReadFromMemberByIndexPair(speciesData, NARC_INDEX_ARC__PPARK, 0, speciesOffset, sizeof(SpeciesPalPark)); } static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow) { int i; - PalParkSpecies speciesData; + SpeciesPalPark speciesData; u16 monSpecies; PalParkTransfer *v4 = SaveData_PalParkTransfer(fieldSystem->saveData); Pokemon *mon = Pokemon_New(HEAP_ID_FIELD); diff --git a/src/map_header.c b/src/map_header.c index 97aca1a3a4..0330108908 100644 --- a/src/map_header.c +++ b/src/map_header.c @@ -252,7 +252,7 @@ BOOL MapHeader_IsPokemonCenter2F(const u32 headerID) return FALSE; } -enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID) +enum EvolutionMethod MapHeader_GetMapEvolutionMethod(u32 headerID) { static const u16 mapEvolutionMethods[] = { MAP_HEADER_ROUTE_217, @@ -298,9 +298,8 @@ enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID) MAP_HEADER_SPEAR_PILLAR_PALKIA, EVO_LEVEL_MAGNETIC_FIELD }; - int i; - for (i = 0; i < NELEMS(mapEvolutionMethods); i += 2) { + for (int i = 0; i < NELEMS(mapEvolutionMethods); i += 2) { if (mapEvolutionMethods[i] == headerID) { return mapEvolutionMethods[i + 1]; } diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 9e3a8497a2..031c827dc9 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -34,7 +34,7 @@ #include "unk_0200F174.h" #include "unk_02054884.h" -#include "res/pokemon/tutor_movesets.h" +#include "res/pokemon/species_learnsets_by_tutor.h" struct UnkStruct_ov5_021F7ED8_t { FieldSystem *fieldSystem; @@ -271,7 +271,7 @@ static u8 ReadMovesetMaskByte(Pokemon *pokemon, u8 offset) break; } - return sTeachableMovesets[moveset - 1].maskData[offset]; + return sSpeciesLearnsetsByTutor[moveset - 1].maskData[offset]; } static u16 ov5_021F7B60(Pokemon *param0, u16 param1) diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 838f097200..88829328ff 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -3,7 +3,7 @@ #include #include -#include "consts/catching_show.h" +#include "generated/catching_show_points_category.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02024440_decl.h" diff --git a/subprojects/narc.wrap b/subprojects/narc.wrap index ef3480dc71..16b2672646 100644 --- a/subprojects/narc.wrap +++ b/subprojects/narc.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/lhearachel/narc.git -revision = v0.1.0 +revision = v0.2.0 depth = 1 [provide] diff --git a/subprojects/packagefiles/rapidjson_patch/gcc14fix.patch b/subprojects/packagefiles/rapidjson_patch/gcc14fix.patch new file mode 100644 index 0000000000..055bddc5ef --- /dev/null +++ b/subprojects/packagefiles/rapidjson_patch/gcc14fix.patch @@ -0,0 +1,22 @@ +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index e3e20dfb..19f5a6a5 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + +@@ -328,6 +326,8 @@ private: + //! Disallow construction from non-const array + template + GenericStringRef(CharType (&str)[N]) /* = delete */; ++ //! Copy assignment operator not permitted - immutable type ++ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */; + }; + + //! Mark a character pointer as constant string diff --git a/subprojects/rapidjson.wrap b/subprojects/rapidjson.wrap new file mode 100644 index 0000000000..041d711be6 --- /dev/null +++ b/subprojects/rapidjson.wrap @@ -0,0 +1,15 @@ +[wrap-file] +directory = rapidjson-1.1.0 +source_url = https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz +source_filename = rapidjson-1.1.0.tar.gz +source_hash = bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e +patch_filename = rapidjson_1.1.0-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/rapidjson_1.1.0-2/get_patch +patch_hash = c1480d0ecef09dbaa4b4d85d86090205386fb2c7e87f4f158b20dbbda14c9afc +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/rapidjson_1.1.0-2/rapidjson-1.1.0.tar.gz +wrapdb_version = 1.1.0-2 + +diff_files = rapidjson_patch/gcc14fix.patch + +[provide] +rapidjson = rapidjson_dep diff --git a/tools/datagen/datagen.h b/tools/datagen/datagen.h new file mode 100644 index 0000000000..79ea793690 --- /dev/null +++ b/tools/datagen/datagen.h @@ -0,0 +1,192 @@ +#ifndef POKEPLATINUM_DATAGEN_H +#define POKEPLATINUM_DATAGEN_H + +/* + * This is a shareable header of utility functions which are of use to data generation + * and packing programs. + */ + +// clang-format off +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +// clang-format on + +namespace fs = std::filesystem; + +// This attribute is useful when working with structures that have an element +// which must be word-aligned. For an example (and reasoning), see +// `SpeciesEvolutionList` in `datagen_species.cpp`. +#define ALIGN_4 __attribute__((aligned(4))) + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; +typedef bool BOOL; + +#define TRUE true +#define FALSE false + +// A lookup-table entry, mirroring the definition of structures generated by `metang`. +struct LookupEntry { + const long value; + const char *def; +}; + +// Search through a lookup-table for a string value. +static inline long Search(const LookupEntry *lookupTable, int low, int high, const char *val) +{ + while (low <= high) { + int mid = low + (high - low) / 2; + + if (strcmp(val, lookupTable[mid].def) == 0) { + return lookupTable[mid].value; + } + + const char *val_p = val; + const char *def_p = lookupTable[mid].def; + while (*val_p && *def_p && *val_p == *def_p) { + val_p++; + def_p++; + } + + if (*val_p > *def_p) { + low = mid + 1; + } else { + high = mid - 1; + } + } + + return -1; +} + +// Lookup a constant from a lookup-table. If the value is not found, then an +// `invalid_argument` exception will be thrown. A C-string is taken for the +// lookup-value for compatibility with rapidjson, which only uses C-strings. +static inline long Lookup(const LookupEntry *lookupTable, int low, int high, const char *val, const std::string &valDesc) +{ + long result = Search(lookupTable, low, high, val); + if (result < 0) { + std::stringstream buf; + buf << "no match found for " << val << " as " << valDesc; + throw std::invalid_argument(buf.str()); + } + + return result; +} + +// A C++-string wrapper to lookup a constant from a lookup table. +static inline long Lookup(const LookupEntry *lookupTable, int low, int high, const std::string &val, const std::string &valDesc) +{ + return Lookup(lookupTable, low, high, val.c_str(), valDesc); +} + +// This macro is a standardized bit of short-hand to lookup a constant value +// of a particular type. e.g., to lookup an Ability constant string's value, you +// would invoke `LookupConst(abilityString, Ability)`; this would expand to: +// `Lookup((LookupEntry *)lookup__Ability, 0, num__Ability, abilityString, "Ability")` +#define LookupConst(val, T) Lookup(reinterpret_cast(lookup__##T), 0, lengthof__##T, val, #T) + +// Align a value to the next 4-byte word-boundary. +static inline long AlignToWord(long val) +{ + return val + (-val & 3); +} + +// Tokenize a string by a given delimiter into a vector of components. +static inline std::vector Tokenize(const std::string &s, const char delim = ' ') +{ + std::vector tokens; + std::size_t start = s.find_first_not_of(delim, 0); + std::size_t end = 0; + while (start != std::string::npos) { + end = s.find_first_of(delim, start); + tokens.emplace_back(s.substr(start, end - start)); + start = s.find_first_not_of(delim, end); + } + + return tokens; +} + +// Pack a NARC to an output path from a VFS context. +static inline void PackNarc(vfs_pack_ctx *ctx, fs::path path) +{ + narc *narc = narc_pack(ctx); + + std::ofstream ofs(path); + ofs.write(reinterpret_cast(narc), narc->size); + + free(narc); +} + +// Pack a single-file NARC of binary elements to an output path. +template +static inline void PackSingleFileNarc(std::vector &elems, fs::path path) +{ + if (elems.empty()) { + return; + } + + vfs_pack_ctx *vfs = narc_pack_start(); + narc_pack_file_copy(vfs, reinterpret_cast(elems.data()), sizeof(elems[0]) * elems.size()); + PackNarc(vfs, path); +} + +// Read a whole file into a C++-string. +static inline std::string ReadWholeFile(std::ifstream &ifs) +{ + ifs.seekg(0, std::ios::end); + size_t size = ifs.tellg(); + std::string contents(size, ' '); + ifs.seekg(0); + ifs.read(&contents[0], size); + + return contents; +} + +// Read a whole file into a C++-string. +static inline std::string ReadWholeFile(fs::path &fname) +{ + std::ifstream ifs(fname); + return ReadWholeFile(ifs); +} + +// Read a file's lines into a vector of C++ strings. +static inline std::vector ReadFileLines(fs::path &fname) +{ + std::ifstream ifs(fname); + std::vector lines; + std::string line; + while (std::getline(ifs, line)) { + lines.emplace_back(line); + } + + return lines; +} + +// Read a registry-type environment variable into a vector of C++ strings. +static inline std::vector ReadRegistryEnvVar(const char *var) +{ + const char *val_p = NULL; + if ((val_p = std::getenv(var)) == NULL) { + std::cerr << "Missing definition for registry environment variable " << var << std::endl; + std::exit(EXIT_FAILURE); + } + + std::string val = val_p; + return Tokenize(val, ';'); +} + +#endif // POKEPLATINUM_DATAGEN_H diff --git a/tools/datagen/datagen_species.cpp b/tools/datagen/datagen_species.cpp new file mode 100644 index 0000000000..ade08d76ba --- /dev/null +++ b/tools/datagen/datagen_species.cpp @@ -0,0 +1,526 @@ +/* + * datagen-species + * + * Usage: datagen-species + * + * This program is responsible for generating data archive from species data files + * (res/pokemon//data.json). Individual files to be polled for packing are + * drawn from an environment var SPECIES, which should be a semicolon-delimited list + * of subdirectories of res/pokemon. + * + * is expected to be a listing of additional subdirectories + * belonging to individual species which have distinct data files. These special + * forms have their own base stats, types, level-up learnsets, etc., as any base + * species form would. + * + * is expected to be a JSON file defining the listing of moves that + * can be taught by a given move tutor, agnostic of species. This file is only + * consulted to restrict the set of valid moves in a species' tutorable learnset. + * + * The following files are generated by this program: + * - pl_personal.narc + * - evo.narc + * - wotbl.narc + * - ppark.narc + * - height.narc + * - pl_poke_data.narc + * - tutorable_moves.h + * - species_learnsets_by_tutor.h + */ +#include +#include +#include +#include +#include +#include + +#include "datagen.h" + +#define POKEPLATINUM_GENERATED_ENUM +#define POKEPLATINUM_GENERATED_LOOKUP +#define POKEPLATINUM_GENERATED_LOOKUP_IMPL + +#include "generated/abilities.h" +#include "generated/egg_groups.h" +#include "generated/evolution_methods.h" +#include "generated/exp_rates.h" +#include "generated/gender_ratios.h" +#include "generated/items.h" +#include "generated/moves.h" +#include "generated/pal_park_land_area.h" +#include "generated/pal_park_water_area.h" +#include "generated/pokemon_colors.h" +#include "generated/pokemon_types.h" +#include "generated/shadow_sizes.h" +#include "generated/species.h" + +#include "struct_defs/archived_poke_sprite_data.h" +#include "struct_defs/species.h" + +#define NUM_TMS 92 // TODO: Move this to a more accessible location, maybe? + +// This struct serves only one purpose: to ensure that the size of the data written +// to file-iamges in evo.narc is word-aligned. The vanilla structures pad to word- +// alignment with 0s, making for two extra 0-bytes after the array. Without this +// manual alignment, the NARC packing routine would instead pad the virtual files +// with `FF FF`, which obviously breaks matching. +struct SpeciesEvolutionList { + ALIGN_4 SpeciesEvolution entries[MAX_EVOLUTIONS]; +}; + +// Entries in `wotbl.narc` are dynamically-sized with a terminating sentinel value +// for each entry. So, we need to know how large the learnset itself is for a +// proper malloc and memcpy while packing to the VFS. +struct SpeciesLearnsetWithSize { + SpeciesLearnset learnset; + unsigned long size; +}; + +static const std::string sHeaderMessage = "" + "/*\n" + " * This header was generated by datagen-species; DO NOT MODIFY IT!!!\n" + " */" + ""; + +static void Usage(std::ostream &ostr) +{ + ostr << "Usage: datagen-species OUT_DIR ROOT_DIR FORMS_REGISTRY TUTOR_SCHEMA" << std::endl; + ostr << std::endl; + ostr << "Generates data archives from species data files (res/pokemon//data.json)" << std::endl; + ostr << "Species data files to be polled for packing are drawn from the environment var\n" + << "SPECIES, which must be a semicolon-delimited list of subdirectories of res/pokemon\n" + << "to be crawled at execution." << std::endl; +} + +static SpeciesData ParseSpeciesData(rapidjson::Document &root) +{ + SpeciesData species = { 0 }; + + rapidjson::Value &baseStats = root["base_stats"]; + species.baseStats.hp = baseStats["hp"].GetUint(); + species.baseStats.attack = baseStats["attack"].GetUint(); + species.baseStats.defense = baseStats["defense"].GetUint(); + species.baseStats.speed = baseStats["speed"].GetUint(); + species.baseStats.spAttack = baseStats["special_attack"].GetUint(); + species.baseStats.spDefense = baseStats["special_defense"].GetUint(); + + rapidjson::Value &evYields = root["ev_yields"]; + species.evYields.hp = evYields["hp"].GetUint(); + species.evYields.attack = evYields["attack"].GetUint(); + species.evYields.defense = evYields["defense"].GetUint(); + species.evYields.speed = evYields["speed"].GetUint(); + species.evYields.spAttack = evYields["special_attack"].GetUint(); + species.evYields.spDefense = evYields["special_defense"].GetUint(); + + rapidjson::Value &abilities = root["abilities"]; + species.abilities[0] = LookupConst(abilities[0].GetString(), Ability); + species.abilities[1] = LookupConst(abilities[1].GetString(), Ability); + + rapidjson::Value &types = root["types"]; + species.types[0] = LookupConst(types[0].GetString(), PokemonType); + species.types[1] = LookupConst(types[1].GetString(), PokemonType); + + rapidjson::Value &heldItems = root["held_items"]; + species.wildHeldItems.common = LookupConst(heldItems["common"].GetString(), Item); + species.wildHeldItems.rare = LookupConst(heldItems["rare"].GetString(), Item); + + rapidjson::Value &eggGroups = root["egg_groups"]; + species.eggGroups[0] = LookupConst(eggGroups[0].GetString(), EggGroup); + species.eggGroups[1] = LookupConst(eggGroups[1].GetString(), EggGroup); + + species.baseExpReward = root["base_exp_reward"].GetUint(); + species.baseFriendship = root["base_friendship"].GetUint(); + species.bodyColor = LookupConst(root["body_color"].GetString(), PokemonColor); + species.catchRate = root["catch_rate"].GetUint(); + species.expRate = LookupConst(root["exp_rate"].GetString(), ExpRate); + species.flipSprite = root["flip_sprite"].GetBool(); + species.genderRatio = LookupConst(root["gender_ratio"].GetString(), GenderRatio); + species.hatchCycles = root["hatch_cycles"].GetUint(); + species.safariFleeRate = root["safari_flee_rate"].GetUint(); + + rapidjson::Value &tmLearnset = root["learnset"]["by_tm"]; + for (auto &tmEntry : tmLearnset.GetArray()) { + std::string entry = tmEntry.GetString(); + int id; + if (entry[0] == 'T' && entry[1] == 'M') { + id = std::stoi(entry.substr(2)) - 1; + } else if (entry[0] == 'H' && entry[1] == 'M') { + id = std::stoi(entry.substr(2)) - 1 + NUM_TMS; + } else { + throw std::invalid_argument("unrecognized TM learnset entry " + entry); + } + species.tmLearnsetMasks[id / 32] |= (1 << (id % 32)); + } + + return species; +} + +static SpeciesEvolutionList ParseEvolutions(rapidjson::Document &root) +{ + SpeciesEvolutionList evos = { 0 }; + if (!root.HasMember("evolutions")) { + return evos; + } + + rapidjson::Value &evoList = root["evolutions"]; + int i = 0; + for (auto &evoEntry : evoList.GetArray()) { + EvolutionMethod method = static_cast(LookupConst(evoEntry[0].GetString(), EvolutionMethod)); + + u16 param; + int speciesIdx = 2; + switch (method) { + case EVO_NONE: + case EVO_LEVEL_HAPPINESS: + case EVO_LEVEL_HAPPINESS_DAY: + case EVO_LEVEL_HAPPINESS_NIGHT: + case EVO_TRADE: + case EVO_LEVEL_MAGNETIC_FIELD: + case EVO_LEVEL_MOSS_ROCK: + case EVO_LEVEL_ICE_ROCK: + param = 0; + speciesIdx = 1; + break; + + case EVO_LEVEL: + case EVO_LEVEL_ATK_GT_DEF: + case EVO_LEVEL_ATK_EQ_DEF: + case EVO_LEVEL_ATK_LT_DEF: + case EVO_LEVEL_PID_LOW: + case EVO_LEVEL_PID_HIGH: + case EVO_LEVEL_NINJASK: + case EVO_LEVEL_SHEDINJA: + case EVO_LEVEL_MALE: + case EVO_LEVEL_FEMALE: + case EVO_LEVEL_BEAUTY: + param = evoEntry[1].GetUint(); + break; + + case EVO_TRADE_WITH_HELD_ITEM: + case EVO_USE_ITEM: + case EVO_USE_ITEM_MALE: + case EVO_USE_ITEM_FEMALE: + case EVO_LEVEL_WITH_HELD_ITEM_DAY: + case EVO_LEVEL_WITH_HELD_ITEM_NIGHT: + param = LookupConst(evoEntry[1].GetString(), Item); + break; + + case EVO_LEVEL_KNOW_MOVE: + param = LookupConst(evoEntry[1].GetString(), Move); + break; + + case EVO_LEVEL_SPECIES_IN_PARTY: + param = LookupConst(evoEntry[1].GetString(), Species); + break; + } + + u16 target = LookupConst(evoEntry[speciesIdx].GetString(), Species); + evos.entries[i++] = SpeciesEvolution { + .method = static_cast(method), + .param = param, + .targetSpecies = target, + }; + } + + return evos; +} + +static SpeciesLearnsetWithSize ParseLevelUpLearnset(rapidjson::Document &root) +{ + SpeciesLearnsetWithSize result = {}; + + rapidjson::Value &byLevel = root["learnset"]["by_level"]; + int i = 0; + for (auto &byLevelEntry : byLevel.GetArray()) { + u16 level = byLevelEntry[0].GetUint(); + u16 move = LookupConst(byLevelEntry[1].GetString(), Move); + result.learnset.entries[i++] = { + .move = move, + .level = level, + }; + + if (i == MAX_LEARNSET_ENTRIES) { + break; + } + } + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" // bitfield-constant-conversion is clang-specific; GCC should ignore it +#pragma GCC diagnostic ignored "-Woverflow" +#pragma GCC diagnostic ignored "-Wbitfield-constant-conversion" + result.learnset.entries[i++] = { + .move = static_cast(-1), + .level = static_cast(-1), + }; +#pragma GCC diagnostic pop + + result.size = AlignToWord(i * sizeof(SpeciesLearnsetEntry)); + return result; +} + +static std::optional TryParsePalPark(rapidjson::Document &root) +{ + if (!root.HasMember("catching_show")) { + return std::nullopt; + } + + rapidjson::Value &catchingShow = root["catching_show"]; + SpeciesPalPark palPark; + palPark.landArea = LookupConst(catchingShow["pal_park_land_area"].GetString(), PalParkLandArea); + palPark.waterArea = LookupConst(catchingShow["pal_park_water_area"].GetString(), PalParkWaterArea); + palPark.catchingPoints = catchingShow["catching_points"].GetUint(); + palPark.rarity = catchingShow["rarity"].GetUint(); + palPark.unused.asU16 = catchingShow["unused"].GetUint(); + + return palPark; +} + +static std::vector EmitTutorableMoves(fs::path &tutorSchemaFname, fs::path outFname) +{ + std::string tutorSchema = ReadWholeFile(tutorSchemaFname); + rapidjson::Document doc; + doc.Parse(tutorSchema.c_str()); + + std::ofstream header(outFname, std::ios::out | std::ios::trunc | std::ios::ate); + header << sHeaderMessage << "\n" + << "#ifndef POKEPLATINUM_GENERATED_TUTORABLE_MOVES\n" + << "#define POKEPLATINUM_GENERATED_TUTORABLE_MOVES\n" + << "\n" + << "static const TeachableMove sTeachableMoves[] = {" + << std::endl; + + std::vector tutorables; + rapidjson::Value &moves = doc["moves"]; + for (const auto &entry : moves.GetObject()) { + Move tutorable = static_cast(LookupConst(entry.name.GetString(), Move)); + if (std::find(tutorables.begin(), tutorables.end(), tutorable) == tutorables.end()) { + tutorables.push_back(tutorable); + } + + const rapidjson::Value &moveObj = entry.value; + header << " { " << entry.name.GetString() << ", " + << moveObj["redCost"].GetUint() << ", " + << moveObj["blueCost"].GetUint() << ", " + << moveObj["yellowCost"].GetUint() << ", " + << moveObj["greenCost"].GetUint() << ", " + << moveObj["location"].GetString() << ", }, " + << std::endl; + } + + header << "};\n" + << "\n" + << "#endif // POKEPLATINUM_GENERATED_TUTORABLE_MOVES" + << std::endl; + header.close(); + return tutorables; +} + +static void TryEmitTutorableLearnset(rapidjson::Document &root, std::ofstream &ofs, std::vector &tutorableMoves, std::size_t tutorableLearnsetSize) +{ + const rapidjson::Value &learnsets = root["learnset"]; + if (!learnsets.HasMember("by_tutor")) { + return; + } + + const rapidjson::Value &byTutorLearnset = learnsets["by_tutor"]; + std::vector tutorableLearnset(tutorableLearnsetSize); + for (const auto &entry : byTutorLearnset.GetArray()) { + Move tutorable = static_cast(LookupConst(entry.GetString(), Move)); + std::vector::iterator it = std::find(tutorableMoves.begin(), tutorableMoves.end(), tutorable); + if (it == tutorableMoves.end()) { + std::stringstream ss; + ss << "Move " << entry.GetString() << " is not available via move tutors"; + throw std::invalid_argument(ss.str()); + } + + // The mask-index of this move is just the move's index / 8 + // The bit-index within that mask is the move's index % 8 + std::size_t idx = it - tutorableMoves.begin(); + tutorableLearnset[idx / 8] |= (1 << (idx % 8)); + } + + ofs << " { "; + for (const auto &mask : tutorableLearnset) { + ofs << "0x" << std::setfill('0') << std::setw(2) << (int)mask << ", "; + } + ofs << "},\n"; +} + +static void PackHeights(vfs_pack_ctx *vfs, rapidjson::Document &root, u8 genderRatio) +{ + u8 *backFemale, *backMale, *frontFemale, *frontMale; + const rapidjson::Value &backOffsets = root["back"]["y_offset"]; + const rapidjson::Value &frontOffsets = root["front"]["y_offset"]; + + u32 femaleSize = 1, maleSize = 1; + + if (genderRatio == GENDER_RATIO_FEMALE_ONLY) { + backMale = static_cast(malloc(0)); + frontMale = static_cast(malloc(0)); + maleSize = 0; + } else { + backMale = static_cast(malloc(1)); + frontMale = static_cast(malloc(1)); + *backMale = backOffsets["male"].GetUint(); + *frontMale = frontOffsets["male"].GetUint(); + } + + if (genderRatio == GENDER_RATIO_MALE_ONLY || genderRatio == GENDER_RATIO_NO_GENDER) { + backFemale = static_cast(malloc(0)); + frontFemale = static_cast(malloc(0)); + femaleSize = 0; + } else { + backFemale = static_cast(malloc(1)); + frontFemale = static_cast(malloc(1)); + *backFemale = backOffsets["female"].GetUint(); + *frontFemale = frontOffsets["female"].GetUint(); + } + + narc_pack_file(vfs, backFemale, femaleSize); + narc_pack_file(vfs, backMale, maleSize); + narc_pack_file(vfs, frontFemale, femaleSize); + narc_pack_file(vfs, frontMale, maleSize); +} + +static SpriteAnimationFrame ParseSpriteAnimationFrame(const rapidjson::Value &frame) +{ + SpriteAnimationFrame data = { 0 }; + data.spriteFrame = frame["sprite_frame"].GetInt(); + data.frameDelay = frame["frame_delay"].GetUint(); + data.xOffset = frame["x_shift"].GetInt(); + data.yOffset = frame["y_shift"].GetInt(); + + return data; +} + +static PokeSpriteFaceData ParsePokeSpriteFace(const rapidjson::Value &face) +{ + PokeSpriteFaceData data = { 0 }; + data.animation = face["animation"].GetUint(); + data.cryDelay = face["cry_delay"].GetUint(); + data.startDelay = face["start_delay"].GetUint(); + + int i = 0; + for (auto &frame : face["frames"].GetArray()) { + data.frames[i++] = ParseSpriteAnimationFrame(frame); + } + + return data; +} + +static ArchivedPokeSpriteData ParsePokeSprite(const rapidjson::Document &root) +{ + ArchivedPokeSpriteData data = { 0 }; + + const rapidjson::Value &front = root["front"]; + const rapidjson::Value &back = root["back"]; + const rapidjson::Value &shadow = root["shadow"]; + + std::cout << "here" << std::endl; + + data.faces[0] = ParsePokeSpriteFace(front); + data.faces[1] = ParsePokeSpriteFace(back); + data.yOffset = front["addl_y_offset"].GetInt(); + data.xOffsetShadow = shadow["x_offset"].GetInt(); + data.shadowSize = LookupConst(shadow["size"].GetString(), ShadowSize); + + return data; +} + +int main(int argc, char **argv) +{ + if (argc == 1) { + Usage(std::cout); + return EXIT_SUCCESS; + } + + fs::path outputRoot = argv[1]; + fs::path dataRoot = argv[2]; + fs::path formsRegistryFname = argv[3]; + fs::path tutorSchemaFname = argv[4]; + + // Determine what moves are tutorable and output the corresponding C header. + std::vector tutorableMoves = EmitTutorableMoves(tutorSchemaFname, outputRoot / "tutorable_moves.h"); + + // Bootstrap the by-tutor learnsets header. + std::ofstream byTutorMovesets(outputRoot / "species_learnsets_by_tutor.h"); + byTutorMovesets << sHeaderMessage << "\n" + << "#ifndef POKEPLATINUM_GENERATED_SPECIES_LEARNSETS_BY_TUTOR_H\n" + << "#define POKEPLATINUM_GENERATED_SPECIES_LEARNSETS_BY_TUTOR_H\n" + << "\n" + << "#include \"tutor_movesets.h\"\n" + << "\n" + << "static const MovesetMask sSpeciesLearnsetsByTutor[MOVESET_MAX] = {\n"; + byTutorMovesets << std::hex << std::setiosflags(std::ios::uppercase); // render all numeric inputs to the stream as hexadecimal + + // Tutorable learnsets are stored as an array of bitmasks; each bit in the mask + // denotes if a tutorable move can be learned by a given species. + std::size_t tutorableLearnsetSize = (tutorableMoves.size() + 7) / 8; + + // Prepare loop contents. + std::vector speciesRegistry = ReadRegistryEnvVar("SPECIES"); + std::vector formsRegistry = ReadFileLines(formsRegistryFname); + speciesRegistry.insert(speciesRegistry.end(), formsRegistry.begin(), formsRegistry.end()); + std::vector::iterator lastNatDex = speciesRegistry.end() - formsRegistry.size() - 3; // -3 accounts for egg and bad_egg + + // Prepare VFSes for each NARC to be output. + vfs_pack_ctx *personalVFS = narc_pack_start(); + vfs_pack_ctx *evoVFS = narc_pack_start(); + vfs_pack_ctx *wotblVFS = narc_pack_start(); + vfs_pack_ctx *heightVFS = narc_pack_start(); + std::vector palParkData; + std::vector pokeSpriteData; + + rapidjson::Document doc; + for (auto &species : speciesRegistry) { + try { + fs::path speciesDataPath = dataRoot / species / "data.json"; + std::string json = ReadWholeFile(speciesDataPath); + doc.Parse(json.c_str()); + + SpeciesData data = ParseSpeciesData(doc); + SpeciesEvolutionList evos = ParseEvolutions(doc); + SpeciesLearnsetWithSize sizedLearnset = ParseLevelUpLearnset(doc); + std::optional palPark = TryParsePalPark(doc); + TryEmitTutorableLearnset(doc, byTutorMovesets, tutorableMoves, tutorableLearnsetSize); + + narc_pack_file_copy(personalVFS, reinterpret_cast(&data), sizeof(data)); + narc_pack_file_copy(evoVFS, reinterpret_cast(&evos), sizeof(evos)); + narc_pack_file_copy(wotblVFS, reinterpret_cast(&sizedLearnset.learnset), sizedLearnset.size); + + if (palPark.has_value()) { + palParkData.emplace_back(palPark.value()); + } + + fs::path speciesSpriteDataPath = dataRoot / species / "sprite_data.json"; + std::ifstream spriteDataIFS(speciesSpriteDataPath); + if (spriteDataIFS.good()) { + std::string spriteData = ReadWholeFile(spriteDataIFS); + doc.Parse(spriteData.c_str()); + + u8 genderRatio = species != "none" ? data.genderRatio : GENDER_RATIO_FEMALE_50; // treat SPECIES_NONE as if it has two genders. + PackHeights(heightVFS, doc, genderRatio); + + ArchivedPokeSpriteData pokeSprite = ParsePokeSprite(doc); + pokeSpriteData.emplace_back(pokeSprite); + } + } catch (std::exception &e) { + std::cerr << "exception parsing data file for " + species << std::endl; + std::cerr << e.what() << std::endl; + std::exit(EXIT_FAILURE); + } + } + + byTutorMovesets << "};\n" + << "#endif // POKEPLATINUM_GENERATED_SPECIES_LEARNSETS_BY_TUTOR_H" + << std::endl; + byTutorMovesets.close(); + + PackNarc(personalVFS, outputRoot / "pl_personal.narc"); + PackNarc(evoVFS, outputRoot / "evo.narc"); + PackNarc(wotblVFS, outputRoot / "wotbl.narc"); + PackNarc(heightVFS, outputRoot / "height.narc"); + PackSingleFileNarc(palParkData, outputRoot / "ppark.narc"); + PackSingleFileNarc(pokeSpriteData, outputRoot / "pl_poke_data.narc"); + return EXIT_SUCCESS; +} diff --git a/tools/datagen/meson.build b/tools/datagen/meson.build new file mode 100644 index 0000000000..d9f62e08e0 --- /dev/null +++ b/tools/datagen/meson.build @@ -0,0 +1,39 @@ +# Datagen is a collection of utilities for transforming editable data files from +# the asset tree into in-game data, whether in source code tables or filesystem +# archives. Individual utilities should be written in C/C++ and make use of +# constants and structure definitions also used by the ROM's source code to ensure +# that changes are correctly synced between source code and generated data. Any +# changes to ROM headers which are also used by these utilities will be picked up +# by standard depfile management and trigger a recompilation, which will then flag +# files generated by the recompiled utilities for rebuild. + +subproject('narc') +subproject('rapidjson') + +rapidjson_dep = dependency('rapidjson') +libnarc_dep = dependency('libnarc') + +datagen_cpp_args = [ + '-std=c++17', + '-Wno-deprecated-declarations', # rapidjson 1.1.0 makes use of std::iterator + '-O3', +] + +datagen_species_exe = executable( + 'datagen-species', + sources: [ + files('datagen_species.cpp'), + c_consts_generators, + ], + cpp_args: datagen_cpp_args, + implicit_include_directories: true, + include_directories: [ + public_includes, + toplevel_includes, + ], + dependencies: [ + libnarc_dep, + rapidjson_dep, + ], + native: true, +) diff --git a/tools/json2bin/catching_show_data.py b/tools/json2bin/catching_show_data.py deleted file mode 100644 index f5259dfed2..0000000000 --- a/tools/json2bin/catching_show_data.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python3 -import pathlib -import json2bin as j2b - -from consts import catching_show -from generated import species - -def parse_catching_show_data(cs_data: dict, _size: int, _consts: type = None) -> bytes: - binary = bytearray([]) - binary.extend(j2b.parse_int(cs_data['catching_points'], 1)) - binary.extend(j2b.parse_int(cs_data['rarity'], 1)) - binary.extend(j2b.parse_int(cs_data['unused'], 2)) - return binary - - -SCHEMA = j2b.Parser() \ - .register('catching_show_data.pal_park_land_area', 1, j2b.parse_const, catching_show.PalParkLandArea) \ - .register('catching_show_data.pal_park_water_area', 1, j2b.parse_const, catching_show.PalParkWaterArea) \ - .register('catching_show_data', 1, parse_catching_show_data) - - -def indexer(file_path: pathlib.Path) -> int: - name = file_path.parent.stem.upper() - return species.Species[f'SPECIES_{name}'].value - - -args = j2b.ARGPARSER.parse_args() -j2b.json2bin(args.source_dir, - SCHEMA, - args.private_dir, - args.output_dir, - indexer, - glob_pattern='**/data.json', - narc_name='ppark', - narc_packer=args.narc, - output_mode=j2b.OutputMode.SINGLE_FILE, - skip_stems=['forms', '000', 'bad_egg', 'egg']) diff --git a/tools/json2bin/evo.py b/tools/json2bin/evo.py deleted file mode 100644 index ae9da934ad..0000000000 --- a/tools/json2bin/evo.py +++ /dev/null @@ -1,132 +0,0 @@ -#!/usr/bin/env python3 -from collections.abc import Sequence -import pathlib -import json2bin as j2b - -from generated import ( - evolution_methods, - items, - moves, - species, -) - - -def get_evo_params(method: evolution_methods.EvolutionMethod, evo: Sequence): - maybe_param = evo[1] - final_param = 0 - #None of these take an extra parameter - if method in set([ - evolution_methods.EvolutionMethod.EVO_NONE, - evolution_methods.EvolutionMethod.EVO_LEVEL_HAPPINESS, - evolution_methods.EvolutionMethod.EVO_LEVEL_HAPPINESS_DAY, - evolution_methods.EvolutionMethod.EVO_LEVEL_HAPPINESS_NIGHT, - evolution_methods.EvolutionMethod.EVO_TRADE, - evolution_methods.EvolutionMethod.EVO_LEVEL_MAGNETIC_FIELD, - evolution_methods.EvolutionMethod.EVO_LEVEL_MOSS_ROCK, - evolution_methods.EvolutionMethod.EVO_LEVEL_ICE_ROCK]): - final_param = 0 - # These all specify a basic integer param - elif method in set([ - evolution_methods.EvolutionMethod.EVO_LEVEL, - evolution_methods.EvolutionMethod.EVO_LEVEL_ATK_GT_DEF, - evolution_methods.EvolutionMethod.EVO_LEVEL_ATK_EQ_DEF, - evolution_methods.EvolutionMethod.EVO_LEVEL_ATK_LT_DEF, - evolution_methods.EvolutionMethod.EVO_LEVEL_PID_LOW, - evolution_methods.EvolutionMethod.EVO_LEVEL_PID_HIGH, - evolution_methods.EvolutionMethod.EVO_LEVEL_NINJASK, - evolution_methods.EvolutionMethod.EVO_LEVEL_SHEDINJA, - evolution_methods.EvolutionMethod.EVO_LEVEL_MALE, - evolution_methods.EvolutionMethod.EVO_LEVEL_FEMALE, - evolution_methods.EvolutionMethod.EVO_LEVEL_BEAUTY]): - final_param = maybe_param - # These specify an item - elif method in set([ - evolution_methods.EvolutionMethod.EVO_TRADE_WITH_HELD_ITEM, - evolution_methods.EvolutionMethod.EVO_USE_ITEM, - evolution_methods.EvolutionMethod.EVO_USE_ITEM_MALE, - evolution_methods.EvolutionMethod.EVO_USE_ITEM_FEMALE, - evolution_methods.EvolutionMethod.EVO_LEVEL_WITH_HELD_ITEM_DAY, - evolution_methods.EvolutionMethod.EVO_LEVEL_WITH_HELD_ITEM_NIGHT]): - final_param = items.Item[maybe_param].value - elif method == evolution_methods.EvolutionMethod.EVO_LEVEL_KNOW_MOVE: - final_param = moves.Move[maybe_param].value - elif method == evolution_methods.EvolutionMethod.EVO_LEVEL_SPECIES_IN_PARTY: - final_param = species.Species[maybe_param].value - - return final_param - - -def table_line(evo_method: int, evo_params: int, species: int) -> bytes: - binary = bytearray([]) - binary.extend(evo_method.to_bytes(2, 'little')) - binary.extend(evo_params.to_bytes(2, 'little')) - binary.extend(species.to_bytes(2, 'little')) - return bytes(binary) - - -def parse_evolutions(table: Sequence, _size: int, _enum: None) -> bytes: - out = bytearray([]) - for j in range(min(len(table), 7)): - evo = table[j] - method = evolution_methods.EvolutionMethod[evo[0]] - params = get_evo_params(method, evo) - target = species.Species[evo[-1]] - out.extend(table_line(method.value, params, target.value)) - - out.extend((0).to_bytes(44 - len(out), 'little')) - - return out - - -SCHEMA = j2b.Parser() \ - .register('evolutions', 44, parse_evolutions, optional=j2b.OptionalBehavior.PAD) - - -NATIONAL_DEX_COUNT = 493 - -FORM_INDICES = { - 'DEOXYS' : { - 'ATTACK': NATIONAL_DEX_COUNT + 3, - 'DEFENSE': NATIONAL_DEX_COUNT + 4, - 'SPEED': NATIONAL_DEX_COUNT + 5, - }, - 'WORMADAM': { - 'SANDY': NATIONAL_DEX_COUNT + 6, - 'TRASH': NATIONAL_DEX_COUNT + 7, - }, - 'GIRATINA': { - 'ORIGIN': NATIONAL_DEX_COUNT + 8, - }, - 'SHAYMIN': { - 'SKY': NATIONAL_DEX_COUNT + 9, - }, - 'ROTOM': { - 'HEAT': NATIONAL_DEX_COUNT + 10, - 'WASH': NATIONAL_DEX_COUNT + 11, - 'FROST': NATIONAL_DEX_COUNT + 12, - 'FAN': NATIONAL_DEX_COUNT + 13, - 'MOW': NATIONAL_DEX_COUNT + 14, - }, -} - -def indexer(file_path: pathlib.Path) -> int: - name = file_path.parent.stem.upper() - if name == '000': return 0 - if name == 'egg': return NATIONAL_DEX_COUNT + 1 - if name == 'bad_egg': return NATIONAL_DEX_COUNT + 2 - if file_path.parent.parent.stem == 'forms': - species_idx = file_path.parent.parent.parent.stem.upper() - form = file_path.parent.stem.upper() - return FORM_INDICES[species_idx][form] - return species.Species[f'SPECIES_{name}'].value - - -args = j2b.ARGPARSER.parse_args() -j2b.json2bin(args.source_dir, - SCHEMA, - args.private_dir, - args.output_dir, - indexer, - glob_pattern='**/data.json', - narc_name='evo', - narc_packer=args.narc) diff --git a/tools/json2bin/meson.build b/tools/json2bin/meson.build index 76fad6ec9c..31cb186424 100644 --- a/tools/json2bin/meson.build +++ b/tools/json2bin/meson.build @@ -3,10 +3,6 @@ json2bin_env.set('PYTHONPATH', meson.project_build_root()) # access to constants # Old combined parser + packer scripts movedata_py = find_program('movedata.py', native: true) -pokemon_personal_data_py = find_program('pokemon_personal_data.py', native: true) -pokemon_wotbl_data_py = find_program('pokemon_wotbl_data.py', native: true) -evo_py = find_program('evo.py', native: true) -pl_poke_data_py = find_program('pl_poke_data.py', native: true) # New single-file-parser scripts encounter_py = find_program('encounter.py', native: true) @@ -17,4 +13,3 @@ encdata_ex_elusive_rod_py = find_program('encdata_ex_elusive_rod.py', native: tr encdata_ex_honey_trees_py = find_program('encdata_ex_honey_trees.py', native: true) encdata_ex_trophy_garden_py = find_program('encdata_ex_trophy_garden.py', native: true) encdata_ex_great_marsh_py = find_program('encdata_ex_great_marsh.py', native: true) -catching_show_data_py = find_program('catching_show_data.py', native: true) diff --git a/tools/json2bin/pl_poke_data.py b/tools/json2bin/pl_poke_data.py deleted file mode 100644 index a395f9a429..0000000000 --- a/tools/json2bin/pl_poke_data.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python3 -import pathlib -import json2bin as j2b - -from consts import shadows -from generated import species - - -def parse_frame(frame: dict) -> bytes: - binary = bytearray([]) - binary.extend(j2b.parse_sint(frame['sprite_frame'], 1)) - binary.extend(j2b.parse_int(frame['frame_delay'], 1)) - binary.extend(j2b.parse_sint(frame['x_shift'], 1)) - binary.extend(j2b.parse_sint(frame['y_shift'], 1)) - - return binary - - -def parse_face(face: dict, _size: int, _consts: type = None) -> bytes: - binary = bytearray([]) - binary.extend(j2b.parse_int(face['cry_delay'], 1)) - binary.extend(j2b.parse_int(face['animation'], 1)) - binary.extend(j2b.parse_int(face['start_delay'], 1)) - - for frame in face['frames']: - binary.extend(parse_frame(frame)) - - return binary - - -SCHEMA = j2b.Parser() \ - .register('front', 43, parse_face) \ - .register('back', 43, parse_face) \ - .register('front.addl_y_offset', 1, j2b.parse_sint) \ - .register('shadow.x_offset', 1, j2b.parse_sint) \ - .register('shadow.size', 1, j2b.parse_const, shadows.PokemonBattleShadowSize) - - -def indexer(file_path: pathlib.Path) -> int: - name = file_path.parent.stem.upper() - if name == '000': return 0 - return species.Species[f'SPECIES_{name}'].value - - -args = j2b.ARGPARSER.parse_args() -j2b.json2bin(args.source_dir, - SCHEMA, - args.private_dir, - args.output_dir, - indexer, - glob_pattern='**/sprite_data.json', - narc_name='pl_poke_data', - narc_packer=args.narc, - output_mode=j2b.OutputMode.SINGLE_FILE, - skip_stems=['forms']) diff --git a/tools/json2bin/pokemon_personal_data.py b/tools/json2bin/pokemon_personal_data.py deleted file mode 100644 index fca8417fa9..0000000000 --- a/tools/json2bin/pokemon_personal_data.py +++ /dev/null @@ -1,109 +0,0 @@ -#!/usr/bin/env python3 -import pathlib - -import json2bin as j2b - -from generated import ( - abilities, - egg_groups, - exp_rates, - gender_ratios, - items, - pokemon_colors, - pokemon_types, - species, -) - -from consts import tm_learnset - -def parse_ev_yields(ev_yields: dict, size: int, _: None) -> bytes: - packed = ev_yields['hp'] - packed = packed + (ev_yields['attack'] << 2) - packed = packed + (ev_yields['defense'] << 4) - packed = packed + (ev_yields['speed'] << 6) - packed = packed + (ev_yields['special_attack'] << 8) - packed = packed + (ev_yields['special_defense'] << 10) - return packed.to_bytes(size, 'little') - -def parse_color(sprite: dict, size: int, _: None) -> bytes: - packed = pokemon_colors.PokemonColor[sprite['color']].value - packed = packed + ((1 if sprite['flip'] else 0) << 7) - return packed.to_bytes(size, 'little') - -SCHEMA = j2b.Parser() \ - .register_name(lambda s: s) \ - .register('base_stats.hp', 1, j2b.parse_int) \ - .register('base_stats.attack', 1, j2b.parse_int) \ - .register('base_stats.defense', 1, j2b.parse_int) \ - .register('base_stats.speed', 1, j2b.parse_int) \ - .register('base_stats.special_attack', 1, j2b.parse_int) \ - .register('base_stats.special_defense', 1, j2b.parse_int) \ - .register('types.0', 1, j2b.parse_const, pokemon_types.PokemonType) \ - .register('types.1', 1, j2b.parse_const, pokemon_types.PokemonType) \ - .register('catch_rate', 1, j2b.parse_int) \ - .register('base_exp_reward', 1, j2b.parse_int) \ - .register('ev_yields', 2, parse_ev_yields) \ - .register('held_items.common', 2, j2b.parse_const, items.Item) \ - .register('held_items.rare', 2, j2b.parse_const, items.Item) \ - .register('gender_ratio', 1, j2b.parse_const, gender_ratios.GenderRatio) \ - .register('hatch_cycles', 1, j2b.parse_int) \ - .register('base_friendship', 1, j2b.parse_int) \ - .register('exp_rate', 1, j2b.parse_const, exp_rates.ExpRate) \ - .register('egg_groups.0', 1, j2b.parse_const, egg_groups.EggGroup) \ - .register('egg_groups.1', 1, j2b.parse_const, egg_groups.EggGroup) \ - .register('abilities.0', 1, j2b.parse_const, abilities.Ability) \ - .register('abilities.1', 1, j2b.parse_const, abilities.Ability) \ - .register('safari_flee_rate', 1, j2b.parse_int) \ - .register('sprite', 1, parse_color) \ - .pad(2) \ - .register('learnset.by_tm', 16, j2b.pack_flags, tm_learnset.TMLearnsetFlags) - - -NATIONAL_DEX_COUNT = 493 - -FORM_INDICES = { - 'DEOXYS' : { - 'ATTACK': NATIONAL_DEX_COUNT + 3, - 'DEFENSE': NATIONAL_DEX_COUNT + 4, - 'SPEED': NATIONAL_DEX_COUNT + 5, - }, - 'WORMADAM': { - 'SANDY': NATIONAL_DEX_COUNT + 6, - 'TRASH': NATIONAL_DEX_COUNT + 7, - }, - 'GIRATINA': { - 'ORIGIN': NATIONAL_DEX_COUNT + 8, - }, - 'SHAYMIN': { - 'SKY': NATIONAL_DEX_COUNT + 9, - }, - 'ROTOM': { - 'HEAT': NATIONAL_DEX_COUNT + 10, - 'WASH': NATIONAL_DEX_COUNT + 11, - 'FROST': NATIONAL_DEX_COUNT + 12, - 'FAN': NATIONAL_DEX_COUNT + 13, - 'MOW': NATIONAL_DEX_COUNT + 14, - }, -} - -def indexer(file_path: pathlib.Path) -> int: - name = file_path.parent.stem.upper() - if name == '000': return 0 - if name == 'egg': return NATIONAL_DEX_COUNT + 1 - if name == 'bad_egg': return NATIONAL_DEX_COUNT + 2 - if file_path.parent.parent.stem == 'forms': - species_idx = file_path.parent.parent.parent.stem.upper() - form = file_path.parent.stem.upper() - return FORM_INDICES[species_idx][form] - return species.Species[f'SPECIES_{name}'].value - - -args = j2b.ARGPARSER.parse_args() -j2b.json2bin(args.source_dir, - SCHEMA, - args.private_dir, - args.output_dir, - indexer, - glob_pattern='**/data.json', - narc_name='pl_personal', - narc_packer=args.narc) diff --git a/tools/json2bin/pokemon_wotbl_data.py b/tools/json2bin/pokemon_wotbl_data.py deleted file mode 100644 index c52201c774..0000000000 --- a/tools/json2bin/pokemon_wotbl_data.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python3 -import pathlib -import json2bin as j2b - -from generated import ( - moves, - species, -) - - -def table_line(move_id: int, level: int) -> bytes: - return ((move_id & 0x01FF) | ((level & 0x7F) << 9)).to_bytes(2, 'little', signed=False) - - -def parse_level_up_moves(table: list, _size: int, _enum: None): - out = [] - for entry in table: - level = entry[0] - move = entry[1] - out.extend(table_line(moves.Move[move].value, level)) - return out - - -SCHEMA = j2b.Parser() \ - .register_name(lambda s: s) \ - .register('learnset.by_level', 0, parse_level_up_moves, optional=j2b.OptionalBehavior.SKIP) \ - .pad(2, 0xff) \ - .align(4) - - -NATIONAL_DEX_COUNT = 493 - -FORM_INDICES = { - 'DEOXYS' : { - 'ATTACK': NATIONAL_DEX_COUNT + 3, - 'DEFENSE': NATIONAL_DEX_COUNT + 4, - 'SPEED': NATIONAL_DEX_COUNT + 5, - }, - 'WORMADAM': { - 'SANDY': NATIONAL_DEX_COUNT + 6, - 'TRASH': NATIONAL_DEX_COUNT + 7, - }, - 'GIRATINA': { - 'ORIGIN': NATIONAL_DEX_COUNT + 8, - }, - 'SHAYMIN': { - 'SKY': NATIONAL_DEX_COUNT + 9, - }, - 'ROTOM': { - 'HEAT': NATIONAL_DEX_COUNT + 10, - 'WASH': NATIONAL_DEX_COUNT + 11, - 'FROST': NATIONAL_DEX_COUNT + 12, - 'FAN': NATIONAL_DEX_COUNT + 13, - 'MOW': NATIONAL_DEX_COUNT + 14, - }, -} - -def indexer(file_path: pathlib.Path) -> int: - name = file_path.parent.stem.upper() - if name == '000': return 0 - if name == 'egg': return NATIONAL_DEX_COUNT + 1 - if name == 'bad_egg': return NATIONAL_DEX_COUNT + 2 - if file_path.parent.parent.stem == 'forms': - species_idx = file_path.parent.parent.parent.stem.upper() - form = file_path.parent.stem.upper() - return FORM_INDICES[species_idx][form] - return species.Species[f'SPECIES_{name}'].value - - -args = j2b.ARGPARSER.parse_args() -j2b.json2bin(args.source_dir, - SCHEMA, - args.private_dir, - args.output_dir, - indexer, - glob_pattern='**/data.json', - narc_name='wotbl', - narc_packer=args.narc) diff --git a/tools/meson.build b/tools/meson.build index 67e818a78b..c065a90c1d 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -1,8 +1,10 @@ # Native tools subdir('csv2bin') +subdir('datagen') subdir('fixrom') subdir('json2bin') subdir('msgenc') +subdir('ordergen') subdir('postconf') subdir('scripts') subdir('debug') @@ -20,6 +22,4 @@ arm_none_eabi_objcopy_exe = find_program('arm-none-eabi-objcopy', native: true) # External tools nitrogfx_exe = find_program('nitrogfx', native: true) narc_exe = find_program('narc', native: true) -constgen_py = find_program('constgen_py', native: true) SDATTool_py = find_program('SDATTool_py', native: true) -metang_exe = find_program('metang', native: true) diff --git a/tools/ordergen/forms.py b/tools/ordergen/forms.py new file mode 100755 index 0000000000..091bc503d0 --- /dev/null +++ b/tools/ordergen/forms.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 + +import argparse +import json + + +argp = argparse.ArgumentParser( + description="Process a forms registry into a listing of res/pokemon subdirectories" +) +argp.add_argument("FORM_REGISTRY", help="Path to the forms registry") +argp.add_argument("DATA_OUT", help="Path to the data-type output registry") +argp.add_argument("ICON_OUT", help="Path to the icon-type output registry") +argp.add_argument("SPRITE_OUT", help="Path to the sprite-type output registry") + +args = argp.parse_args() + +with ( + open(args.FORM_REGISTRY, "r", encoding="utf-8") as form_reg_f, + open(args.DATA_OUT, "w", encoding="utf-8") as data_out, + open(args.ICON_OUT, "w", encoding="utf-8") as icon_out, + open(args.SPRITE_OUT, "w", encoding="utf-8") as sprite_out, +): + form_reg: dict[str, dict[str, str | bool]] = json.load(form_reg_f) + + all_sprite_lines = [] + all_palette_lines = [] + last_sprite_lines = [] + last_palette_lines = [] + + for species, form_set in form_reg.items(): + shared_palette = form_set.get("__shared_palette", False) + dupe_base_icon = form_set.get("__dupe_base_icon", False) + all_back_then_front = form_set.get("__all_back_then_front", False) + all_normal_then_shiny = form_set.get("__all_normal_then_shiny", False) + front_only = form_set.get("__front_only", False) + last_sprite = form_set.get("__last_sprite", False) + + if dupe_base_icon: + print(f"{species}", file=icon_out) + + forms_back = [f"{species}/forms/base/back.png"] + forms_front = [f"{species}/forms/base/front.png"] + forms_normal = [f"{species}/forms/base/normal.png"] + forms_shiny = [f"{species}/forms/base/shiny.pal"] + for form_name, form_type in form_set.items(): + if form_name.startswith("__"): + continue + + if form_type == "data": + print(f"{species}/forms/{form_name}", file=data_out) + print(f"{species}/forms/{form_name}", file=icon_out) + elif form_type == "icon": + print(f"{species}/forms/{form_name}", file=icon_out) + + if not front_only: + forms_back.append(f"{species}/forms/{form_name}/back.png") + forms_shiny.append(f"{species}/forms/{form_name}/shiny.pal") + forms_front.append(f"{species}/forms/{form_name}/front.png") + forms_normal.append(f"{species}/forms/{form_name}/normal.pal") + + sprite_lines = [] + palette_lines = [] + if all_back_then_front: + sprite_lines.extend(forms_back) + sprite_lines.extend(forms_front) + else: # form back then form front for each form + [ + sprite_lines.extend((back, front)) + for (back, front) in zip(forms_back, forms_front) + ] + + if shared_palette: + palette_lines.append(forms_normal[0]) + palette_lines.append(forms_shiny[0]) + elif all_normal_then_shiny: + palette_lines.extend(forms_normal) + palette_lines.extend(forms_shiny) + else: # form normal then form shiny for each form + [ + palette_lines.extend((normal, shiny)) + for (normal, shiny) in zip(forms_normal, forms_shiny) + ] + + if last_sprite: + last_sprite_lines = sprite_lines + last_palette_lines = palette_lines + else: + all_sprite_lines.extend(sprite_lines) + all_palette_lines.extend(palette_lines) + + if last_sprite_lines: + all_sprite_lines.extend(last_sprite_lines) + all_palette_lines.extend(last_palette_lines) + + [print(sprite, file=sprite_out) for sprite in all_sprite_lines] + [print(palette, file=sprite_out) for palette in all_palette_lines] + print(".shared/substitute_back.png", file=sprite_out) + print(".shared/substitute_front.png", file=sprite_out) + print(".shared/substitute.pal", file=sprite_out) + print(".shared/shadows.png", file=sprite_out) + print(".shared/shadows.pal", file=sprite_out) diff --git a/tools/ordergen/meson.build b/tools/ordergen/meson.build new file mode 100644 index 0000000000..545f9825e2 --- /dev/null +++ b/tools/ordergen/meson.build @@ -0,0 +1 @@ +ordergen_forms_py = find_program('forms.py', native: true) diff --git a/tools/scripts/make_height.py b/tools/scripts/make_height.py deleted file mode 100644 index de79643f4d..0000000000 --- a/tools/scripts/make_height.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess - -from generated.gender_ratios import GenderRatio - - -argparser = argparse.ArgumentParser( - prog='pl_poke_icon.narc packer', - description='Packs the archive containing Pokemon icons' -) -argparser.add_argument('-n', '--narc', - required=True, - help='Path to narc executable') -argparser.add_argument('-s', '--source-dir', - required=True, - help='Path to the source directory (res/pokemon)') -argparser.add_argument('-p', '--private-dir', - required=True, - help='Path to the private directory (where binaries will be made)') -argparser.add_argument('-o', '--output-dir', - required=True, - help='Path to the output directory (where the NARC will be made)') -argparser.add_argument('subdirs', - nargs='+', - help='List of subdirectories to process in-order') -args = argparser.parse_args() - -source_dir = pathlib.Path(args.source_dir) -private_dir = pathlib.Path(args.private_dir) -output_dir = pathlib.Path(args.output_dir) - -private_dir.mkdir(parents=True, exist_ok=True) - -for i, subdir in enumerate(args.subdirs): - # Do not attempt to process eggs - if subdir in ['egg', 'bad_egg']: - continue - - with open(source_dir / subdir / 'sprite_data.json', 'r') as data_file: - spdata = json.load(data_file) - with open(source_dir / subdir / 'data.json', 'r') as data_file: - pkdata = json.load(data_file) - - gender_ratio = pkdata['gender_ratio'] - female_only = (gender_ratio == GenderRatio.GENDER_RATIO_FEMALE_ONLY.name) - male_or_genderless = (gender_ratio in [ - GenderRatio.GENDER_RATIO_MALE_ONLY.name, - GenderRatio.GENDER_RATIO_NO_GENDER.name - ]) - - j = 0 - for face in ['back', 'front']: - for gender in ['female', 'male']: - target_fname = private_dir / f'{i:04}-{j:02}.bin' - if female_only and gender == 'male': - subprocess.run(['touch', target_fname]) - elif male_or_genderless and gender == 'female' and subdir != '000': # DPPic is handled like a normal mon - subprocess.run(['touch', target_fname]) - else: - with open(target_fname, 'wb+') as target_file: - target_file.write(spdata[face]['y_offset'][gender].to_bytes(1, 'little')) - - j += 1 - -subprocess.run([args.narc, 'create', '--output', output_dir / 'height.narc', private_dir]) diff --git a/tools/scripts/make_pl_pokegra.py b/tools/scripts/make_pl_pokegra.py index 6eb0e2a274..5bfd46e6da 100644 --- a/tools/scripts/make_pl_pokegra.py +++ b/tools/scripts/make_pl_pokegra.py @@ -58,9 +58,9 @@ for i, subdir in enumerate(args.subdirs): j += 1 - if i == 0: # species 000 has special palette files - shutil.copy(source_dir / '000/normal_pal.NCLR', private_dir / '0000-04.NCLR') - shutil.copy(source_dir / '000/shiny_pal.NCLR', private_dir / '0000-05.NCLR') + if i == 0: # species none has special palette files + shutil.copy(source_dir / 'none/normal_pal.NCLR', private_dir / '0000-04.NCLR') + shutil.copy(source_dir / 'none/shiny_pal.NCLR', private_dir / '0000-05.NCLR') continue normal_pal_src = source_dir / subdir / 'normal.pal' diff --git a/tools/scripts/make_species_tables.py b/tools/scripts/make_species_tables.py index 3a765efadb..e87dea7192 100644 --- a/tools/scripts/make_species_tables.py +++ b/tools/scripts/make_species_tables.py @@ -12,9 +12,6 @@ argparser = argparse.ArgumentParser( prog='make_species_tables.py', description='Creates generated .h files for species-specific data' ) -argparser.add_argument('-t', '--tutorable-moves', - required=True, - help='Path to the tutorable moves schema') argparser.add_argument('-s', '--source-dir', required=True, help='Path to the source directory (res/pokemon)') @@ -26,12 +23,6 @@ args = argparser.parse_args() source_dir = pathlib.Path(args.source_dir) output_dir = pathlib.Path(args.output_dir) -tutors_schema = {} -with open(args.tutorable_moves, 'r', encoding='utf-8') as f: - tutors_schema = json.load(f) - -moveset = [Move[m] for m in tutors_schema["moves"].keys()] - NATIONAL_DEX_COUNT = 493 FORM_INDICES = { @@ -59,7 +50,6 @@ FORM_INDICES = { }, } -species_movesets = {} species_footprints = { 0: { "has": False, "size": "FOOTPRINT_SMALL" } } @@ -70,13 +60,12 @@ for file_path in source_dir.glob("**/data.json"): species_name = file_path.parent.stem.upper() - if species_name in ["000", "EGG", "BAD_EGG"]: + if species_name in ["NONE", "EGG", "BAD_EGG"]: continue isForm = False if file_path.parent.parent.stem == "forms": - form_name = species_name species_name = file_path.parent.parent.parent.stem.upper() @@ -86,22 +75,6 @@ for file_path in source_dir.glob("**/data.json"): else: species_id = Species[f"SPECIES_{species_name}"].value - - # this needs to be increased if more than 40 moves are added to this list - byte_array = [0, 0, 0, 0, 0] - - def set_bit(bit_num): - byte_index = bit_num // 8 - bit_index = bit_num % 8 - - byte = byte_array[byte_index] - byte_array[byte_index] = byte | (1 << bit_index) - - for tutor_move in species_data["learnset"]["by_tutor"]: - set_bit(moveset.index(Move[tutor_move])) - - species_movesets[species_id] = byte_array - if not isForm: species_footprints[species_id] = species_data["footprint"] @@ -110,29 +83,6 @@ generated_disclaimer = [ "// This file is GENERATED. Changes will be overwritten here on build\n", "// Check make_species_tables.py for reference\n", ] - -# write moveset table header -output_path = output_dir / "tutor_movesets.h" - -with open(output_path, "w") as output_file: - output_file.writelines(generated_disclaimer) - output_file.write("#ifndef POKEPLATINUM_GENERATED_TUTOR_MOVESETS_H\n") - output_file.write("#define POKEPLATINUM_GENERATED_TUTOR_MOVESETS_H\n") - output_file.write("#include \"tutor_movesets.h\"\n") - output_file.write("#include \"constants/forms.h\"\n") - output_file.write("\n") - output_file.write("const MovesetMask sTeachableMovesets[MOVESET_MAX] = {\n") - - sorted_array = sorted(species_movesets.items()) - - for key, value in sorted_array: - struct = ''.join([f" 0x{i:X},".ljust(6) for i in value]) - - output_file.write(f" {{{struct.rstrip(' ,').ljust(29)} }},\n") - - output_file.write("};\n") - output_file.write("\n#endif\n") - # write footprint table header output_path = output_dir / "footprint_data.h" diff --git a/tools/scripts/make_tutorable_moves.py b/tools/scripts/make_tutorable_moves.py deleted file mode 100644 index 8f72347ce2..0000000000 --- a/tools/scripts/make_tutorable_moves.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import re - -def snake(s): - return '_'.join( - re.sub('([A-Z][a-z]+)', r' \1', - re.sub('([A-Z]+)', r' \1', - s.replace('-', ' '))).split() - ).lower() - -def guard(s): - return snake(str(s)).upper().replace('/', '__').replace('.', '__') - -argparser = argparse.ArgumentParser( - prog='make_tutorable_moves.py', - description='Generates tutorable_moves.h' -) -argparser.add_argument('--schema', - required=True, - help='Path to the source schema file') -argparser.add_argument('--output-dir', - required=True, - help='Path to the output directory (where the header will be generated)') -args = argparser.parse_args() - -schema_file = open(args.schema, 'r', encoding='utf-8') -output_dir = pathlib.Path(args.output_dir) -output_fname = output_dir / 'tutorable_moves.h' -output_file = open(output_fname, 'w', encoding='utf-8') - -schema_json = json.load(schema_file) -static_prefix = 'static ' if schema_json['static'] else '' -const_prefix = 'const ' if schema_json['const'] else '' - -entries = [ - f' {{ {move}, {entry["redCost"]}, {entry["blueCost"]}, {entry["yellowCost"]}, {entry["greenCost"]}, {entry["location"]} }},' - for move, entry in schema_json['moves'].items() -] - -incl_guard = guard(output_fname) -output_file.writelines([ - f'#ifndef {incl_guard}\n', - f'#define {incl_guard}\n', - '\n', - f'{static_prefix}{const_prefix}{schema_json["type"]} {schema_json["name"]}[] = {{\n', - '\n'.join(entries), - '\n', - '};\n', - '\n', - f'#endif // {incl_guard}\n', -]) - -schema_file.close() -output_file.close() - diff --git a/tools/scripts/meson.build b/tools/scripts/meson.build index 6cc19bc4ec..ddebedcd59 100644 --- a/tools/scripts/meson.build +++ b/tools/scripts/meson.build @@ -1,13 +1,11 @@ make_pl_poke_icon_py = find_program('make_pl_poke_icon.py', native: true) make_pl_pokegra_py = find_program('make_pl_pokegra.py', native: true) make_pl_otherpoke_py = find_program('make_pl_otherpoke.py', native: true) -make_height_py = find_program('make_height.py', native: true) make_script_bin_sh = find_program('make_script_bin.sh', native: true) make_pl_pokezukan_py = find_program('make_pl_pokezukan.py', native: true) make_shinzukan_py = find_program('make_shinzukan.py', native: true) make_pl_growtbl_py = find_program('make_pl_growtbl.py', native: true) make_species_tables_py = find_program('make_species_tables.py', native: true) -make_tutorable_moves_py = find_program('make_tutorable_moves.py', native: true) make_pokedex_data_py = find_program('make_pokedex_data.py', native: true) make_pokedex_message_banks_py = find_program('make_pokedex_message_banks.py', native: true) make_pokedex_enc_platinum_py = find_program('make_pokedex_enc_platinum.py', native: true) diff --git a/tools/scripts/migration/species_data.py b/tools/scripts/migration/species_data.py index 14c328b802..fffba7b445 100755 --- a/tools/scripts/migration/species_data.py +++ b/tools/scripts/migration/species_data.py @@ -1,5 +1,14 @@ #!/usr/bin/env python3 +""" + This is a standalone script for existing end-users to migrate their data + structures to the new species_data format expected by datagen_species.cpp. + New users and users who have not made any changes to species' data.json + files should not need to use it. Any user which *has* made changes to these + files can accept their copy during a merge from main, then run this script + to update all of their files in bulk. +""" + import json import pathlib @@ -67,36 +76,43 @@ def migrate(d: dict) -> dict: o["exp_rate"] = d["exp_rate"] o["egg_groups"] = d["egg_groups"] o["abilities"] = d["abilities"] - o["safari_flee_rate"] = d["great_marsh_flee_rate"] - - o["sprite"] = {} - o["sprite"]["color"] = d["sprite"]["color"] - o["sprite"]["flip"] = d["sprite"]["flip_sprite"] + o["safari_flee_rate"] = d.get("safari_flee_rate", d.get("great_marsh_flee_rate")) + o["body_color"] = d["sprite"]["color"] + o["flip_sprite"] = d["sprite"].get("flip", d["sprite"].get("flip_sprite")) o["learnset"] = {} + learnsets = d["learnset"] + by_level = [] - for k, v in d["learnset"]["level_up"].items(): - if isinstance(v, list): - for mem in v: - by_level.append([int(k), mem]) - else: - by_level.append([int(k), v]) + if "level_up" in learnsets: # old dictionary-based structure + for k, v in learnsets["level_up"].items(): + if isinstance(v, list): + for mem in v: + by_level.append([int(k), mem]) + else: + by_level.append([int(k), v]) + else: # newer list-of-tuples structure + by_level = learnsets["by_level"] + o["learnset"]["by_level"] = by_level - o["learnset"]["by_tm"] = d["learnset"]["tms"] - if "tutor" in d["learnset"]: - o["learnset"]["by_tutor"] = d["learnset"]["tutor"] + o["learnset"]["by_tm"] = learnsets.get("by_tm", learnsets.get("tms")) + if "tutor" in learnsets: + o["learnset"]["by_tutor"] = learnsets["tutor"] + elif "by_tutor" in learnsets: + o["learnset"]["by_tutor"] = learnsets["by_tutor"] o["evolutions"] = d.get("evolutions", []) if "footprint" in d: o["footprint"] = {} - o["footprint"]["has"] = d["footprint"]["has_footprint"] - o["footprint"]["size"] = d["footprint"]["footprint_size"] + footprint = d["footprint"] + o["footprint"]["has"] = footprint.get("has", footprint.get("has_footprint")) + o["footprint"]["size"] = footprint.get("size", footprint.get("footprint_size")) if "pokedex_data" in d: o["pokedex_data"] = d["pokedex_data"] if "catching_show_data" in d: - o["catching_show_data"] = d["catching_show_data"] + o["catching_show"] = d["catching_show_data"] return o