From 90df6784670e19ac14a9ec69214b4a952823ba83 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 10:47:31 -0800 Subject: [PATCH 01/10] Terminology shift: PokemonPersonalData -> SpeciesData + struct cleanup --- consts/pokemon.json | 68 ++--- include/constants/pokemon.h | 6 +- include/pokemon.h | 126 ++++----- .../subscripts/subscript_check_shaymin_form.s | 10 +- .../subscript_giratina_form_change.s | 4 +- .../pokemon_summary_screen/3d_anim.c | 2 +- .../pokemon_summary_screen/sprite.c | 2 +- src/battle/battle_display.c | 2 +- src/battle/battle_script.c | 30 +- src/battle/trainer_ai/trainer_ai.c | 8 +- src/overlay005/ov5_021E622C.c | 8 +- src/overlay006/ov6_02240C9C.c | 8 +- src/overlay006/ov6_022426AC.c | 2 +- src/overlay019/ov19_021D0D80.c | 10 +- src/overlay019/ov19_021DB8E4.c | 2 +- src/overlay021/ov21_021DE668.c | 4 +- src/overlay021/ov21_021DF734.c | 2 +- src/overlay021/ov21_021E8D48.c | 4 +- src/overlay033/ov33_02256474.c | 2 +- src/overlay040/ov40_0225645C.c | 2 +- src/overlay044/ov44_022565BC.c | 2 +- src/overlay062/ov62_02239D60.c | 6 +- src/overlay079/ov79_021D2268.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay094/ov94_0223E46C.c | 4 +- src/overlay094/ov94_022414B8.c | 2 +- src/overlay095/ov95_02246C20.c | 2 +- src/overlay097/ov97_02236380.c | 8 +- src/overlay104/ov104_0222DCE0.c | 6 +- src/overlay104/ov104_0223A0C4.c | 6 +- src/overlay105/ov105_02241AE0.c | 2 +- src/pokedex.c | 2 +- src/pokemon.c | 258 +++++++++--------- src/unk_0204AEE8.c | 6 +- 34 files changed, 309 insertions(+), 301 deletions(-) diff --git a/consts/pokemon.json b/consts/pokemon.json index bd7973fda3..9d4417d0ef 100644 --- a/consts/pokemon.json +++ b/consts/pokemon.json @@ -25,42 +25,42 @@ "NUMBER_OF_MON_TYPES" ] }, - "@PokemonPersonalDataParam": { + "@SpeciesDataParam": { "type": "enum", "values": [ - "MON_DATA_PERSONAL_BASE_HP", - "MON_DATA_PERSONAL_BASE_ATK", - "MON_DATA_PERSONAL_BASE_DEF", - "MON_DATA_PERSONAL_BASE_SPEED", - "MON_DATA_PERSONAL_BASE_SP_ATK", - "MON_DATA_PERSONAL_BASE_SP_DEF", - "MON_DATA_PERSONAL_TYPE_1", - "MON_DATA_PERSONAL_TYPE_2", - "MON_DATA_PERSONAL_CATCH_RATE", - "MON_DATA_PERSONAL_BASE_EXP", - "MON_DATA_PERSONAL_EV_HP_YIELD", - "MON_DATA_PERSONAL_EV_ATK_YIELD", - "MON_DATA_PERSONAL_EV_DEF_YIELD", - "MON_DATA_PERSONAL_EV_SPEED_YIELD", - "MON_DATA_PERSONAL_EV_SP_ATK_YIELD", - "MON_DATA_PERSONAL_EV_SP_DEF_YIELD", - "MON_DATA_PERSONAL_ITEM1", - "MON_DATA_PERSONAL_ITEM2", - "MON_DATA_PERSONAL_GENDER", - "MON_DATA_PERSONAL_HATCH_CYCLE", - "MON_DATA_PERSONAL_BASE_FRIENDSHIP", - "MON_DATA_PERSONAL_EXP_RATE", - "MON_DATA_PERSONAL_EGG_GROUP_1", - "MON_DATA_PERSONAL_EGG_GROUP_2", - "MON_DATA_PERSONAL_ABILITY_1", - "MON_DATA_PERSONAL_ABILITY_2", - "MON_DATA_PERSONAL_GREAT_MARSH_FLEE_RATE", - "MON_DATA_PERSONAL_COLOR", - "MON_DATA_PERSONAL_FLIP_SPRITE", - "MON_DATA_PERSONAL_TM_LEARNSET_MASK_1", - "MON_DATA_PERSONAL_TM_LEARNSET_MASK_2", - "MON_DATA_PERSONAL_TM_LEARNSET_MASK_3", - "MON_DATA_PERSONAL_TM_LEARNSET_MASK_4" + "SPECIES_DATA_BASE_HP", + "SPECIES_DATA_BASE_ATK", + "SPECIES_DATA_BASE_DEF", + "SPECIES_DATA_BASE_SPEED", + "SPECIES_DATA_BASE_SP_ATK", + "SPECIES_DATA_BASE_SP_DEF", + "SPECIES_DATA_TYPE_1", + "SPECIES_DATA_TYPE_2", + "SPECIES_DATA_CATCH_RATE", + "SPECIES_DATA_BASE_EXP_REWARD", + "SPECIES_DATA_EV_HP_YIELD", + "SPECIES_DATA_EV_ATK_YIELD", + "SPECIES_DATA_EV_DEF_YIELD", + "SPECIES_DATA_EV_SPEED_YIELD", + "SPECIES_DATA_EV_SP_ATK_YIELD", + "SPECIES_DATA_EV_SP_DEF_YIELD", + "SPECIES_DATA_HELD_ITEM_COMMON", + "SPECIES_DATA_HELD_ITEM_RARE", + "SPECIES_DATA_GENDER_RATIO", + "SPECIES_DATA_HATCH_CYCLES", + "SPECIES_DATA_BASE_FRIENDSHIP", + "SPECIES_DATA_EXP_RATE", + "SPECIES_DATA_EGG_GROUP_1", + "SPECIES_DATA_EGG_GROUP_2", + "SPECIES_DATA_ABILITY_1", + "SPECIES_DATA_ABILITY_2", + "SPECIES_DATA_SAFARI_FLEE_RATE", + "SPECIES_DATA_BODY_COLOR", + "SPECIES_DATA_FLIP_SPRITE", + "SPECIES_DATA_TM_LEARNSET_MASK_1", + "SPECIES_DATA_TM_LEARNSET_MASK_2", + "SPECIES_DATA_TM_LEARNSET_MASK_3", + "SPECIES_DATA_TM_LEARNSET_MASK_4" ] }, "@PokemonColor": { diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 941eccd959..309f8bad74 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_CONSTANTS_POKEMON_H #define POKEPLATINUM_CONSTANTS_POKEMON_H -#include "consts/pokemon.h" // defs for PokemonType and PokemonPersonalDataParam +#include "consts/pokemon.h" // defs for PokemonType and SpeciesDataParam /** * @brief Pokemon Stats @@ -17,6 +17,10 @@ enum { STAT_MAX }; +#define MAX_ABILITIES 2 +#define MAX_EGG_GROUPS 2 +#define MAX_TYPES 2 + #define MAX_PARTY_SIZE 6 #define NUM_BOOSTABLE_STATS 8 diff --git a/include/pokemon.h b/include/pokemon.h index a5b830001b..4012e7cced 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -31,48 +31,52 @@ #define FACE_BACK 0 #define FACE_FRONT 2 -/** - * @brief Pokemon Personal data structure. This contains data that is the same across all pokemon of the same species/form - */ -typedef struct PokemonPersonalData { - u8 baseHp; //!< The pokemons base HP stat - u8 baseAtk; //!< The pokemons base Attack stat - u8 baseDef; //!< The pokemons base Defense stat - u8 baseSpeed; //!< The pokemons base Speed stat - u8 baseSpAtk; //!< The pokemons base Special Attack stat - u8 baseSpDef; //!< The pokemons base Special Defense stat - u8 type1; //!< The pokemons first type - u8 type2; //!< The pokemons second type - u8 catchRate; //!< The pokemons catch rate - u8 baseExp; //!< A factor in determining experience yield when defeating this pokemon - u16 evHpYield : 2; //!< How many HP EVs will be gained when defeating this pokemon - u16 evAtkYield : 2; //!< How many Attack EVs will be gained when defeating this pokemon - u16 evDefYield : 2; //!< How many Defense EVs will be gained when defeating this pokemon - u16 evSpeedYield : 2; //!< How many Speed EVs will be gained when defeating this pokemon - u16 evSpAtkYield : 2; //!< How many Special Attack EVs will be gained when defeating this pokemon - u16 evSpDefYield : 2; //!< How many Special Defense EVs will be gained when defeating this pokemon - // u16 padding : 4; +typedef struct SpeciesBaseStats { + u8 hp; + u8 attack; + u8 defense; + u8 speed; + u8 spAttack; + u8 spDefense; +} SpeciesBaseStats; - u16 item1; //!< Common held item when this pokemon is encountered in the wild - u16 item2; //!< Rare held item when this pokemon is encountered in the wild - u8 gender; //!< The pokemons gender ratio, except for special values, a higher value will result in more females and a lower value will result in more males appearing - u8 hatchCycles; //!< How long eggs of this pokemon will take to hatch. In Gen.IV One cycle is 255 steps - u8 baseFriendship; //!< The pokemons base Friendship stat - u8 expRate; //!< The experience rate category of the pokemon. This sets which formula is used to determine the pokemons level based on its experience - u8 eggGroup1; //!< The pokemons first egg group - u8 eggGroup2; //!< The pokemons second egg group - u8 ability1; //!< The pokemons first possible ability - u8 ability2; //!< The pokemons second possible ability - u8 greatMarshFleeRate; //!< The pokemons base flee rate in the Great Marsh safari zone - u8 color : 7; //!< The pokemons color category +typedef struct SpeciesEVYields { + u16 hp : 2; + u16 attack : 2; + u16 defense : 2; + u16 speed : 2; + u16 spAttack : 2; + u16 spDefense : 2; +} SpeciesEVYields; + +typedef struct SpeciesWildHeldItems { + u16 common; + u16 rare; +} SpeciesWildHeldItems; + +typedef struct SpeciesData { + SpeciesBaseStats baseStats; + u8 types[MAX_TYPES]; + u8 catchRate; + u8 baseExpReward; + SpeciesEVYields evYields; + SpeciesWildHeldItems wildHeldItems; + u8 genderRatio; + u8 hatchCycles; + u8 baseFriendship; + u8 expRate; + u8 eggGroups[MAX_EGG_GROUPS]; + u8 abilities[MAX_ABILITIES]; + u8 safariFleeRate; + u8 bodyColor : 7; u8 flipSprite : 1; // u16 padding; - u32 tmLearnsetMask1; //!< Bitflags for whether this pokemon can learn a TM (TM1 -> TM32) - u32 tmLearnsetMask2; //!< Bitflags for whether this pokemon can learn a TM (TM33 -> TM64) - u32 tmLearnsetMask3; //!< Bitflags for whether this pokemon can learn a TM (TM65 -> TM92, HM1 -> HM4) - u32 tmLearnsetMask4; //!< Bitflags for whether this pokemon can learn a TM (HM5 -> HM8, rest unused) -} PokemonPersonalData; + u32 tmLearnsetMask1; // Bitflags for whether this pokemon can learn a TM (TM1 -> TM32) + u32 tmLearnsetMask2; // Bitflags for whether this pokemon can learn a TM (TM33 -> TM64) + u32 tmLearnsetMask3; // Bitflags for whether this pokemon can learn a TM (TM65 -> TM92, HM1 -> HM4) + u32 tmLearnsetMask4; // Bitflags for whether this pokemon can learn a TM (HM5 -> HM8, rest unused) +} SpeciesData; /** * @brief Zeros out a Pokemon data structure, then encrypts the result @@ -207,58 +211,58 @@ void BoxPokemon_SetValue(BoxPokemon *boxMon, enum PokemonDataParam param, const void Pokemon_IncreaseValue(Pokemon *mon, enum PokemonDataParam param, int value); /** - * @brief Gets a PokemonPersonalData based on a pokemon species and form + * @brief Gets a SpeciesData based on a pokemon species and form * * @param monSpecies * @param monForm - * @param heapID The index of the heap that the PokemonPersonalData should be loaded into - * @return PokemonPersonalData* + * @param heapID The index of the heap that the SpeciesData should be loaded into + * @return SpeciesData* */ -PokemonPersonalData *PokemonPersonalData_FromMonForm(int monSpecies, int monForm, int heapID); +SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID); /** - * @brief Gets a PokemonPersonalData based on a pokemon species + * @brief Gets a SpeciesData based on a pokemon species * * @param monSpecies - * @param heapID The index of the heap that the PokemonPersonalData should be loaded into - * @return PokemonPersonalData* + * @param heapID The index of the heap that the SpeciesData should be loaded into + * @return SpeciesData* */ -PokemonPersonalData *PokemonPersonalData_FromMonSpecies(int monSpecies, int heapID); +SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, int heapID); /** - * @brief Gets a value from a PokemonPersonalData structure + * @brief Gets a value from a SpeciesData structure * - * @param monPersonalData + * @param speciesData * @param param What value to get * @return The requested value */ -u32 PokemonPersonalData_GetValue(PokemonPersonalData *monPersonalData, enum PokemonPersonalDataParam param); +u32 SpeciesData_GetValue(SpeciesData *speciesData, enum SpeciesDataParam param); /** - * @brief Frees a PokemonPersonalData structure from the heap + * @brief Frees a SpeciesData structure from the heap * - * @param monPersonalData + * @param speciesData */ -void PokemonPersonalData_Free(PokemonPersonalData *monPersonalData); +void SpeciesData_Free(SpeciesData *speciesData); /** - * @brief Loads a PokemonPersonalData based on its species and form and gets a value from it + * @brief Loads a SpeciesData based on its species and form and gets a value from it * * @param monSpecies * @param monForm * @param param What value to get * @return The requested value */ -u32 PokemonPersonalData_GetFormValue(int monSpecies, int monForm, enum PokemonPersonalDataParam param); +u32 SpeciesData_GetFormValue(int monSpecies, int monForm, enum SpeciesDataParam param); /** - * @brief Loads a PokemonPersonalData based on its species and gets a value from it + * @brief Loads a SpeciesData based on its species and gets a value from it * * @param monSpecies * @param param What value to get * @return The requested value */ -u32 PokemonPersonalData_GetSpeciesValue(int monSpecies, enum PokemonPersonalDataParam param); +u32 SpeciesData_GetSpeciesValue(int monSpecies, enum SpeciesDataParam param); /** * @brief Gets how much progress a Pokemon has made towards its next level as a percentage @@ -321,12 +325,12 @@ u32 Pokemon_GetSpeciesLevelAt(u16 monSpecies, u32 monExp); /** * @brief Gets the level of a pokemon based on its personal data and exp * - * @param monPersonalData + * @param speciesData * @param unused_monSpecies unused * @param monExp * @return The pokemons level */ -u32 PokemonPersonalData_GetLevelAt(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monExp); +u32 SpeciesData_GetLevelAt(SpeciesData *speciesData, u16 unused_monSpecies, u32 monExp); /** * @brief Gets the nature of a Pokemon based on its personality value @@ -389,14 +393,14 @@ u8 BoxPokemon_GetGender(BoxPokemon *boxMon); u8 Pokemon_GetGenderOf(u16 monSpecies, u32 monPersonality); /** - * @brief Gets the gender of a pokemon based on its PokemonPersonalData and personality value + * @brief Gets the gender of a pokemon based on its SpeciesData and personality value * - * @param monPersonalData + * @param speciesData * @param unused_monSpecies unused * @param monPersonality * @return The pokemons gender */ -u8 PokemonPersonalData_GetGenderOf(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monPersonality); +u8 SpeciesData_GetGenderOf(SpeciesData *speciesData, u16 unused_monSpecies, u32 monPersonality); /** * @brief Gets whether a BoxPokemon is shiny based on its Original Trainer ID and its personality value diff --git a/res/battle/scripts/subscripts/subscript_check_shaymin_form.s b/res/battle/scripts/subscripts/subscript_check_shaymin_form.s index e15857ff90..b28d085cab 100644 --- a/res/battle/scripts/subscripts/subscript_check_shaymin_form.s +++ b/res/battle/scripts/subscripts/subscript_check_shaymin_form.s @@ -11,20 +11,20 @@ _000: UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_FORM_NUM, 0 UpdateVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, 0 CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_PERSONALITY, 1, _049 - LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_1 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_ABILITY_1 GoTo _062 _049: - LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_2 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_ABILITY_2 CompareVarToValue OPCODE_NEQ, BTLVAR_SCRIPT_TEMP, 0, _062 - LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_1 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_ABILITY_1 _062: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_RECALC_MON_STATS UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP - LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_TYPE_1 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_TYPE_1 UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TYPE_1, BTLVAR_CALC_TEMP - LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_TYPE_2 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_TYPE_2 UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TYPE_2, BTLVAR_CALC_TEMP UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER Call BATTLE_SUBSCRIPT_FORM_CHANGE diff --git a/res/battle/scripts/subscripts/subscript_giratina_form_change.s b/res/battle/scripts/subscripts/subscript_giratina_form_change.s index 080164f8dd..414a127811 100644 --- a/res/battle/scripts/subscripts/subscript_giratina_form_change.s +++ b/res/battle/scripts/subscripts/subscript_giratina_form_change.s @@ -7,11 +7,11 @@ _000: UpdateMonData OPCODE_SET, BTLSCR_MSG_BATTLER_TEMP, BATTLEMON_FORM_NUM, 0 UpdateVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, 0 CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_BATTLER_TEMP, BATTLEMON_PERSONALITY, 1, _024 - LoadArchivedMonData SPECIES_GIRATINA, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_1 + LoadArchivedMonData SPECIES_GIRATINA, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_ABILITY_1 GoTo _028 _024: - LoadArchivedMonData SPECIES_GIRATINA, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_2 + LoadArchivedMonData SPECIES_GIRATINA, BTLVAR_SCRIPT_TEMP, SPECIES_DATA_ABILITY_2 _028: UpdateMonDataFromVar OPCODE_SET, BTLSCR_MSG_BATTLER_TEMP, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP diff --git a/src/applications/pokemon_summary_screen/3d_anim.c b/src/applications/pokemon_summary_screen/3d_anim.c index 424ba9513f..c37bee81bf 100644 --- a/src/applications/pokemon_summary_screen/3d_anim.c +++ b/src/applications/pokemon_summary_screen/3d_anim.c @@ -358,7 +358,7 @@ void PokemonSummaryScreen_LoadMonSprite(PokemonSummaryScreen *summaryScreen) PokeSprite_LoadAnimationFrames(summaryScreen->narcPlPokeData, summaryScreen->monSprite.frames, summaryScreen->monData.species, 1); - summaryScreen->monSprite.flip = PokemonPersonalData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1; + summaryScreen->monSprite.flip = SpeciesData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1; summaryScreen->monSprite.sprite = sub_02007C34(summaryScreen->monSprite.spriteManager, &sprite, 52, 104, 0, 0, summaryScreen->monSprite.frames, NULL); sub_02007DEC(summaryScreen->monSprite.sprite, 35, summaryScreen->monSprite.flip); diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c index d120b5314c..86634abad9 100644 --- a/src/applications/pokemon_summary_screen/sprite.c +++ b/src/applications/pokemon_summary_screen/sprite.c @@ -731,7 +731,7 @@ void PokemonSummaryScreen_SetMonIcon(PokemonSummaryScreen *summaryScreen) sub_0200D948(summaryScreen->renderer, summaryScreen->gfxHandler, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, iconIndex, 0, 11); sub_0200D414(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], PokeIconPaletteIndex(summaryScreen->monData.species, summaryScreen->monData.form, summaryScreen->monData.isEgg) + 7); - CellActor_SetFlipMode(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], (PokemonPersonalData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1)); + CellActor_SetFlipMode(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], (SpeciesData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1)); } void PokemonSummaryScreen_ShowMonIcon(PokemonSummaryScreen *summaryScreen) diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index d09ab1877f..911a3de7ef 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -3171,7 +3171,7 @@ static void ov16_02260B04(SysTask *param0, void *param1) v3 = ov16_0223ED6C(v0->unk_00); v2 = BattleMon_Get(BattleSystem_Context(v0->unk_00), v0->unk_09, 0, NULL); - v1 = PokemonPersonalData_GetSpeciesValue(v2, 26); + v1 = SpeciesData_GetSpeciesValue(v2, 26); v1 = v1 * Unk_ov16_0226F194[v3][0] / Unk_ov16_0226F194[v3][1]; if ((BattleSystem_RandNext(v0->unk_00) % 255) <= v1) { diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index a50ead2dab..1cbb826c7c 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -2443,7 +2443,7 @@ static BOOL BtlCmd_CalcExpGain(BattleSystem *battleSys, BattleContext *battleCtx } } - u16 exp = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battleCtx->faintedMon].species, MON_DATA_PERSONAL_BASE_EXP); + u16 exp = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battleCtx->faintedMon].species, SPECIES_DATA_BASE_EXP_REWARD); exp = (exp * battleCtx->battleMons[battleCtx->faintedMon].level) / 7; if (totalMonsWithExpShare) { @@ -6431,10 +6431,10 @@ static BOOL BtlCmd_BeatUp(BattleSystem *battleSys, BattleContext *battleCtx) form = Pokemon_GetValue(mon, MON_DATA_FORM, NULL); level = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); - battleCtx->damage = PokemonPersonalData_GetFormValue(species, form, MON_DATA_PERSONAL_BASE_ATK); + battleCtx->damage = SpeciesData_GetFormValue(species, form, SPECIES_DATA_BASE_ATK); battleCtx->damage *= CURRENT_MOVE_DATA.power; battleCtx->damage *= ((level * 2 / 5) + 2); - battleCtx->damage /= PokemonPersonalData_GetFormValue(DEFENDING_MON.species, DEFENDING_MON.formNum, MON_DATA_PERSONAL_BASE_DEF); + battleCtx->damage /= SpeciesData_GetFormValue(DEFENDING_MON.species, DEFENDING_MON.formNum, SPECIES_DATA_BASE_DEF); battleCtx->damage /= 50; battleCtx->damage += 2; battleCtx->damage *= battleCtx->criticalMul; @@ -9648,7 +9648,7 @@ static BOOL BtlCmd_LoadArchivedMonData(BattleSystem *battleSys, BattleContext *b int personalParam = BattleScript_Read(battleCtx); int *form = BattleScript_VarAddress(battleSys, battleCtx, formVar); - battleCtx->calcTemp = PokemonPersonalData_GetFormValue(species, *form, personalParam); + battleCtx->calcTemp = SpeciesData_GetFormValue(species, *form, personalParam); return FALSE; } @@ -10457,9 +10457,9 @@ static void BattleScript_CalcEffortValues(Party *party, int slot, int species, i int itemEffect; int itemPower; Pokemon *mon; - PokemonPersonalData *personal; + SpeciesData *personal; - personal = PokemonPersonalData_FromMonForm(species, form, HEAP_ID_BATTLE); + personal = SpeciesData_FromMonForm(species, form, HEAP_ID_BATTLE); mon = Party_GetPokemonBySlotIndex(party, slot); item = Pokemon_GetValue(mon, MON_DATA_HELD_ITEM, NULL); itemEffect = Item_LoadParam(item, ITEM_PARAM_HOLD_EFFECT, HEAP_ID_BATTLE); @@ -10478,42 +10478,42 @@ static void BattleScript_CalcEffortValues(Party *party, int slot, int species, i switch (stat) { case STAT_HP: - tmp = PokemonPersonalData_GetValue(personal, MON_DATA_PERSONAL_EV_HP_YIELD); + tmp = SpeciesData_GetValue(personal, SPECIES_DATA_EV_HP_YIELD); if (itemEffect == HOLD_EFFECT_LVLUP_HP_EV_UP) { tmp += itemPower; } break; case STAT_ATTACK: - tmp = PokemonPersonalData_GetValue(personal, MON_DATA_PERSONAL_EV_ATK_YIELD); + tmp = SpeciesData_GetValue(personal, SPECIES_DATA_EV_ATK_YIELD); if (itemEffect == HOLD_EFFECT_LVLUP_ATK_EV_UP) { tmp += itemPower; } break; case STAT_DEFENSE: - tmp = PokemonPersonalData_GetValue(personal, MON_DATA_PERSONAL_EV_DEF_YIELD); + tmp = SpeciesData_GetValue(personal, SPECIES_DATA_EV_DEF_YIELD); if (itemEffect == HOLD_EFFECT_LVLUP_DEF_EV_UP) { tmp += itemPower; } break; case STAT_SPEED: - tmp = PokemonPersonalData_GetValue(personal, MON_DATA_PERSONAL_EV_SPEED_YIELD); + tmp = SpeciesData_GetValue(personal, SPECIES_DATA_EV_SPEED_YIELD); if (itemEffect == HOLD_EFFECT_LVLUP_SPEED_EV_UP) { tmp += itemPower; } break; case STAT_SPECIAL_ATTACK: - tmp = PokemonPersonalData_GetValue(personal, MON_DATA_PERSONAL_EV_SP_ATK_YIELD); + tmp = SpeciesData_GetValue(personal, SPECIES_DATA_EV_SP_ATK_YIELD); if (itemEffect == HOLD_EFFECT_LVLUP_SPATK_EV_UP) { tmp += itemPower; } break; case STAT_SPECIAL_DEFENSE: - tmp = PokemonPersonalData_GetValue(personal, MON_DATA_PERSONAL_EV_SP_DEF_YIELD); + tmp = SpeciesData_GetValue(personal, SPECIES_DATA_EV_SP_DEF_YIELD); if (itemEffect == HOLD_EFFECT_LVLUP_SPDEF_EV_UP) { tmp += itemPower; } @@ -10543,7 +10543,7 @@ static void BattleScript_CalcEffortValues(Party *party, int slot, int species, i Pokemon_SetValue(mon, MON_DATA_HP_EV + stat, &curEVs[stat]); } - PokemonPersonalData_Free(personal); + SpeciesData_Free(personal); } static void BattleScript_CatchMonTask(SysTask *param0, void *param1) @@ -11156,10 +11156,10 @@ static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext * u32 speciesMod; if (battleCtx->msgItemTemp == ITEM_SAFARI_BALL) { - speciesMod = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battleCtx->defender].species, MON_DATA_PERSONAL_CATCH_RATE); + speciesMod = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battleCtx->defender].species, SPECIES_DATA_CATCH_RATE); speciesMod = speciesMod * sSafariCatchRate[battleCtx->safariCatchStage].numerator / sSafariCatchRate[battleCtx->safariCatchStage].denominator; } else { - speciesMod = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battleCtx->defender].species, MON_DATA_PERSONAL_CATCH_RATE); + speciesMod = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battleCtx->defender].species, SPECIES_DATA_CATCH_RATE); } u32 ballMod = 10; diff --git a/src/battle/trainer_ai/trainer_ai.c b/src/battle/trainer_ai/trainer_ai.c index a014937a10..aed71cabe7 100644 --- a/src/battle/trainer_ai/trainer_ai.c +++ b/src/battle/trainer_ai/trainer_ai.c @@ -1293,8 +1293,8 @@ static void AICmd_LoadBattlerAbility(BattleSystem *battleSys, BattleContext *bat AI_CONTEXT.calcTemp = battleCtx->battleMons[battler].ability; } else { // Try to guess the opponent's ability (flip a coin) - int ability1 = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battler].species, MON_DATA_PERSONAL_ABILITY_1); - int ability2 = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battler].species, MON_DATA_PERSONAL_ABILITY_2); + int ability1 = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battler].species, SPECIES_DATA_ABILITY_1); + int ability2 = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battler].species, SPECIES_DATA_ABILITY_2); if (ability1 && ability2) { if (BattleSystem_RandNext(battleSys) & 1) { @@ -1338,8 +1338,8 @@ static void AICmd_CheckBattlerAbility(BattleSystem *battleSys, BattleContext *ba tmpAbility = battleCtx->battleMons[battler].ability; } else { // Try to guess the opponent's ability (flip a coin) - int ability1 = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battler].species, MON_DATA_PERSONAL_ABILITY_1); - int ability2 = PokemonPersonalData_GetSpeciesValue(battleCtx->battleMons[battler].species, MON_DATA_PERSONAL_ABILITY_2); + int ability1 = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battler].species, SPECIES_DATA_ABILITY_1); + int ability2 = SpeciesData_GetSpeciesValue(battleCtx->battleMons[battler].species, SPECIES_DATA_ABILITY_2); if (ability1 && ability2) { // If the opponent has two abilities, but neither are the expected one, diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index a5c985ebe2..cfd684d7a0 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2600,7 +2600,7 @@ void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, i { u8 v0, v1, v2; u16 v3; - u8 v4 = PokemonPersonalData_GetSpeciesValue(param1, MON_DATA_PERSONAL_HATCH_CYCLE); + u8 v4 = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); Strbuf *v5; Pokemon_InitWith(param0, param1, 1, 32, FALSE, 0, OTID_NOT_SET, 0); @@ -2643,7 +2643,7 @@ void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 p u16 v1; u32 v2; Strbuf *v3; - u8 v4 = PokemonPersonalData_GetSpeciesValue(param1, MON_DATA_PERSONAL_HATCH_CYCLE); + u8 v4 = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); v2 = sub_02026248(param2); @@ -2759,8 +2759,8 @@ static u8 ov5_021E6FF0(BoxPokemon **param0) v2[v5] = BoxPokemon_GetValue(param0[v5], MON_DATA_OT_ID, NULL); v4 = BoxPokemon_GetValue(param0[v5], MON_DATA_PERSONALITY, NULL); v3[v5] = Pokemon_GetGenderOf(v1[v5], v4); - v0[v5][0] = PokemonPersonalData_GetSpeciesValue(v1[v5], 22); - v0[v5][1] = PokemonPersonalData_GetSpeciesValue(v1[v5], 23); + v0[v5][0] = SpeciesData_GetSpeciesValue(v1[v5], 22); + v0[v5][1] = SpeciesData_GetSpeciesValue(v1[v5], 23); } if ((v0[0][0] == 15) || (v0[1][0] == 15)) { diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 472d4ad02f..dd8a5dfb7b 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -979,7 +979,7 @@ static void ov6_02241BAC(const u16 species, const u8 level, const int param2, co if (!encounterFieldParams->isFirstMonEgg) { if (encounterFieldParams->firstMonAbility == ABILITY_CUTE_CHARM) { - u32 speciesGenderRatio = PokemonPersonalData_GetSpeciesValue(species, MON_DATA_PERSONAL_GENDER); + u32 speciesGenderRatio = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_GENDER_RATIO); switch (speciesGenderRatio) { case GENDER_RATIO_MALE_ONLY: @@ -1037,7 +1037,7 @@ static void ov6_02241CC0(u16 species, u8 level, const int param2, const WildEnco Pokemon_Init(newEncounter); BOOL v0 = TRUE; - u32 speciesGenderRatio = PokemonPersonalData_GetSpeciesValue(species, MON_DATA_PERSONAL_GENDER); + u32 speciesGenderRatio = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_GENDER_RATIO); switch (speciesGenderRatio) { case GENDER_RATIO_MALE_ONLY: @@ -1278,8 +1278,8 @@ static BOOL ov6_0224219C(const EncounterSlot *param0, const u8 maxEncounters, co u8 v1 = 0; for (v2 = 0; v2 < maxEncounters; v2++) { - u8 v3 = PokemonPersonalData_GetSpeciesValue(param0[v2].species, MON_DATA_PERSONAL_TYPE_1); - u8 v4 = PokemonPersonalData_GetSpeciesValue(param0[v2].species, MON_DATA_PERSONAL_TYPE_2); + u8 v3 = SpeciesData_GetSpeciesValue(param0[v2].species, SPECIES_DATA_TYPE_1); + u8 v4 = SpeciesData_GetSpeciesValue(param0[v2].species, SPECIES_DATA_TYPE_2); if (v3 == type || v4 == type) { v0[v1++] = v2; diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c index 3d661ec44b..c5fde2f69b 100644 --- a/src/overlay006/ov6_022426AC.c +++ b/src/overlay006/ov6_022426AC.c @@ -49,7 +49,7 @@ void GreatMarshLookout_CreateLookoutMonSprite(GreatMarshLookout_SpriteResources resources->unk_1CC = 0; int gender; - u8 genderRatio = PokemonPersonalData_GetSpeciesValue(species, MON_DATA_PERSONAL_GENDER); + u8 genderRatio = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_PERSONAL_GENDER); switch (genderRatio) { case GENDER_RATIO_MALE_ONLY: diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 7007468583..695c6fc2bb 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -3953,21 +3953,21 @@ static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, U { UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); BOOL v1 = BoxPokemon_EnterDecryptionContext(param1); - PokemonPersonalData *v2; + SpeciesData *v2; v0->unk_00 = param1; v0->unk_04 = BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL); v0->unk_06 = BoxPokemon_GetValue(param1, MON_DATA_HELD_ITEM, NULL); v0->unk_08 = sub_0207A294(sub_0207A274(param2->unk_11C), v0->unk_04); v0->unk_0F = BoxPokemon_GetValue(param1, MON_DATA_EGG_EXISTS, NULL); - v2 = PokemonPersonalData_FromMonSpecies(v0->unk_04, 9); - v0->unk_0A = PokemonPersonalData_GetLevelAt(v2, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_EXP, NULL)); + v2 = SpeciesData_FromMonSpecies(v0->unk_04, 9); + v0->unk_0A = SpeciesData_GetLevelAt(v2, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_EXP, NULL)); v0->unk_0B = BoxPokemon_GetValue(param1, MON_DATA_MARKS, NULL); v0->unk_0C = BoxPokemon_GetValue(param1, MON_DATA_TYPE_1, NULL); v0->unk_0D = BoxPokemon_GetValue(param1, MON_DATA_TYPE_2, NULL); if ((v0->unk_0F == 0) && BoxPokemon_GetValue(param1, MON_DATA_NIDORAN_HAS_NICKNAME, NULL)) { - v0->unk_0E = PokemonPersonalData_GetGenderOf(v2, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL)); + v0->unk_0E = SpeciesData_GetGenderOf(v2, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL)); } else { v0->unk_0E = 255; } @@ -3995,7 +3995,7 @@ static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, U MessageLoader_GetStrbuf(param2->unk_198, v3, v0->unk_24); } - PokemonPersonalData_Free(v2); + SpeciesData_Free(v2); BoxPokemon_ExitDecryptionContext(param1, v1); } diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index af327cce13..7d58b0767a 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -253,7 +253,7 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_ if (BoxPokemon_GetValue(v1, MON_DATA_IS_EGG, NULL) == 0) { u16 v9 = BoxPokemon_GetValue(v1, MON_DATA_FORM, NULL); - v6 = PokemonPersonalData_GetFormValue(v5, v9, MON_DATA_PERSONAL_COLOR); + v6 = SpeciesData_GetFormValue(v5, v9, SPECIES_DATA_BODY_COLOR); } else { v6 = (v5 != SPECIES_MANAPHY) ? 8 : 1; } diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index 7cdd4d06c9..b560d7f9d0 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -632,8 +632,8 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7 int v4, v5; int v6 = PokedexSort_DefaultForm(param2->unk_04, species); - v4 = PokemonPersonalData_GetFormValue(species, v6, 6); - v5 = PokemonPersonalData_GetFormValue(species, v6, 7); + v4 = SpeciesData_GetFormValue(species, v6, 6); + v5 = SpeciesData_GetFormValue(species, v6, 7); v4 = ov21_021DF180(v4); v5 = ov21_021DF180(v5); diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index e6430fd37f..a04114f531 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -798,7 +798,7 @@ static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 *param1) int v0; int v1; - v0 = PokemonPersonalData_GetSpeciesValue(param0, 18); + v0 = SpeciesData_GetSpeciesValue(param0, 18); if (v0 == 0) { return 1; diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index db2d03024d..a5aba54ba6 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -592,8 +592,8 @@ static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection * CellActorResourceData v1; int v2, v3; - v2 = PokemonPersonalData_GetSpeciesValue(param4, 6); - v3 = PokemonPersonalData_GetSpeciesValue(param4, 7); + v2 = SpeciesData_GetSpeciesValue(param4, 6); + v3 = SpeciesData_GetSpeciesValue(param4, 7); v2 = ov21_021DF180(v2); v3 = ov21_021DF180(v3); diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 78da74687a..71e50aa6e6 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -289,7 +289,7 @@ static void ov33_02256634(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_ GF_ASSERT(0); } - param0->unk_134[v5].unk_30 = PokemonPersonalData_GetFormValue(param1->unk_04[v5].unk_04, param1->unk_04[v5].unk_08, 28); + param0->unk_134[v5].unk_30 = SpeciesData_GetFormValue(param1->unk_04[v5].unk_04, param1->unk_04[v5].unk_08, 28); param0->unk_134[v5].unk_31 = 0; param0->unk_134[v5].unk_32 = 0; diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index ca9017cb20..82f00b01e3 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -392,7 +392,7 @@ static void ov40_02256848(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_ ov25_02255938(param0->unk_24[2], 1 + PokeIconPaletteIndex(1, 0, 1)); if (param1->unk_00 > 0) { - if (PokemonPersonalData_GetFormValue(param1->unk_1C[0], param1->unk_20[0], 28)) { + if (SpeciesData_GetFormValue(param1->unk_1C[0], param1->unk_20[0], 28)) { ov25_022558C4(param0->unk_24[0], 6); } else { ov25_022558C4(param0->unk_24[0], 7); diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index 9688c3aafa..153228005a 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -328,7 +328,7 @@ static void ov44_02256954(UnkStruct_ov44_022565BC *param0, u32 param1, u32 param if (param1 == 5) { v1 = 4; } else { - if (PokemonPersonalData_GetFormValue(param3, param4, 28)) { + if (SpeciesData_GetFormValue(param3, param4, 28)) { v1 = 4; } else { v1 = 5; diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index d90f684982..100e47adc0 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -1172,7 +1172,7 @@ static void ov62_0223AFEC(UnkStruct_0208C06C *param0) static void ov62_0223B050(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02239DBC *v0 = param0->unk_860; - PokemonPersonalData *v1; + SpeciesData *v1; ArchivedSprite v2; u8 v3; u8 v4; @@ -1198,7 +1198,7 @@ static void ov62_0223B050(UnkStruct_0208C06C *param0) v7 = SPECIES_EGG; } - v1 = PokemonPersonalData_FromMonSpecies(v7, 102); + v1 = SpeciesData_FromMonSpecies(v7, 102); v3 = Pokemon_GetGenderOf(v7, v8); v4 = Pokemon_IsPersonalityShiny(v5, v8); v9 = LoadPokemonSpriteYOffset(v7, v3, v10, v6, v8); @@ -1206,7 +1206,7 @@ static void ov62_0223B050(UnkStruct_0208C06C *param0) BuildArchivedPokemonSprite(&v2, v7, v3, v10, v4, v6, v8); v0->unk_32C = sub_02007C34(param0->unk_14.unk_50, &v2, 42, 91 + v9, 0, 0, NULL, NULL); - PokemonPersonalData_Free(v1); + SpeciesData_Free(v1); } static void ov62_0223B124(UnkStruct_0208C06C *param0, int param1) diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index d20624440f..ddc49ce9aa 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -517,7 +517,7 @@ static void ov79_021D27D8(UnkStruct_ov79_021D2928 *param0) param0->unk_30.unk_04 = Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_SPECIES, NULL); param0->unk_30.unk_07 = Pokemon_GetGender(param0->unk_10->unk_00); param0->unk_30.unk_06 = Pokemon_GetNature(param0->unk_10->unk_00); - param0->unk_30.unk_08 = PokemonPersonalData_GetFormValue(param0->unk_30.unk_04, Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_FORM, NULL), 28) ^ 1; + param0->unk_30.unk_08 = SpeciesData_GetFormValue(param0->unk_30.unk_04, Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_FORM, NULL), 28) ^ 1; param0->unk_30.unk_0C = Strbuf_Init(12, param0->unk_00); Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_NICKNAME_STRBUF, param0->unk_30.unk_0C); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index ca84d17a0c..4e6f05c577 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -766,7 +766,7 @@ static void ov88_0223BD18(Pokemon *param0, UnkStruct_ov88_0223C8AC *param1) Pokemon_ExitDecryptionContext(param0, v0); if (param1->unk_00 != 0) { - param1->unk_0A = PokemonPersonalData_GetFormValue(param1->unk_00, param1->unk_06, 28); + param1->unk_0A = SpeciesData_GetFormValue(param1->unk_00, param1->unk_06, 28); } if (v1 != 0) { diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 2c85c18b26..d19d56b820 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -419,7 +419,7 @@ static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0) break; case 1: if (param0->unk_B7A.unk_00 != 0) { - param0->unk_10E4->unk_20 = PokemonPersonalData_GetSpeciesValue(param0->unk_B7A.unk_00, 18); + param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_B7A.unk_00, 18); if (ov94_02241B80(¶m0->unk_B7A, param0->unk_10E4->unk_20)) { Sound_PlayEffect(1500); @@ -834,7 +834,7 @@ static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0) Window_FillTilemap(¶m0->unk_FCC[1], 0x0); ov94_02242158(¶m0->unk_FCC[1], param0->unk_B94, v0, 0, 0, TEXT_COLOR(1, 2, 0)); - param0->unk_10E4->unk_20 = PokemonPersonalData_GetSpeciesValue(v0, 18); + param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(v0, 18); ov94_02242AC4(¶m0->unk_111C, param0->unk_10E4->unk_06 + param0->unk_10E4->unk_04, param0->unk_10E4->unk_0A, param0->unk_10E4->unk_08); if (ov94_02241B80(¶m0->unk_B7A, param0->unk_10E4->unk_20)) { diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index f306020502..b452fee576 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -640,7 +640,7 @@ static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0) Window_Remove(¶m0->unk_F9C[1]); param0->unk_B74.unk_00 = v0; Sound_PlayEffect(1500); - param0->unk_10E4->unk_20 = PokemonPersonalData_GetSpeciesValue(v0, 18); + param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(v0, 18); if (ov94_02241B80(¶m0->unk_B74, param0->unk_10E4->unk_20)) { param0->unk_2C = 10; diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 90c1fd26c2..258120d465 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -196,7 +196,7 @@ static BOOL ov95_02246DEC(BoxPokemon *param0) int v0 = BoxPokemon_GetValue(param0, MON_DATA_SPECIES, NULL); int v1 = BoxPokemon_GetValue(param0, MON_DATA_FORM, NULL); - return PokemonPersonalData_GetFormValue(v0, v1, 28) == 0; + return SpeciesData_GetFormValue(v0, v1, 28) == 0; } int ov95_02246E1C(OverlayManager *param0, int *param1) diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index 3260185e0b..defb770aa1 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -1329,21 +1329,21 @@ static int ov97_02236E28(BoxPokemonGBA *param0, BoxPokemon *param1) v2 = BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL); v3 = GetGBABoxMonData(param0, 46, NULL); - v1 = PokemonPersonalData_GetSpeciesValue(v2, 25); + v1 = SpeciesData_GetSpeciesValue(v2, 25); if (v1) { for (v0 = 0; v0 < (sizeof(Unk_ov97_0223ECA0) / 2); v0++) { if (Unk_ov97_0223ECA0[v0] == v2) { - v1 = PokemonPersonalData_GetSpeciesValue(v2, 24); + v1 = SpeciesData_GetSpeciesValue(v2, 24); break; } } if ((v0 == (sizeof(Unk_ov97_0223ECA0) / 2)) && ((v3 & 1) == 0)) { - v1 = PokemonPersonalData_GetSpeciesValue(v2, 24); + v1 = SpeciesData_GetSpeciesValue(v2, 24); } } else { - v1 = PokemonPersonalData_GetSpeciesValue(v2, 24); + v1 = SpeciesData_GetSpeciesValue(v2, 24); } return v1; diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 7d613e6501..410f102510 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -230,16 +230,16 @@ u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, u32 param2 param0->unk_1E_val2 = 0; param0->unk_1F = gGameLanguage; - v0 = PokemonPersonalData_GetSpeciesValue(param0->unk_00_val1_0, 25); + v0 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, 25); if (v0) { if (param0->unk_10 & 1) { param0->unk_20 = v0; } else { - param0->unk_20 = PokemonPersonalData_GetSpeciesValue(param0->unk_00_val1_0, 24); + param0->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, 24); } } else { - param0->unk_20 = PokemonPersonalData_GetSpeciesValue(param0->unk_00_val1_0, 24); + param0->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, 24); } param0->unk_21 = v3; diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index 6a934255e3..d3d2665fb4 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -883,16 +883,16 @@ static u32 ov104_0223A3A8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_s param1->unk_1E_val2 = 0; param1->unk_1F = gGameLanguage; - v0 = PokemonPersonalData_GetSpeciesValue(param1->unk_00_val1_0, 25); + v0 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 25); if (v0) { if (param1->unk_10 & 1) { param1->unk_20 = v0; } else { - param1->unk_20 = PokemonPersonalData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); } } else { - param1->unk_20 = PokemonPersonalData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); } param1->unk_21 = v3; diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 00b49a20ea..2e28a08bfc 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -3015,7 +3015,7 @@ static void ov105_022455C4(UnkStruct_ov105_02241FF4 *param0, u8 param1, Pokemon v0 = Pokemon_GetValue(param2, MON_DATA_SPECIES, NULL); v1 = Pokemon_GetValue(param2, MON_DATA_FORM, NULL); - if (PokemonPersonalData_GetFormValue(v0, v1, 28) == 0) { + if (SpeciesData_GetFormValue(v0, v1, 28) == 0) { ov105_02245DB8(param0->unk_12C[param1], param5); } diff --git a/src/pokedex.c b/src/pokedex.c index ebcebc472b..2826913f76 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -620,7 +620,7 @@ static u32 GetDisplayGender(const Pokedex *pokedexData, u16 species, int display u32 defaultGender, secondaryGender; u32 displayGender; - if (PokemonPersonalData_GetSpeciesValue(species, MON_DATA_PERSONAL_GENDER) == GENDER_RATIO_NO_GENDER) { + if (SpeciesData_GetSpeciesValue(species, SPECIES_DATA_GENDER_RATIO) == GENDER_RATIO_NO_GENDER) { if (displaySecondary == FALSE) { return GENDER_NONE; } else { diff --git a/src/pokemon.c b/src/pokemon.c index 2e7ac8fce2..4291237425 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -134,8 +134,8 @@ static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *pa static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID); static void BoxPokemon_CalcAbility(BoxPokemon *boxMon); -static void PokemonPersonalData_LoadSpecies(int monSpecies, PokemonPersonalData *monPersonalData); -static void PokemonPersonalData_LoadForm(int monSpecies, int monForm, PokemonPersonalData *monPersonalData); +static void SpeciesData_LoadSpecies(int monSpecies, SpeciesData *speciesData); +static void SpeciesData_LoadForm(int monSpecies, int monForm, SpeciesData *speciesData); static void PokemonEvolutionData_LoadSpecies(int monSpecies, PokemonEvolutionData *monEvolutionData); static void Pokemon_EncryptData(void *data, u32 bytes, u32 seed); static void Pokemon_DecryptData(void *data, u32 bytes, u32 seed); @@ -288,7 +288,7 @@ static void sub_02073E18(BoxPokemon *boxMon, int monSpecies, int monLevel, int m v1 = Pokemon_GetSpeciesBaseExpAt(monSpecies, monLevel); BoxPokemon_SetValue(boxMon, MON_DATA_EXP, &v1); - v1 = PokemonPersonalData_GetSpeciesValue(monSpecies, MON_DATA_PERSONAL_BASE_FRIENDSHIP); + v1 = SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_BASE_FRIENDSHIP); BoxPokemon_SetValue(boxMon, MON_DATA_FRIENDSHIP, &v1); BoxPokemon_SetValue(boxMon, MON_DATA_MET_LEVEL, &monLevel); @@ -326,8 +326,8 @@ static void sub_02073E18(BoxPokemon *boxMon, int monSpecies, int monLevel, int m BoxPokemon_SetValue(boxMon, MON_DATA_SPDEF_IV, &v2); } - v1 = PokemonPersonalData_GetSpeciesValue(monSpecies, MON_DATA_PERSONAL_ABILITY_1); - v2 = PokemonPersonalData_GetSpeciesValue(monSpecies, MON_DATA_PERSONAL_ABILITY_2); + v1 = SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_ABILITY_1); + v2 = SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_ABILITY_2); if (v2 != ABILITY_NONE) { if (monPersonality & 1) { @@ -378,7 +378,7 @@ void sub_02074088(Pokemon *mon, u16 monSpecies, u8 monLevel, u8 monIVs, u8 gende u32 sub_02074128(u16 monSpecies, u8 param1, u8 param2) { - u8 monGenderChance = PokemonPersonalData_GetSpeciesValue(monSpecies, MON_DATA_PERSONAL_GENDER); + u8 monGenderChance = SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_GENDER_RATIO); u32 result; switch (monGenderChance) { @@ -447,45 +447,45 @@ void Pokemon_CalcStats(Pokemon *mon) int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL); int monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); - PokemonPersonalData *monPersonalData = Heap_AllocFromHeap(0, sizeof(PokemonPersonalData)); + SpeciesData *speciesData = Heap_AllocFromHeap(0, sizeof(SpeciesData)); - PokemonPersonalData_LoadForm(monSpecies, monForm, monPersonalData); + SpeciesData_LoadForm(monSpecies, monForm, speciesData); int newMaxHp; if (monSpecies == SPECIES_SHEDINJA) { newMaxHp = 1; } else { - newMaxHp = ((2 * monPersonalData->baseHp + monHpIV + monHpEV / 4) * monLevel / 100 + monLevel + 10); + newMaxHp = ((2 * speciesData->baseStats.hp + monHpIV + monHpEV / 4) * monLevel / 100 + monLevel + 10); } Pokemon_SetValue(mon, MON_DATA_MAX_HP, &newMaxHp); // TODO inline func maybe - int newAtk = ((2 * monPersonalData->baseAtk + monAtkIV + monAtkEV / 4) * monLevel / 100 + 5); + int newAtk = ((2 * speciesData->baseStats.attack + monAtkIV + monAtkEV / 4) * monLevel / 100 + 5); newAtk = Pokemon_GetNatureStatValue(Pokemon_GetNature(mon), newAtk, STAT_ATTACK); Pokemon_SetValue(mon, MON_DATA_ATK, &newAtk); - int newDef = ((2 * monPersonalData->baseDef + monDefIV + monDefEV / 4) * monLevel / 100 + 5); + int newDef = ((2 * speciesData->baseStats.defense + monDefIV + monDefEV / 4) * monLevel / 100 + 5); newDef = Pokemon_GetNatureStatValue(Pokemon_GetNature(mon), newDef, STAT_DEFENSE); Pokemon_SetValue(mon, MON_DATA_DEF, &newDef); - int newSpeed = ((2 * monPersonalData->baseSpeed + monSpeedIV + monSpeedEV / 4) * monLevel / 100 + 5); + int newSpeed = ((2 * speciesData->baseStats.speed + monSpeedIV + monSpeedEV / 4) * monLevel / 100 + 5); newSpeed = Pokemon_GetNatureStatValue(Pokemon_GetNature(mon), newSpeed, STAT_SPEED); Pokemon_SetValue(mon, MON_DATA_SPEED, &newSpeed); - int newSpAtk = ((2 * monPersonalData->baseSpAtk + monSpAtkIV + monSpAtkEV / 4) * monLevel / 100 + 5); + int newSpAtk = ((2 * speciesData->baseStats.spAttack + monSpAtkIV + monSpAtkEV / 4) * monLevel / 100 + 5); newSpAtk = Pokemon_GetNatureStatValue(Pokemon_GetNature(mon), newSpAtk, STAT_SPECIAL_ATTACK); Pokemon_SetValue(mon, MON_DATA_SP_ATK, &newSpAtk); - int newSpDef = ((2 * monPersonalData->baseSpDef + monSpDefIV + monSpDefEV / 4) * monLevel / 100 + 5); + int newSpDef = ((2 * speciesData->baseStats.spDefense + monSpDefIV + monSpDefEV / 4) * monLevel / 100 + 5); newSpDef = Pokemon_GetNatureStatValue(Pokemon_GetNature(mon), newSpDef, STAT_SPECIAL_DEFENSE); Pokemon_SetValue(mon, MON_DATA_SP_DEF, &newSpDef); - Heap_FreeToHeap(monPersonalData); + Heap_FreeToHeap(speciesData); if (monCurrentHp != 0 || monMaxHp == 0) { if (monSpecies == SPECIES_SHEDINJA) { @@ -1080,7 +1080,7 @@ static u32 BoxPokemon_GetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam if (monDataBlockA->species == SPECIES_ARCEUS && monDataBlockA->ability == ABILITY_MULTITYPE) { result = Pokemon_GetArceusTypeOf(Item_LoadParam(monDataBlockA->heldItem, ITEM_PARAM_HOLD_EFFECT, HEAP_ID_SYSTEM)); } else { - result = PokemonPersonalData_GetFormValue(monDataBlockA->species, monDataBlockB->form, MON_DATA_PERSONAL_TYPE_1 + (param - MON_DATA_TYPE_1)); + result = SpeciesData_GetFormValue(monDataBlockA->species, monDataBlockB->form, SPECIES_DATA_TYPE_1 + (param - MON_DATA_TYPE_1)); } break; @@ -1995,157 +1995,157 @@ static void BoxPokemon_IncreaseDataInternal(BoxPokemon *boxMon, enum PokemonData } } -PokemonPersonalData *PokemonPersonalData_FromMonForm(int monSpecies, int monForm, int heapID) +SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID) { - PokemonPersonalData *monPersonalData = Heap_AllocFromHeap(heapID, sizeof(PokemonPersonalData)); - PokemonPersonalData_LoadForm(monSpecies, monForm, monPersonalData); + SpeciesData *speciesData = Heap_AllocFromHeap(heapID, sizeof(SpeciesData)); + SpeciesData_LoadForm(monSpecies, monForm, speciesData); - return monPersonalData; + return speciesData; } -PokemonPersonalData *PokemonPersonalData_FromMonSpecies(int monSpecies, int heapID) +SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, int heapID) { - PokemonPersonalData *monPersonalData = Heap_AllocFromHeap(heapID, sizeof(PokemonPersonalData)); - PokemonPersonalData_LoadSpecies(monSpecies, monPersonalData); + SpeciesData *speciesData = Heap_AllocFromHeap(heapID, sizeof(SpeciesData)); + SpeciesData_LoadSpecies(monSpecies, speciesData); - return monPersonalData; + return speciesData; } -u32 PokemonPersonalData_GetValue(PokemonPersonalData *monPersonalData, enum PokemonPersonalDataParam param) +u32 SpeciesData_GetValue(SpeciesData *speciesData, enum SpeciesDataParam param) { u32 result; - GF_ASSERT(monPersonalData); + GF_ASSERT(speciesData); switch (param) { - case MON_DATA_PERSONAL_BASE_HP: - result = monPersonalData->baseHp; + case SPECIES_DATA_BASE_HP: + result = speciesData->baseStats.hp; break; - case MON_DATA_PERSONAL_BASE_ATK: - result = monPersonalData->baseAtk; + case SPECIES_DATA_BASE_ATK: + result = speciesData->baseStats.attack; break; - case MON_DATA_PERSONAL_BASE_DEF: - result = monPersonalData->baseDef; + case SPECIES_DATA_BASE_DEF: + result = speciesData->baseStats.defense; break; - case MON_DATA_PERSONAL_BASE_SPEED: - result = monPersonalData->baseSpeed; + case SPECIES_DATA_BASE_SPEED: + result = speciesData->baseStats.speed; break; - case MON_DATA_PERSONAL_BASE_SP_ATK: - result = monPersonalData->baseSpAtk; + case SPECIES_DATA_BASE_SP_ATK: + result = speciesData->baseStats.spAttack; break; - case MON_DATA_PERSONAL_BASE_SP_DEF: - result = monPersonalData->baseSpDef; + case SPECIES_DATA_BASE_SP_DEF: + result = speciesData->baseStats.spDefense; break; - case MON_DATA_PERSONAL_TYPE_1: - result = monPersonalData->type1; + case SPECIES_DATA_TYPE_1: + result = speciesData->types[0]; break; - case MON_DATA_PERSONAL_TYPE_2: - result = monPersonalData->type2; + case SPECIES_DATA_TYPE_2: + result = speciesData->types[1]; break; - case MON_DATA_PERSONAL_CATCH_RATE: - result = monPersonalData->catchRate; + case SPECIES_DATA_CATCH_RATE: + result = speciesData->catchRate; break; - case MON_DATA_PERSONAL_BASE_EXP: - result = monPersonalData->baseExp; + case SPECIES_DATA_BASE_EXP_REWARD: + result = speciesData->baseExpReward; break; - case MON_DATA_PERSONAL_EV_HP_YIELD: - result = monPersonalData->evHpYield; + case SPECIES_DATA_EV_HP_YIELD: + result = speciesData->evYields.hp; break; - case MON_DATA_PERSONAL_EV_ATK_YIELD: - result = monPersonalData->evAtkYield; + case SPECIES_DATA_EV_ATK_YIELD: + result = speciesData->evYields.attack; break; - case MON_DATA_PERSONAL_EV_DEF_YIELD: - result = monPersonalData->evDefYield; + case SPECIES_DATA_EV_DEF_YIELD: + result = speciesData->evYields.defense; break; - case MON_DATA_PERSONAL_EV_SPEED_YIELD: - result = monPersonalData->evSpeedYield; + case SPECIES_DATA_EV_SPEED_YIELD: + result = speciesData->evYields.speed; break; - case MON_DATA_PERSONAL_EV_SP_ATK_YIELD: - result = monPersonalData->evSpAtkYield; + case SPECIES_DATA_EV_SP_ATK_YIELD: + result = speciesData->evYields.spAttack; break; - case MON_DATA_PERSONAL_EV_SP_DEF_YIELD: - result = monPersonalData->evSpDefYield; + case SPECIES_DATA_EV_SP_DEF_YIELD: + result = speciesData->evYields.spDefense; break; - case MON_DATA_PERSONAL_ITEM1: - result = monPersonalData->item1; + case SPECIES_DATA_HELD_ITEM_COMMON: + result = speciesData->wildHeldItems.common; break; - case MON_DATA_PERSONAL_ITEM2: - result = monPersonalData->item2; + case SPECIES_DATA_HELD_ITEM_RARE: + result = speciesData->wildHeldItems.rare; break; - case MON_DATA_PERSONAL_GENDER: - result = monPersonalData->gender; + case SPECIES_DATA_GENDER_RATIO: + result = speciesData->genderRatio; break; - case MON_DATA_PERSONAL_HATCH_CYCLE: - result = monPersonalData->hatchCycles; + case SPECIES_DATA_HATCH_CYCLES: + result = speciesData->hatchCycles; break; - case MON_DATA_PERSONAL_BASE_FRIENDSHIP: - result = monPersonalData->baseFriendship; + case SPECIES_DATA_BASE_FRIENDSHIP: + result = speciesData->baseFriendship; break; - case MON_DATA_PERSONAL_EXP_RATE: - result = monPersonalData->expRate; + case SPECIES_DATA_EXP_RATE: + result = speciesData->expRate; break; - case MON_DATA_PERSONAL_EGG_GROUP_1: - result = monPersonalData->eggGroup1; + case SPECIES_DATA_EGG_GROUP_1: + result = speciesData->eggGroups[0]; break; - case MON_DATA_PERSONAL_EGG_GROUP_2: - result = monPersonalData->eggGroup2; + case SPECIES_DATA_EGG_GROUP_2: + result = speciesData->eggGroups[1]; break; - case MON_DATA_PERSONAL_ABILITY_1: - result = monPersonalData->ability1; + case SPECIES_DATA_ABILITY_1: + result = speciesData->abilities[0]; break; - case MON_DATA_PERSONAL_ABILITY_2: - result = monPersonalData->ability2; + case SPECIES_DATA_ABILITY_2: + result = speciesData->abilities[1]; break; - case MON_DATA_PERSONAL_GREAT_MARSH_FLEE_RATE: - result = monPersonalData->greatMarshFleeRate; + case SPECIES_DATA_SAFARI_FLEE_RATE: + result = speciesData->safariFleeRate; break; - case MON_DATA_PERSONAL_COLOR: - result = monPersonalData->color; + case SPECIES_DATA_BODY_COLOR: + result = speciesData->bodyColor; break; - case MON_DATA_PERSONAL_FLIP_SPRITE: - result = monPersonalData->flipSprite; + case SPECIES_DATA_FLIP_SPRITE: + result = speciesData->flipSprite; break; - case MON_DATA_PERSONAL_TM_LEARNSET_MASK_1: - result = monPersonalData->tmLearnsetMask1; + case SPECIES_DATA_TM_LEARNSET_MASK_1: + result = speciesData->tmLearnsetMask1; break; - case MON_DATA_PERSONAL_TM_LEARNSET_MASK_2: - result = monPersonalData->tmLearnsetMask2; + case SPECIES_DATA_TM_LEARNSET_MASK_2: + result = speciesData->tmLearnsetMask2; break; - case MON_DATA_PERSONAL_TM_LEARNSET_MASK_3: - result = monPersonalData->tmLearnsetMask3; + case SPECIES_DATA_TM_LEARNSET_MASK_3: + result = speciesData->tmLearnsetMask3; break; - case MON_DATA_PERSONAL_TM_LEARNSET_MASK_4: - result = monPersonalData->tmLearnsetMask4; + case SPECIES_DATA_TM_LEARNSET_MASK_4: + result = speciesData->tmLearnsetMask4; break; } return result; } -void PokemonPersonalData_Free(PokemonPersonalData *monPersonalData) +void SpeciesData_Free(SpeciesData *speciesData) { - GF_ASSERT(monPersonalData); - Heap_FreeToHeap(monPersonalData); + GF_ASSERT(speciesData); + Heap_FreeToHeap(speciesData); } -u32 PokemonPersonalData_GetFormValue(int monSpecies, int monForm, enum PokemonPersonalDataParam param) +u32 SpeciesData_GetFormValue(int monSpecies, int monForm, enum SpeciesDataParam param) { monSpecies = Pokemon_GetFormNarcIndex(monSpecies, monForm); - PokemonPersonalData *monPersonalData = PokemonPersonalData_FromMonSpecies(monSpecies, 0); - u32 result = PokemonPersonalData_GetValue(monPersonalData, param); + SpeciesData *speciesData = SpeciesData_FromMonSpecies(monSpecies, 0); + u32 result = SpeciesData_GetValue(speciesData, param); - PokemonPersonalData_Free(monPersonalData); + SpeciesData_Free(speciesData); return result; } -u32 PokemonPersonalData_GetSpeciesValue(int monSpecies, enum PokemonPersonalDataParam param) +u32 SpeciesData_GetSpeciesValue(int monSpecies, enum SpeciesDataParam param) { - PokemonPersonalData *monPersonalData = PokemonPersonalData_FromMonSpecies(monSpecies, 0); - u32 result = PokemonPersonalData_GetValue(monPersonalData, param); + SpeciesData *speciesData = SpeciesData_FromMonSpecies(monSpecies, 0); + u32 result = SpeciesData_GetValue(speciesData, param); - PokemonPersonalData_Free(monPersonalData); + SpeciesData_Free(speciesData); return result; } @@ -2186,7 +2186,7 @@ u32 Pokemon_GetCurrentLevelBaseExp(Pokemon *mon) u32 Pokemon_GetSpeciesBaseExpAt(int monSpecies, int monLevel) { - return Pokemon_GetExpRateBaseExpAt(PokemonPersonalData_GetSpeciesValue(monSpecies, MON_DATA_PERSONAL_EXP_RATE), monLevel); + return Pokemon_GetExpRateBaseExpAt(SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_EXP_RATE), monLevel); } static void Pokemon_LoadExperienceTableOf(enum PokemonExpRate monExpRate, u32 *monExpTable) @@ -2229,20 +2229,20 @@ u32 BoxPokemon_GetLevel(BoxPokemon *boxMon) u32 Pokemon_GetSpeciesLevelAt(u16 monSpecies, u32 monExp) { - PokemonPersonalData *monPersonalData = PokemonPersonalData_FromMonSpecies(monSpecies, 0); + SpeciesData *speciesData = SpeciesData_FromMonSpecies(monSpecies, 0); - u32 monLevel = PokemonPersonalData_GetLevelAt(monPersonalData, monSpecies, monExp); - PokemonPersonalData_Free(monPersonalData); + u32 monLevel = SpeciesData_GetLevelAt(speciesData, monSpecies, monExp); + SpeciesData_Free(speciesData); return monLevel; } -u32 PokemonPersonalData_GetLevelAt(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monExp) +u32 SpeciesData_GetLevelAt(SpeciesData *speciesData, u16 unused_monSpecies, u32 monExp) { // TODO const for table size static u32 monExpTable[101]; - enum PokemonExpRate monExpRate = PokemonPersonalData_GetValue(monPersonalData, MON_DATA_PERSONAL_EXP_RATE); + enum PokemonExpRate monExpRate = SpeciesData_GetValue(speciesData, SPECIES_DATA_EXP_RATE); Pokemon_LoadExperienceTableOf(monExpRate, monExpTable); int i; @@ -2422,17 +2422,17 @@ u8 BoxPokemon_GetGender(BoxPokemon *boxMon) u8 Pokemon_GetGenderOf(u16 monSpecies, u32 monPersonality) { - PokemonPersonalData *monPersonalData = PokemonPersonalData_FromMonSpecies(monSpecies, 0); - u8 monGender = PokemonPersonalData_GetGenderOf(monPersonalData, monSpecies, monPersonality); + SpeciesData *speciesData = SpeciesData_FromMonSpecies(monSpecies, 0); + u8 monGender = SpeciesData_GetGenderOf(speciesData, monSpecies, monPersonality); - PokemonPersonalData_Free(monPersonalData); + SpeciesData_Free(speciesData); return monGender; } -u8 PokemonPersonalData_GetGenderOf(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monPersonality) +u8 SpeciesData_GetGenderOf(SpeciesData *speciesData, u16 unused_monSpecies, u32 monPersonality) { - u8 monGender = PokemonPersonalData_GetValue(monPersonalData, MON_DATA_PERSONAL_GENDER); + u8 monGender = SpeciesData_GetValue(speciesData, SPECIES_DATA_GENDER_RATIO); switch (monGender) { case GENDER_RATIO_MALE_ONLY: @@ -3223,7 +3223,7 @@ BOOL Pokemon_ShouldLevelUp(Pokemon *mon) u16 monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); u8 monNextLevel = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL) + 1; u32 monExp = Pokemon_GetValue(mon, MON_DATA_EXP, NULL); - int monExpRate = PokemonPersonalData_GetSpeciesValue(monSpecies, MON_DATA_PERSONAL_EXP_RATE); + int monExpRate = SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_EXP_RATE); // TODO const value? u32 maxExp = Pokemon_GetExpRateBaseExpAt(monExpRate, 100); @@ -4419,8 +4419,8 @@ void Pokemon_GiveHeldItem(Pokemon *mon, u32 param1, int param2) u32 rand = LCRNG_Next() % 100; u16 monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); u16 monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL); - u16 monItem1 = PokemonPersonalData_GetFormValue(monSpecies, monForm, MON_DATA_PERSONAL_ITEM1); - u16 monItem2 = PokemonPersonalData_GetFormValue(monSpecies, monForm, MON_DATA_PERSONAL_ITEM2); + u16 monItem1 = SpeciesData_GetFormValue(monSpecies, monForm, SPECIES_DATA_HELD_ITEM_COMMON); + u16 monItem2 = SpeciesData_GetFormValue(monSpecies, monForm, SPECIES_DATA_HELD_ITEM_RARE); if (monItem1 == monItem2 && monItem1 != ITEM_NONE) { Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &monItem1); @@ -4456,22 +4456,22 @@ BOOL CanPokemonFormLearnTM(u16 monSpecies, int monForm, u8 tmID) } u32 tmFlag; - u8 monPersonalDataAttribute; + u8 speciesDataAttribute; if (tmID < 32) { tmFlag = (1 << tmID); - monPersonalDataAttribute = MON_DATA_PERSONAL_TM_LEARNSET_MASK_1; + speciesDataAttribute = SPECIES_DATA_TM_LEARNSET_MASK_1; } else if (tmID < 64) { tmFlag = (1 << (tmID - 32)); - monPersonalDataAttribute = MON_DATA_PERSONAL_TM_LEARNSET_MASK_2; + speciesDataAttribute = SPECIES_DATA_TM_LEARNSET_MASK_2; } else if (tmID < 96) { tmFlag = (1 << (tmID - 64)); - monPersonalDataAttribute = MON_DATA_PERSONAL_TM_LEARNSET_MASK_3; + speciesDataAttribute = SPECIES_DATA_TM_LEARNSET_MASK_3; } else { tmFlag = (1 << (tmID - 96)); - monPersonalDataAttribute = MON_DATA_PERSONAL_TM_LEARNSET_MASK_4; + speciesDataAttribute = SPECIES_DATA_TM_LEARNSET_MASK_4; } - return (PokemonPersonalData_GetFormValue(monSpecies, monForm, monPersonalDataAttribute) & tmFlag) != 0; + return (SpeciesData_GetFormValue(monSpecies, monForm, speciesDataAttribute) & tmFlag) != 0; } void Pokemon_CalcAbility(Pokemon *mon) @@ -4485,8 +4485,8 @@ static void BoxPokemon_CalcAbility(BoxPokemon *boxMon) int monSpecies = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, NULL); u32 monPersonality = BoxPokemon_GetValue(boxMon, MON_DATA_PERSONALITY, NULL); int monForm = BoxPokemon_GetValue(boxMon, MON_DATA_FORM, NULL); - int monAbility1 = PokemonPersonalData_GetFormValue(monSpecies, monForm, MON_DATA_PERSONAL_ABILITY_1); - int monAbility2 = PokemonPersonalData_GetFormValue(monSpecies, monForm, MON_DATA_PERSONAL_ABILITY_2); + int monAbility1 = SpeciesData_GetFormValue(monSpecies, monForm, SPECIES_DATA_ABILITY_1); + int monAbility2 = SpeciesData_GetFormValue(monSpecies, monForm, SPECIES_DATA_ABILITY_2); // TODO enum value? if (monAbility2 != ABILITY_NONE) { @@ -4535,15 +4535,15 @@ void sub_020780C4(Pokemon *mon, u32 monPersonality) Heap_FreeToHeap(newMon); } -static void PokemonPersonalData_LoadSpecies(int monSpecies, PokemonPersonalData *monPersonalData) +static void SpeciesData_LoadSpecies(int monSpecies, SpeciesData *speciesData) { - NARC_ReadWholeMemberByIndexPair(monPersonalData, NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL, monSpecies); + NARC_ReadWholeMemberByIndexPair(speciesData, NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL, monSpecies); } -static void PokemonPersonalData_LoadForm(int monSpecies, int monForm, PokemonPersonalData *monPersonalData) +static void SpeciesData_LoadForm(int monSpecies, int monForm, SpeciesData *speciesData) { monSpecies = Pokemon_GetFormNarcIndex(monSpecies, monForm); - NARC_ReadWholeMemberByIndexPair(monPersonalData, NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL, monSpecies); + NARC_ReadWholeMemberByIndexPair(speciesData, NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL, monSpecies); } static void PokemonEvolutionData_LoadSpecies(int monSpecies, PokemonEvolutionData *monEvolutionData) diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 66cdf238cd..9fc144727b 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -378,16 +378,16 @@ static u32 sub_0204B1E8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_sub param1->unk_1E_val2 = 0; param1->unk_1F = gGameLanguage; - v0 = PokemonPersonalData_GetSpeciesValue(param1->unk_00_val1_0, 25); + v0 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 25); if (v0) { if (param1->unk_10 & 1) { param1->unk_20 = v0; } else { - param1->unk_20 = PokemonPersonalData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); } } else { - param1->unk_20 = PokemonPersonalData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); } param1->unk_21 = v3; From 465d8cae751d9832d34328829cbf9943eb9da571 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 12:39:35 -0800 Subject: [PATCH 02/10] Document and clean-up Pokemon_GetEvolutionTargetSpecies --- consts/pokemon.json | 26 +-- include/constants/pokemon.h | 3 + include/pokemon.h | 9 +- res/pokemon/abra/data.json | 4 +- res/pokemon/aipom/data.json | 4 +- res/pokemon/anorith/data.json | 4 +- res/pokemon/aron/data.json | 4 +- res/pokemon/azurill/data.json | 4 +- res/pokemon/bagon/data.json | 4 +- res/pokemon/baltoy/data.json | 4 +- res/pokemon/barboach/data.json | 4 +- res/pokemon/bayleef/data.json | 4 +- res/pokemon/beldum/data.json | 4 +- res/pokemon/bellsprout/data.json | 4 +- res/pokemon/bidoof/data.json | 4 +- res/pokemon/bonsly/data.json | 4 +- res/pokemon/bronzor/data.json | 4 +- res/pokemon/budew/data.json | 4 +- res/pokemon/buizel/data.json | 4 +- res/pokemon/bulbasaur/data.json | 4 +- res/pokemon/buneary/data.json | 4 +- res/pokemon/cacnea/data.json | 4 +- res/pokemon/carvanha/data.json | 4 +- res/pokemon/cascoon/data.json | 4 +- res/pokemon/caterpie/data.json | 4 +- res/pokemon/chansey/data.json | 4 +- res/pokemon/charmander/data.json | 4 +- res/pokemon/charmeleon/data.json | 4 +- res/pokemon/cherubi/data.json | 4 +- res/pokemon/chikorita/data.json | 4 +- res/pokemon/chimchar/data.json | 4 +- res/pokemon/chinchou/data.json | 4 +- res/pokemon/chingling/data.json | 4 +- res/pokemon/clamperl/data.json | 6 +- res/pokemon/cleffa/data.json | 4 +- res/pokemon/combusken/data.json | 4 +- res/pokemon/corphish/data.json | 4 +- res/pokemon/cranidos/data.json | 4 +- res/pokemon/croagunk/data.json | 4 +- res/pokemon/croconaw/data.json | 4 +- res/pokemon/cubone/data.json | 4 +- res/pokemon/cyndaquil/data.json | 4 +- res/pokemon/diglett/data.json | 4 +- res/pokemon/doduo/data.json | 4 +- res/pokemon/dragonair/data.json | 4 +- res/pokemon/dratini/data.json | 4 +- res/pokemon/drifloon/data.json | 4 +- res/pokemon/drowzee/data.json | 4 +- res/pokemon/dusclops/data.json | 4 +- res/pokemon/duskull/data.json | 4 +- res/pokemon/eevee/data.json | 10 +- res/pokemon/ekans/data.json | 4 +- res/pokemon/electabuzz/data.json | 4 +- res/pokemon/electrike/data.json | 4 +- res/pokemon/elekid/data.json | 4 +- res/pokemon/feebas/data.json | 4 +- res/pokemon/finneon/data.json | 4 +- res/pokemon/flaaffy/data.json | 4 +- res/pokemon/gabite/data.json | 4 +- res/pokemon/gastly/data.json | 4 +- res/pokemon/geodude/data.json | 4 +- res/pokemon/gible/data.json | 4 +- res/pokemon/glameow/data.json | 4 +- res/pokemon/gligar/data.json | 4 +- res/pokemon/golbat/data.json | 4 +- res/pokemon/goldeen/data.json | 4 +- res/pokemon/grimer/data.json | 4 +- res/pokemon/grotle/data.json | 4 +- res/pokemon/grovyle/data.json | 4 +- res/pokemon/gulpin/data.json | 4 +- res/pokemon/happiny/data.json | 4 +- res/pokemon/hippopotas/data.json | 4 +- res/pokemon/hoothoot/data.json | 4 +- res/pokemon/hoppip/data.json | 4 +- res/pokemon/horsea/data.json | 4 +- res/pokemon/houndour/data.json | 4 +- res/pokemon/igglybuff/data.json | 4 +- res/pokemon/ivysaur/data.json | 4 +- res/pokemon/kabuto/data.json | 4 +- res/pokemon/kakuna/data.json | 4 +- res/pokemon/kirlia/data.json | 4 +- res/pokemon/koffing/data.json | 4 +- res/pokemon/krabby/data.json | 4 +- res/pokemon/kricketot/data.json | 4 +- res/pokemon/lairon/data.json | 4 +- res/pokemon/larvitar/data.json | 4 +- res/pokemon/ledyba/data.json | 4 +- res/pokemon/lickitung/data.json | 4 +- res/pokemon/lileep/data.json | 4 +- res/pokemon/lotad/data.json | 4 +- res/pokemon/loudred/data.json | 4 +- res/pokemon/luxio/data.json | 4 +- res/pokemon/machop/data.json | 4 +- res/pokemon/magby/data.json | 4 +- res/pokemon/magikarp/data.json | 4 +- res/pokemon/magmar/data.json | 4 +- res/pokemon/magnemite/data.json | 4 +- res/pokemon/magneton/data.json | 4 +- res/pokemon/makuhita/data.json | 4 +- res/pokemon/mankey/data.json | 4 +- res/pokemon/mantyke/data.json | 4 +- res/pokemon/mareep/data.json | 4 +- res/pokemon/marill/data.json | 4 +- res/pokemon/marshtomp/data.json | 4 +- res/pokemon/meditite/data.json | 4 +- res/pokemon/meowth/data.json | 4 +- res/pokemon/metang/data.json | 4 +- res/pokemon/metapod/data.json | 4 +- res/pokemon/mime_jr/data.json | 4 +- res/pokemon/monferno/data.json | 4 +- res/pokemon/mudkip/data.json | 4 +- res/pokemon/munchlax/data.json | 4 +- res/pokemon/natu/data.json | 4 +- res/pokemon/nidoran_f/data.json | 4 +- res/pokemon/nidoran_m/data.json | 4 +- res/pokemon/nosepass/data.json | 4 +- res/pokemon/numel/data.json | 4 +- res/pokemon/oddish/data.json | 4 +- res/pokemon/omanyte/data.json | 4 +- res/pokemon/onix/data.json | 4 +- res/pokemon/paras/data.json | 4 +- res/pokemon/phanpy/data.json | 4 +- res/pokemon/pichu/data.json | 4 +- res/pokemon/pidgeotto/data.json | 4 +- res/pokemon/pidgey/data.json | 4 +- res/pokemon/piloswine/data.json | 4 +- res/pokemon/pineco/data.json | 4 +- res/pokemon/piplup/data.json | 4 +- res/pokemon/poliwag/data.json | 4 +- res/pokemon/poliwhirl/data.json | 4 +- res/pokemon/ponyta/data.json | 4 +- res/pokemon/poochyena/data.json | 4 +- res/pokemon/porygon/data.json | 4 +- res/pokemon/porygon2/data.json | 4 +- res/pokemon/prinplup/data.json | 4 +- res/pokemon/psyduck/data.json | 4 +- res/pokemon/pupitar/data.json | 4 +- res/pokemon/quilava/data.json | 4 +- res/pokemon/ralts/data.json | 4 +- res/pokemon/rattata/data.json | 4 +- res/pokemon/remoraid/data.json | 4 +- res/pokemon/rhydon/data.json | 4 +- res/pokemon/rhyhorn/data.json | 4 +- res/pokemon/riolu/data.json | 4 +- res/pokemon/sandshrew/data.json | 4 +- res/pokemon/scyther/data.json | 4 +- res/pokemon/seadra/data.json | 4 +- res/pokemon/sealeo/data.json | 4 +- res/pokemon/seedot/data.json | 4 +- res/pokemon/seel/data.json | 4 +- res/pokemon/sentret/data.json | 4 +- res/pokemon/shelgon/data.json | 4 +- res/pokemon/shellos/data.json | 4 +- res/pokemon/shieldon/data.json | 4 +- res/pokemon/shinx/data.json | 4 +- res/pokemon/shroomish/data.json | 4 +- res/pokemon/shuppet/data.json | 4 +- res/pokemon/silcoon/data.json | 4 +- res/pokemon/skiploom/data.json | 4 +- res/pokemon/skorupi/data.json | 4 +- res/pokemon/slakoth/data.json | 4 +- res/pokemon/slowpoke/data.json | 6 +- res/pokemon/slugma/data.json | 4 +- res/pokemon/smoochum/data.json | 4 +- res/pokemon/sneasel/data.json | 4 +- res/pokemon/snorunt/data.json | 4 +- res/pokemon/snover/data.json | 4 +- res/pokemon/snubbull/data.json | 4 +- res/pokemon/spearow/data.json | 4 +- res/pokemon/spheal/data.json | 4 +- res/pokemon/spinarak/data.json | 4 +- res/pokemon/spoink/data.json | 4 +- res/pokemon/squirtle/data.json | 4 +- res/pokemon/staravia/data.json | 4 +- res/pokemon/starly/data.json | 4 +- res/pokemon/stunky/data.json | 4 +- res/pokemon/surskit/data.json | 4 +- res/pokemon/swablu/data.json | 4 +- res/pokemon/swinub/data.json | 4 +- res/pokemon/taillow/data.json | 4 +- res/pokemon/tangela/data.json | 4 +- res/pokemon/teddiursa/data.json | 4 +- res/pokemon/tentacool/data.json | 4 +- res/pokemon/togepi/data.json | 4 +- res/pokemon/torchic/data.json | 4 +- res/pokemon/totodile/data.json | 4 +- res/pokemon/trapinch/data.json | 4 +- res/pokemon/treecko/data.json | 4 +- res/pokemon/turtwig/data.json | 4 +- res/pokemon/venonat/data.json | 4 +- res/pokemon/vibrava/data.json | 4 +- res/pokemon/vigoroth/data.json | 4 +- res/pokemon/voltorb/data.json | 4 +- res/pokemon/wailmer/data.json | 4 +- res/pokemon/wartortle/data.json | 4 +- res/pokemon/weedle/data.json | 4 +- res/pokemon/whismur/data.json | 4 +- res/pokemon/wingull/data.json | 4 +- res/pokemon/wooper/data.json | 4 +- res/pokemon/wynaut/data.json | 4 +- res/pokemon/yanma/data.json | 4 +- res/pokemon/zigzagoon/data.json | 4 +- res/pokemon/zubat/data.json | 4 +- src/battle/ov16_0223DF00.c | 2 +- src/map_header.c | 42 ++--- src/overlay094/ov94_022444C8.c | 4 +- src/pokemon.c | 312 +++++++++++++++++-------------- src/unk_0203D1B8.c | 2 +- src/unk_0207E0B8.c | 2 +- src/unk_020819DC.c | 2 +- src/unk_02084B70.c | 2 +- src/unk_02096420.c | 2 +- tools/json2bin/evo.py | 26 +-- 213 files changed, 638 insertions(+), 606 deletions(-) diff --git a/consts/pokemon.json b/consts/pokemon.json index 9d4417d0ef..3d493aa473 100644 --- a/consts/pokemon.json +++ b/consts/pokemon.json @@ -104,12 +104,12 @@ "type": "enum", "values": [ "EVO_NONE", - "EVO_HAPPINESS", - "EVO_HAPPINESS_DAY", - "EVO_HAPPINESS_NIGHT", - "EVO_LEVEL_UP", + "EVO_LEVEL_HAPPINESS", + "EVO_LEVEL_HAPPINESS_DAY", + "EVO_LEVEL_HAPPINESS_NIGHT", + "EVO_LEVEL", "EVO_TRADE", - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "EVO_USE_ITEM", "EVO_LEVEL_ATK_GT_DEF", "EVO_LEVEL_ATK_EQ_DEF", @@ -118,18 +118,18 @@ "EVO_LEVEL_PID_HIGH", "EVO_LEVEL_NINJASK", "EVO_LEVEL_SHEDINJA", - "EVO_BEAUTY", + "EVO_LEVEL_BEAUTY", "EVO_USE_ITEM_MALE", "EVO_USE_ITEM_FEMALE", - "EVO_USE_ITEM_DAY", - "EVO_USE_ITEM_NIGHT", - "EVO_KNOW_MOVE", - "EVO_MON_IN_PARTY", + "EVO_LEVEL_WITH_HELD_ITEM_DAY", + "EVO_LEVEL_WITH_HELD_ITEM_NIGHT", + "EVO_LEVEL_KNOW_MOVE", + "EVO_LEVEL_SPECIES_IN_PARTY", "EVO_LEVEL_MALE", "EVO_LEVEL_FEMALE", - "EVO_ELECTRIC_FIELD", - "EVO_MOSSY_STONE", - "EVO_ICY_STONE" + "EVO_LEVEL_MAGNETIC_FIELD", + "EVO_LEVEL_MOSS_ROCK", + "EVO_LEVEL_ICE_ROCK" ] }, "@PokemonExpRate": { diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 309f8bad74..41b416a284 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -20,6 +20,7 @@ enum { #define MAX_ABILITIES 2 #define MAX_EGG_GROUPS 2 #define MAX_TYPES 2 +#define MAX_EVOLUTIONS 7 #define MAX_PARTY_SIZE 6 #define NUM_BOOSTABLE_STATS 8 @@ -38,6 +39,8 @@ enum { #define LEARNSET_MOVE_ALREADY_KNOWN 0xFFFE #define LEARNSET_ALL_SLOTS_FILLED 0xFFFF +#define EVOLVE_FRIENDSHIP_THRESHOLD 220 + /** * @brief Pokemon Data Parameters */ diff --git a/include/pokemon.h b/include/pokemon.h index 4012e7cced..0c65cd449a 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -78,6 +78,13 @@ typedef struct SpeciesData { u32 tmLearnsetMask4; // Bitflags for whether this pokemon can learn a TM (HM5 -> HM8, rest unused) } SpeciesData; +enum EvolutionClass { + EVO_CLASS_BY_LEVEL = 0, + EVO_CLASS_BY_TRADE, + EVO_CLASS_UNUSED_02, + EVO_CLASS_BY_ITEM, +}; + /** * @brief Zeros out a Pokemon data structure, then encrypts the result * @@ -562,7 +569,7 @@ u8 BoxPokemon_GetForm(BoxPokemon *boxMon); BoxPokemon *Pokemon_GetBoxPokemon(Pokemon *mon); BOOL Pokemon_ShouldLevelUp(Pokemon *mon); -u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int *evoTypeResult); +u16 Pokemon_GetEvolutionTargetSpecies(Party *party, Pokemon *mon, u8 evoClass, u16 evoParam, int *evoTypeResult); u16 sub_02076F84(const u16 monSpecies); u16 sub_02076FD4(const u16 monSpecies); diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json index 1d05fc251b..f5e87d2543 100644 --- a/res/pokemon/abra/data.json +++ b/res/pokemon/abra/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_KADABRA" ] @@ -137,4 +137,4 @@ "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json index 758357b249..2f5f7eed40 100644 --- a/res/pokemon/aipom/data.json +++ b/res/pokemon/aipom/data.json @@ -125,7 +125,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_DOUBLE_HIT", "SPECIES_AMBIPOM" ] @@ -156,4 +156,4 @@ "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json index 75e52de76b..0a5655aaf3 100644 --- a/res/pokemon/anorith/data.json +++ b/res/pokemon/anorith/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_ARMALDO" ] @@ -136,4 +136,4 @@ "rarity": 20, "unused": 1035 } -} \ No newline at end of file +} diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json index 6c14cb1d77..c215edfe01 100644 --- a/res/pokemon/aron/data.json +++ b/res/pokemon/aron/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_LAIRON" ] @@ -145,4 +145,4 @@ "rarity": 30, "unused": 2830 } -} \ No newline at end of file +} diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json index 39f7fe60ea..ed8106b370 100644 --- a/res/pokemon/azurill/data.json +++ b/res/pokemon/azurill/data.json @@ -91,7 +91,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_MARILL" ] ], @@ -121,4 +121,4 @@ "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json index 9f9e86a972..664a14361f 100644 --- a/res/pokemon/bagon/data.json +++ b/res/pokemon/bagon/data.json @@ -102,7 +102,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_SHELGON" ] @@ -133,4 +133,4 @@ "rarity": 30, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json index 73cc826827..1bd3b0160a 100644 --- a/res/pokemon/baltoy/data.json +++ b/res/pokemon/baltoy/data.json @@ -115,7 +115,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_CLAYDOL" ] @@ -146,4 +146,4 @@ "rarity": 30, "unused": 2568 } -} \ No newline at end of file +} diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json index 469181a5bd..6ac36843ea 100644 --- a/res/pokemon/barboach/data.json +++ b/res/pokemon/barboach/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_WHISCASH" ] @@ -135,4 +135,4 @@ "rarity": 30, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json index 218402a208..0c73c39a30 100644 --- a/res/pokemon/bayleef/data.json +++ b/res/pokemon/bayleef/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_MEGANIUM" ] @@ -139,4 +139,4 @@ "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json index 4772de1284..a5347a21fb 100644 --- a/res/pokemon/beldum/data.json +++ b/res/pokemon/beldum/data.json @@ -56,7 +56,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_METANG" ] @@ -87,4 +87,4 @@ "rarity": 20, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json index e4cc50e284..bbff53c4e0 100644 --- a/res/pokemon/bellsprout/data.json +++ b/res/pokemon/bellsprout/data.json @@ -99,7 +99,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 21, "SPECIES_WEEPINBELL" ] @@ -130,4 +130,4 @@ "rarity": 50, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json index a1dcc9e615..97fd252eef 100644 --- a/res/pokemon/bidoof/data.json +++ b/res/pokemon/bidoof/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 15, "SPECIES_BIBAREL" ] @@ -140,4 +140,4 @@ "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json index 8e84a3056d..1310296a93 100644 --- a/res/pokemon/bonsly/data.json +++ b/res/pokemon/bonsly/data.json @@ -102,7 +102,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_MIMIC", "SPECIES_SUDOWOODO" ] @@ -133,4 +133,4 @@ "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json index 1cb68700fc..d852eb731f 100644 --- a/res/pokemon/bronzor/data.json +++ b/res/pokemon/bronzor/data.json @@ -113,7 +113,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 33, "SPECIES_BRONZONG" ] @@ -144,4 +144,4 @@ "rarity": 20, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json index 1206a0d940..656a8ea6a6 100644 --- a/res/pokemon/budew/data.json +++ b/res/pokemon/budew/data.json @@ -94,7 +94,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS_DAY", + "EVO_LEVEL_HAPPINESS_DAY", "SPECIES_ROSELIA" ] ], @@ -124,4 +124,4 @@ "rarity": 10, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json index 850250589a..6e49639cf6 100644 --- a/res/pokemon/buizel/data.json +++ b/res/pokemon/buizel/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 26, "SPECIES_FLOATZEL" ] @@ -135,4 +135,4 @@ "rarity": 20, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json index b1d88da784..f8cf3bcdb5 100644 --- a/res/pokemon/bulbasaur/data.json +++ b/res/pokemon/bulbasaur/data.json @@ -103,7 +103,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_IVYSAUR" ] @@ -134,4 +134,4 @@ "rarity": 30, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json index 002f4546b0..8b84397292 100644 --- a/res/pokemon/buneary/data.json +++ b/res/pokemon/buneary/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_LOPUNNY" ] ], @@ -141,4 +141,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json index 18fe2f80a7..1676280dc6 100644 --- a/res/pokemon/cacnea/data.json +++ b/res/pokemon/cacnea/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_CACTURNE" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json index 119efd6977..911bd4ddcf 100644 --- a/res/pokemon/carvanha/data.json +++ b/res/pokemon/carvanha/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_SHARPEDO" ] @@ -139,4 +139,4 @@ "rarity": 30, "unused": 4099 } -} \ No newline at end of file +} diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json index ee13edfaf0..5049fdfada 100644 --- a/res/pokemon/cascoon/data.json +++ b/res/pokemon/cascoon/data.json @@ -55,7 +55,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 10, "SPECIES_DUSTOX" ] @@ -86,4 +86,4 @@ "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json index 6e5dd4e515..211a2d54cb 100644 --- a/res/pokemon/caterpie/data.json +++ b/res/pokemon/caterpie/data.json @@ -58,7 +58,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 7, "SPECIES_METAPOD" ] @@ -89,4 +89,4 @@ "rarity": 50, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json index 6352adb0e0..0d19c8601b 100644 --- a/res/pokemon/chansey/data.json +++ b/res/pokemon/chansey/data.json @@ -137,7 +137,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_BLISSEY" ] ], @@ -167,4 +167,4 @@ "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json index 6a55f5669c..11c08ea2c5 100644 --- a/res/pokemon/charmander/data.json +++ b/res/pokemon/charmander/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_CHARMELEON" ] @@ -138,4 +138,4 @@ "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json index 51942c94e3..0995f7bb55 100644 --- a/res/pokemon/charmeleon/data.json +++ b/res/pokemon/charmeleon/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_CHARIZARD" ] @@ -139,4 +139,4 @@ "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json index cca0d1960a..6e8a66bbdd 100644 --- a/res/pokemon/cherubi/data.json +++ b/res/pokemon/cherubi/data.json @@ -93,7 +93,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_CHERRIM" ] @@ -124,4 +124,4 @@ "rarity": 10, "unused": 4364 } -} \ No newline at end of file +} diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json index 762dc87a21..95f9e783fe 100644 --- a/res/pokemon/chikorita/data.json +++ b/res/pokemon/chikorita/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_BAYLEEF" ] @@ -135,4 +135,4 @@ "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json index a219c7be73..e78ee8f1c9 100644 --- a/res/pokemon/chimchar/data.json +++ b/res/pokemon/chimchar/data.json @@ -118,7 +118,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 14, "SPECIES_MONFERNO" ] @@ -149,4 +149,4 @@ "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json index fbf1714e08..eabb14d298 100644 --- a/res/pokemon/chinchou/data.json +++ b/res/pokemon/chinchou/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 27, "SPECIES_LANTURN" ] @@ -136,4 +136,4 @@ "rarity": 30, "unused": 1795 } -} \ No newline at end of file +} diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json index 4f07386a62..ebaedf8fba 100644 --- a/res/pokemon/chingling/data.json +++ b/res/pokemon/chingling/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS_NIGHT", + "EVO_LEVEL_HAPPINESS_NIGHT", "SPECIES_CHIMECHO" ] ], @@ -137,4 +137,4 @@ "rarity": 20, "unused": 1297 } -} \ No newline at end of file +} diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json index 8f18bf8e79..ccde895d63 100644 --- a/res/pokemon/clamperl/data.json +++ b/res/pokemon/clamperl/data.json @@ -87,12 +87,12 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_DEEPSEATOOTH", "SPECIES_HUNTAIL" ], [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_DEEPSEASCALE", "SPECIES_GOREBYSS" ] @@ -123,4 +123,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json index 1674769b46..6a814bca43 100644 --- a/res/pokemon/cleffa/data.json +++ b/res/pokemon/cleffa/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_CLEFAIRY" ] ], @@ -140,4 +140,4 @@ "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json index ef034a7a73..d866de071f 100644 --- a/res/pokemon/combusken/data.json +++ b/res/pokemon/combusken/data.json @@ -117,7 +117,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_BLAZIKEN" ] @@ -148,4 +148,4 @@ "rarity": 10, "unused": 2306 } -} \ No newline at end of file +} diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json index 8a6f938307..20991f56c5 100644 --- a/res/pokemon/corphish/data.json +++ b/res/pokemon/corphish/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_CRAWDAUNT" ] @@ -145,4 +145,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json index 6dbaa5560d..d7542cdda8 100644 --- a/res/pokemon/cranidos/data.json +++ b/res/pokemon/cranidos/data.json @@ -121,7 +121,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_RAMPARDOS" ] @@ -152,4 +152,4 @@ "rarity": 20, "unused": 3595 } -} \ No newline at end of file +} diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json index 2ab6ea9ce0..5e980e2fd8 100644 --- a/res/pokemon/croagunk/data.json +++ b/res/pokemon/croagunk/data.json @@ -121,7 +121,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 37, "SPECIES_TOXICROAK" ] @@ -152,4 +152,4 @@ "rarity": 3, "unused": 4108 } -} \ No newline at end of file +} diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json index 398cede217..31d1cdab51 100644 --- a/res/pokemon/croconaw/data.json +++ b/res/pokemon/croconaw/data.json @@ -118,7 +118,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_FERALIGATR" ] @@ -149,4 +149,4 @@ "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/cubone/data.json b/res/pokemon/cubone/data.json index ee02d2ee81..21396034cb 100644 --- a/res/pokemon/cubone/data.json +++ b/res/pokemon/cubone/data.json @@ -116,7 +116,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 28, "SPECIES_MAROWAK" ] @@ -147,4 +147,4 @@ "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/cyndaquil/data.json b/res/pokemon/cyndaquil/data.json index 987e8f4f02..118544e6b8 100644 --- a/res/pokemon/cyndaquil/data.json +++ b/res/pokemon/cyndaquil/data.json @@ -97,7 +97,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 14, "SPECIES_QUILAVA" ] @@ -128,4 +128,4 @@ "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/diglett/data.json b/res/pokemon/diglett/data.json index a3398f72c2..050353c77e 100644 --- a/res/pokemon/diglett/data.json +++ b/res/pokemon/diglett/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 26, "SPECIES_DUGTRIO" ] @@ -132,4 +132,4 @@ "rarity": 50, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/doduo/data.json b/res/pokemon/doduo/data.json index 2819181032..766bdd0ed5 100644 --- a/res/pokemon/doduo/data.json +++ b/res/pokemon/doduo/data.json @@ -97,7 +97,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 31, "SPECIES_DODRIO" ] @@ -128,4 +128,4 @@ "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/dragonair/data.json b/res/pokemon/dragonair/data.json index 8e12610802..03a9f50916 100644 --- a/res/pokemon/dragonair/data.json +++ b/res/pokemon/dragonair/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 55, "SPECIES_DRAGONITE" ] @@ -141,4 +141,4 @@ "rarity": 10, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index 15653d52bc..f1ecd55cde 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_DRAGONAIR" ] @@ -139,4 +139,4 @@ "rarity": 20, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 69a650cfc5..1d32469fe6 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -121,7 +121,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 28, "SPECIES_DRIFBLIM" ] @@ -152,4 +152,4 @@ "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/drowzee/data.json b/res/pokemon/drowzee/data.json index 950ace0f72..b666314c27 100644 --- a/res/pokemon/drowzee/data.json +++ b/res/pokemon/drowzee/data.json @@ -116,7 +116,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 26, "SPECIES_HYPNO" ] @@ -147,4 +147,4 @@ "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/dusclops/data.json b/res/pokemon/dusclops/data.json index a601e70bf2..444fa66fb9 100644 --- a/res/pokemon/dusclops/data.json +++ b/res/pokemon/dusclops/data.json @@ -132,7 +132,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_REAPER_CLOTH", "SPECIES_DUSKNOIR" ] @@ -163,4 +163,4 @@ "rarity": 20, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/duskull/data.json b/res/pokemon/duskull/data.json index ac1917213e..be399aec1c 100644 --- a/res/pokemon/duskull/data.json +++ b/res/pokemon/duskull/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 37, "SPECIES_DUSCLOPS" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/eevee/data.json b/res/pokemon/eevee/data.json index dc6d032322..13bba39656 100644 --- a/res/pokemon/eevee/data.json +++ b/res/pokemon/eevee/data.json @@ -92,11 +92,11 @@ }, "evolutions": [ [ - "EVO_MOSSY_STONE", + "EVO_LEVEL_MOSS_ROCK", "SPECIES_LEAFEON" ], [ - "EVO_ICY_STONE", + "EVO_LEVEL_ICE_ROCK", "SPECIES_GLACEON" ], [ @@ -115,11 +115,11 @@ "SPECIES_FLAREON" ], [ - "EVO_HAPPINESS_DAY", + "EVO_LEVEL_HAPPINESS_DAY", "SPECIES_ESPEON" ], [ - "EVO_HAPPINESS_NIGHT", + "EVO_LEVEL_HAPPINESS_NIGHT", "SPECIES_UMBREON" ] ], @@ -149,4 +149,4 @@ "rarity": 3, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/ekans/data.json b/res/pokemon/ekans/data.json index 997b5de794..e5415a60c5 100644 --- a/res/pokemon/ekans/data.json +++ b/res/pokemon/ekans/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 22, "SPECIES_ARBOK" ] @@ -140,4 +140,4 @@ "rarity": 50, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/electabuzz/data.json b/res/pokemon/electabuzz/data.json index 0323f11731..e395d8fa49 100644 --- a/res/pokemon/electabuzz/data.json +++ b/res/pokemon/electabuzz/data.json @@ -113,7 +113,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_ELECTIRIZER", "SPECIES_ELECTIVIRE" ] @@ -144,4 +144,4 @@ "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/electrike/data.json b/res/pokemon/electrike/data.json index 0aa1f37923..b371adc7e6 100644 --- a/res/pokemon/electrike/data.json +++ b/res/pokemon/electrike/data.json @@ -100,7 +100,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 26, "SPECIES_MANECTRIC" ] @@ -131,4 +131,4 @@ "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/elekid/data.json b/res/pokemon/elekid/data.json index 4658067439..eb1da51bff 100644 --- a/res/pokemon/elekid/data.json +++ b/res/pokemon/elekid/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_ELECTABUZZ" ] @@ -138,4 +138,4 @@ "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/feebas/data.json b/res/pokemon/feebas/data.json index d9b230fa0f..4c60f32098 100644 --- a/res/pokemon/feebas/data.json +++ b/res/pokemon/feebas/data.json @@ -83,7 +83,7 @@ }, "evolutions": [ [ - "EVO_BEAUTY", + "EVO_LEVEL_BEAUTY", 170, "SPECIES_MILOTIC" ] @@ -114,4 +114,4 @@ "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/finneon/data.json b/res/pokemon/finneon/data.json index e47c84b178..727631b71f 100644 --- a/res/pokemon/finneon/data.json +++ b/res/pokemon/finneon/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 31, "SPECIES_LUMINEON" ] @@ -137,4 +137,4 @@ "rarity": 10, "unused": 3344 } -} \ No newline at end of file +} diff --git a/res/pokemon/flaaffy/data.json b/res/pokemon/flaaffy/data.json index 45b7281a5a..f5c017dfb2 100644 --- a/res/pokemon/flaaffy/data.json +++ b/res/pokemon/flaaffy/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_AMPHAROS" ] @@ -135,4 +135,4 @@ "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/gabite/data.json b/res/pokemon/gabite/data.json index babfc5e513..9cc9e1d53f 100644 --- a/res/pokemon/gabite/data.json +++ b/res/pokemon/gabite/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 48, "SPECIES_GARCHOMP" ] @@ -142,4 +142,4 @@ "rarity": 20, "unused": 4102 } -} \ No newline at end of file +} diff --git a/res/pokemon/gastly/data.json b/res/pokemon/gastly/data.json index f4ea45f2db..62923e2259 100644 --- a/res/pokemon/gastly/data.json +++ b/res/pokemon/gastly/data.json @@ -117,7 +117,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_HAUNTER" ] @@ -148,4 +148,4 @@ "rarity": 30, "unused": 1548 } -} \ No newline at end of file +} diff --git a/res/pokemon/geodude/data.json b/res/pokemon/geodude/data.json index e34309397f..6ec6074d79 100644 --- a/res/pokemon/geodude/data.json +++ b/res/pokemon/geodude/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_GRAVELER" ] @@ -143,4 +143,4 @@ "rarity": 50, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/gible/data.json b/res/pokemon/gible/data.json index e77926564c..5a5a991419 100644 --- a/res/pokemon/gible/data.json +++ b/res/pokemon/gible/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 24, "SPECIES_GABITE" ] @@ -138,4 +138,4 @@ "rarity": 30, "unused": 1030 } -} \ No newline at end of file +} diff --git a/res/pokemon/glameow/data.json b/res/pokemon/glameow/data.json index 5a3e76c0cb..0f3dabd2d1 100644 --- a/res/pokemon/glameow/data.json +++ b/res/pokemon/glameow/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 38, "SPECIES_PURUGLY" ] @@ -140,4 +140,4 @@ "rarity": 30, "unused": 4102 } -} \ No newline at end of file +} diff --git a/res/pokemon/gligar/data.json b/res/pokemon/gligar/data.json index b03998f337..ad14327672 100644 --- a/res/pokemon/gligar/data.json +++ b/res/pokemon/gligar/data.json @@ -119,7 +119,7 @@ }, "evolutions": [ [ - "EVO_USE_ITEM_NIGHT", + "EVO_LEVEL_WITH_HELD_ITEM_NIGHT", "ITEM_RAZOR_FANG", "SPECIES_GLISCOR" ] @@ -150,4 +150,4 @@ "rarity": 30, "unused": 4360 } -} \ No newline at end of file +} diff --git a/res/pokemon/golbat/data.json b/res/pokemon/golbat/data.json index ab589359e6..5aa00e0034 100644 --- a/res/pokemon/golbat/data.json +++ b/res/pokemon/golbat/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_CROBAT" ] ], @@ -142,4 +142,4 @@ "rarity": 30, "unused": 4358 } -} \ No newline at end of file +} diff --git a/res/pokemon/goldeen/data.json b/res/pokemon/goldeen/data.json index 84db95e06d..8e9c820681 100644 --- a/res/pokemon/goldeen/data.json +++ b/res/pokemon/goldeen/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 33, "SPECIES_SEAKING" ] @@ -132,4 +132,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/grimer/data.json b/res/pokemon/grimer/data.json index 618d3e3f45..bc79dddbaf 100644 --- a/res/pokemon/grimer/data.json +++ b/res/pokemon/grimer/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 38, "SPECIES_MUK" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/grotle/data.json b/res/pokemon/grotle/data.json index d16399fd79..8f20a7e3e6 100644 --- a/res/pokemon/grotle/data.json +++ b/res/pokemon/grotle/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_TORTERRA" ] @@ -138,4 +138,4 @@ "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/grovyle/data.json b/res/pokemon/grovyle/data.json index 1838d8e319..6c37b4be8a 100644 --- a/res/pokemon/grovyle/data.json +++ b/res/pokemon/grovyle/data.json @@ -117,7 +117,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_SCEPTILE" ] @@ -148,4 +148,4 @@ "rarity": 10, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/gulpin/data.json b/res/pokemon/gulpin/data.json index 71ba4772b2..a3d58cf48c 100644 --- a/res/pokemon/gulpin/data.json +++ b/res/pokemon/gulpin/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 26, "SPECIES_SWALOT" ] @@ -140,4 +140,4 @@ "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/happiny/data.json b/res/pokemon/happiny/data.json index 6c6ad0b17c..fc871694af 100644 --- a/res/pokemon/happiny/data.json +++ b/res/pokemon/happiny/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_USE_ITEM_DAY", + "EVO_LEVEL_WITH_HELD_ITEM_DAY", "ITEM_OVAL_STONE", "SPECIES_CHANSEY" ] @@ -136,4 +136,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/hippopotas/data.json b/res/pokemon/hippopotas/data.json index db30b1ba8b..5c32a43d3c 100644 --- a/res/pokemon/hippopotas/data.json +++ b/res/pokemon/hippopotas/data.json @@ -96,7 +96,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 34, "SPECIES_HIPPOWDON" ] @@ -127,4 +127,4 @@ "rarity": 20, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/hoothoot/data.json b/res/pokemon/hoothoot/data.json index 43b62a990d..7bcd6ccab4 100644 --- a/res/pokemon/hoothoot/data.json +++ b/res/pokemon/hoothoot/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_NOCTOWL" ] @@ -141,4 +141,4 @@ "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/hoppip/data.json b/res/pokemon/hoppip/data.json index b83c1b77ed..e5ce8bbb8d 100644 --- a/res/pokemon/hoppip/data.json +++ b/res/pokemon/hoppip/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_SKIPLOOM" ] @@ -132,4 +132,4 @@ "rarity": 30, "unused": 4353 } -} \ No newline at end of file +} diff --git a/res/pokemon/horsea/data.json b/res/pokemon/horsea/data.json index 23a5be257f..744542a046 100644 --- a/res/pokemon/horsea/data.json +++ b/res/pokemon/horsea/data.json @@ -99,7 +99,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_SEADRA" ] @@ -130,4 +130,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/houndour/data.json b/res/pokemon/houndour/data.json index fb04904621..2345b98a62 100644 --- a/res/pokemon/houndour/data.json +++ b/res/pokemon/houndour/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 24, "SPECIES_HOUNDOOM" ] @@ -142,4 +142,4 @@ "rarity": 30, "unused": 528 } -} \ No newline at end of file +} diff --git a/res/pokemon/igglybuff/data.json b/res/pokemon/igglybuff/data.json index 4b0fc68948..fa73263aea 100644 --- a/res/pokemon/igglybuff/data.json +++ b/res/pokemon/igglybuff/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_JIGGLYPUFF" ] ], @@ -136,4 +136,4 @@ "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/ivysaur/data.json b/res/pokemon/ivysaur/data.json index ed70ec7b57..1bb4be44bf 100644 --- a/res/pokemon/ivysaur/data.json +++ b/res/pokemon/ivysaur/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_VENUSAUR" ] @@ -138,4 +138,4 @@ "rarity": 10, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/kabuto/data.json b/res/pokemon/kabuto/data.json index c2ee9c9fff..3fe6b0a0a4 100644 --- a/res/pokemon/kabuto/data.json +++ b/res/pokemon/kabuto/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_KABUTOPS" ] @@ -139,4 +139,4 @@ "rarity": 30, "unused": 779 } -} \ No newline at end of file +} diff --git a/res/pokemon/kakuna/data.json b/res/pokemon/kakuna/data.json index e79d3d00b6..a00bc4b9a4 100644 --- a/res/pokemon/kakuna/data.json +++ b/res/pokemon/kakuna/data.json @@ -55,7 +55,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 10, "SPECIES_BEEDRILL" ] @@ -86,4 +86,4 @@ "rarity": 30, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/kirlia/data.json b/res/pokemon/kirlia/data.json index f1dcd3a132..2d943dfa18 100644 --- a/res/pokemon/kirlia/data.json +++ b/res/pokemon/kirlia/data.json @@ -122,7 +122,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_GARDEVOIR" ], @@ -158,4 +158,4 @@ "rarity": 20, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/koffing/data.json b/res/pokemon/koffing/data.json index 5c1b52a229..f2917d1706 100644 --- a/res/pokemon/koffing/data.json +++ b/res/pokemon/koffing/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 35, "SPECIES_WEEZING" ] @@ -137,4 +137,4 @@ "rarity": 30, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/krabby/data.json b/res/pokemon/krabby/data.json index 32582521a2..cd3cf4de6c 100644 --- a/res/pokemon/krabby/data.json +++ b/res/pokemon/krabby/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 28, "SPECIES_KINGLER" ] @@ -145,4 +145,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/kricketot/data.json b/res/pokemon/kricketot/data.json index c222b17d6b..9b564a1605 100644 --- a/res/pokemon/kricketot/data.json +++ b/res/pokemon/kricketot/data.json @@ -61,7 +61,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 10, "SPECIES_KRICKETUNE" ] @@ -92,4 +92,4 @@ "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/lairon/data.json b/res/pokemon/lairon/data.json index d2d6c1cbb3..cbfa5a0fbe 100644 --- a/res/pokemon/lairon/data.json +++ b/res/pokemon/lairon/data.json @@ -120,7 +120,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 42, "SPECIES_AGGRON" ] @@ -151,4 +151,4 @@ "rarity": 20, "unused": 2830 } -} \ No newline at end of file +} diff --git a/res/pokemon/larvitar/data.json b/res/pokemon/larvitar/data.json index e798f70c96..7120f977c9 100644 --- a/res/pokemon/larvitar/data.json +++ b/res/pokemon/larvitar/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_PUPITAR" ] @@ -140,4 +140,4 @@ "rarity": 20, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/ledyba/data.json b/res/pokemon/ledyba/data.json index c1b6b30b27..e221c40186 100644 --- a/res/pokemon/ledyba/data.json +++ b/res/pokemon/ledyba/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_LEDIAN" ] @@ -142,4 +142,4 @@ "rarity": 50, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/lickitung/data.json b/res/pokemon/lickitung/data.json index 6ad662d682..afc836c718 100644 --- a/res/pokemon/lickitung/data.json +++ b/res/pokemon/lickitung/data.json @@ -125,7 +125,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_ROLLOUT", "SPECIES_LICKILICKY" ] @@ -156,4 +156,4 @@ "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/lileep/data.json b/res/pokemon/lileep/data.json index 75225075f4..c54e82fca5 100644 --- a/res/pokemon/lileep/data.json +++ b/res/pokemon/lileep/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_CRADILY" ] @@ -138,4 +138,4 @@ "rarity": 20, "unused": 267 } -} \ No newline at end of file +} diff --git a/res/pokemon/lotad/data.json b/res/pokemon/lotad/data.json index 6966722dfa..be7c094787 100644 --- a/res/pokemon/lotad/data.json +++ b/res/pokemon/lotad/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 14, "SPECIES_LOMBRE" ] @@ -132,4 +132,4 @@ "rarity": 50, "unused": 259 } -} \ No newline at end of file +} diff --git a/res/pokemon/loudred/data.json b/res/pokemon/loudred/data.json index 6189c3d556..8a7c731201 100644 --- a/res/pokemon/loudred/data.json +++ b/res/pokemon/loudred/data.json @@ -118,7 +118,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_EXPLOUD" ] @@ -149,4 +149,4 @@ "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/luxio/data.json b/res/pokemon/luxio/data.json index f8ee4b9dd8..58a1bc6c9d 100644 --- a/res/pokemon/luxio/data.json +++ b/res/pokemon/luxio/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_LUXRAY" ] @@ -132,4 +132,4 @@ "rarity": 20, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/machop/data.json b/res/pokemon/machop/data.json index 70ee7929c3..aadc4e03dc 100644 --- a/res/pokemon/machop/data.json +++ b/res/pokemon/machop/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 28, "SPECIES_MACHOKE" ] @@ -142,4 +142,4 @@ "rarity": 30, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/magby/data.json b/res/pokemon/magby/data.json index 13a8ccd2b6..3b51eecd82 100644 --- a/res/pokemon/magby/data.json +++ b/res/pokemon/magby/data.json @@ -102,7 +102,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_MAGMAR" ] @@ -133,4 +133,4 @@ "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/magikarp/data.json b/res/pokemon/magikarp/data.json index 13bbd79050..964e762420 100644 --- a/res/pokemon/magikarp/data.json +++ b/res/pokemon/magikarp/data.json @@ -56,7 +56,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_GYARADOS" ] @@ -87,4 +87,4 @@ "rarity": 50, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/magmar/data.json b/res/pokemon/magmar/data.json index d3ea2865b9..fb67b0667d 100644 --- a/res/pokemon/magmar/data.json +++ b/res/pokemon/magmar/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_MAGMARIZER", "SPECIES_MAGMORTAR" ] @@ -138,4 +138,4 @@ "rarity": 20, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/magnemite/data.json b/res/pokemon/magnemite/data.json index 7684ba4878..4b5b32355c 100644 --- a/res/pokemon/magnemite/data.json +++ b/res/pokemon/magnemite/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_MAGNETON" ] @@ -136,4 +136,4 @@ "rarity": 30, "unused": 3591 } -} \ No newline at end of file +} diff --git a/res/pokemon/magneton/data.json b/res/pokemon/magneton/data.json index 9942bf8d86..9e53f541ca 100644 --- a/res/pokemon/magneton/data.json +++ b/res/pokemon/magneton/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_ELECTRIC_FIELD", + "EVO_LEVEL_MAGNETIC_FIELD", "SPECIES_MAGNEZONE" ] ], @@ -140,4 +140,4 @@ "rarity": 20, "unused": 3591 } -} \ No newline at end of file +} diff --git a/res/pokemon/makuhita/data.json b/res/pokemon/makuhita/data.json index 5a7d8ab731..af57ce72cf 100644 --- a/res/pokemon/makuhita/data.json +++ b/res/pokemon/makuhita/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 24, "SPECIES_HARIYAMA" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/mankey/data.json b/res/pokemon/mankey/data.json index 04a53975eb..f64f6dec24 100644 --- a/res/pokemon/mankey/data.json +++ b/res/pokemon/mankey/data.json @@ -123,7 +123,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 28, "SPECIES_PRIMEAPE" ] @@ -154,4 +154,4 @@ "rarity": 30, "unused": 2313 } -} \ No newline at end of file +} diff --git a/res/pokemon/mantyke/data.json b/res/pokemon/mantyke/data.json index 2d9ce52763..b590d64eb0 100644 --- a/res/pokemon/mantyke/data.json +++ b/res/pokemon/mantyke/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_MON_IN_PARTY", + "EVO_LEVEL_SPECIES_IN_PARTY", "SPECIES_REMORAID", "SPECIES_MANTINE" ] @@ -132,4 +132,4 @@ "rarity": 3, "unused": 3593 } -} \ No newline at end of file +} diff --git a/res/pokemon/mareep/data.json b/res/pokemon/mareep/data.json index dd7172143f..007d679f0c 100644 --- a/res/pokemon/mareep/data.json +++ b/res/pokemon/mareep/data.json @@ -93,7 +93,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 15, "SPECIES_FLAAFFY" ] @@ -124,4 +124,4 @@ "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/marill/data.json b/res/pokemon/marill/data.json index 0a56601f39..57067ae3e3 100644 --- a/res/pokemon/marill/data.json +++ b/res/pokemon/marill/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_AZUMARILL" ] @@ -137,4 +137,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/marshtomp/data.json b/res/pokemon/marshtomp/data.json index 781f72df15..31b530b5ff 100644 --- a/res/pokemon/marshtomp/data.json +++ b/res/pokemon/marshtomp/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_SWAMPERT" ] @@ -145,4 +145,4 @@ "rarity": 10, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/meditite/data.json b/res/pokemon/meditite/data.json index f68000a817..7a584423ce 100644 --- a/res/pokemon/meditite/data.json +++ b/res/pokemon/meditite/data.json @@ -117,7 +117,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 37, "SPECIES_MEDICHAM" ] @@ -148,4 +148,4 @@ "rarity": 30, "unused": 2569 } -} \ No newline at end of file +} diff --git a/res/pokemon/meowth/data.json b/res/pokemon/meowth/data.json index 8770d57f8d..42de2f9293 100644 --- a/res/pokemon/meowth/data.json +++ b/res/pokemon/meowth/data.json @@ -118,7 +118,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 28, "SPECIES_PERSIAN" ] @@ -149,4 +149,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/metang/data.json b/res/pokemon/metang/data.json index 8e1ce7b5e9..ea3e1e2ac4 100644 --- a/res/pokemon/metang/data.json +++ b/res/pokemon/metang/data.json @@ -125,7 +125,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 45, "SPECIES_METAGROSS" ] @@ -156,4 +156,4 @@ "rarity": 10, "unused": 2574 } -} \ No newline at end of file +} diff --git a/res/pokemon/metapod/data.json b/res/pokemon/metapod/data.json index f3e88e72e5..a2a3c601f8 100644 --- a/res/pokemon/metapod/data.json +++ b/res/pokemon/metapod/data.json @@ -55,7 +55,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 10, "SPECIES_BUTTERFREE" ] @@ -86,4 +86,4 @@ "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/mime_jr/data.json b/res/pokemon/mime_jr/data.json index 67380e030e..6498cc93c4 100644 --- a/res/pokemon/mime_jr/data.json +++ b/res/pokemon/mime_jr/data.json @@ -126,7 +126,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_MIMIC", "SPECIES_MR_MIME" ] @@ -157,4 +157,4 @@ "rarity": 3, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/monferno/data.json b/res/pokemon/monferno/data.json index ea1547f053..eddcd80a95 100644 --- a/res/pokemon/monferno/data.json +++ b/res/pokemon/monferno/data.json @@ -123,7 +123,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_INFERNAPE" ] @@ -154,4 +154,4 @@ "rarity": 10, "unused": 2306 } -} \ No newline at end of file +} diff --git a/res/pokemon/mudkip/data.json b/res/pokemon/mudkip/data.json index f217242442..38f85c5c6a 100644 --- a/res/pokemon/mudkip/data.json +++ b/res/pokemon/mudkip/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_MARSHTOMP" ] @@ -137,4 +137,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/munchlax/data.json b/res/pokemon/munchlax/data.json index 71a7de80f6..ba1f97ce87 100644 --- a/res/pokemon/munchlax/data.json +++ b/res/pokemon/munchlax/data.json @@ -124,7 +124,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_SNORLAX" ] ], @@ -154,4 +154,4 @@ "rarity": 20, "unused": 2310 } -} \ No newline at end of file +} diff --git a/res/pokemon/natu/data.json b/res/pokemon/natu/data.json index cd5ce2efc3..add71f223e 100644 --- a/res/pokemon/natu/data.json +++ b/res/pokemon/natu/data.json @@ -121,7 +121,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_XATU" ] @@ -152,4 +152,4 @@ "rarity": 30, "unused": 4362 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidoran_f/data.json b/res/pokemon/nidoran_f/data.json index 108bc375ab..d0216a03da 100644 --- a/res/pokemon/nidoran_f/data.json +++ b/res/pokemon/nidoran_f/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_NIDORINA" ] @@ -136,4 +136,4 @@ "rarity": 50, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/nidoran_m/data.json b/res/pokemon/nidoran_m/data.json index e1d52a6609..97fefd40c7 100644 --- a/res/pokemon/nidoran_m/data.json +++ b/res/pokemon/nidoran_m/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_NIDORINO" ] @@ -136,4 +136,4 @@ "rarity": 50, "unused": 1542 } -} \ No newline at end of file +} diff --git a/res/pokemon/nosepass/data.json b/res/pokemon/nosepass/data.json index 946b6402f1..4dc70c6351 100644 --- a/res/pokemon/nosepass/data.json +++ b/res/pokemon/nosepass/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_ELECTRIC_FIELD", + "EVO_LEVEL_MAGNETIC_FIELD", "SPECIES_PROBOPASS" ] ], @@ -140,4 +140,4 @@ "rarity": 20, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/numel/data.json b/res/pokemon/numel/data.json index 45891ee9f5..12c90b5f09 100644 --- a/res/pokemon/numel/data.json +++ b/res/pokemon/numel/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 33, "SPECIES_CAMERUPT" ] @@ -132,4 +132,4 @@ "rarity": 30, "unused": 2050 } -} \ No newline at end of file +} diff --git a/res/pokemon/oddish/data.json b/res/pokemon/oddish/data.json index 7f582faf7a..6b61cea76a 100644 --- a/res/pokemon/oddish/data.json +++ b/res/pokemon/oddish/data.json @@ -95,7 +95,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 21, "SPECIES_GLOOM" ] @@ -126,4 +126,4 @@ "rarity": 50, "unused": 1537 } -} \ No newline at end of file +} diff --git a/res/pokemon/omanyte/data.json b/res/pokemon/omanyte/data.json index 534098ef2d..64bcf16549 100644 --- a/res/pokemon/omanyte/data.json +++ b/res/pokemon/omanyte/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_OMASTAR" ] @@ -139,4 +139,4 @@ "rarity": 30, "unused": 779 } -} \ No newline at end of file +} diff --git a/res/pokemon/onix/data.json b/res/pokemon/onix/data.json index df5b8f7c96..73a2c2b291 100644 --- a/res/pokemon/onix/data.json +++ b/res/pokemon/onix/data.json @@ -117,7 +117,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_METAL_COAT", "SPECIES_STEELIX" ] @@ -148,4 +148,4 @@ "rarity": 10, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/paras/data.json b/res/pokemon/paras/data.json index ae64fbf634..a9f54ad00a 100644 --- a/res/pokemon/paras/data.json +++ b/res/pokemon/paras/data.json @@ -103,7 +103,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 24, "SPECIES_PARASECT" ] @@ -134,4 +134,4 @@ "rarity": 50, "unused": 260 } -} \ No newline at end of file +} diff --git a/res/pokemon/phanpy/data.json b/res/pokemon/phanpy/data.json index 1cb3f3d6c9..7f737b1a36 100644 --- a/res/pokemon/phanpy/data.json +++ b/res/pokemon/phanpy/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_DONPHAN" ] @@ -135,4 +135,4 @@ "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/pichu/data.json b/res/pokemon/pichu/data.json index 6d805bed81..4c078f414d 100644 --- a/res/pokemon/pichu/data.json +++ b/res/pokemon/pichu/data.json @@ -96,7 +96,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_PIKACHU" ] ], @@ -126,4 +126,4 @@ "rarity": 10, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/pidgeotto/data.json b/res/pokemon/pidgeotto/data.json index 9bd031c95c..83468739cb 100644 --- a/res/pokemon/pidgeotto/data.json +++ b/res/pokemon/pidgeotto/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_PIDGEOT" ] @@ -135,4 +135,4 @@ "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/pidgey/data.json b/res/pokemon/pidgey/data.json index 7d00e141be..f7d703f695 100644 --- a/res/pokemon/pidgey/data.json +++ b/res/pokemon/pidgey/data.json @@ -100,7 +100,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_PIDGEOTTO" ] @@ -131,4 +131,4 @@ "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/piloswine/data.json b/res/pokemon/piloswine/data.json index 949b1f5a74..e2ff0c03d3 100644 --- a/res/pokemon/piloswine/data.json +++ b/res/pokemon/piloswine/data.json @@ -115,7 +115,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_ANCIENT_POWER", "SPECIES_MAMOSWINE" ] @@ -146,4 +146,4 @@ "rarity": 20, "unused": 2061 } -} \ No newline at end of file +} diff --git a/res/pokemon/pineco/data.json b/res/pokemon/pineco/data.json index 7c316b0ded..286c6a2e78 100644 --- a/res/pokemon/pineco/data.json +++ b/res/pokemon/pineco/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 31, "SPECIES_FORRETRESS" ] @@ -135,4 +135,4 @@ "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/piplup/data.json b/res/pokemon/piplup/data.json index c3ab93b331..d7da9e8fa0 100644 --- a/res/pokemon/piplup/data.json +++ b/res/pokemon/piplup/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_PRINPLUP" ] @@ -136,4 +136,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/poliwag/data.json b/res/pokemon/poliwag/data.json index 9eceeba8c5..a07e19de12 100644 --- a/res/pokemon/poliwag/data.json +++ b/res/pokemon/poliwag/data.json @@ -96,7 +96,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_POLIWHIRL" ] @@ -127,4 +127,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/poliwhirl/data.json b/res/pokemon/poliwhirl/data.json index e440cfdf0a..ab801891b6 100644 --- a/res/pokemon/poliwhirl/data.json +++ b/res/pokemon/poliwhirl/data.json @@ -113,7 +113,7 @@ "SPECIES_POLIWRATH" ], [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_KINGS_ROCK", "SPECIES_POLITOED" ] @@ -144,4 +144,4 @@ "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/ponyta/data.json b/res/pokemon/ponyta/data.json index 99f8651212..2a1eb48fb0 100644 --- a/res/pokemon/ponyta/data.json +++ b/res/pokemon/ponyta/data.json @@ -95,7 +95,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_RAPIDASH" ] @@ -126,4 +126,4 @@ "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/poochyena/data.json b/res/pokemon/poochyena/data.json index 9172729106..97a1911a02 100644 --- a/res/pokemon/poochyena/data.json +++ b/res/pokemon/poochyena/data.json @@ -102,7 +102,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_MIGHTYENA" ] @@ -133,4 +133,4 @@ "rarity": 50, "unused": 4112 } -} \ No newline at end of file +} diff --git a/res/pokemon/porygon/data.json b/res/pokemon/porygon/data.json index ed059567af..e7013004ab 100644 --- a/res/pokemon/porygon/data.json +++ b/res/pokemon/porygon/data.json @@ -113,7 +113,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_UPGRADE", "SPECIES_PORYGON2" ] @@ -144,4 +144,4 @@ "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/porygon2/data.json b/res/pokemon/porygon2/data.json index 8c66afa9d2..5c46a3f2ad 100644 --- a/res/pokemon/porygon2/data.json +++ b/res/pokemon/porygon2/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_DUBIOUS_DISC", "SPECIES_PORYGON_Z" ] @@ -145,4 +145,4 @@ "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/prinplup/data.json b/res/pokemon/prinplup/data.json index 6e89374834..df0c792438 100644 --- a/res/pokemon/prinplup/data.json +++ b/res/pokemon/prinplup/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_EMPOLEON" ] @@ -143,4 +143,4 @@ "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/psyduck/data.json b/res/pokemon/psyduck/data.json index 4f1a41383f..a645c9239a 100644 --- a/res/pokemon/psyduck/data.json +++ b/res/pokemon/psyduck/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 33, "SPECIES_GOLDUCK" ] @@ -145,4 +145,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/pupitar/data.json b/res/pokemon/pupitar/data.json index 955883a561..d3a8a195c6 100644 --- a/res/pokemon/pupitar/data.json +++ b/res/pokemon/pupitar/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 55, "SPECIES_TYRANITAR" ] @@ -143,4 +143,4 @@ "rarity": 10, "unused": 2059 } -} \ No newline at end of file +} diff --git a/res/pokemon/quilava/data.json b/res/pokemon/quilava/data.json index 201a65353b..ff9360b1ff 100644 --- a/res/pokemon/quilava/data.json +++ b/res/pokemon/quilava/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_TYPHLOSION" ] @@ -135,4 +135,4 @@ "rarity": 10, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/ralts/data.json b/res/pokemon/ralts/data.json index 76b0fca73d..f8e89ee2ab 100644 --- a/res/pokemon/ralts/data.json +++ b/res/pokemon/ralts/data.json @@ -117,7 +117,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_KIRLIA" ] @@ -148,4 +148,4 @@ "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/rattata/data.json b/res/pokemon/rattata/data.json index 55b97f7b6a..89c5ad702b 100644 --- a/res/pokemon/rattata/data.json +++ b/res/pokemon/rattata/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_RATICATE" ] @@ -142,4 +142,4 @@ "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/remoraid/data.json b/res/pokemon/remoraid/data.json index a73984b289..cc68264523 100644 --- a/res/pokemon/remoraid/data.json +++ b/res/pokemon/remoraid/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_OCTILLERY" ] @@ -136,4 +136,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/rhydon/data.json b/res/pokemon/rhydon/data.json index 39c595608e..e70e8b1ae3 100644 --- a/res/pokemon/rhydon/data.json +++ b/res/pokemon/rhydon/data.json @@ -138,7 +138,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_PROTECTOR", "SPECIES_RHYPERIOR" ] @@ -169,4 +169,4 @@ "rarity": 20, "unused": 2824 } -} \ No newline at end of file +} diff --git a/res/pokemon/rhyhorn/data.json b/res/pokemon/rhyhorn/data.json index 8de41cf0b2..7b7fa3fb23 100644 --- a/res/pokemon/rhyhorn/data.json +++ b/res/pokemon/rhyhorn/data.json @@ -120,7 +120,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 42, "SPECIES_RHYDON" ] @@ -151,4 +151,4 @@ "rarity": 30, "unused": 2824 } -} \ No newline at end of file +} diff --git a/res/pokemon/riolu/data.json b/res/pokemon/riolu/data.json index f47dcb6a0e..d7fd6e0338 100644 --- a/res/pokemon/riolu/data.json +++ b/res/pokemon/riolu/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS_DAY", + "EVO_LEVEL_HAPPINESS_DAY", "SPECIES_LUCARIO" ] ], @@ -141,4 +141,4 @@ "rarity": 20, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/sandshrew/data.json b/res/pokemon/sandshrew/data.json index 2bd8016063..317e9aa768 100644 --- a/res/pokemon/sandshrew/data.json +++ b/res/pokemon/sandshrew/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 22, "SPECIES_SANDSLASH" ] @@ -142,4 +142,4 @@ "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/scyther/data.json b/res/pokemon/scyther/data.json index 5c7bd385c1..253193e43e 100644 --- a/res/pokemon/scyther/data.json +++ b/res/pokemon/scyther/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_METAL_COAT", "SPECIES_SCIZOR" ] @@ -142,4 +142,4 @@ "rarity": 20, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/seadra/data.json b/res/pokemon/seadra/data.json index d6c5706276..e975d9452a 100644 --- a/res/pokemon/seadra/data.json +++ b/res/pokemon/seadra/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_DRAGON_SCALE", "SPECIES_KINGDRA" ] @@ -137,4 +137,4 @@ "rarity": 20, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/sealeo/data.json b/res/pokemon/sealeo/data.json index b3090f47d5..ca62b59b1b 100644 --- a/res/pokemon/sealeo/data.json +++ b/res/pokemon/sealeo/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 44, "SPECIES_WALREIN" ] @@ -140,4 +140,4 @@ "rarity": 20, "unused": 781 } -} \ No newline at end of file +} diff --git a/res/pokemon/seedot/data.json b/res/pokemon/seedot/data.json index 29df3f4607..e1a7e9087e 100644 --- a/res/pokemon/seedot/data.json +++ b/res/pokemon/seedot/data.json @@ -93,7 +93,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 14, "SPECIES_NUZLEAF" ] @@ -124,4 +124,4 @@ "rarity": 50, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/seel/data.json b/res/pokemon/seel/data.json index 2663ac847d..2c4518b6f5 100644 --- a/res/pokemon/seel/data.json +++ b/res/pokemon/seel/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 34, "SPECIES_DEWGONG" ] @@ -132,4 +132,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/sentret/data.json b/res/pokemon/sentret/data.json index 2b6d16b454..b7eadb9f71 100644 --- a/res/pokemon/sentret/data.json +++ b/res/pokemon/sentret/data.json @@ -120,7 +120,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 15, "SPECIES_FURRET" ] @@ -151,4 +151,4 @@ "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/shelgon/data.json b/res/pokemon/shelgon/data.json index 0238fa56f7..00fc4c05b0 100644 --- a/res/pokemon/shelgon/data.json +++ b/res/pokemon/shelgon/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 50, "SPECIES_SALAMENCE" ] @@ -141,4 +141,4 @@ "rarity": 20, "unused": 3855 } -} \ No newline at end of file +} diff --git a/res/pokemon/shellos/data.json b/res/pokemon/shellos/data.json index 003fdb369b..8a07df2bd6 100644 --- a/res/pokemon/shellos/data.json +++ b/res/pokemon/shellos/data.json @@ -92,7 +92,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_GASTRODON" ] @@ -123,4 +123,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/shieldon/data.json b/res/pokemon/shieldon/data.json index 59b583eed3..26abd45059 100644 --- a/res/pokemon/shieldon/data.json +++ b/res/pokemon/shieldon/data.json @@ -113,7 +113,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_BASTIODON" ] @@ -144,4 +144,4 @@ "rarity": 20, "unused": 2827 } -} \ No newline at end of file +} diff --git a/res/pokemon/shinx/data.json b/res/pokemon/shinx/data.json index 9838d1a8f9..bddab1ea26 100644 --- a/res/pokemon/shinx/data.json +++ b/res/pokemon/shinx/data.json @@ -98,7 +98,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 15, "SPECIES_LUXIO" ] @@ -129,4 +129,4 @@ "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/shroomish/data.json b/res/pokemon/shroomish/data.json index 7f0be1685a..e77126fae3 100644 --- a/res/pokemon/shroomish/data.json +++ b/res/pokemon/shroomish/data.json @@ -96,7 +96,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 23, "SPECIES_BRELOOM" ] @@ -127,4 +127,4 @@ "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/shuppet/data.json b/res/pokemon/shuppet/data.json index 9539d92d8e..aba5563a7a 100644 --- a/res/pokemon/shuppet/data.json +++ b/res/pokemon/shuppet/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 37, "SPECIES_BANETTE" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 3084 } -} \ No newline at end of file +} diff --git a/res/pokemon/silcoon/data.json b/res/pokemon/silcoon/data.json index 31c8b3cfac..bd6db0837e 100644 --- a/res/pokemon/silcoon/data.json +++ b/res/pokemon/silcoon/data.json @@ -55,7 +55,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 10, "SPECIES_BEAUTIFLY" ] @@ -86,4 +86,4 @@ "rarity": 30, "unused": 1028 } -} \ No newline at end of file +} diff --git a/res/pokemon/skiploom/data.json b/res/pokemon/skiploom/data.json index d1d87cc0cd..892c74fc96 100644 --- a/res/pokemon/skiploom/data.json +++ b/res/pokemon/skiploom/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 27, "SPECIES_JUMPLUFF" ] @@ -137,4 +137,4 @@ "rarity": 20, "unused": 4353 } -} \ No newline at end of file +} diff --git a/res/pokemon/skorupi/data.json b/res/pokemon/skorupi/data.json index db7680a7b9..8e89ba064b 100644 --- a/res/pokemon/skorupi/data.json +++ b/res/pokemon/skorupi/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_DRAPION" ] @@ -142,4 +142,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/slakoth/data.json b/res/pokemon/slakoth/data.json index 886f3afbc0..346f21e043 100644 --- a/res/pokemon/slakoth/data.json +++ b/res/pokemon/slakoth/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_VIGOROTH" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/slowpoke/data.json b/res/pokemon/slowpoke/data.json index 8ffdb33493..dfa1bca464 100644 --- a/res/pokemon/slowpoke/data.json +++ b/res/pokemon/slowpoke/data.json @@ -122,12 +122,12 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 37, "SPECIES_SLOWBRO" ], [ - "EVO_TRADE_WITH_ITEM", + "EVO_TRADE_WITH_HELD_ITEM", "ITEM_KINGS_ROCK", "SPECIES_SLOWKING" ] @@ -158,4 +158,4 @@ "rarity": 30, "unused": 2563 } -} \ No newline at end of file +} diff --git a/res/pokemon/slugma/data.json b/res/pokemon/slugma/data.json index 86c61ac593..4e0f401dc4 100644 --- a/res/pokemon/slugma/data.json +++ b/res/pokemon/slugma/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 38, "SPECIES_MAGCARGO" ] @@ -132,4 +132,4 @@ "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/smoochum/data.json b/res/pokemon/smoochum/data.json index 569677d6ba..6f59a3420e 100644 --- a/res/pokemon/smoochum/data.json +++ b/res/pokemon/smoochum/data.json @@ -113,7 +113,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_JYNX" ] @@ -144,4 +144,4 @@ "rarity": 10, "unused": 2573 } -} \ No newline at end of file +} diff --git a/res/pokemon/sneasel/data.json b/res/pokemon/sneasel/data.json index 62f2f1383c..654bc8b9ca 100644 --- a/res/pokemon/sneasel/data.json +++ b/res/pokemon/sneasel/data.json @@ -124,7 +124,7 @@ }, "evolutions": [ [ - "EVO_USE_ITEM_NIGHT", + "EVO_LEVEL_WITH_HELD_ITEM_NIGHT", "ITEM_RAZOR_CLAW", "SPECIES_WEAVILE" ] @@ -155,4 +155,4 @@ "rarity": 30, "unused": 3344 } -} \ No newline at end of file +} diff --git a/res/pokemon/snorunt/data.json b/res/pokemon/snorunt/data.json index c81357fc2e..f46872d89f 100644 --- a/res/pokemon/snorunt/data.json +++ b/res/pokemon/snorunt/data.json @@ -97,7 +97,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 42, "SPECIES_GLALIE" ], @@ -133,4 +133,4 @@ "rarity": 30, "unused": 3341 } -} \ No newline at end of file +} diff --git a/res/pokemon/snover/data.json b/res/pokemon/snover/data.json index 64eaccf2c0..d0c8b2f0c7 100644 --- a/res/pokemon/snover/data.json +++ b/res/pokemon/snover/data.json @@ -106,7 +106,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_ABOMASNOW" ] @@ -137,4 +137,4 @@ "rarity": 30, "unused": 2063 } -} \ No newline at end of file +} diff --git a/res/pokemon/snubbull/data.json b/res/pokemon/snubbull/data.json index b229ac4b4e..5fa1e20020 100644 --- a/res/pokemon/snubbull/data.json +++ b/res/pokemon/snubbull/data.json @@ -119,7 +119,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 23, "SPECIES_GRANBULL" ] @@ -150,4 +150,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/spearow/data.json b/res/pokemon/spearow/data.json index d83995667e..9c67163ea8 100644 --- a/res/pokemon/spearow/data.json +++ b/res/pokemon/spearow/data.json @@ -99,7 +99,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_FEAROW" ] @@ -130,4 +130,4 @@ "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/spheal/data.json b/res/pokemon/spheal/data.json index e46bbb6170..e46afe5ad7 100644 --- a/res/pokemon/spheal/data.json +++ b/res/pokemon/spheal/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_SEALEO" ] @@ -138,4 +138,4 @@ "rarity": 30, "unused": 781 } -} \ No newline at end of file +} diff --git a/res/pokemon/spinarak/data.json b/res/pokemon/spinarak/data.json index 6670c70ec7..8928437476 100644 --- a/res/pokemon/spinarak/data.json +++ b/res/pokemon/spinarak/data.json @@ -97,7 +97,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 22, "SPECIES_ARIADOS" ] @@ -128,4 +128,4 @@ "rarity": 50, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/spoink/data.json b/res/pokemon/spoink/data.json index bfe6681c48..af1aa4051a 100644 --- a/res/pokemon/spoink/data.json +++ b/res/pokemon/spoink/data.json @@ -115,7 +115,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 32, "SPECIES_GRUMPIG" ] @@ -146,4 +146,4 @@ "rarity": 30, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/squirtle/data.json b/res/pokemon/squirtle/data.json index c1dd7e9e96..4c002c9715 100644 --- a/res/pokemon/squirtle/data.json +++ b/res/pokemon/squirtle/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_WARTORTLE" ] @@ -140,4 +140,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/staravia/data.json b/res/pokemon/staravia/data.json index c72913f414..362912913a 100644 --- a/res/pokemon/staravia/data.json +++ b/res/pokemon/staravia/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 34, "SPECIES_STARAPTOR" ] @@ -132,4 +132,4 @@ "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/starly/data.json b/res/pokemon/starly/data.json index 740d5eaa66..b212a422a9 100644 --- a/res/pokemon/starly/data.json +++ b/res/pokemon/starly/data.json @@ -100,7 +100,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 14, "SPECIES_STARAVIA" ] @@ -131,4 +131,4 @@ "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/stunky/data.json b/res/pokemon/stunky/data.json index e022010e45..de8f503431 100644 --- a/res/pokemon/stunky/data.json +++ b/res/pokemon/stunky/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 34, "SPECIES_SKUNTANK" ] @@ -139,4 +139,4 @@ "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/surskit/data.json b/res/pokemon/surskit/data.json index f67759d256..2f738a8f69 100644 --- a/res/pokemon/surskit/data.json +++ b/res/pokemon/surskit/data.json @@ -96,7 +96,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 22, "SPECIES_MASQUERAIN" ] @@ -127,4 +127,4 @@ "rarity": 30, "unused": 772 } -} \ No newline at end of file +} diff --git a/res/pokemon/swablu/data.json b/res/pokemon/swablu/data.json index f6b2c36528..831ec6315b 100644 --- a/res/pokemon/swablu/data.json +++ b/res/pokemon/swablu/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 35, "SPECIES_ALTARIA" ] @@ -138,4 +138,4 @@ "rarity": 30, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/swinub/data.json b/res/pokemon/swinub/data.json index 0c2d15ff61..936a581cd4 100644 --- a/res/pokemon/swinub/data.json +++ b/res/pokemon/swinub/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 33, "SPECIES_PILOSWINE" ] @@ -138,4 +138,4 @@ "rarity": 30, "unused": 2061 } -} \ No newline at end of file +} diff --git a/res/pokemon/taillow/data.json b/res/pokemon/taillow/data.json index 332f5eb07f..2fb21ad866 100644 --- a/res/pokemon/taillow/data.json +++ b/res/pokemon/taillow/data.json @@ -99,7 +99,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 22, "SPECIES_SWELLOW" ] @@ -130,4 +130,4 @@ "rarity": 50, "unused": 4357 } -} \ No newline at end of file +} diff --git a/res/pokemon/tangela/data.json b/res/pokemon/tangela/data.json index 076b9218c5..c06bc83ff8 100644 --- a/res/pokemon/tangela/data.json +++ b/res/pokemon/tangela/data.json @@ -110,7 +110,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_ANCIENT_POWER", "SPECIES_TANGROWTH" ] @@ -141,4 +141,4 @@ "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/teddiursa/data.json b/res/pokemon/teddiursa/data.json index 47702e41c4..28c1613ea0 100644 --- a/res/pokemon/teddiursa/data.json +++ b/res/pokemon/teddiursa/data.json @@ -120,7 +120,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_URSARING" ] @@ -151,4 +151,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/tentacool/data.json b/res/pokemon/tentacool/data.json index 6543fd36a5..b7ddf07c93 100644 --- a/res/pokemon/tentacool/data.json +++ b/res/pokemon/tentacool/data.json @@ -101,7 +101,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_TENTACRUEL" ] @@ -132,4 +132,4 @@ "rarity": 50, "unused": 1539 } -} \ No newline at end of file +} diff --git a/res/pokemon/togepi/data.json b/res/pokemon/togepi/data.json index 6b79ef87f3..de6571b41d 100644 --- a/res/pokemon/togepi/data.json +++ b/res/pokemon/togepi/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_HAPPINESS", + "EVO_LEVEL_HAPPINESS", "SPECIES_TOGETIC" ] ], @@ -144,4 +144,4 @@ "rarity": 10, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/torchic/data.json b/res/pokemon/torchic/data.json index 8b57993521..2cfade1db8 100644 --- a/res/pokemon/torchic/data.json +++ b/res/pokemon/torchic/data.json @@ -103,7 +103,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_COMBUSKEN" ] @@ -134,4 +134,4 @@ "rarity": 30, "unused": 514 } -} \ No newline at end of file +} diff --git a/res/pokemon/totodile/data.json b/res/pokemon/totodile/data.json index 05653448fa..d702975731 100644 --- a/res/pokemon/totodile/data.json +++ b/res/pokemon/totodile/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_CROCONAW" ] @@ -145,4 +145,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/trapinch/data.json b/res/pokemon/trapinch/data.json index 52b7dce178..2678590028 100644 --- a/res/pokemon/trapinch/data.json +++ b/res/pokemon/trapinch/data.json @@ -96,7 +96,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 35, "SPECIES_VIBRAVA" ] @@ -127,4 +127,4 @@ "rarity": 30, "unused": 2056 } -} \ No newline at end of file +} diff --git a/res/pokemon/treecko/data.json b/res/pokemon/treecko/data.json index e0d1a034c7..ce41b12d84 100644 --- a/res/pokemon/treecko/data.json +++ b/res/pokemon/treecko/data.json @@ -112,7 +112,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 16, "SPECIES_GROVYLE" ] @@ -143,4 +143,4 @@ "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/turtwig/data.json b/res/pokemon/turtwig/data.json index 8efa843495..a322cc407c 100644 --- a/res/pokemon/turtwig/data.json +++ b/res/pokemon/turtwig/data.json @@ -104,7 +104,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 18, "SPECIES_GROTLE" ] @@ -135,4 +135,4 @@ "rarity": 30, "unused": 257 } -} \ No newline at end of file +} diff --git a/res/pokemon/venonat/data.json b/res/pokemon/venonat/data.json index f7c080da45..df1010469f 100644 --- a/res/pokemon/venonat/data.json +++ b/res/pokemon/venonat/data.json @@ -97,7 +97,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 31, "SPECIES_VENOMOTH" ] @@ -128,4 +128,4 @@ "rarity": 50, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/vibrava/data.json b/res/pokemon/vibrava/data.json index 22711761fb..eb4c52969f 100644 --- a/res/pokemon/vibrava/data.json +++ b/res/pokemon/vibrava/data.json @@ -111,7 +111,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 45, "SPECIES_FLYGON" ] @@ -142,4 +142,4 @@ "rarity": 20, "unused": 3848 } -} \ No newline at end of file +} diff --git a/res/pokemon/vigoroth/data.json b/res/pokemon/vigoroth/data.json index 04e606444e..b9e6e015e2 100644 --- a/res/pokemon/vigoroth/data.json +++ b/res/pokemon/vigoroth/data.json @@ -120,7 +120,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_SLAKING" ] @@ -151,4 +151,4 @@ "rarity": 20, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/voltorb/data.json b/res/pokemon/voltorb/data.json index b5d08b005b..a8f29d4b58 100644 --- a/res/pokemon/voltorb/data.json +++ b/res/pokemon/voltorb/data.json @@ -100,7 +100,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 30, "SPECIES_ELECTRODE" ] @@ -131,4 +131,4 @@ "rarity": 30, "unused": 1799 } -} \ No newline at end of file +} diff --git a/res/pokemon/wailmer/data.json b/res/pokemon/wailmer/data.json index 1a91578c9a..fa1b0c54ed 100644 --- a/res/pokemon/wailmer/data.json +++ b/res/pokemon/wailmer/data.json @@ -103,7 +103,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 40, "SPECIES_WAILORD" ] @@ -134,4 +134,4 @@ "rarity": 30, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/wartortle/data.json b/res/pokemon/wartortle/data.json index 9da37443de..1eae959c77 100644 --- a/res/pokemon/wartortle/data.json +++ b/res/pokemon/wartortle/data.json @@ -113,7 +113,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 36, "SPECIES_BLASTOISE" ] @@ -144,4 +144,4 @@ "rarity": 10, "unused": 771 } -} \ No newline at end of file +} diff --git a/res/pokemon/weedle/data.json b/res/pokemon/weedle/data.json index a2684ba780..76eff6ff18 100644 --- a/res/pokemon/weedle/data.json +++ b/res/pokemon/weedle/data.json @@ -56,7 +56,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 7, "SPECIES_KAKUNA" ] @@ -87,4 +87,4 @@ "rarity": 50, "unused": 1540 } -} \ No newline at end of file +} diff --git a/res/pokemon/whismur/data.json b/res/pokemon/whismur/data.json index afed8639a4..79cde25015 100644 --- a/res/pokemon/whismur/data.json +++ b/res/pokemon/whismur/data.json @@ -103,7 +103,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_LOUDRED" ] @@ -134,4 +134,4 @@ "rarity": 30, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/wingull/data.json b/res/pokemon/wingull/data.json index 5e72a11330..f9a5995bf3 100644 --- a/res/pokemon/wingull/data.json +++ b/res/pokemon/wingull/data.json @@ -107,7 +107,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 25, "SPECIES_PELIPPER" ] @@ -138,4 +138,4 @@ "rarity": 50, "unused": 4355 } -} \ No newline at end of file +} diff --git a/res/pokemon/wooper/data.json b/res/pokemon/wooper/data.json index 82ede9789a..198daa9136 100644 --- a/res/pokemon/wooper/data.json +++ b/res/pokemon/wooper/data.json @@ -109,7 +109,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_QUAGSIRE" ] @@ -140,4 +140,4 @@ "rarity": 30, "unused": 2051 } -} \ No newline at end of file +} diff --git a/res/pokemon/wynaut/data.json b/res/pokemon/wynaut/data.json index 2e657fef18..f4638e09ac 100644 --- a/res/pokemon/wynaut/data.json +++ b/res/pokemon/wynaut/data.json @@ -62,7 +62,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 15, "SPECIES_WOBBUFFET" ] @@ -93,4 +93,4 @@ "rarity": 10, "unused": 2570 } -} \ No newline at end of file +} diff --git a/res/pokemon/yanma/data.json b/res/pokemon/yanma/data.json index 9bb39a7049..72c07045dd 100644 --- a/res/pokemon/yanma/data.json +++ b/res/pokemon/yanma/data.json @@ -108,7 +108,7 @@ }, "evolutions": [ [ - "EVO_KNOW_MOVE", + "EVO_LEVEL_KNOW_MOVE", "MOVE_ANCIENT_POWER", "SPECIES_YANMEGA" ] @@ -139,4 +139,4 @@ "rarity": 10, "unused": 4356 } -} \ No newline at end of file +} diff --git a/res/pokemon/zigzagoon/data.json b/res/pokemon/zigzagoon/data.json index ca4539d55d..5f003bde66 100644 --- a/res/pokemon/zigzagoon/data.json +++ b/res/pokemon/zigzagoon/data.json @@ -114,7 +114,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 20, "SPECIES_LINOONE" ] @@ -145,4 +145,4 @@ "rarity": 50, "unused": 1285 } -} \ No newline at end of file +} diff --git a/res/pokemon/zubat/data.json b/res/pokemon/zubat/data.json index 9f518a7b08..b45cfde32f 100644 --- a/res/pokemon/zubat/data.json +++ b/res/pokemon/zubat/data.json @@ -105,7 +105,7 @@ }, "evolutions": [ [ - "EVO_LEVEL_UP", + "EVO_LEVEL", 22, "SPECIES_GOLBAT" ] @@ -136,4 +136,4 @@ "rarity": 50, "unused": 4358 } -} \ No newline at end of file +} diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 3caa46a00c..91b54aae5f 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -978,7 +978,7 @@ u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2) if (param1[0] < 6) { v0 = Party_GetPokemonBySlotIndex(param0->parties[0], param1[0]); - if ((v1 = sub_02076B94(param0->parties[0], v0, 0, param0->mapEvolutionMethod, param2))) { + if ((v1 = Pokemon_GetEvolutionTargetSpecies(param0->parties[0], v0, EVO_CLASS_BY_LEVEL, param0->mapEvolutionMethod, param2))) { return v1; } } diff --git a/src/map_header.c b/src/map_header.c index 1fc1507f35..97aca1a3a4 100644 --- a/src/map_header.c +++ b/src/map_header.c @@ -256,47 +256,47 @@ enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID) { static const u16 mapEvolutionMethods[] = { MAP_HEADER_ROUTE_217, - EVO_ICY_STONE, + EVO_LEVEL_ICE_ROCK, MAP_HEADER_ETERNA_FOREST, - EVO_MOSSY_STONE, + EVO_LEVEL_MOSS_ROCK, MAP_HEADER_MT_CORONET_1F_SOUTH, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_2F, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_3F, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_OUTSIDE_NORTH, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_OUTSIDE_SOUTH, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_4F_ROOMS_1_AND_2, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_4F_ROOM_3, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_5F, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_6F, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_1F_TUNNEL_ROOM, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_2, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_1, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_MT_CORONET_B1F, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_SPEAR_PILLAR, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_SPEAR_PILLAR_DISTORTED, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_HALL_OF_ORIGIN, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_UNKNOWN_511, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_SPEAR_PILLAR_DIALGA, - EVO_ELECTRIC_FIELD, + EVO_LEVEL_MAGNETIC_FIELD, MAP_HEADER_SPEAR_PILLAR_PALKIA, - EVO_ELECTRIC_FIELD + EVO_LEVEL_MAGNETIC_FIELD }; int i; diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c index e71e4a3e2f..7ff8defc84 100644 --- a/src/overlay094/ov94_022444C8.c +++ b/src/overlay094/ov94_022444C8.c @@ -95,7 +95,7 @@ int ov94_02244678(UnkStruct_ov94_0223FD4C *param0, int param1) int v3; int v4; - v3 = sub_02076B94(NULL, v1, 1, v2, &v4); + v3 = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_TRADE, v2, &v4); if (v3 != 0) { param0->unk_100 = sub_0207AE68(NULL, v1, v3, param0->unk_00->unk_24, param0->unk_00->unk_3C, param0->unk_00->unk_10, param0->unk_00->unk_30, param0->unk_00->records, SaveData_PoketchData(param0->unk_00->unk_20), v4, 0x4, 62); @@ -115,7 +115,7 @@ int ov94_02244678(UnkStruct_ov94_0223FD4C *param0, int param1) int v7; int v8; - v7 = sub_02076B94(NULL, v1, 1, v6, &v8); + v7 = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_TRADE, v6, &v8); if (v7 != 0) { param0->unk_100 = sub_0207AE68(NULL, v1, v7, param0->unk_00->unk_24, param0->unk_00->unk_3C, param0->unk_00->unk_10, param0->unk_00->unk_30, param0->unk_00->records, SaveData_PoketchData(param0->unk_00->unk_20), v8, 0x4, 62); diff --git a/src/pokemon.c b/src/pokemon.c index 4291237425..a35aa73136 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -12,6 +12,8 @@ #include "constants/species.h" #include "consts/abilities.h" #include "consts/gender.h" +#include "consts/items.h" +#include "consts/pokemon.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" @@ -90,17 +92,13 @@ static const s8 sNatureFlavorAffinities[][5] = { { 0x0, 0x0, 0x0, 0x0, 0x0 }, }; -typedef struct PokemonEvolutionMethod { - u16 type; +typedef struct SpeciesEvolution { + u16 method; u16 param; u16 targetSpecies; -} PokemonEvolutionMethod; +} SpeciesEvolution; -typedef struct PokemonEvolutionData { - PokemonEvolutionMethod methods[7]; -} PokemonEvolutionData; - -static enum PokemonDataBlockID { +enum PokemonDataBlockID { DATA_BLOCK_A = 0, DATA_BLOCK_B, DATA_BLOCK_C, @@ -136,7 +134,7 @@ static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID); static void BoxPokemon_CalcAbility(BoxPokemon *boxMon); static void SpeciesData_LoadSpecies(int monSpecies, SpeciesData *speciesData); static void SpeciesData_LoadForm(int monSpecies, int monForm, SpeciesData *speciesData); -static void PokemonEvolutionData_LoadSpecies(int monSpecies, PokemonEvolutionData *monEvolutionData); +static void LoadSpeciesEvolutions(int monSpecies, SpeciesEvolution speciesEvolution[MAX_EVOLUTIONS]); static void Pokemon_EncryptData(void *data, u32 bytes, u32 seed); static void Pokemon_DecryptData(void *data, u32 bytes, u32 seed); static u16 Pokemon_GetDataChecksum(void *data, u32 bytes); @@ -3247,8 +3245,7 @@ BOOL Pokemon_ShouldLevelUp(Pokemon *mon) return FALSE; } -// TODO return species enum (TODO: replace species id defines with enum) -u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int *evoTypeResult) +u16 Pokemon_GetEvolutionTargetSpecies(Party *party, Pokemon *mon, u8 evoClass, u16 evoParam, int *evoTypeResult) { u16 targetSpecies = SPECIES_NONE; @@ -3260,164 +3257,205 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * int i; u16 monFriendship; - u16 monPersonalityUpper = (monPersonality & 0xffff0000) >> 16; - u8 itemHoldEffect = Item_LoadParam(monHeldItem, ITEM_PARAM_HOLD_EFFECT, 0); + u16 monPersonalityUpper = (monPersonality & 0xFFFF0000) >> 16; + u8 itemHoldEffect = Item_LoadParam(monHeldItem, ITEM_PARAM_HOLD_EFFECT, HEAP_ID_SYSTEM); - if (monSpecies != SPECIES_KADABRA) { - if (itemHoldEffect == HOLD_EFFECT_NO_EVOLVE && evoTypeList != 3) { - return 0; - } + if (monSpecies != SPECIES_KADABRA + && itemHoldEffect == HOLD_EFFECT_NO_EVOLVE + && evoClass != EVO_CLASS_BY_ITEM) { + return SPECIES_NONE; } - int v11; + int stackVar; if (evoTypeResult == NULL) { - evoTypeResult = &v11; + evoTypeResult = &stackVar; } - PokemonEvolutionData *monEvolutionData = Heap_AllocFromHeap(0, sizeof(PokemonEvolutionData)); - PokemonEvolutionData_LoadSpecies(monSpecies, monEvolutionData); + SpeciesEvolution *speciesEvolutions = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesEvolution) * MAX_EVOLUTIONS); + LoadSpeciesEvolutions(monSpecies, speciesEvolutions); - // TODO enum? - switch (evoTypeList) { - case 0: + switch (evoClass) { + case EVO_CLASS_BY_LEVEL: { u8 monLevel = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); monFriendship = Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL); - for (i = 0; i < 7; i++) { - switch (monEvolutionData->methods[i].type) { - case 1: // high friendship - if (220 <= monFriendship) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 1; + for (i = 0; i < MAX_EVOLUTIONS; i++) { + switch (speciesEvolutions[i].method) { + case EVO_LEVEL_HAPPINESS: + if (EVOLVE_FRIENDSHIP_THRESHOLD <= monFriendship) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_HAPPINESS; } break; - case 2: // high friendship && daytime - if (IsNight() == 0 && 220 <= monFriendship) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 2; + + case EVO_LEVEL_HAPPINESS_DAY: + if (IsNight() == FALSE && EVOLVE_FRIENDSHIP_THRESHOLD <= monFriendship) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_HAPPINESS_DAY; } break; - case 3: // high friendship && nighttime - if (IsNight() == 1 && 220 <= monFriendship) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 3; + + case EVO_LEVEL_HAPPINESS_NIGHT: + if (IsNight() == TRUE && EVOLVE_FRIENDSHIP_THRESHOLD <= monFriendship) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_HAPPINESS_NIGHT; } break; - case 4: // above level param - if (monEvolutionData->methods[i].param <= monLevel) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 4; + + case EVO_LEVEL: + if (speciesEvolutions[i].param <= monLevel) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL; } break; - case 8: // tyrogue evo to hitmonlee: above level param && attack > defense - if (monEvolutionData->methods[i].param <= monLevel) { + + case EVO_LEVEL_ATK_GT_DEF: + if (speciesEvolutions[i].param <= monLevel) { if (Pokemon_GetValue(mon, MON_DATA_ATK, NULL) > Pokemon_GetValue(mon, MON_DATA_DEF, NULL)) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 8; + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_ATK_GT_DEF; } } break; - case 9: // tyrogue evo to hitmontop: above level param && attack == defense - if (monEvolutionData->methods[i].param <= monLevel) { + + case EVO_LEVEL_ATK_EQ_DEF: + if (speciesEvolutions[i].param <= monLevel) { if (Pokemon_GetValue(mon, MON_DATA_ATK, NULL) == Pokemon_GetValue(mon, MON_DATA_DEF, NULL)) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 9; + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_ATK_EQ_DEF; } } break; - case 10: // tyrogue evo to hitmonchan: above level param && attack < defense - if (monEvolutionData->methods[i].param <= monLevel) { + + case EVO_LEVEL_ATK_LT_DEF: + if (speciesEvolutions[i].param <= monLevel) { if (Pokemon_GetValue(mon, MON_DATA_ATK, NULL) < Pokemon_GetValue(mon, MON_DATA_DEF, NULL)) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 10; + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_ATK_LT_DEF; } } break; - case 11: // wurmple evo to silcoon: above level param && upper16 of personality % 10 < 5 - if (monEvolutionData->methods[i].param <= monLevel) { + + case EVO_LEVEL_PID_LOW: + if (speciesEvolutions[i].param <= monLevel) { if (monPersonalityUpper % 10 < 5) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 11; + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_PID_LOW; } } break; - case 12: // wurmple evo to cascoon: above level param && upper16 of personality % 10 >= 5 - if (monEvolutionData->methods[i].param <= monLevel) { + + case EVO_LEVEL_PID_HIGH: + if (speciesEvolutions[i].param <= monLevel) { if (monPersonalityUpper % 10 >= 5) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 12; + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_PID_HIGH; } } break; - case 13: // nincada evo to ninjask: above level param - if (monEvolutionData->methods[i].param <= monLevel) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 13; + + case EVO_LEVEL_NINJASK: + if (speciesEvolutions[i].param <= monLevel) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_NINJASK; } break; - case 14: // nincada evo to shedinja: ??? - evoTypeResult[0] = 14; + + case EVO_LEVEL_SHEDINJA: + *evoTypeResult = EVO_LEVEL_SHEDINJA; break; - case 15: // feebas evo: beauty > param - if (monEvolutionData->methods[i].param <= monBeauty) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 15; + + case EVO_LEVEL_BEAUTY: + if (speciesEvolutions[i].param <= monBeauty) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_BEAUTY; } break; - case 18: // happiny evo: hold param && daytime - if (IsNight() == 0 && monEvolutionData->methods[i].param == monHeldItem) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 18; + + case EVO_LEVEL_WITH_HELD_ITEM_DAY: + if (IsNight() == FALSE && speciesEvolutions[i].param == monHeldItem) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_WITH_HELD_ITEM_DAY; } break; - case 19: // sneasel and gligar evo: hold param && nighttime - if (IsNight() == 1 && monEvolutionData->methods[i].param == monHeldItem) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 19; + + case EVO_LEVEL_WITH_HELD_ITEM_NIGHT: + if (IsNight() == TRUE && speciesEvolutions[i].param == monHeldItem) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_WITH_HELD_ITEM_NIGHT; } break; - case 20: // lickitung, tangela etc. evo: after param learned - if (Pokemon_HasMove(mon, monEvolutionData->methods[i].param) == 1) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 20; + + case EVO_LEVEL_KNOW_MOVE: + if (Pokemon_HasMove(mon, speciesEvolutions[i].param) == TRUE) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_KNOW_MOVE; } break; - case 21: // mantyke evo: have param in party + + case EVO_LEVEL_SPECIES_IN_PARTY: if (party != NULL) { - if (Party_HasSpecies(party, monEvolutionData->methods[i].param) == 1) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 21; + if (Party_HasSpecies(party, speciesEvolutions[i].param) == TRUE) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_SPECIES_IN_PARTY; } } break; - case 22: // burmy evo to mothim: above level param && male - if (Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == 0 && monEvolutionData->methods[i].param <= monLevel) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 22; + + case EVO_LEVEL_MALE: + if (Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == GENDER_MALE && speciesEvolutions[i].param <= monLevel) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_MALE; } break; - case 23: // burmy evo to wormadam, combee evo to vespiquen: above level param && female - if (Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == 1 && monEvolutionData->methods[i].param <= monLevel) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 23; + + case EVO_LEVEL_FEMALE: + if (Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == GENDER_FEMALE && speciesEvolutions[i].param <= monLevel) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_FEMALE; } break; - case 24: // magneton and nosepass evo: custom check - if (monEvolutionData->methods[i].type == evoParam) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 24; + + case EVO_LEVEL_MAGNETIC_FIELD: + if (speciesEvolutions[i].method == evoParam) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_MAGNETIC_FIELD; } break; - case 25: // eevee evo to leafeon: custom check - if (monEvolutionData->methods[i].type == evoParam) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 25; + + case EVO_LEVEL_MOSS_ROCK: + if (speciesEvolutions[i].method == evoParam) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_MOSS_ROCK; } break; - case 26: // eevee evo to glaceon: custom check - if (monEvolutionData->methods[i].type == evoParam) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 26; + + case EVO_LEVEL_ICE_ROCK: + if (speciesEvolutions[i].method == evoParam) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_LEVEL_ICE_ROCK; + } + break; + } + + if (targetSpecies) { + break; + } + } + } break; + + case EVO_CLASS_BY_TRADE: + for (i = 0; i < MAX_EVOLUTIONS; i++) { + switch (speciesEvolutions[i].method) { + case EVO_TRADE: + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_TRADE; + break; + + case EVO_TRADE_WITH_HELD_ITEM: + if (speciesEvolutions[i].param == monHeldItem) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_TRADE_WITH_HELD_ITEM; } break; } @@ -3427,45 +3465,29 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 1: - for (i = 0; i < 7; i++) { - switch (monEvolutionData->methods[i].type) { - case 5: // kadabra etc. evo: trade - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 5; - break; - case 6: // poliwhirl evo to politoed etc.: trade holding param - if (monEvolutionData->methods[i].param == monHeldItem) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 6; - } + + case EVO_CLASS_UNUSED_02: + case EVO_CLASS_BY_ITEM: + for (i = 0; i < MAX_EVOLUTIONS; i++) { + if (speciesEvolutions[i].method == EVO_USE_ITEM && speciesEvolutions[i].param == evoParam) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_NONE; break; } - if (targetSpecies) { + if (speciesEvolutions[i].method == EVO_USE_ITEM_MALE + && Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == GENDER_MALE + && speciesEvolutions[i].param == evoParam) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_NONE; break; } - } - break; - case 2: - case 3: - for (i = 0; i < 7; i++) { - // use param - if (monEvolutionData->methods[i].type == 7 && monEvolutionData->methods[i].param == evoParam) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 0; - break; - } - // kirlia evo to gallade: use param && male - if (monEvolutionData->methods[i].type == 16 && Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == 0 && monEvolutionData->methods[i].param == evoParam) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 0; - break; - } - // snorunt evo to froslass: use param && female - if (monEvolutionData->methods[i].type == 17 && Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == 1 && monEvolutionData->methods[i].param == evoParam) { - targetSpecies = monEvolutionData->methods[i].targetSpecies; - evoTypeResult[0] = 0; + + if (speciesEvolutions[i].method == EVO_USE_ITEM_FEMALE + && Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == GENDER_FEMALE + && speciesEvolutions[i].param == evoParam) { + targetSpecies = speciesEvolutions[i].targetSpecies; + *evoTypeResult = EVO_NONE; break; } @@ -3476,7 +3498,7 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * break; } - Heap_FreeToHeap(monEvolutionData); + Heap_FreeToHeap(speciesEvolutions); return targetSpecies; } @@ -4546,9 +4568,9 @@ static void SpeciesData_LoadForm(int monSpecies, int monForm, SpeciesData *speci NARC_ReadWholeMemberByIndexPair(speciesData, NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL, monSpecies); } -static void PokemonEvolutionData_LoadSpecies(int monSpecies, PokemonEvolutionData *monEvolutionData) +static void LoadSpeciesEvolutions(int monSpecies, SpeciesEvolution speciesEvolutions[MAX_EVOLUTIONS]) { - NARC_ReadWholeMemberByIndexPair(monEvolutionData, NARC_INDEX_POKETOOL__PERSONAL__EVO, monSpecies); + NARC_ReadWholeMemberByIndexPair(speciesEvolutions, NARC_INDEX_POKETOOL__PERSONAL__EVO, monSpecies); } static void Pokemon_EncryptData(void *data, u32 bytes, u32 seed) diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index c2f3395203..56cf31f6c7 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1072,7 +1072,7 @@ BOOL sub_0203DBF0(FieldTask *param0) int v4; int v5; - if ((v4 = sub_02076B94(NULL, v2->unk_04.unk_40, 1, v3, &v5)) != 0) { + if ((v4 = Pokemon_GetEvolutionTargetSpecies(NULL, v2->unk_04.unk_40, EVO_CLASS_BY_TRADE, v3, &v5)) != 0) { Heap_Create(3, 26, 0x30000); v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_GetPokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26); v2->unk_00 = 6; diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 549762838f..667303d42b 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -2596,7 +2596,7 @@ static int ApplyItemEffectOnPokemon(GameWindowLayout *param0) if (Item_Get(v0, 26) != 0) { Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - param0->unk_5A4->unk_38 = sub_02076B94(NULL, v1, 3, param0->unk_5A4->unk_24, ¶m0->unk_5A4->unk_3C); + param0->unk_5A4->unk_38 = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_ITEM, param0->unk_5A4->unk_24, ¶m0->unk_5A4->unk_3C); param0->unk_5A4->unk_23 = 8; Heap_FreeToHeap(v0); return 32; diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 8f63b71578..c9a13e8885 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -440,7 +440,7 @@ void sub_0208232C(GameWindowLayout *param0, u8 param1) v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); - if (sub_02076B94(NULL, v0, 3, param0->unk_5A4->unk_24, NULL) == 0) { + if (Pokemon_GetEvolutionTargetSpecies(NULL, v0, EVO_CLASS_BY_ITEM, param0->unk_5A4->unk_24, NULL) == 0) { sub_02082810(param0, param1, 1); } else { sub_02082810(param0, param1, 0); diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index d09512c159..508dabe7fa 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -807,7 +807,7 @@ static int sub_02085C50(void *param0) v3 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); fieldSystem = v0->unk_5A4->unk_1C; v5 = MapHeader_GetMapEvolutionMethod(fieldSystem->location->mapId); - v0->unk_5A4->unk_38 = sub_02076B94(v0->unk_5A4->unk_00, v3, 0, v5, &v0->unk_5A4->unk_3C); + v0->unk_5A4->unk_38 = Pokemon_GetEvolutionTargetSpecies(v0->unk_5A4->unk_00, v3, EVO_CLASS_BY_LEVEL, v5, &v0->unk_5A4->unk_3C); if (v0->unk_5A4->unk_38 != 0) { v0->unk_5A4->unk_23 = 9; diff --git a/src/unk_02096420.c b/src/unk_02096420.c index 1f43061796..74ee8b9ac9 100644 --- a/src/unk_02096420.c +++ b/src/unk_02096420.c @@ -90,7 +90,7 @@ u8 CheckItemEffectsOnPokemon(Pokemon *param0, u16 param1, u16 param2, u32 param3 } if (Item_Get(v0, 26) != 0) { - if (sub_02076B94(NULL, param0, 3, param1, NULL) != 0) { + if (Pokemon_GetEvolutionTargetSpecies(NULL, param0, EVO_CLASS_BY_ITEM, param1, NULL) != 0) { Heap_FreeToHeap(v0); return 1; } diff --git a/tools/json2bin/evo.py b/tools/json2bin/evo.py index f3e35d0ff4..f7ce70c275 100644 --- a/tools/json2bin/evo.py +++ b/tools/json2bin/evo.py @@ -17,17 +17,17 @@ def get_evo_params(method: pokemon.PokemonEvoMethod, evo: Sequence): #None of these take an extra parameter if method in set([ pokemon.PokemonEvoMethod.EVO_NONE, - pokemon.PokemonEvoMethod.EVO_HAPPINESS, - pokemon.PokemonEvoMethod.EVO_HAPPINESS_DAY, - pokemon.PokemonEvoMethod.EVO_HAPPINESS_NIGHT, + pokemon.PokemonEvoMethod.EVO_LEVEL_HAPPINESS, + pokemon.PokemonEvoMethod.EVO_LEVEL_HAPPINESS_DAY, + pokemon.PokemonEvoMethod.EVO_LEVEL_HAPPINESS_NIGHT, pokemon.PokemonEvoMethod.EVO_TRADE, - pokemon.PokemonEvoMethod.EVO_ELECTRIC_FIELD, - pokemon.PokemonEvoMethod.EVO_MOSSY_STONE, - pokemon.PokemonEvoMethod.EVO_ICY_STONE]): + pokemon.PokemonEvoMethod.EVO_LEVEL_MAGNETIC_FIELD, + pokemon.PokemonEvoMethod.EVO_LEVEL_MOSS_ROCK, + pokemon.PokemonEvoMethod.EVO_LEVEL_ICE_ROCK]): final_param = 0 # These all specify a basic integer param elif method in set([ - pokemon.PokemonEvoMethod.EVO_LEVEL_UP, + pokemon.PokemonEvoMethod.EVO_LEVEL, pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_GT_DEF, pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_EQ_DEF, pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_LT_DEF, @@ -37,20 +37,20 @@ def get_evo_params(method: pokemon.PokemonEvoMethod, evo: Sequence): pokemon.PokemonEvoMethod.EVO_LEVEL_SHEDINJA, pokemon.PokemonEvoMethod.EVO_LEVEL_MALE, pokemon.PokemonEvoMethod.EVO_LEVEL_FEMALE, - pokemon.PokemonEvoMethod.EVO_BEAUTY]): + pokemon.PokemonEvoMethod.EVO_LEVEL_BEAUTY]): final_param = maybe_param # These specify an item elif method in set([ - pokemon.PokemonEvoMethod.EVO_TRADE_WITH_ITEM, + pokemon.PokemonEvoMethod.EVO_TRADE_WITH_HELD_ITEM, pokemon.PokemonEvoMethod.EVO_USE_ITEM, pokemon.PokemonEvoMethod.EVO_USE_ITEM_MALE, pokemon.PokemonEvoMethod.EVO_USE_ITEM_FEMALE, - pokemon.PokemonEvoMethod.EVO_USE_ITEM_DAY, - pokemon.PokemonEvoMethod.EVO_USE_ITEM_NIGHT]): + pokemon.PokemonEvoMethod.EVO_LEVEL_WITH_HELD_ITEM_DAY, + pokemon.PokemonEvoMethod.EVO_LEVEL_WITH_HELD_ITEM_NIGHT]): final_param = items.Item[maybe_param].value - elif method == pokemon.PokemonEvoMethod.EVO_KNOW_MOVE: + elif method == pokemon.PokemonEvoMethod.EVO_LEVEL_KNOW_MOVE: final_param = moves.Move[maybe_param].value - elif method == pokemon.PokemonEvoMethod.EVO_MON_IN_PARTY: + elif method == pokemon.PokemonEvoMethod.EVO_LEVEL_SPECIES_IN_PARTY: final_param = species.PokemonSpecies[maybe_param].value return final_param From 50eae5bf1c14c5abe4406db6892eeb64cb3b819b Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 14:25:22 -0800 Subject: [PATCH 03/10] Document and clean up learnset-related functions --- include/constants/pokemon.h | 2 + src/pokemon.c | 91 ++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 53 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 41b416a284..fc1a4d7470 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -36,8 +36,10 @@ enum { #define MAX_POKEMON_LEVEL 100 #define LEARNSET_NO_MOVE_TO_LEARN 0 +#define MAX_LEARNSET_ENTRIES 20 #define LEARNSET_MOVE_ALREADY_KNOWN 0xFFFE #define LEARNSET_ALL_SLOTS_FILLED 0xFFFF +#define LEARNSET_SENTINEL_ENTRY 0xFFFF #define EVOLVE_FRIENDSHIP_THRESHOLD 220 diff --git a/src/pokemon.c b/src/pokemon.c index a35aa73136..e494d9f52b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -98,6 +98,12 @@ typedef struct SpeciesEvolution { u16 targetSpecies; } SpeciesEvolution; +// This struct is not explicitly used; it is provided to document and enforce the size of +// the learnset entries. +typedef struct SpeciesLearnset { + __attribute__((aligned(4))) u16 entries[MAX_LEARNSET_ENTRIES + 1]; +} SpeciesLearnset; + enum PokemonDataBlockID { DATA_BLOCK_A = 0, DATA_BLOCK_B, @@ -3538,34 +3544,25 @@ u16 sub_02076FD4(const u16 monSpecies) static void BoxPokemon_SetDefaultMoves(BoxPokemon *boxMon) { - BOOL reencrypt; - // TODO const value? - u16 *monLevelUpMoves = Heap_AllocFromHeap(0, 44); - + BOOL reencrypt; // must pre-declare to match + u16 *monLevelUpMoves = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset)); reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); - u16 monSpecies = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, 0); - int monForm = BoxPokemon_GetValue(boxMon, MON_DATA_FORM, 0); + u16 monSpecies = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, NULL); + int monForm = BoxPokemon_GetValue(boxMon, MON_DATA_FORM, NULL); u8 monLevel = BoxPokemon_GetLevel(boxMon); Pokemon_LoadLevelUpMovesOf(monSpecies, monForm, monLevelUpMoves); - int i = 0; - - // TODO const values for sentinels? - while (monLevelUpMoves[i] != 0xffff) { - if ((monLevelUpMoves[i] & 0xfe00) <= monLevel << 9) { - u16 monLevelUpMoveID = monLevelUpMoves[i] & 0x1ff; - u16 moveID = BoxPokemon_AddMove(boxMon, monLevelUpMoveID); - - if (moveID == 0xffff) { + for (int i = 0; monLevelUpMoves[i] != LEARNSET_SENTINEL_ENTRY; i++) { + if ((monLevelUpMoves[i] & 0xFE00) <= monLevel << 9) { + u16 monLevelUpMoveID = monLevelUpMoves[i] & 0x1FF; + if (BoxPokemon_AddMove(boxMon, monLevelUpMoveID) == LEARNSET_ALL_SLOTS_FILLED) { BoxPokemon_ReplaceMove(boxMon, monLevelUpMoveID); } } else { break; } - - i++; } Heap_FreeToHeap(monLevelUpMoves); @@ -3580,27 +3577,24 @@ u16 Pokemon_AddMove(Pokemon *mon, u16 moveID) static u16 BoxPokemon_AddMove(BoxPokemon *boxMon, u16 moveID) { - // TODO const values for sentinels? - u16 result = 0xffff; - + u16 result = LEARNSET_ALL_SLOTS_FILLED; BOOL reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); for (int i = 0; i < LEARNED_MOVES_MAX; i++) { u16 slotMove; - if ((slotMove = BoxPokemon_GetValue(boxMon, MON_DATA_MOVE1 + i, NULL)) == 0) { + if ((slotMove = BoxPokemon_GetValue(boxMon, MON_DATA_MOVE1 + i, NULL)) == MOVE_NONE) { BoxPokemon_SetMoveSlot(boxMon, moveID, i); result = moveID; break; } else { if (slotMove == moveID) { - result = 0xfffe; + result = LEARNSET_MOVE_ALREADY_KNOWN; break; } } } BoxPokemon_ExitDecryptionContext(boxMon, reencrypt); - return result; } @@ -3618,15 +3612,16 @@ static void BoxPokemon_ReplaceMove(BoxPokemon *boxMon, u16 moveID) u8 movePPs[LEARNED_MOVES_MAX]; u8 movePPUps[LEARNED_MOVES_MAX]; - for (int i = 0; i < 3; i++) { + // Bubble move slots 2 through 4 upwards + for (int i = 0; i < LEARNED_MOVES_MAX - 1; i++) { moveIDs[i] = BoxPokemon_GetValue(boxMon, MON_DATA_MOVE2 + i, NULL); movePPs[i] = BoxPokemon_GetValue(boxMon, MON_DATA_MOVE2_CUR_PP + i, NULL); movePPUps[i] = BoxPokemon_GetValue(boxMon, MON_DATA_MOVE2_PP_UPS + i, NULL); } - moveIDs[3] = moveID; - movePPs[3] = MoveTable_LoadParam(moveID, MOVEATTRIBUTE_PP); - movePPUps[3] = 0; + moveIDs[LEARNED_MOVES_MAX - 1] = moveID; + movePPs[LEARNED_MOVES_MAX - 1] = MoveTable_LoadParam(moveID, MOVEATTRIBUTE_PP); + movePPUps[LEARNED_MOVES_MAX - 1] = 0; for (int i = 0; i < LEARNED_MOVES_MAX; i++) { BoxPokemon_SetValue(boxMon, MON_DATA_MOVE1 + i, &moveIDs[i]); @@ -3641,14 +3636,11 @@ void Pokemon_ResetMoveSlot(Pokemon *mon, u16 moveID, u8 moveSlot) { Pokemon_SetMoveSlot(mon, moveID, moveSlot); - u32 moveMaxPP; - u32 movePPUps = 0; + u32 moveMaxPP, movePPUps = 0; Pokemon_SetValue(mon, MON_DATA_MOVE1_PP_UPS + moveSlot, &movePPUps); moveMaxPP = MoveTable_CalcMaxPP(moveID, 0); Pokemon_SetValue(mon, MON_DATA_MOVE1_CUR_PP + moveSlot, &moveMaxPP); - - return; } void Pokemon_SetMoveSlot(Pokemon *mon, u16 moveID, u8 moveSlot) @@ -3668,40 +3660,34 @@ static void BoxPokemon_SetMoveSlot(BoxPokemon *boxMon, u16 moveID, u8 moveSlot) u16 Pokemon_LevelUpMove(Pokemon *mon, int *index, u16 *moveID) { - u16 result = 0x0; - // TODO const value? - u16 *monLevelUpMoves = Heap_AllocFromHeap(0, 44); - + u16 result = MOVE_NONE; + u16 *monLevelUpMoves = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset)); u16 monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL); u8 monLevel = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); Pokemon_LoadLevelUpMovesOf(monSpecies, monForm, monLevelUpMoves); - // TODO const values for sentinels? - if (monLevelUpMoves[index[0]] == 0xffff) { + if (monLevelUpMoves[*index] == LEARNSET_SENTINEL_ENTRY) { Heap_FreeToHeap(monLevelUpMoves); - return 0x0; + return MOVE_NONE; } - while ((monLevelUpMoves[index[0]] & 0xfe00) != monLevel << 9) { - index[0]++; - - if (monLevelUpMoves[index[0]] == 0xffff) { + while ((monLevelUpMoves[*index] & 0xFE00) != monLevel << 9) { + (*index)++; + if (monLevelUpMoves[*index] == LEARNSET_SENTINEL_ENTRY) { Heap_FreeToHeap(monLevelUpMoves); - return 0x0; + return MOVE_NONE; } } - if ((monLevelUpMoves[index[0]] & 0xfe00) == monLevel << 9) { - moveID[0] = monLevelUpMoves[index[0]] & 0x1ff; - index[0]++; - - result = Pokemon_AddMove(mon, moveID[0]); + if ((monLevelUpMoves[*index] & 0xFE00) == monLevel << 9) { + *moveID = monLevelUpMoves[*index] & 0x1FF; + (*index)++; + result = Pokemon_AddMove(mon, *moveID); } Heap_FreeToHeap(monLevelUpMoves); - return result; } @@ -3874,15 +3860,14 @@ s8 Pokemon_GetFlavorAffinityOf(u32 monPersonality, int flavor) int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMoveIDs) { - u16 *monLevelUpMoves = Heap_AllocFromHeap(0, 44); + u16 *monLevelUpMoves = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset)); Pokemon_LoadLevelUpMovesOf(monSpecies, monForm, monLevelUpMoves); int result = 0; - // TODO const values for sentinels? - while (monLevelUpMoves[result] != 0xffff) { - monLevelUpMoveIDs[result] = monLevelUpMoves[result] & 0x1ff; + while (monLevelUpMoves[result] != LEARNSET_ALL_SLOTS_FILLED) { + monLevelUpMoveIDs[result] = monLevelUpMoves[result] & 0x1FF; result++; } From 2e09fce6a2d072dc4546e2988cfbb323dfece167 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 14:28:59 -0800 Subject: [PATCH 04/10] Extract species-related structs to species.h --- include/constants/pokemon.h | 11 ----- include/pch/global_pch.h | 2 + include/pokemon.h | 48 +--------------------- include/struct_defs/species.h | 75 +++++++++++++++++++++++++++++++++++ src/pokemon.c | 12 ------ 5 files changed, 78 insertions(+), 70 deletions(-) create mode 100644 include/struct_defs/species.h diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index fc1a4d7470..8fe2d191ff 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -17,11 +17,6 @@ enum { STAT_MAX }; -#define MAX_ABILITIES 2 -#define MAX_EGG_GROUPS 2 -#define MAX_TYPES 2 -#define MAX_EVOLUTIONS 7 - #define MAX_PARTY_SIZE 6 #define NUM_BOOSTABLE_STATS 8 @@ -35,12 +30,6 @@ enum { #define MAX_POKEMON_MARKINGS 6 #define MAX_POKEMON_LEVEL 100 -#define LEARNSET_NO_MOVE_TO_LEARN 0 -#define MAX_LEARNSET_ENTRIES 20 -#define LEARNSET_MOVE_ALREADY_KNOWN 0xFFFE -#define LEARNSET_ALL_SLOTS_FILLED 0xFFFF -#define LEARNSET_SENTINEL_ENTRY 0xFFFF - #define EVOLVE_FRIENDSHIP_THRESHOLD 220 /** diff --git a/include/pch/global_pch.h b/include/pch/global_pch.h index fa77a9a3e4..8218d34b0d 100644 --- a/include/pch/global_pch.h +++ b/include/pch/global_pch.h @@ -16,6 +16,8 @@ #define NELEMS(a) (sizeof(a) / sizeof(*(a))) #define XtOffset(pointer_type, field) ((unsigned int)&(((pointer_type)NULL)->field)) +#define ALIGN_4 __attribute__((aligned(4))) + typedef struct { int x; int y; diff --git a/include/pokemon.h b/include/pokemon.h index 0c65cd449a..145c9970b7 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -14,6 +14,7 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/pokemon.h" +#include "struct_defs/species.h" #include "struct_defs/sprite_animation_frame.h" #include "overlay005/struct_ov5_021DE5D0.h" @@ -31,53 +32,6 @@ #define FACE_BACK 0 #define FACE_FRONT 2 -typedef struct SpeciesBaseStats { - u8 hp; - u8 attack; - u8 defense; - u8 speed; - u8 spAttack; - u8 spDefense; -} SpeciesBaseStats; - -typedef struct SpeciesEVYields { - u16 hp : 2; - u16 attack : 2; - u16 defense : 2; - u16 speed : 2; - u16 spAttack : 2; - u16 spDefense : 2; -} SpeciesEVYields; - -typedef struct SpeciesWildHeldItems { - u16 common; - u16 rare; -} SpeciesWildHeldItems; - -typedef struct SpeciesData { - SpeciesBaseStats baseStats; - u8 types[MAX_TYPES]; - u8 catchRate; - u8 baseExpReward; - SpeciesEVYields evYields; - SpeciesWildHeldItems wildHeldItems; - u8 genderRatio; - u8 hatchCycles; - u8 baseFriendship; - u8 expRate; - u8 eggGroups[MAX_EGG_GROUPS]; - u8 abilities[MAX_ABILITIES]; - u8 safariFleeRate; - u8 bodyColor : 7; - u8 flipSprite : 1; - // u16 padding; - - u32 tmLearnsetMask1; // Bitflags for whether this pokemon can learn a TM (TM1 -> TM32) - u32 tmLearnsetMask2; // Bitflags for whether this pokemon can learn a TM (TM33 -> TM64) - u32 tmLearnsetMask3; // Bitflags for whether this pokemon can learn a TM (TM65 -> TM92, HM1 -> HM4) - u32 tmLearnsetMask4; // Bitflags for whether this pokemon can learn a TM (HM5 -> HM8, rest unused) -} SpeciesData; - enum EvolutionClass { EVO_CLASS_BY_LEVEL = 0, EVO_CLASS_BY_TRADE, diff --git a/include/struct_defs/species.h b/include/struct_defs/species.h new file mode 100644 index 0000000000..69cc3a2793 --- /dev/null +++ b/include/struct_defs/species.h @@ -0,0 +1,75 @@ +#ifndef POKEPLATINUM_SPECIES_H +#define POKEPLATINUM_SPECIES_H + +#define MAX_ABILITIES 2 +#define MAX_EGG_GROUPS 2 +#define MAX_TYPES 2 + +#define MAX_EVOLUTIONS 7 + +#define MAX_LEARNSET_ENTRIES 20 +#define LEARNSET_NO_MOVE_TO_LEARN 0 +#define LEARNSET_MOVE_ALREADY_KNOWN 0xFFFE +#define LEARNSET_ALL_SLOTS_FILLED 0xFFFF +#define LEARNSET_SENTINEL_ENTRY 0xFFFF + +typedef struct SpeciesBaseStats { + u8 hp; + u8 attack; + u8 defense; + u8 speed; + u8 spAttack; + u8 spDefense; +} SpeciesBaseStats; + +typedef struct SpeciesEVYields { + u16 hp : 2; + u16 attack : 2; + u16 defense : 2; + u16 speed : 2; + u16 spAttack : 2; + u16 spDefense : 2; +} SpeciesEVYields; + +typedef struct SpeciesWildHeldItems { + u16 common; + u16 rare; +} SpeciesWildHeldItems; + +typedef struct SpeciesData { + SpeciesBaseStats baseStats; + u8 types[MAX_TYPES]; + u8 catchRate; + u8 baseExpReward; + SpeciesEVYields evYields; + SpeciesWildHeldItems wildHeldItems; + u8 genderRatio; + u8 hatchCycles; + u8 baseFriendship; + u8 expRate; + u8 eggGroups[MAX_EGG_GROUPS]; + u8 abilities[MAX_ABILITIES]; + u8 safariFleeRate; + u8 bodyColor : 7; + u8 flipSprite : 1; + // u16 padding; + + u32 tmLearnsetMask1; // Bitflags for whether this pokemon can learn a TM (TM1 -> TM32) + u32 tmLearnsetMask2; // Bitflags for whether this pokemon can learn a TM (TM33 -> TM64) + u32 tmLearnsetMask3; // Bitflags for whether this pokemon can learn a TM (TM65 -> TM92, HM1 -> HM4) + u32 tmLearnsetMask4; // Bitflags for whether this pokemon can learn a TM (HM5 -> HM8, rest unused) +} SpeciesData; + +typedef struct SpeciesEvolution { + u16 method; + u16 param; + u16 targetSpecies; +} SpeciesEvolution; + +// 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]; +} SpeciesLearnset; + +#endif // POKEPLATINUM_SPECIES_H diff --git a/src/pokemon.c b/src/pokemon.c index e494d9f52b..568e7504b1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -92,18 +92,6 @@ static const s8 sNatureFlavorAffinities[][5] = { { 0x0, 0x0, 0x0, 0x0, 0x0 }, }; -typedef struct SpeciesEvolution { - u16 method; - u16 param; - u16 targetSpecies; -} SpeciesEvolution; - -// This struct is not explicitly used; it is provided to document and enforce the size of -// the learnset entries. -typedef struct SpeciesLearnset { - __attribute__((aligned(4))) u16 entries[MAX_LEARNSET_ENTRIES + 1]; -} SpeciesLearnset; - enum PokemonDataBlockID { DATA_BLOCK_A = 0, DATA_BLOCK_B, From 92cd212dea05cb07a8dff3855f0160556b45908b Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 21:59:48 -0800 Subject: [PATCH 05/10] Integrate metang as a subproject + migrate species data constants --- .clang-format | 2 +- .gitignore | 1 + asm/macros/btlcmd.inc | 6 +- asm/macros/scrcmd.inc | 6 +- asm/trainer_ai/trainer_ai_script.s | 5 +- consts/abilities.json | 133 ---- consts/items.json | 632 ------------------ consts/meson.build | 3 - consts/moves.json | 474 ------------- consts/pokemon.json | 87 --- consts/species.json | 506 -------------- gen_compile_commands.py | 4 + generated/abilities.txt | 124 ++++ generated/egg_groups.txt | 16 + generated/exp_rates.txt | 6 + generated/gender_ratios.txt | 8 + generated/item_hold_effects.txt | 147 ++++ generated/items.txt | 469 +++++++++++++ generated/meson.build | 43 ++ generated/moves.txt | 469 +++++++++++++ generated/pokemon_colors.txt | 12 + generated/pokemon_types.txt | 19 + generated/species.txt | 496 ++++++++++++++ include/constants/items.h | 5 +- include/constants/moves.h | 1 + include/constants/pokemon.h | 3 +- include/constants/species.h | 2 +- include/string_template.h | 2 +- meson.build | 4 +- res/items/meson.build | 5 +- res/items/pl_item_data_format.txt | 4 +- .../pokemon_summary_screen/main.c | 2 +- .../pokemon_summary_screen/sprite.c | 2 +- .../pokemon_summary_screen/window.c | 2 +- src/bag.c | 2 +- src/battle/battle_controller.c | 2 +- src/battle/battle_lib.c | 2 +- src/battle/battle_script.c | 2 +- src/battle/ov16_0223DF00.c | 2 +- src/battle/trainer_ai/trainer_ai.c | 2 +- src/field_battle_data_transfer.c | 4 +- src/overlay005/ov5_021F6454.c | 4 +- src/overlay006/ov6_02240C9C.c | 5 +- src/overlay017/ov17_0223F118.c | 2 +- src/overlay019/ov19_021DB8E4.c | 2 +- src/overlay094/ov94_0223FB48.c | 4 +- src/overlay104/ov104_02237DD8.c | 2 +- src/overlay118/ov118_021D0D80.c | 2 +- src/pokedex.c | 1 + src/pokemon.c | 15 +- src/string_template.c | 2 +- src/unk_020131EC.c | 2 +- src/unk_0207AE68.c | 4 +- src/unk_02083370.c | 2 +- src/unk_02096420.c | 2 +- src/unk_02098218.c | 2 +- subprojects/metang.wrap | 7 + tools/json2bin/catching_show_data.py | 8 +- tools/json2bin/convert.py | 5 +- tools/json2bin/encdata_ex_elusive_rod.py | 4 +- tools/json2bin/encdata_ex_great_marsh.py | 4 +- tools/json2bin/encdata_ex_honey_trees.py | 4 +- tools/json2bin/encdata_ex_trophy_garden.py | 4 +- tools/json2bin/encounter.py | 4 +- tools/json2bin/evo.py | 13 +- tools/json2bin/movedata.py | 7 +- tools/json2bin/pl_poke_data.py | 8 +- tools/json2bin/pokemon_personal_data.py | 26 +- tools/json2bin/pokemon_wotbl_data.py | 6 +- tools/json2bin/trainer_data.py | 2 +- tools/json2bin/trainer_party.py | 2 +- tools/meson.build | 1 + tools/scripts/make_height.py | 8 +- tools/scripts/make_pl_pokezukan.py | 4 +- tools/scripts/make_pokedex_data.py | 14 +- tools/scripts/make_pokedex_enc_platinum.py | 102 +-- tools/scripts/make_pokedex_message_banks.py | 4 +- tools/scripts/make_shinzukan.py | 4 +- tools/scripts/make_species_tables.py | 7 +- 79 files changed, 2011 insertions(+), 2004 deletions(-) delete mode 100644 consts/abilities.json delete mode 100644 consts/items.json delete mode 100644 consts/species.json create mode 100644 generated/abilities.txt create mode 100644 generated/egg_groups.txt create mode 100644 generated/exp_rates.txt create mode 100644 generated/gender_ratios.txt create mode 100644 generated/item_hold_effects.txt create mode 100644 generated/items.txt create mode 100644 generated/meson.build create mode 100644 generated/moves.txt create mode 100644 generated/pokemon_colors.txt create mode 100644 generated/pokemon_types.txt create mode 100644 generated/species.txt create mode 100644 subprojects/metang.wrap diff --git a/.clang-format b/.clang-format index 325bd6f544..732793b41d 100644 --- a/.clang-format +++ b/.clang-format @@ -59,7 +59,7 @@ IncludeBlocks: Regroup IncludeCategories: - Regex: '((<.+>)|("nitro/.*\.h"))' Priority: 1 - - Regex: '"(consts|constants)/.*\.h"' + - Regex: '"(consts|constants|generated)/.*\.h"' Priority: 2 - Regex: '"(struct_(decls|defs))/.*\.h"' Priority: 3 diff --git a/.gitignore b/.gitignore index dd95dccf9b..dd13be31fb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ /subprojects/SDATTool/ /subprojects/knarc/ /subprojects/narc/ +/subprojects/metang/ # CLion folders .idea/ diff --git a/asm/macros/btlcmd.inc b/asm/macros/btlcmd.inc index 58a87eeca1..1711130e40 100644 --- a/asm/macros/btlcmd.inc +++ b/asm/macros/btlcmd.inc @@ -5,16 +5,18 @@ #include "constants/battle.h" #include "constants/items.h" #include "constants/species.h" +#include "generated/abilities.h" +#include "generated/items.h" +#include "generated/moves.h" +#include "generated/pokemon_types.h" #include "gmm/message_bank_battle_strings.h" #include "battle/btlcmd.h" - .include "consts/abilities.inc" .include "consts/battle.inc" .include "consts/battle_subscripts.inc" .include "consts/btlcmd.inc" .include "consts/game_records.inc" .include "consts/gender.inc" - .include "consts/items.inc" .include "consts/moves.inc" .include "consts/pokemon.inc" diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 869d176f02..e18537af26 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1,15 +1,15 @@ +#include "generated/items.h" +#include "generated/moves.h" +#include "generated/species.h" .include "macros/movement.inc" .include "consts/badges.inc" .include "consts/catching_show.inc" .include "consts/game_records.inc" - .include "consts/items.inc" .include "consts/journal.inc" .include "consts/map.inc" - .include "consts/moves.inc" .include "consts/poketch.inc" .include "consts/scrcmd.inc" .include "consts/sdat.inc" - .include "consts/species.inc" #include "res/trainers/trdata.naix" diff --git a/asm/trainer_ai/trainer_ai_script.s b/asm/trainer_ai/trainer_ai_script.s index 284cdc9e65..e74eecb581 100644 --- a/asm/trainer_ai/trainer_ai_script.s +++ b/asm/trainer_ai/trainer_ai_script.s @@ -5,11 +5,12 @@ #include "constants/battle.h" #include "constants/items.h" #include "constants/battle/trainer_ai.h" +#include "generated/abilities.h" +#include "generated/moves.h" +#include "generated/pokemon_types.h" - .include "consts/abilities.inc" .include "consts/battle.inc" .include "consts/gender.inc" - .include "consts/items.inc" .include "consts/moves.inc" .include "consts/pokemon.inc" .include "consts/trainer_ai.inc" diff --git a/consts/abilities.json b/consts/abilities.json deleted file mode 100644 index 46588de029..0000000000 --- a/consts/abilities.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "definitions": { - "@Ability": { - "type": "enum", - "values": [ - "ABILITY_NONE", - "ABILITY_STENCH", - "ABILITY_DRIZZLE", - "ABILITY_SPEED_BOOST", - "ABILITY_BATTLE_ARMOR", - "ABILITY_STURDY", - "ABILITY_DAMP", - "ABILITY_LIMBER", - "ABILITY_SAND_VEIL", - "ABILITY_STATIC", - "ABILITY_VOLT_ABSORB", - "ABILITY_WATER_ABSORB", - "ABILITY_OBLIVIOUS", - "ABILITY_CLOUD_NINE", - "ABILITY_COMPOUND_EYES", - "ABILITY_INSOMNIA", - "ABILITY_COLOR_CHANGE", - "ABILITY_IMMUNITY", - "ABILITY_FLASH_FIRE", - "ABILITY_SHIELD_DUST", - "ABILITY_OWN_TEMPO", - "ABILITY_SUCTION_CUPS", - "ABILITY_INTIMIDATE", - "ABILITY_SHADOW_TAG", - "ABILITY_ROUGH_SKIN", - "ABILITY_WONDER_GUARD", - "ABILITY_LEVITATE", - "ABILITY_EFFECT_SPORE", - "ABILITY_SYNCHRONIZE", - "ABILITY_CLEAR_BODY", - "ABILITY_NATURAL_CURE", - "ABILITY_LIGHTNING_ROD", - "ABILITY_SERENE_GRACE", - "ABILITY_SWIFT_SWIM", - "ABILITY_CHLOROPHYLL", - "ABILITY_ILLUMINATE", - "ABILITY_TRACE", - "ABILITY_HUGE_POWER", - "ABILITY_POISON_POINT", - "ABILITY_INNER_FOCUS", - "ABILITY_MAGMA_ARMOR", - "ABILITY_WATER_VEIL", - "ABILITY_MAGNET_PULL", - "ABILITY_SOUNDPROOF", - "ABILITY_RAIN_DISH", - "ABILITY_SAND_STREAM", - "ABILITY_PRESSURE", - "ABILITY_THICK_FAT", - "ABILITY_EARLY_BIRD", - "ABILITY_FLAME_BODY", - "ABILITY_RUN_AWAY", - "ABILITY_KEEN_EYE", - "ABILITY_HYPER_CUTTER", - "ABILITY_PICKUP", - "ABILITY_TRUANT", - "ABILITY_HUSTLE", - "ABILITY_CUTE_CHARM", - "ABILITY_PLUS", - "ABILITY_MINUS", - "ABILITY_FORECAST", - "ABILITY_STICKY_HOLD", - "ABILITY_SHED_SKIN", - "ABILITY_GUTS", - "ABILITY_MARVEL_SCALE", - "ABILITY_LIQUID_OOZE", - "ABILITY_OVERGROW", - "ABILITY_BLAZE", - "ABILITY_TORRENT", - "ABILITY_SWARM", - "ABILITY_ROCK_HEAD", - "ABILITY_DROUGHT", - "ABILITY_ARENA_TRAP", - "ABILITY_VITAL_SPIRIT", - "ABILITY_WHITE_SMOKE", - "ABILITY_PURE_POWER", - "ABILITY_SHELL_ARMOR", - "ABILITY_AIR_LOCK", - "ABILITY_TANGLED_FEET", - "ABILITY_MOTOR_DRIVE", - "ABILITY_RIVALRY", - "ABILITY_STEADFAST", - "ABILITY_SNOW_CLOAK", - "ABILITY_GLUTTONY", - "ABILITY_ANGER_POINT", - "ABILITY_UNBURDEN", - "ABILITY_HEATPROOF", - "ABILITY_SIMPLE", - "ABILITY_DRY_SKIN", - "ABILITY_DOWNLOAD", - "ABILITY_IRON_FIST", - "ABILITY_POISON_HEAL", - "ABILITY_ADAPTABILITY", - "ABILITY_SKILL_LINK", - "ABILITY_HYDRATION", - "ABILITY_SOLAR_POWER", - "ABILITY_QUICK_FEET", - "ABILITY_NORMALIZE", - "ABILITY_SNIPER", - "ABILITY_MAGIC_GUARD", - "ABILITY_NO_GUARD", - "ABILITY_STALL", - "ABILITY_TECHNICIAN", - "ABILITY_LEAF_GUARD", - "ABILITY_KLUTZ", - "ABILITY_MOLD_BREAKER", - "ABILITY_SUPER_LUCK", - "ABILITY_AFTERMATH", - "ABILITY_ANTICIPATION", - "ABILITY_FOREWARN", - "ABILITY_UNAWARE", - "ABILITY_TINTED_LENS", - "ABILITY_FILTER", - "ABILITY_SLOW_START", - "ABILITY_SCRAPPY", - "ABILITY_STORM_DRAIN", - "ABILITY_ICE_BODY", - "ABILITY_SOLID_ROCK", - "ABILITY_SNOW_WARNING", - "ABILITY_HONEY_GATHER", - "ABILITY_FRISK", - "ABILITY_RECKLESS", - "ABILITY_MULTITYPE", - "ABILITY_FLOWER_GIFT", - "ABILITY_BAD_DREAMS" - ] - } - } -} diff --git a/consts/items.json b/consts/items.json deleted file mode 100644 index d9610d1640..0000000000 --- a/consts/items.json +++ /dev/null @@ -1,632 +0,0 @@ -{ - "definitions": { - "@ItemHoldEffect": { - "type": "enum", - "as_preproc": true, - "values": [ - "HOLD_EFFECT_NONE", - "HOLD_EFFECT_HP_RESTORE", - "HOLD_EFFECT_GIRATINA_BOOST", - "HOLD_EFFECT_DIALGA_BOOST", - "HOLD_EFFECT_PALKIA_BOOST", - "HOLD_EFFECT_PRZ_RESTORE", - "HOLD_EFFECT_SLP_RESTORE", - "HOLD_EFFECT_PSN_RESTORE", - "HOLD_EFFECT_BRN_RESTORE", - "HOLD_EFFECT_FRZ_RESTORE", - "HOLD_EFFECT_PP_RESTORE", - "HOLD_EFFECT_CONFUSE_RESTORE", - "HOLD_EFFECT_STATUS_RESTORE", - "HOLD_EFFECT_HP_PCT_RESTORE", - "HOLD_EFFECT_HP_RESTORE_SPICY", - "HOLD_EFFECT_HP_RESTORE_DRY", - "HOLD_EFFECT_HP_RESTORE_SWEET", - "HOLD_EFFECT_HP_RESTORE_BITTER", - "HOLD_EFFECT_HP_RESTORE_SOUR", - "HOLD_EFFECT_WEAKEN_SE_FIRE", - "HOLD_EFFECT_WEAKEN_SE_WATER", - "HOLD_EFFECT_WEAKEN_SE_ELECTRIC", - "HOLD_EFFECT_WEAKEN_SE_GRASS", - "HOLD_EFFECT_WEAKEN_SE_ICE", - "HOLD_EFFECT_WEAKEN_SE_FIGHT", - "HOLD_EFFECT_WEAKEN_SE_POISON", - "HOLD_EFFECT_WEAKEN_SE_GROUND", - "HOLD_EFFECT_WEAKEN_SE_FLYING", - "HOLD_EFFECT_WEAKEN_SE_PSYCHIC", - "HOLD_EFFECT_WEAKEN_SE_BUG", - "HOLD_EFFECT_WEAKEN_SE_ROCK", - "HOLD_EFFECT_WEAKEN_SE_GHOST", - "HOLD_EFFECT_WEAKEN_SE_DRAGON", - "HOLD_EFFECT_WEAKEN_SE_DARK", - "HOLD_EFFECT_WEAKEN_SE_STEEL", - "HOLD_EFFECT_WEAKEN_NORMAL", - "HOLD_EFFECT_PINCH_ATK_UP", - "HOLD_EFFECT_PINCH_DEF_UP", - "HOLD_EFFECT_PINCH_SPEED_UP", - "HOLD_EFFECT_PINCH_SPATK_UP", - "HOLD_EFFECT_PINCH_SPDEF_UP", - "HOLD_EFFECT_PINCH_CRITRATE_UP", - "HOLD_EFFECT_PINCH_RANDOM_UP", - "HOLD_EFFECT_HP_RESTORE_SE", - "HOLD_EFFECT_PINCH_ACC_UP", - "HOLD_EFFECT_PINCH_PRIORITY", - "HOLD_EFFECT_RECOIL_PHYSICAL", - "HOLD_EFFECT_RECOIL_SPECIAL", - "HOLD_EFFECT_ACC_REDUCE", - "HOLD_EFFECT_STATDOWN_RESTORE", - "HOLD_EFFECT_EVS_UP_SPEED_DOWN", - "HOLD_EFFECT_EXP_SHARE", - "HOLD_EFFECT_SOMETIMES_PRIORITY", - "HOLD_EFFECT_FRIENDSHIP_UP", - "HOLD_EFFECT_HEAL_INFATUATION", - "HOLD_EFFECT_CHOICE_ATK", - "HOLD_EFFECT_SOMETIMES_FLINCH", - "HOLD_EFFECT_STRENGTHEN_BUG", - "HOLD_EFFECT_MONEY_UP", - "HOLD_EFFECT_ENCOUNTERS_DOWN", - "HOLD_EFFECT_LATI_SPECIAL", - "HOLD_EFFECT_CLAMPERL_SPATK", - "HOLD_EFFECT_CLAMPERL_SPDEF", - "HOLD_EFFECT_FLEE", - "HOLD_EFFECT_NO_EVOLVE", - "HOLD_EFFECT_MAYBE_ENDURE", - "HOLD_EFFECT_EXP_UP", - "HOLD_EFFECT_CRITRATE_UP", - "HOLD_EFFECT_STRENGTHEN_STEEL", - "HOLD_EFFECT_HP_RESTORE_GRADUAL", - "HOLD_EFFECT_EVOLVE_SEADRA", - "HOLD_EFFECT_PIKA_SPATK_UP", - "HOLD_EFFECT_STRENGTHEN_GROUND", - "HOLD_EFFECT_STRENGTHEN_ROCK", - "HOLD_EFFECT_STRENGTHEN_GRASS", - "HOLD_EFFECT_STRENGTHEN_DARK", - "HOLD_EFFECT_STRENGTHEN_FIGHT", - "HOLD_EFFECT_STRENGTHEN_ELECTRIC", - "HOLD_EFFECT_STRENGTHEN_WATER", - "HOLD_EFFECT_STRENGTHEN_FLYING", - "HOLD_EFFECT_STRENGTHEN_POISON", - "HOLD_EFFECT_STRENGTHEN_ICE", - "HOLD_EFFECT_STRENGTHEN_GHOST", - "HOLD_EFFECT_STRENGTHEN_PSYCHIC", - "HOLD_EFFECT_STRENGTHEN_FIRE", - "HOLD_EFFECT_STRENGTHEN_DRAGON", - "HOLD_EFFECT_STRENGTHEN_NORMAL", - "HOLD_EFFECT_EVOLVE_PORYGON", - "HOLD_EFFECT_HP_RESTORE_ON_DMG", - "HOLD_EFFECT_CHANSEY_CRITRATE_UP", - "HOLD_EFFECT_DITTO_DEF_UP", - "HOLD_EFFECT_CUBONE_ATK_UP", - "HOLD_EFFECT_FARFETCHD_CRITRATE_UP", - "HOLD_EFFECT_ACCURACY_UP", - "HOLD_EFFECT_POWER_UP_PHYS", - "HOLD_EFFECT_POWER_UP_SPEC", - "HOLD_EFFECT_POWER_UP_SE", - "HOLD_EFFECT_EXTEND_SCREENS", - "HOLD_EFFECT_HP_DRAIN_ON_ATK", - "HOLD_EFFECT_CHARGE_SKIP", - "HOLD_EFFECT_PSN_USER", - "HOLD_EFFECT_BRN_USER", - "HOLD_EFFECT_DITTO_SPEED_UP", - "HOLD_EFFECT_ENDURE", - "HOLD_EFFECT_ACCURACY_UP_SLOWER", - "HOLD_EFFECT_BOOST_REPEATED", - "HOLD_EFFECT_SPEED_DOWN_GROUNDED", - "HOLD_EFFECT_PRIORITY_DOWN", - "HOLD_EFFECT_RECIPROCATE_INFAT", - "HOLD_EFFECT_HP_RESTORE_PSN_TYPE", - "HOLD_EFFECT_EXTEND_HAIL", - "HOLD_EFFECT_EXTEND_SANDSTORM", - "HOLD_EFFECT_EXTEND_SUN", - "HOLD_EFFECT_EXTEND_RAIN", - "HOLD_EFFECT_EXTEND_TRAPPING", - "HOLD_EFFECT_CHOICE_SPEED", - "HOLD_EFFECT_DMG_USER_CONTACT_XFR", - "HOLD_EFFECT_LVLUP_ATK_EV_UP", - "HOLD_EFFECT_LVLUP_DEF_EV_UP", - "HOLD_EFFECT_LVLUP_SPATK_EV_UP", - "HOLD_EFFECT_LVLUP_SPDEF_EV_UP", - "HOLD_EFFECT_LVLUP_SPEED_EV_UP", - "HOLD_EFFECT_LVLUP_HP_EV_UP", - "HOLD_EFFECT_SWITCH", - "HOLD_EFFECT_LEECH_BOOST", - "HOLD_EFFECT_CHOICE_SPATK", - "HOLD_EFFECT_ARCEUS_FIRE", - "HOLD_EFFECT_ARCEUS_WATER", - "HOLD_EFFECT_ARCEUS_ELECTRIC", - "HOLD_EFFECT_ARCEUS_GRASS", - "HOLD_EFFECT_ARCEUS_ICE", - "HOLD_EFFECT_ARCEUS_FIGHTING", - "HOLD_EFFECT_ARCEUS_POISON", - "HOLD_EFFECT_ARCEUS_GROUND", - "HOLD_EFFECT_ARCEUS_FLYING", - "HOLD_EFFECT_ARCEUS_PSYCHIC", - "HOLD_EFFECT_ARCEUS_BUG", - "HOLD_EFFECT_ARCEUS_ROCK", - "HOLD_EFFECT_ARCEUS_GHOST", - "HOLD_EFFECT_ARCEUS_DRAGON", - "HOLD_EFFECT_ARCEUS_DARK", - "HOLD_EFFECT_ARCEUS_STEEL", - "HOLD_EFFECT_EVOLVE_RHYDON", - "HOLD_EFFECT_EVOLVE_ELECTABUZZ", - "HOLD_EFFECT_EVOLVE_MAGMAR", - "HOLD_EFFECT_EVOLVE_PORYGON2", - "HOLD_EFFECT_EVOLVE_DUSCLOPS" - ] - }, - "@Item": { - "type": "enum", - "as_preproc": true, - "values": [ - "ITEM_NONE", - "ITEM_MASTER_BALL", - "ITEM_ULTRA_BALL", - "ITEM_GREAT_BALL", - "ITEM_POKE_BALL", - "ITEM_SAFARI_BALL", - "ITEM_NET_BALL", - "ITEM_DIVE_BALL", - "ITEM_NEST_BALL", - "ITEM_REPEAT_BALL", - "ITEM_TIMER_BALL", - "ITEM_LUXURY_BALL", - "ITEM_PREMIER_BALL", - "ITEM_DUSK_BALL", - "ITEM_HEAL_BALL", - "ITEM_QUICK_BALL", - "ITEM_CHERISH_BALL", - "ITEM_POTION", - "ITEM_ANTIDOTE", - "ITEM_BURN_HEAL", - "ITEM_ICE_HEAL", - "ITEM_AWAKENING", - "ITEM_PARLYZ_HEAL", - "ITEM_FULL_RESTORE", - "ITEM_MAX_POTION", - "ITEM_HYPER_POTION", - "ITEM_SUPER_POTION", - "ITEM_FULL_HEAL", - "ITEM_REVIVE", - "ITEM_MAX_REVIVE", - "ITEM_FRESH_WATER", - "ITEM_SODA_POP", - "ITEM_LEMONADE", - "ITEM_MOOMOO_MILK", - "ITEM_ENERGYPOWDER", - "ITEM_ENERGY_ROOT", - "ITEM_HEAL_POWDER", - "ITEM_REVIVAL_HERB", - "ITEM_ETHER", - "ITEM_MAX_ETHER", - "ITEM_ELIXIR", - "ITEM_MAX_ELIXIR", - "ITEM_LAVA_COOKIE", - "ITEM_BERRY_JUICE", - "ITEM_SACRED_ASH", - "ITEM_HP_UP", - "ITEM_PROTEIN", - "ITEM_IRON", - "ITEM_CARBOS", - "ITEM_CALCIUM", - "ITEM_RARE_CANDY", - "ITEM_PP_UP", - "ITEM_ZINC", - "ITEM_PP_MAX", - "ITEM_OLD_GATEAU", - "ITEM_GUARD_SPEC_", - "ITEM_DIRE_HIT", - "ITEM_X_ATTACK", - "ITEM_X_DEFENSE", - "ITEM_X_SPEED", - "ITEM_X_ACCURACY", - "ITEM_X_SPECIAL", - "ITEM_X_SP__DEF", - "ITEM_POKE_DOLL", - "ITEM_FLUFFY_TAIL", - "ITEM_BLUE_FLUTE", - "ITEM_YELLOW_FLUTE", - "ITEM_RED_FLUTE", - "ITEM_BLACK_FLUTE", - "ITEM_WHITE_FLUTE", - "ITEM_SHOAL_SALT", - "ITEM_SHOAL_SHELL", - "ITEM_RED_SHARD", - "ITEM_BLUE_SHARD", - "ITEM_YELLOW_SHARD", - "ITEM_GREEN_SHARD", - "ITEM_SUPER_REPEL", - "ITEM_MAX_REPEL", - "ITEM_ESCAPE_ROPE", - "ITEM_REPEL", - "ITEM_SUN_STONE", - "ITEM_MOON_STONE", - "ITEM_FIRE_STONE", - "ITEM_THUNDERSTONE", - "ITEM_WATER_STONE", - "ITEM_LEAF_STONE", - "ITEM_TINYMUSHROOM", - "ITEM_BIG_MUSHROOM", - "ITEM_PEARL", - "ITEM_BIG_PEARL", - "ITEM_STARDUST", - "ITEM_STAR_PIECE", - "ITEM_NUGGET", - "ITEM_HEART_SCALE", - "ITEM_HONEY", - "ITEM_GROWTH_MULCH", - "ITEM_DAMP_MULCH", - "ITEM_STABLE_MULCH", - "ITEM_GOOEY_MULCH", - "ITEM_ROOT_FOSSIL", - "ITEM_CLAW_FOSSIL", - "ITEM_HELIX_FOSSIL", - "ITEM_DOME_FOSSIL", - "ITEM_OLD_AMBER", - "ITEM_ARMOR_FOSSIL", - "ITEM_SKULL_FOSSIL", - "ITEM_RARE_BONE", - "ITEM_SHINY_STONE", - "ITEM_DUSK_STONE", - "ITEM_DAWN_STONE", - "ITEM_OVAL_STONE", - "ITEM_ODD_KEYSTONE", - "ITEM_GRISEOUS_ORB", - "ITEM_UNUSED_113", - "ITEM_UNUSED_114", - "ITEM_UNUSED_115", - "ITEM_UNUSED_116", - "ITEM_UNUSED_117", - "ITEM_UNUSED_118", - "ITEM_UNUSED_119", - "ITEM_UNUSED_120", - "ITEM_UNUSED_121", - "ITEM_UNUSED_122", - "ITEM_UNUSED_123", - "ITEM_UNUSED_124", - "ITEM_UNUSED_125", - "ITEM_UNUSED_126", - "ITEM_UNUSED_127", - "ITEM_UNUSED_128", - "ITEM_UNUSED_129", - "ITEM_UNUSED_130", - "ITEM_UNUSED_131", - "ITEM_UNUSED_132", - "ITEM_UNUSED_133", - "ITEM_UNUSED_134", - "ITEM_ADAMANT_ORB", - "ITEM_LUSTROUS_ORB", - "ITEM_GRASS_MAIL", - "ITEM_FLAME_MAIL", - "ITEM_BUBBLE_MAIL", - "ITEM_BLOOM_MAIL", - "ITEM_TUNNEL_MAIL", - "ITEM_STEEL_MAIL", - "ITEM_HEART_MAIL", - "ITEM_SNOW_MAIL", - "ITEM_SPACE_MAIL", - "ITEM_AIR_MAIL", - "ITEM_MOSAIC_MAIL", - "ITEM_BRICK_MAIL", - "ITEM_CHERI_BERRY", - "ITEM_CHESTO_BERRY", - "ITEM_PECHA_BERRY", - "ITEM_RAWST_BERRY", - "ITEM_ASPEAR_BERRY", - "ITEM_LEPPA_BERRY", - "ITEM_ORAN_BERRY", - "ITEM_PERSIM_BERRY", - "ITEM_LUM_BERRY", - "ITEM_SITRUS_BERRY", - "ITEM_FIGY_BERRY", - "ITEM_WIKI_BERRY", - "ITEM_MAGO_BERRY", - "ITEM_AGUAV_BERRY", - "ITEM_IAPAPA_BERRY", - "ITEM_RAZZ_BERRY", - "ITEM_BLUK_BERRY", - "ITEM_NANAB_BERRY", - "ITEM_WEPEAR_BERRY", - "ITEM_PINAP_BERRY", - "ITEM_POMEG_BERRY", - "ITEM_KELPSY_BERRY", - "ITEM_QUALOT_BERRY", - "ITEM_HONDEW_BERRY", - "ITEM_GREPA_BERRY", - "ITEM_TAMATO_BERRY", - "ITEM_CORNN_BERRY", - "ITEM_MAGOST_BERRY", - "ITEM_RABUTA_BERRY", - "ITEM_NOMEL_BERRY", - "ITEM_SPELON_BERRY", - "ITEM_PAMTRE_BERRY", - "ITEM_WATMEL_BERRY", - "ITEM_DURIN_BERRY", - "ITEM_BELUE_BERRY", - "ITEM_OCCA_BERRY", - "ITEM_PASSHO_BERRY", - "ITEM_WACAN_BERRY", - "ITEM_RINDO_BERRY", - "ITEM_YACHE_BERRY", - "ITEM_CHOPLE_BERRY", - "ITEM_KEBIA_BERRY", - "ITEM_SHUCA_BERRY", - "ITEM_COBA_BERRY", - "ITEM_PAYAPA_BERRY", - "ITEM_TANGA_BERRY", - "ITEM_CHARTI_BERRY", - "ITEM_KASIB_BERRY", - "ITEM_HABAN_BERRY", - "ITEM_COLBUR_BERRY", - "ITEM_BABIRI_BERRY", - "ITEM_CHILAN_BERRY", - "ITEM_LIECHI_BERRY", - "ITEM_GANLON_BERRY", - "ITEM_SALAC_BERRY", - "ITEM_PETAYA_BERRY", - "ITEM_APICOT_BERRY", - "ITEM_LANSAT_BERRY", - "ITEM_STARF_BERRY", - "ITEM_ENIGMA_BERRY", - "ITEM_MICLE_BERRY", - "ITEM_CUSTAP_BERRY", - "ITEM_JABOCA_BERRY", - "ITEM_ROWAP_BERRY", - "ITEM_BRIGHTPOWDER", - "ITEM_WHITE_HERB", - "ITEM_MACHO_BRACE", - "ITEM_EXP_SHARE", - "ITEM_QUICK_CLAW", - "ITEM_SOOTHE_BELL", - "ITEM_MENTAL_HERB", - "ITEM_CHOICE_BAND", - "ITEM_KINGS_ROCK", - "ITEM_SILVERPOWDER", - "ITEM_AMULET_COIN", - "ITEM_CLEANSE_TAG", - "ITEM_SOUL_DEW", - "ITEM_DEEPSEATOOTH", - "ITEM_DEEPSEASCALE", - "ITEM_SMOKE_BALL", - "ITEM_EVERSTONE", - "ITEM_FOCUS_BAND", - "ITEM_LUCKY_EGG", - "ITEM_SCOPE_LENS", - "ITEM_METAL_COAT", - "ITEM_LEFTOVERS", - "ITEM_DRAGON_SCALE", - "ITEM_LIGHT_BALL", - "ITEM_SOFT_SAND", - "ITEM_HARD_STONE", - "ITEM_MIRACLE_SEED", - "ITEM_BLACKGLASSES", - "ITEM_BLACK_BELT", - "ITEM_MAGNET", - "ITEM_MYSTIC_WATER", - "ITEM_SHARP_BEAK", - "ITEM_POISON_BARB", - "ITEM_NEVERMELTICE", - "ITEM_SPELL_TAG", - "ITEM_TWISTEDSPOON", - "ITEM_CHARCOAL", - "ITEM_DRAGON_FANG", - "ITEM_SILK_SCARF", - "ITEM_UPGRADE", - "ITEM_SHELL_BELL", - "ITEM_SEA_INCENSE", - "ITEM_LAX_INCENSE", - "ITEM_LUCKY_PUNCH", - "ITEM_METAL_POWDER", - "ITEM_THICK_CLUB", - "ITEM_STICK", - "ITEM_RED_SCARF", - "ITEM_BLUE_SCARF", - "ITEM_PINK_SCARF", - "ITEM_GREEN_SCARF", - "ITEM_YELLOW_SCARF", - "ITEM_WIDE_LENS", - "ITEM_MUSCLE_BAND", - "ITEM_WISE_GLASSES", - "ITEM_EXPERT_BELT", - "ITEM_LIGHT_CLAY", - "ITEM_LIFE_ORB", - "ITEM_POWER_HERB", - "ITEM_TOXIC_ORB", - "ITEM_FLAME_ORB", - "ITEM_QUICK_POWDER", - "ITEM_FOCUS_SASH", - "ITEM_ZOOM_LENS", - "ITEM_METRONOME", - "ITEM_IRON_BALL", - "ITEM_LAGGING_TAIL", - "ITEM_DESTINY_KNOT", - "ITEM_BLACK_SLUDGE", - "ITEM_ICY_ROCK", - "ITEM_SMOOTH_ROCK", - "ITEM_HEAT_ROCK", - "ITEM_DAMP_ROCK", - "ITEM_GRIP_CLAW", - "ITEM_CHOICE_SCARF", - "ITEM_STICKY_BARB", - "ITEM_POWER_BRACER", - "ITEM_POWER_BELT", - "ITEM_POWER_LENS", - "ITEM_POWER_BAND", - "ITEM_POWER_ANKLET", - "ITEM_POWER_WEIGHT", - "ITEM_SHED_SHELL", - "ITEM_BIG_ROOT", - "ITEM_CHOICE_SPECS", - "ITEM_FLAME_PLATE", - "ITEM_SPLASH_PLATE", - "ITEM_ZAP_PLATE", - "ITEM_MEADOW_PLATE", - "ITEM_ICICLE_PLATE", - "ITEM_FIST_PLATE", - "ITEM_TOXIC_PLATE", - "ITEM_EARTH_PLATE", - "ITEM_SKY_PLATE", - "ITEM_MIND_PLATE", - "ITEM_INSECT_PLATE", - "ITEM_STONE_PLATE", - "ITEM_SPOOKY_PLATE", - "ITEM_DRACO_PLATE", - "ITEM_DREAD_PLATE", - "ITEM_IRON_PLATE", - "ITEM_ODD_INCENSE", - "ITEM_ROCK_INCENSE", - "ITEM_FULL_INCENSE", - "ITEM_WAVE_INCENSE", - "ITEM_ROSE_INCENSE", - "ITEM_LUCK_INCENSE", - "ITEM_PURE_INCENSE", - "ITEM_PROTECTOR", - "ITEM_ELECTIRIZER", - "ITEM_MAGMARIZER", - "ITEM_DUBIOUS_DISC", - "ITEM_REAPER_CLOTH", - "ITEM_RAZOR_CLAW", - "ITEM_RAZOR_FANG", - "ITEM_TM01", - "ITEM_TM02", - "ITEM_TM03", - "ITEM_TM04", - "ITEM_TM05", - "ITEM_TM06", - "ITEM_TM07", - "ITEM_TM08", - "ITEM_TM09", - "ITEM_TM10", - "ITEM_TM11", - "ITEM_TM12", - "ITEM_TM13", - "ITEM_TM14", - "ITEM_TM15", - "ITEM_TM16", - "ITEM_TM17", - "ITEM_TM18", - "ITEM_TM19", - "ITEM_TM20", - "ITEM_TM21", - "ITEM_TM22", - "ITEM_TM23", - "ITEM_TM24", - "ITEM_TM25", - "ITEM_TM26", - "ITEM_TM27", - "ITEM_TM28", - "ITEM_TM29", - "ITEM_TM30", - "ITEM_TM31", - "ITEM_TM32", - "ITEM_TM33", - "ITEM_TM34", - "ITEM_TM35", - "ITEM_TM36", - "ITEM_TM37", - "ITEM_TM38", - "ITEM_TM39", - "ITEM_TM40", - "ITEM_TM41", - "ITEM_TM42", - "ITEM_TM43", - "ITEM_TM44", - "ITEM_TM45", - "ITEM_TM46", - "ITEM_TM47", - "ITEM_TM48", - "ITEM_TM49", - "ITEM_TM50", - "ITEM_TM51", - "ITEM_TM52", - "ITEM_TM53", - "ITEM_TM54", - "ITEM_TM55", - "ITEM_TM56", - "ITEM_TM57", - "ITEM_TM58", - "ITEM_TM59", - "ITEM_TM60", - "ITEM_TM61", - "ITEM_TM62", - "ITEM_TM63", - "ITEM_TM64", - "ITEM_TM65", - "ITEM_TM66", - "ITEM_TM67", - "ITEM_TM68", - "ITEM_TM69", - "ITEM_TM70", - "ITEM_TM71", - "ITEM_TM72", - "ITEM_TM73", - "ITEM_TM74", - "ITEM_TM75", - "ITEM_TM76", - "ITEM_TM77", - "ITEM_TM78", - "ITEM_TM79", - "ITEM_TM80", - "ITEM_TM81", - "ITEM_TM82", - "ITEM_TM83", - "ITEM_TM84", - "ITEM_TM85", - "ITEM_TM86", - "ITEM_TM87", - "ITEM_TM88", - "ITEM_TM89", - "ITEM_TM90", - "ITEM_TM91", - "ITEM_TM92", - "ITEM_HM01", - "ITEM_HM02", - "ITEM_HM03", - "ITEM_HM04", - "ITEM_HM05", - "ITEM_HM06", - "ITEM_HM07", - "ITEM_HM08", - "ITEM_EXPLORER_KIT", - "ITEM_LOOT_SACK", - "ITEM_RULE_BOOK", - "ITEM_POKE_RADAR", - "ITEM_POINT_CARD", - "ITEM_JOURNAL", - "ITEM_SEAL_CASE", - "ITEM_FASHION_CASE", - "ITEM_SEAL_BAG", - "ITEM_PAL_PAD", - "ITEM_WORKS_KEY", - "ITEM_OLD_CHARM", - "ITEM_GALACTIC_KEY", - "ITEM_RED_CHAIN", - "ITEM_TOWN_MAP", - "ITEM_VS_SEEKER", - "ITEM_COIN_CASE", - "ITEM_OLD_ROD", - "ITEM_GOOD_ROD", - "ITEM_SUPER_ROD", - "ITEM_SPRAYDUCK", - "ITEM_POFFIN_CASE", - "ITEM_BICYCLE", - "ITEM_SUITE_KEY", - "ITEM_OAKS_LETTER", - "ITEM_LUNAR_WING", - "ITEM_MEMBER_CARD", - "ITEM_AZURE_FLUTE", - "ITEM_S_S_TICKET", - "ITEM_CONTEST_PASS", - "ITEM_MAGMA_STONE", - "ITEM_PARCEL", - "ITEM_COUPON_1", - "ITEM_COUPON_2", - "ITEM_COUPON_3", - "ITEM_STORAGE_KEY", - "ITEM_SECRETPOTION", - "ITEM_VS_RECORDER", - "ITEM_GRACIDEA", - "ITEM_SECRET_KEY", - "MAX_ITEMS" - ] - } - } -} diff --git a/consts/meson.build b/consts/meson.build index 45a34107e8..bfbe9b6756 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -1,5 +1,4 @@ consts_manifest_basenames = [ - 'abilities', 'badges', 'battle', 'battle_subscripts', @@ -7,7 +6,6 @@ consts_manifest_basenames = [ 'catching_show', 'game_records', 'gender', - 'items', 'journal', 'map', 'movement', @@ -17,7 +15,6 @@ consts_manifest_basenames = [ 'scrcmd', 'sdat', 'shadows', - 'species', 'tm_learnset', 'trainer', 'trainer_ai', diff --git a/consts/moves.json b/consts/moves.json index 59b92c3f9a..b1395977cd 100644 --- a/consts/moves.json +++ b/consts/moves.json @@ -17,480 +17,6 @@ "MOVEATTRIBUTE_CONTEST_TYPE" ] }, - "@Move": { - "type": "enum", - "values": [ - "MOVE_NONE", - "MOVE_POUND", - "MOVE_KARATE_CHOP", - "MOVE_DOUBLE_SLAP", - "MOVE_COMET_PUNCH", - "MOVE_MEGA_PUNCH", - "MOVE_PAY_DAY", - "MOVE_FIRE_PUNCH", - "MOVE_ICE_PUNCH", - "MOVE_THUNDER_PUNCH", - "MOVE_SCRATCH", - "MOVE_VICE_GRIP", - "MOVE_GUILLOTINE", - "MOVE_RAZOR_WIND", - "MOVE_SWORDS_DANCE", - "MOVE_CUT", - "MOVE_GUST", - "MOVE_WING_ATTACK", - "MOVE_WHIRLWIND", - "MOVE_FLY", - "MOVE_BIND", - "MOVE_SLAM", - "MOVE_VINE_WHIP", - "MOVE_STOMP", - "MOVE_DOUBLE_KICK", - "MOVE_MEGA_KICK", - "MOVE_JUMP_KICK", - "MOVE_ROLLING_KICK", - "MOVE_SAND_ATTACK", - "MOVE_HEADBUTT", - "MOVE_HORN_ATTACK", - "MOVE_FURY_ATTACK", - "MOVE_HORN_DRILL", - "MOVE_TACKLE", - "MOVE_BODY_SLAM", - "MOVE_WRAP", - "MOVE_TAKE_DOWN", - "MOVE_THRASH", - "MOVE_DOUBLE_EDGE", - "MOVE_TAIL_WHIP", - "MOVE_POISON_STING", - "MOVE_TWINEEDLE", - "MOVE_PIN_MISSILE", - "MOVE_LEER", - "MOVE_BITE", - "MOVE_GROWL", - "MOVE_ROAR", - "MOVE_SING", - "MOVE_SUPERSONIC", - "MOVE_SONIC_BOOM", - "MOVE_DISABLE", - "MOVE_ACID", - "MOVE_EMBER", - "MOVE_FLAMETHROWER", - "MOVE_MIST", - "MOVE_WATER_GUN", - "MOVE_HYDRO_PUMP", - "MOVE_SURF", - "MOVE_ICE_BEAM", - "MOVE_BLIZZARD", - "MOVE_PSYBEAM", - "MOVE_BUBBLE_BEAM", - "MOVE_AURORA_BEAM", - "MOVE_HYPER_BEAM", - "MOVE_PECK", - "MOVE_DRILL_PECK", - "MOVE_SUBMISSION", - "MOVE_LOW_KICK", - "MOVE_COUNTER", - "MOVE_SEISMIC_TOSS", - "MOVE_STRENGTH", - "MOVE_ABSORB", - "MOVE_MEGA_DRAIN", - "MOVE_LEECH_SEED", - "MOVE_GROWTH", - "MOVE_RAZOR_LEAF", - "MOVE_SOLAR_BEAM", - "MOVE_POISON_POWDER", - "MOVE_STUN_SPORE", - "MOVE_SLEEP_POWDER", - "MOVE_PETAL_DANCE", - "MOVE_STRING_SHOT", - "MOVE_DRAGON_RAGE", - "MOVE_FIRE_SPIN", - "MOVE_THUNDER_SHOCK", - "MOVE_THUNDERBOLT", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER", - "MOVE_ROCK_THROW", - "MOVE_EARTHQUAKE", - "MOVE_FISSURE", - "MOVE_DIG", - "MOVE_TOXIC", - "MOVE_CONFUSION", - "MOVE_PSYCHIC", - "MOVE_HYPNOSIS", - "MOVE_MEDITATE", - "MOVE_AGILITY", - "MOVE_QUICK_ATTACK", - "MOVE_RAGE", - "MOVE_TELEPORT", - "MOVE_NIGHT_SHADE", - "MOVE_MIMIC", - "MOVE_SCREECH", - "MOVE_DOUBLE_TEAM", - "MOVE_RECOVER", - "MOVE_HARDEN", - "MOVE_MINIMIZE", - "MOVE_SMOKE_SCREEN", - "MOVE_CONFUSE_RAY", - "MOVE_WITHDRAW", - "MOVE_DEFENSE_CURL", - "MOVE_BARRIER", - "MOVE_LIGHT_SCREEN", - "MOVE_HAZE", - "MOVE_REFLECT", - "MOVE_FOCUS_ENERGY", - "MOVE_BIDE", - "MOVE_METRONOME", - "MOVE_MIRROR_MOVE", - "MOVE_SELFDESTRUCT", - "MOVE_EGG_BOMB", - "MOVE_LICK", - "MOVE_SMOG", - "MOVE_SLUDGE", - "MOVE_BONE_CLUB", - "MOVE_FIRE_BLAST", - "MOVE_WATERFALL", - "MOVE_CLAMP", - "MOVE_SWIFT", - "MOVE_SKULL_BASH", - "MOVE_SPIKE_CANNON", - "MOVE_CONSTRICT", - "MOVE_AMNESIA", - "MOVE_KINESIS", - "MOVE_SOFTBOILED", - "MOVE_HI_JUMP_KICK", - "MOVE_GLARE", - "MOVE_DREAM_EATER", - "MOVE_POISON_GAS", - "MOVE_BARRAGE", - "MOVE_LEECH_LIFE", - "MOVE_LOVELY_KISS", - "MOVE_SKY_ATTACK", - "MOVE_TRANSFORM", - "MOVE_BUBBLE", - "MOVE_DIZZY_PUNCH", - "MOVE_SPORE", - "MOVE_FLASH", - "MOVE_PSYWAVE", - "MOVE_SPLASH", - "MOVE_ACID_ARMOR", - "MOVE_CRABHAMMER", - "MOVE_EXPLOSION", - "MOVE_FURY_SWIPES", - "MOVE_BONEMERANG", - "MOVE_REST", - "MOVE_ROCK_SLIDE", - "MOVE_HYPER_FANG", - "MOVE_SHARPEN", - "MOVE_CONVERSION", - "MOVE_TRI_ATTACK", - "MOVE_SUPER_FANG", - "MOVE_SLASH", - "MOVE_SUBSTITUTE", - "MOVE_STRUGGLE", - "MOVE_SKETCH", - "MOVE_TRIPLE_KICK", - "MOVE_THIEF", - "MOVE_SPIDER_WEB", - "MOVE_MIND_READER", - "MOVE_NIGHTMARE", - "MOVE_FLAME_WHEEL", - "MOVE_SNORE", - "MOVE_CURSE", - "MOVE_FLAIL", - "MOVE_CONVERSION_2", - "MOVE_AEROBLAST", - "MOVE_COTTON_SPORE", - "MOVE_REVERSAL", - "MOVE_SPITE", - "MOVE_POWDER_SNOW", - "MOVE_PROTECT", - "MOVE_MACH_PUNCH", - "MOVE_SCARY_FACE", - "MOVE_FAINT_ATTACK", - "MOVE_SWEET_KISS", - "MOVE_BELLY_DRUM", - "MOVE_SLUDGE_BOMB", - "MOVE_MUD_SLAP", - "MOVE_OCTAZOOKA", - "MOVE_SPIKES", - "MOVE_ZAP_CANNON", - "MOVE_FORESIGHT", - "MOVE_DESTINY_BOND", - "MOVE_PERISH_SONG", - "MOVE_ICY_WIND", - "MOVE_DETECT", - "MOVE_BONE_RUSH", - "MOVE_LOCK_ON", - "MOVE_OUTRAGE", - "MOVE_SANDSTORM", - "MOVE_GIGA_DRAIN", - "MOVE_ENDURE", - "MOVE_CHARM", - "MOVE_ROLLOUT", - "MOVE_FALSE_SWIPE", - "MOVE_SWAGGER", - "MOVE_MILK_DRINK", - "MOVE_SPARK", - "MOVE_FURY_CUTTER", - "MOVE_STEEL_WING", - "MOVE_MEAN_LOOK", - "MOVE_ATTRACT", - "MOVE_SLEEP_TALK", - "MOVE_HEAL_BELL", - "MOVE_RETURN", - "MOVE_PRESENT", - "MOVE_FRUSTRATION", - "MOVE_SAFEGUARD", - "MOVE_PAIN_SPLIT", - "MOVE_SACRED_FIRE", - "MOVE_MAGNITUDE", - "MOVE_DYNAMIC_PUNCH", - "MOVE_MEGAHORN", - "MOVE_DRAGON_BREATH", - "MOVE_BATON_PASS", - "MOVE_ENCORE", - "MOVE_PURSUIT", - "MOVE_RAPID_SPIN", - "MOVE_SWEET_SCENT", - "MOVE_IRON_TAIL", - "MOVE_METAL_CLAW", - "MOVE_VITAL_THROW", - "MOVE_MORNING_SUN", - "MOVE_SYNTHESIS", - "MOVE_MOONLIGHT", - "MOVE_HIDDEN_POWER", - "MOVE_CROSS_CHOP", - "MOVE_TWISTER", - "MOVE_RAIN_DANCE", - "MOVE_SUNNY_DAY", - "MOVE_CRUNCH", - "MOVE_MIRROR_COAT", - "MOVE_PSYCH_UP", - "MOVE_EXTREME_SPEED", - "MOVE_ANCIENT_POWER", - "MOVE_SHADOW_BALL", - "MOVE_FUTURE_SIGHT", - "MOVE_ROCK_SMASH", - "MOVE_WHIRLPOOL", - "MOVE_BEAT_UP", - "MOVE_FAKE_OUT", - "MOVE_UPROAR", - "MOVE_STOCKPILE", - "MOVE_SPIT_UP", - "MOVE_SWALLOW", - "MOVE_HEAT_WAVE", - "MOVE_HAIL", - "MOVE_TORMENT", - "MOVE_FLATTER", - "MOVE_WILL_O_WISP", - "MOVE_MEMENTO", - "MOVE_FACADE", - "MOVE_FOCUS_PUNCH", - "MOVE_SMELLING_SALT", - "MOVE_FOLLOW_ME", - "MOVE_NATURE_POWER", - "MOVE_CHARGE", - "MOVE_TAUNT", - "MOVE_HELPING_HAND", - "MOVE_TRICK", - "MOVE_ROLE_PLAY", - "MOVE_WISH", - "MOVE_ASSIST", - "MOVE_INGRAIN", - "MOVE_SUPERPOWER", - "MOVE_MAGIC_COAT", - "MOVE_RECYCLE", - "MOVE_REVENGE", - "MOVE_BRICK_BREAK", - "MOVE_YAWN", - "MOVE_KNOCK_OFF", - "MOVE_ENDEAVOR", - "MOVE_ERUPTION", - "MOVE_SKILL_SWAP", - "MOVE_IMPRISON", - "MOVE_REFRESH", - "MOVE_GRUDGE", - "MOVE_SNATCH", - "MOVE_SECRET_POWER", - "MOVE_DIVE", - "MOVE_ARM_THRUST", - "MOVE_CAMOUFLAGE", - "MOVE_TAIL_GLOW", - "MOVE_LUSTER_PURGE", - "MOVE_MIST_BALL", - "MOVE_FEATHER_DANCE", - "MOVE_TEETER_DANCE", - "MOVE_BLAZE_KICK", - "MOVE_MUD_SPORT", - "MOVE_ICE_BALL", - "MOVE_NEEDLE_ARM", - "MOVE_SLACK_OFF", - "MOVE_HYPER_VOICE", - "MOVE_POISON_FANG", - "MOVE_CRUSH_CLAW", - "MOVE_BLAST_BURN", - "MOVE_HYDRO_CANNON", - "MOVE_METEOR_MASH", - "MOVE_ASTONISH", - "MOVE_WEATHER_BALL", - "MOVE_AROMATHERAPY", - "MOVE_FAKE_TEARS", - "MOVE_AIR_CUTTER", - "MOVE_OVERHEAT", - "MOVE_ODOR_SLEUTH", - "MOVE_ROCK_TOMB", - "MOVE_SILVER_WIND", - "MOVE_METAL_SOUND", - "MOVE_GRASS_WHISTLE", - "MOVE_TICKLE", - "MOVE_COSMIC_POWER", - "MOVE_WATER_SPOUT", - "MOVE_SIGNAL_BEAM", - "MOVE_SHADOW_PUNCH", - "MOVE_EXTRASENSORY", - "MOVE_SKY_UPPERCUT", - "MOVE_SAND_TOMB", - "MOVE_SHEER_COLD", - "MOVE_MUDDY_WATER", - "MOVE_BULLET_SEED", - "MOVE_AERIAL_ACE", - "MOVE_ICICLE_SPEAR", - "MOVE_IRON_DEFENSE", - "MOVE_BLOCK", - "MOVE_HOWL", - "MOVE_DRAGON_CLAW", - "MOVE_FRENZY_PLANT", - "MOVE_BULK_UP", - "MOVE_BOUNCE", - "MOVE_MUD_SHOT", - "MOVE_POISON_TAIL", - "MOVE_COVET", - "MOVE_VOLT_TACKLE", - "MOVE_MAGICAL_LEAF", - "MOVE_WATER_SPORT", - "MOVE_CALM_MIND", - "MOVE_LEAF_BLADE", - "MOVE_DRAGON_DANCE", - "MOVE_ROCK_BLAST", - "MOVE_SHOCK_WAVE", - "MOVE_WATER_PULSE", - "MOVE_DOOM_DESIRE", - "MOVE_PSYCHO_BOOST", - "MOVE_ROOST", - "MOVE_GRAVITY", - "MOVE_MIRACLE_EYE", - "MOVE_WAKE_UP_SLAP", - "MOVE_HAMMER_ARM", - "MOVE_GYRO_BALL", - "MOVE_HEALING_WISH", - "MOVE_BRINE", - "MOVE_NATURAL_GIFT", - "MOVE_FEINT", - "MOVE_PLUCK", - "MOVE_TAILWIND", - "MOVE_ACUPRESSURE", - "MOVE_METAL_BURST", - "MOVE_U_TURN", - "MOVE_CLOSE_COMBAT", - "MOVE_PAYBACK", - "MOVE_ASSURANCE", - "MOVE_EMBARGO", - "MOVE_FLING", - "MOVE_PSYCHO_SHIFT", - "MOVE_TRUMP_CARD", - "MOVE_HEAL_BLOCK", - "MOVE_WRING_OUT", - "MOVE_POWER_TRICK", - "MOVE_GASTRO_ACID", - "MOVE_LUCKY_CHANT", - "MOVE_ME_FIRST", - "MOVE_COPYCAT", - "MOVE_POWER_SWAP", - "MOVE_GUARD_SWAP", - "MOVE_PUNISHMENT", - "MOVE_LAST_RESORT", - "MOVE_WORRY_SEED", - "MOVE_SUCKER_PUNCH", - "MOVE_TOXIC_SPIKES", - "MOVE_HEART_SWAP", - "MOVE_AQUA_RING", - "MOVE_MAGNET_RISE", - "MOVE_FLARE_BLITZ", - "MOVE_FORCE_PALM", - "MOVE_AURA_SPHERE", - "MOVE_ROCK_POLISH", - "MOVE_POISON_JAB", - "MOVE_DARK_PULSE", - "MOVE_NIGHT_SLASH", - "MOVE_AQUA_TAIL", - "MOVE_SEED_BOMB", - "MOVE_AIR_SLASH", - "MOVE_X_SCISSOR", - "MOVE_BUG_BUZZ", - "MOVE_DRAGON_PULSE", - "MOVE_DRAGON_RUSH", - "MOVE_POWER_GEM", - "MOVE_DRAIN_PUNCH", - "MOVE_VACUUM_WAVE", - "MOVE_FOCUS_BLAST", - "MOVE_ENERGY_BALL", - "MOVE_BRAVE_BIRD", - "MOVE_EARTH_POWER", - "MOVE_SWITCHEROO", - "MOVE_GIGA_IMPACT", - "MOVE_NASTY_PLOT", - "MOVE_BULLET_PUNCH", - "MOVE_AVALANCHE", - "MOVE_ICE_SHARD", - "MOVE_SHADOW_CLAW", - "MOVE_THUNDER_FANG", - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_SHADOW_SNEAK", - "MOVE_MUD_BOMB", - "MOVE_PSYCHO_CUT", - "MOVE_ZEN_HEADBUTT", - "MOVE_MIRROR_SHOT", - "MOVE_FLASH_CANNON", - "MOVE_ROCK_CLIMB", - "MOVE_DEFOG", - "MOVE_TRICK_ROOM", - "MOVE_DRACO_METEOR", - "MOVE_DISCHARGE", - "MOVE_LAVA_PLUME", - "MOVE_LEAF_STORM", - "MOVE_POWER_WHIP", - "MOVE_ROCK_WRECKER", - "MOVE_CROSS_POISON", - "MOVE_GUNK_SHOT", - "MOVE_IRON_HEAD", - "MOVE_MAGNET_BOMB", - "MOVE_STONE_EDGE", - "MOVE_CAPTIVATE", - "MOVE_STEALTH_ROCK", - "MOVE_GRASS_KNOT", - "MOVE_CHATTER", - "MOVE_JUDGMENT", - "MOVE_BUG_BITE", - "MOVE_CHARGE_BEAM", - "MOVE_WOOD_HAMMER", - "MOVE_AQUA_JET", - "MOVE_ATTACK_ORDER", - "MOVE_DEFEND_ORDER", - "MOVE_HEAL_ORDER", - "MOVE_HEAD_SMASH", - "MOVE_DOUBLE_HIT", - "MOVE_ROAR_OF_TIME", - "MOVE_SPACIAL_REND", - "MOVE_LUNAR_DANCE", - "MOVE_CRUSH_GRIP", - "MOVE_MAGMA_STORM", - "MOVE_DARK_VOID", - "MOVE_SEED_FLARE", - "MOVE_OMINOUS_WIND", - "MOVE_SHADOW_FORCE", - "MAX_MOVES" - ] - }, "@MoveClass": { "type": "enum", "values": [ diff --git a/consts/pokemon.json b/consts/pokemon.json index 3d493aa473..2bcaa0b19b 100644 --- a/consts/pokemon.json +++ b/consts/pokemon.json @@ -1,30 +1,5 @@ { "definitions": { - "@PokemonType": { - "type": "enum", - "as_preproc": true, - "values": [ - "TYPE_NORMAL", - "TYPE_FIGHTING", - "TYPE_FLYING", - "TYPE_POISON", - "TYPE_GROUND", - "TYPE_ROCK", - "TYPE_BUG", - "TYPE_GHOST", - "TYPE_STEEL", - "TYPE_MYSTERY", - "TYPE_FIRE", - "TYPE_WATER", - "TYPE_GRASS", - "TYPE_ELECTRIC", - "TYPE_PSYCHIC", - "TYPE_ICE", - "TYPE_DRAGON", - "TYPE_DARK", - "NUMBER_OF_MON_TYPES" - ] - }, "@SpeciesDataParam": { "type": "enum", "values": [ @@ -63,43 +38,6 @@ "SPECIES_DATA_TM_LEARNSET_MASK_4" ] }, - "@PokemonColor": { - "type": "enum", - "values": [ - "MON_COLOR_RED", - "MON_COLOR_BLUE", - "MON_COLOR_YELLOW", - "MON_COLOR_GREEN", - "MON_COLOR_BLACK", - "MON_COLOR_BROWN", - "MON_COLOR_PURPLE", - "MON_COLOR_GRAY", - "MON_COLOR_WHITE", - "MON_COLOR_PINK", - "MON_COLOR_EGG" - ] - }, - "@PokemonEggGroup": { - "type": "enum", - "values": [ - "EGG_GROUP_NONE", - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1", - "EGG_GROUP_BUG", - "EGG_GROUP_FLYING", - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS", - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_WATER_3", - "EGG_GROUP_MINERAL", - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_WATER_2", - "EGG_GROUP_DITTO", - "EGG_GROUP_DRAGON", - "EGG_GROUP_UNDISCOVERED" - ] - }, "@PokemonEvoMethod": { "type": "enum", "values": [ @@ -132,17 +70,6 @@ "EVO_LEVEL_ICE_ROCK" ] }, - "@PokemonExpRate": { - "type": "enum", - "values": [ - "EXP_RATE_MEDIUM_FAST", - "EXP_RATE_ERRATIC", - "EXP_RATE_FLUCTUATING", - "EXP_RATE_MEDIUM_SLOW", - "EXP_RATE_FAST", - "EXP_RATE_SLOW" - ] - }, "@PokemonContestType": { "type": "enum", "values": [ @@ -154,20 +81,6 @@ "CONTEST_TYPE_MAX" ] }, - "@PokemonGenderRatio": { - "type": "aliases", - "as_preproc": true, - "values": { - "GENDER_RATIO_MALE_ONLY": 0, - "GENDER_RATIO_FEMALE_12_5": 31, - "GENDER_RATIO_FEMALE_25": 63, - "GENDER_RATIO_FEMALE_50": 127, - "GENDER_RATIO_FEMALE_75": 191, - "GENDER_RATIO_FEMALE_87_5": 223, - "GENDER_RATIO_FEMALE_ONLY": 254, - "GENDER_RATIO_NO_GENDER": 255 - } - }, "@PokemonFootprintSize": { "type": "enum", "as_preproc": true, diff --git a/consts/species.json b/consts/species.json deleted file mode 100644 index 30924d3d06..0000000000 --- a/consts/species.json +++ /dev/null @@ -1,506 +0,0 @@ -{ - "definitions": { - "@PokemonSpecies": { - "type": "enum", - "as_preproc": true, - "values": [ - "SPECIES_NONE", - "SPECIES_BULBASAUR", - "SPECIES_IVYSAUR", - "SPECIES_VENUSAUR", - "SPECIES_CHARMANDER", - "SPECIES_CHARMELEON", - "SPECIES_CHARIZARD", - "SPECIES_SQUIRTLE", - "SPECIES_WARTORTLE", - "SPECIES_BLASTOISE", - "SPECIES_CATERPIE", - "SPECIES_METAPOD", - "SPECIES_BUTTERFREE", - "SPECIES_WEEDLE", - "SPECIES_KAKUNA", - "SPECIES_BEEDRILL", - "SPECIES_PIDGEY", - "SPECIES_PIDGEOTTO", - "SPECIES_PIDGEOT", - "SPECIES_RATTATA", - "SPECIES_RATICATE", - "SPECIES_SPEAROW", - "SPECIES_FEAROW", - "SPECIES_EKANS", - "SPECIES_ARBOK", - "SPECIES_PIKACHU", - "SPECIES_RAICHU", - "SPECIES_SANDSHREW", - "SPECIES_SANDSLASH", - "SPECIES_NIDORAN_F", - "SPECIES_NIDORINA", - "SPECIES_NIDOQUEEN", - "SPECIES_NIDORAN_M", - "SPECIES_NIDORINO", - "SPECIES_NIDOKING", - "SPECIES_CLEFAIRY", - "SPECIES_CLEFABLE", - "SPECIES_VULPIX", - "SPECIES_NINETALES", - "SPECIES_JIGGLYPUFF", - "SPECIES_WIGGLYTUFF", - "SPECIES_ZUBAT", - "SPECIES_GOLBAT", - "SPECIES_ODDISH", - "SPECIES_GLOOM", - "SPECIES_VILEPLUME", - "SPECIES_PARAS", - "SPECIES_PARASECT", - "SPECIES_VENONAT", - "SPECIES_VENOMOTH", - "SPECIES_DIGLETT", - "SPECIES_DUGTRIO", - "SPECIES_MEOWTH", - "SPECIES_PERSIAN", - "SPECIES_PSYDUCK", - "SPECIES_GOLDUCK", - "SPECIES_MANKEY", - "SPECIES_PRIMEAPE", - "SPECIES_GROWLITHE", - "SPECIES_ARCANINE", - "SPECIES_POLIWAG", - "SPECIES_POLIWHIRL", - "SPECIES_POLIWRATH", - "SPECIES_ABRA", - "SPECIES_KADABRA", - "SPECIES_ALAKAZAM", - "SPECIES_MACHOP", - "SPECIES_MACHOKE", - "SPECIES_MACHAMP", - "SPECIES_BELLSPROUT", - "SPECIES_WEEPINBELL", - "SPECIES_VICTREEBEL", - "SPECIES_TENTACOOL", - "SPECIES_TENTACRUEL", - "SPECIES_GEODUDE", - "SPECIES_GRAVELER", - "SPECIES_GOLEM", - "SPECIES_PONYTA", - "SPECIES_RAPIDASH", - "SPECIES_SLOWPOKE", - "SPECIES_SLOWBRO", - "SPECIES_MAGNEMITE", - "SPECIES_MAGNETON", - "SPECIES_FARFETCHD", - "SPECIES_DODUO", - "SPECIES_DODRIO", - "SPECIES_SEEL", - "SPECIES_DEWGONG", - "SPECIES_GRIMER", - "SPECIES_MUK", - "SPECIES_SHELLDER", - "SPECIES_CLOYSTER", - "SPECIES_GASTLY", - "SPECIES_HAUNTER", - "SPECIES_GENGAR", - "SPECIES_ONIX", - "SPECIES_DROWZEE", - "SPECIES_HYPNO", - "SPECIES_KRABBY", - "SPECIES_KINGLER", - "SPECIES_VOLTORB", - "SPECIES_ELECTRODE", - "SPECIES_EXEGGCUTE", - "SPECIES_EXEGGUTOR", - "SPECIES_CUBONE", - "SPECIES_MAROWAK", - "SPECIES_HITMONLEE", - "SPECIES_HITMONCHAN", - "SPECIES_LICKITUNG", - "SPECIES_KOFFING", - "SPECIES_WEEZING", - "SPECIES_RHYHORN", - "SPECIES_RHYDON", - "SPECIES_CHANSEY", - "SPECIES_TANGELA", - "SPECIES_KANGASKHAN", - "SPECIES_HORSEA", - "SPECIES_SEADRA", - "SPECIES_GOLDEEN", - "SPECIES_SEAKING", - "SPECIES_STARYU", - "SPECIES_STARMIE", - "SPECIES_MR_MIME", - "SPECIES_SCYTHER", - "SPECIES_JYNX", - "SPECIES_ELECTABUZZ", - "SPECIES_MAGMAR", - "SPECIES_PINSIR", - "SPECIES_TAUROS", - "SPECIES_MAGIKARP", - "SPECIES_GYARADOS", - "SPECIES_LAPRAS", - "SPECIES_DITTO", - "SPECIES_EEVEE", - "SPECIES_VAPOREON", - "SPECIES_JOLTEON", - "SPECIES_FLAREON", - "SPECIES_PORYGON", - "SPECIES_OMANYTE", - "SPECIES_OMASTAR", - "SPECIES_KABUTO", - "SPECIES_KABUTOPS", - "SPECIES_AERODACTYL", - "SPECIES_SNORLAX", - "SPECIES_ARTICUNO", - "SPECIES_ZAPDOS", - "SPECIES_MOLTRES", - "SPECIES_DRATINI", - "SPECIES_DRAGONAIR", - "SPECIES_DRAGONITE", - "SPECIES_MEWTWO", - "SPECIES_MEW", - "SPECIES_CHIKORITA", - "SPECIES_BAYLEEF", - "SPECIES_MEGANIUM", - "SPECIES_CYNDAQUIL", - "SPECIES_QUILAVA", - "SPECIES_TYPHLOSION", - "SPECIES_TOTODILE", - "SPECIES_CROCONAW", - "SPECIES_FERALIGATR", - "SPECIES_SENTRET", - "SPECIES_FURRET", - "SPECIES_HOOTHOOT", - "SPECIES_NOCTOWL", - "SPECIES_LEDYBA", - "SPECIES_LEDIAN", - "SPECIES_SPINARAK", - "SPECIES_ARIADOS", - "SPECIES_CROBAT", - "SPECIES_CHINCHOU", - "SPECIES_LANTURN", - "SPECIES_PICHU", - "SPECIES_CLEFFA", - "SPECIES_IGGLYBUFF", - "SPECIES_TOGEPI", - "SPECIES_TOGETIC", - "SPECIES_NATU", - "SPECIES_XATU", - "SPECIES_MAREEP", - "SPECIES_FLAAFFY", - "SPECIES_AMPHAROS", - "SPECIES_BELLOSSOM", - "SPECIES_MARILL", - "SPECIES_AZUMARILL", - "SPECIES_SUDOWOODO", - "SPECIES_POLITOED", - "SPECIES_HOPPIP", - "SPECIES_SKIPLOOM", - "SPECIES_JUMPLUFF", - "SPECIES_AIPOM", - "SPECIES_SUNKERN", - "SPECIES_SUNFLORA", - "SPECIES_YANMA", - "SPECIES_WOOPER", - "SPECIES_QUAGSIRE", - "SPECIES_ESPEON", - "SPECIES_UMBREON", - "SPECIES_MURKROW", - "SPECIES_SLOWKING", - "SPECIES_MISDREAVUS", - "SPECIES_UNOWN", - "SPECIES_WOBBUFFET", - "SPECIES_GIRAFARIG", - "SPECIES_PINECO", - "SPECIES_FORRETRESS", - "SPECIES_DUNSPARCE", - "SPECIES_GLIGAR", - "SPECIES_STEELIX", - "SPECIES_SNUBBULL", - "SPECIES_GRANBULL", - "SPECIES_QWILFISH", - "SPECIES_SCIZOR", - "SPECIES_SHUCKLE", - "SPECIES_HERACROSS", - "SPECIES_SNEASEL", - "SPECIES_TEDDIURSA", - "SPECIES_URSARING", - "SPECIES_SLUGMA", - "SPECIES_MAGCARGO", - "SPECIES_SWINUB", - "SPECIES_PILOSWINE", - "SPECIES_CORSOLA", - "SPECIES_REMORAID", - "SPECIES_OCTILLERY", - "SPECIES_DELIBIRD", - "SPECIES_MANTINE", - "SPECIES_SKARMORY", - "SPECIES_HOUNDOUR", - "SPECIES_HOUNDOOM", - "SPECIES_KINGDRA", - "SPECIES_PHANPY", - "SPECIES_DONPHAN", - "SPECIES_PORYGON2", - "SPECIES_STANTLER", - "SPECIES_SMEARGLE", - "SPECIES_TYROGUE", - "SPECIES_HITMONTOP", - "SPECIES_SMOOCHUM", - "SPECIES_ELEKID", - "SPECIES_MAGBY", - "SPECIES_MILTANK", - "SPECIES_BLISSEY", - "SPECIES_RAIKOU", - "SPECIES_ENTEI", - "SPECIES_SUICUNE", - "SPECIES_LARVITAR", - "SPECIES_PUPITAR", - "SPECIES_TYRANITAR", - "SPECIES_LUGIA", - "SPECIES_HO_OH", - "SPECIES_CELEBI", - "SPECIES_TREECKO", - "SPECIES_GROVYLE", - "SPECIES_SCEPTILE", - "SPECIES_TORCHIC", - "SPECIES_COMBUSKEN", - "SPECIES_BLAZIKEN", - "SPECIES_MUDKIP", - "SPECIES_MARSHTOMP", - "SPECIES_SWAMPERT", - "SPECIES_POOCHYENA", - "SPECIES_MIGHTYENA", - "SPECIES_ZIGZAGOON", - "SPECIES_LINOONE", - "SPECIES_WURMPLE", - "SPECIES_SILCOON", - "SPECIES_BEAUTIFLY", - "SPECIES_CASCOON", - "SPECIES_DUSTOX", - "SPECIES_LOTAD", - "SPECIES_LOMBRE", - "SPECIES_LUDICOLO", - "SPECIES_SEEDOT", - "SPECIES_NUZLEAF", - "SPECIES_SHIFTRY", - "SPECIES_TAILLOW", - "SPECIES_SWELLOW", - "SPECIES_WINGULL", - "SPECIES_PELIPPER", - "SPECIES_RALTS", - "SPECIES_KIRLIA", - "SPECIES_GARDEVOIR", - "SPECIES_SURSKIT", - "SPECIES_MASQUERAIN", - "SPECIES_SHROOMISH", - "SPECIES_BRELOOM", - "SPECIES_SLAKOTH", - "SPECIES_VIGOROTH", - "SPECIES_SLAKING", - "SPECIES_NINCADA", - "SPECIES_NINJASK", - "SPECIES_SHEDINJA", - "SPECIES_WHISMUR", - "SPECIES_LOUDRED", - "SPECIES_EXPLOUD", - "SPECIES_MAKUHITA", - "SPECIES_HARIYAMA", - "SPECIES_AZURILL", - "SPECIES_NOSEPASS", - "SPECIES_SKITTY", - "SPECIES_DELCATTY", - "SPECIES_SABLEYE", - "SPECIES_MAWILE", - "SPECIES_ARON", - "SPECIES_LAIRON", - "SPECIES_AGGRON", - "SPECIES_MEDITITE", - "SPECIES_MEDICHAM", - "SPECIES_ELECTRIKE", - "SPECIES_MANECTRIC", - "SPECIES_PLUSLE", - "SPECIES_MINUN", - "SPECIES_VOLBEAT", - "SPECIES_ILLUMISE", - "SPECIES_ROSELIA", - "SPECIES_GULPIN", - "SPECIES_SWALOT", - "SPECIES_CARVANHA", - "SPECIES_SHARPEDO", - "SPECIES_WAILMER", - "SPECIES_WAILORD", - "SPECIES_NUMEL", - "SPECIES_CAMERUPT", - "SPECIES_TORKOAL", - "SPECIES_SPOINK", - "SPECIES_GRUMPIG", - "SPECIES_SPINDA", - "SPECIES_TRAPINCH", - "SPECIES_VIBRAVA", - "SPECIES_FLYGON", - "SPECIES_CACNEA", - "SPECIES_CACTURNE", - "SPECIES_SWABLU", - "SPECIES_ALTARIA", - "SPECIES_ZANGOOSE", - "SPECIES_SEVIPER", - "SPECIES_LUNATONE", - "SPECIES_SOLROCK", - "SPECIES_BARBOACH", - "SPECIES_WHISCASH", - "SPECIES_CORPHISH", - "SPECIES_CRAWDAUNT", - "SPECIES_BALTOY", - "SPECIES_CLAYDOL", - "SPECIES_LILEEP", - "SPECIES_CRADILY", - "SPECIES_ANORITH", - "SPECIES_ARMALDO", - "SPECIES_FEEBAS", - "SPECIES_MILOTIC", - "SPECIES_CASTFORM", - "SPECIES_KECLEON", - "SPECIES_SHUPPET", - "SPECIES_BANETTE", - "SPECIES_DUSKULL", - "SPECIES_DUSCLOPS", - "SPECIES_TROPIUS", - "SPECIES_CHIMECHO", - "SPECIES_ABSOL", - "SPECIES_WYNAUT", - "SPECIES_SNORUNT", - "SPECIES_GLALIE", - "SPECIES_SPHEAL", - "SPECIES_SEALEO", - "SPECIES_WALREIN", - "SPECIES_CLAMPERL", - "SPECIES_HUNTAIL", - "SPECIES_GOREBYSS", - "SPECIES_RELICANTH", - "SPECIES_LUVDISC", - "SPECIES_BAGON", - "SPECIES_SHELGON", - "SPECIES_SALAMENCE", - "SPECIES_BELDUM", - "SPECIES_METANG", - "SPECIES_METAGROSS", - "SPECIES_REGIROCK", - "SPECIES_REGICE", - "SPECIES_REGISTEEL", - "SPECIES_LATIAS", - "SPECIES_LATIOS", - "SPECIES_KYOGRE", - "SPECIES_GROUDON", - "SPECIES_RAYQUAZA", - "SPECIES_JIRACHI", - "SPECIES_DEOXYS", - "SPECIES_TURTWIG", - "SPECIES_GROTLE", - "SPECIES_TORTERRA", - "SPECIES_CHIMCHAR", - "SPECIES_MONFERNO", - "SPECIES_INFERNAPE", - "SPECIES_PIPLUP", - "SPECIES_PRINPLUP", - "SPECIES_EMPOLEON", - "SPECIES_STARLY", - "SPECIES_STARAVIA", - "SPECIES_STARAPTOR", - "SPECIES_BIDOOF", - "SPECIES_BIBAREL", - "SPECIES_KRICKETOT", - "SPECIES_KRICKETUNE", - "SPECIES_SHINX", - "SPECIES_LUXIO", - "SPECIES_LUXRAY", - "SPECIES_BUDEW", - "SPECIES_ROSERADE", - "SPECIES_CRANIDOS", - "SPECIES_RAMPARDOS", - "SPECIES_SHIELDON", - "SPECIES_BASTIODON", - "SPECIES_BURMY", - "SPECIES_WORMADAM", - "SPECIES_MOTHIM", - "SPECIES_COMBEE", - "SPECIES_VESPIQUEN", - "SPECIES_PACHIRISU", - "SPECIES_BUIZEL", - "SPECIES_FLOATZEL", - "SPECIES_CHERUBI", - "SPECIES_CHERRIM", - "SPECIES_SHELLOS", - "SPECIES_GASTRODON", - "SPECIES_AMBIPOM", - "SPECIES_DRIFLOON", - "SPECIES_DRIFBLIM", - "SPECIES_BUNEARY", - "SPECIES_LOPUNNY", - "SPECIES_MISMAGIUS", - "SPECIES_HONCHKROW", - "SPECIES_GLAMEOW", - "SPECIES_PURUGLY", - "SPECIES_CHINGLING", - "SPECIES_STUNKY", - "SPECIES_SKUNTANK", - "SPECIES_BRONZOR", - "SPECIES_BRONZONG", - "SPECIES_BONSLY", - "SPECIES_MIME_JR", - "SPECIES_HAPPINY", - "SPECIES_CHATOT", - "SPECIES_SPIRITOMB", - "SPECIES_GIBLE", - "SPECIES_GABITE", - "SPECIES_GARCHOMP", - "SPECIES_MUNCHLAX", - "SPECIES_RIOLU", - "SPECIES_LUCARIO", - "SPECIES_HIPPOPOTAS", - "SPECIES_HIPPOWDON", - "SPECIES_SKORUPI", - "SPECIES_DRAPION", - "SPECIES_CROAGUNK", - "SPECIES_TOXICROAK", - "SPECIES_CARNIVINE", - "SPECIES_FINNEON", - "SPECIES_LUMINEON", - "SPECIES_MANTYKE", - "SPECIES_SNOVER", - "SPECIES_ABOMASNOW", - "SPECIES_WEAVILE", - "SPECIES_MAGNEZONE", - "SPECIES_LICKILICKY", - "SPECIES_RHYPERIOR", - "SPECIES_TANGROWTH", - "SPECIES_ELECTIVIRE", - "SPECIES_MAGMORTAR", - "SPECIES_TOGEKISS", - "SPECIES_YANMEGA", - "SPECIES_LEAFEON", - "SPECIES_GLACEON", - "SPECIES_GLISCOR", - "SPECIES_MAMOSWINE", - "SPECIES_PORYGON_Z", - "SPECIES_GALLADE", - "SPECIES_PROBOPASS", - "SPECIES_DUSKNOIR", - "SPECIES_FROSLASS", - "SPECIES_ROTOM", - "SPECIES_UXIE", - "SPECIES_MESPRIT", - "SPECIES_AZELF", - "SPECIES_DIALGA", - "SPECIES_PALKIA", - "SPECIES_HEATRAN", - "SPECIES_REGIGIGAS", - "SPECIES_GIRATINA", - "SPECIES_CRESSELIA", - "SPECIES_PHIONE", - "SPECIES_MANAPHY", - "SPECIES_DARKRAI", - "SPECIES_SHAYMIN", - "SPECIES_ARCEUS", - "SPECIES_EGG", - "SPECIES_BAD_EGG" - ] - } - } -} diff --git a/gen_compile_commands.py b/gen_compile_commands.py index b6085a31dc..a7f924ce18 100644 --- a/gen_compile_commands.py +++ b/gen_compile_commands.py @@ -40,6 +40,10 @@ arm9_c_flags = [ '-DSDK_CW_FORCE_EXPORT_SUPPORT', '-DSDK_FINALROM', '-DSDK_TS', + '-DPOKEPLATINUM_GENERATED_ENUM', + '-DPM_KEEP_ASSERTS', + '-DGAME_VERSION=PLATINUM', + '-DGAME_LANGUAGE=ENGLISH' ] asm_commands = [ diff --git a/generated/abilities.txt b/generated/abilities.txt new file mode 100644 index 0000000000..1f61db2806 --- /dev/null +++ b/generated/abilities.txt @@ -0,0 +1,124 @@ +ABILITY_NONE +ABILITY_STENCH +ABILITY_DRIZZLE +ABILITY_SPEED_BOOST +ABILITY_BATTLE_ARMOR +ABILITY_STURDY +ABILITY_DAMP +ABILITY_LIMBER +ABILITY_SAND_VEIL +ABILITY_STATIC +ABILITY_VOLT_ABSORB +ABILITY_WATER_ABSORB +ABILITY_OBLIVIOUS +ABILITY_CLOUD_NINE +ABILITY_COMPOUND_EYES +ABILITY_INSOMNIA +ABILITY_COLOR_CHANGE +ABILITY_IMMUNITY +ABILITY_FLASH_FIRE +ABILITY_SHIELD_DUST +ABILITY_OWN_TEMPO +ABILITY_SUCTION_CUPS +ABILITY_INTIMIDATE +ABILITY_SHADOW_TAG +ABILITY_ROUGH_SKIN +ABILITY_WONDER_GUARD +ABILITY_LEVITATE +ABILITY_EFFECT_SPORE +ABILITY_SYNCHRONIZE +ABILITY_CLEAR_BODY +ABILITY_NATURAL_CURE +ABILITY_LIGHTNING_ROD +ABILITY_SERENE_GRACE +ABILITY_SWIFT_SWIM +ABILITY_CHLOROPHYLL +ABILITY_ILLUMINATE +ABILITY_TRACE +ABILITY_HUGE_POWER +ABILITY_POISON_POINT +ABILITY_INNER_FOCUS +ABILITY_MAGMA_ARMOR +ABILITY_WATER_VEIL +ABILITY_MAGNET_PULL +ABILITY_SOUNDPROOF +ABILITY_RAIN_DISH +ABILITY_SAND_STREAM +ABILITY_PRESSURE +ABILITY_THICK_FAT +ABILITY_EARLY_BIRD +ABILITY_FLAME_BODY +ABILITY_RUN_AWAY +ABILITY_KEEN_EYE +ABILITY_HYPER_CUTTER +ABILITY_PICKUP +ABILITY_TRUANT +ABILITY_HUSTLE +ABILITY_CUTE_CHARM +ABILITY_PLUS +ABILITY_MINUS +ABILITY_FORECAST +ABILITY_STICKY_HOLD +ABILITY_SHED_SKIN +ABILITY_GUTS +ABILITY_MARVEL_SCALE +ABILITY_LIQUID_OOZE +ABILITY_OVERGROW +ABILITY_BLAZE +ABILITY_TORRENT +ABILITY_SWARM +ABILITY_ROCK_HEAD +ABILITY_DROUGHT +ABILITY_ARENA_TRAP +ABILITY_VITAL_SPIRIT +ABILITY_WHITE_SMOKE +ABILITY_PURE_POWER +ABILITY_SHELL_ARMOR +ABILITY_AIR_LOCK +ABILITY_TANGLED_FEET +ABILITY_MOTOR_DRIVE +ABILITY_RIVALRY +ABILITY_STEADFAST +ABILITY_SNOW_CLOAK +ABILITY_GLUTTONY +ABILITY_ANGER_POINT +ABILITY_UNBURDEN +ABILITY_HEATPROOF +ABILITY_SIMPLE +ABILITY_DRY_SKIN +ABILITY_DOWNLOAD +ABILITY_IRON_FIST +ABILITY_POISON_HEAL +ABILITY_ADAPTABILITY +ABILITY_SKILL_LINK +ABILITY_HYDRATION +ABILITY_SOLAR_POWER +ABILITY_QUICK_FEET +ABILITY_NORMALIZE +ABILITY_SNIPER +ABILITY_MAGIC_GUARD +ABILITY_NO_GUARD +ABILITY_STALL +ABILITY_TECHNICIAN +ABILITY_LEAF_GUARD +ABILITY_KLUTZ +ABILITY_MOLD_BREAKER +ABILITY_SUPER_LUCK +ABILITY_AFTERMATH +ABILITY_ANTICIPATION +ABILITY_FOREWARN +ABILITY_UNAWARE +ABILITY_TINTED_LENS +ABILITY_FILTER +ABILITY_SLOW_START +ABILITY_SCRAPPY +ABILITY_STORM_DRAIN +ABILITY_ICE_BODY +ABILITY_SOLID_ROCK +ABILITY_SNOW_WARNING +ABILITY_HONEY_GATHER +ABILITY_FRISK +ABILITY_RECKLESS +ABILITY_MULTITYPE +ABILITY_FLOWER_GIFT +ABILITY_BAD_DREAMS diff --git a/generated/egg_groups.txt b/generated/egg_groups.txt new file mode 100644 index 0000000000..18f48343e9 --- /dev/null +++ b/generated/egg_groups.txt @@ -0,0 +1,16 @@ +EGG_GROUP_NONE +EGG_GROUP_MONSTER +EGG_GROUP_WATER_1 +EGG_GROUP_BUG +EGG_GROUP_FLYING +EGG_GROUP_FIELD +EGG_GROUP_FAIRY +EGG_GROUP_GRASS +EGG_GROUP_HUMAN_LIKE +EGG_GROUP_WATER_3 +EGG_GROUP_MINERAL +EGG_GROUP_AMORPHOUS +EGG_GROUP_WATER_2 +EGG_GROUP_DITTO +EGG_GROUP_DRAGON +EGG_GROUP_UNDISCOVERED diff --git a/generated/exp_rates.txt b/generated/exp_rates.txt new file mode 100644 index 0000000000..43abaca332 --- /dev/null +++ b/generated/exp_rates.txt @@ -0,0 +1,6 @@ +EXP_RATE_MEDIUM_FAST +EXP_RATE_ERRATIC +EXP_RATE_FLUCTUATING +EXP_RATE_MEDIUM_SLOW +EXP_RATE_FAST +EXP_RATE_SLOW diff --git a/generated/gender_ratios.txt b/generated/gender_ratios.txt new file mode 100644 index 0000000000..c453f1f638 --- /dev/null +++ b/generated/gender_ratios.txt @@ -0,0 +1,8 @@ +GENDER_RATIO_MALE_ONLY = 0 +GENDER_RATIO_FEMALE_12_5 = 31 +GENDER_RATIO_FEMALE_25 = 63 +GENDER_RATIO_FEMALE_50 = 127 +GENDER_RATIO_FEMALE_75 = 191 +GENDER_RATIO_FEMALE_87_5 = 223 +GENDER_RATIO_FEMALE_ONLY = 254 +GENDER_RATIO_NO_GENDER = 255 diff --git a/generated/item_hold_effects.txt b/generated/item_hold_effects.txt new file mode 100644 index 0000000000..8b6edea913 --- /dev/null +++ b/generated/item_hold_effects.txt @@ -0,0 +1,147 @@ +HOLD_EFFECT_NONE +HOLD_EFFECT_HP_RESTORE +HOLD_EFFECT_GIRATINA_BOOST +HOLD_EFFECT_DIALGA_BOOST +HOLD_EFFECT_PALKIA_BOOST +HOLD_EFFECT_PRZ_RESTORE +HOLD_EFFECT_SLP_RESTORE +HOLD_EFFECT_PSN_RESTORE +HOLD_EFFECT_BRN_RESTORE +HOLD_EFFECT_FRZ_RESTORE +HOLD_EFFECT_PP_RESTORE +HOLD_EFFECT_CONFUSE_RESTORE +HOLD_EFFECT_STATUS_RESTORE +HOLD_EFFECT_HP_PCT_RESTORE +HOLD_EFFECT_HP_RESTORE_SPICY +HOLD_EFFECT_HP_RESTORE_DRY +HOLD_EFFECT_HP_RESTORE_SWEET +HOLD_EFFECT_HP_RESTORE_BITTER +HOLD_EFFECT_HP_RESTORE_SOUR +HOLD_EFFECT_WEAKEN_SE_FIRE +HOLD_EFFECT_WEAKEN_SE_WATER +HOLD_EFFECT_WEAKEN_SE_ELECTRIC +HOLD_EFFECT_WEAKEN_SE_GRASS +HOLD_EFFECT_WEAKEN_SE_ICE +HOLD_EFFECT_WEAKEN_SE_FIGHT +HOLD_EFFECT_WEAKEN_SE_POISON +HOLD_EFFECT_WEAKEN_SE_GROUND +HOLD_EFFECT_WEAKEN_SE_FLYING +HOLD_EFFECT_WEAKEN_SE_PSYCHIC +HOLD_EFFECT_WEAKEN_SE_BUG +HOLD_EFFECT_WEAKEN_SE_ROCK +HOLD_EFFECT_WEAKEN_SE_GHOST +HOLD_EFFECT_WEAKEN_SE_DRAGON +HOLD_EFFECT_WEAKEN_SE_DARK +HOLD_EFFECT_WEAKEN_SE_STEEL +HOLD_EFFECT_WEAKEN_NORMAL +HOLD_EFFECT_PINCH_ATK_UP +HOLD_EFFECT_PINCH_DEF_UP +HOLD_EFFECT_PINCH_SPEED_UP +HOLD_EFFECT_PINCH_SPATK_UP +HOLD_EFFECT_PINCH_SPDEF_UP +HOLD_EFFECT_PINCH_CRITRATE_UP +HOLD_EFFECT_PINCH_RANDOM_UP +HOLD_EFFECT_HP_RESTORE_SE +HOLD_EFFECT_PINCH_ACC_UP +HOLD_EFFECT_PINCH_PRIORITY +HOLD_EFFECT_RECOIL_PHYSICAL +HOLD_EFFECT_RECOIL_SPECIAL +HOLD_EFFECT_ACC_REDUCE +HOLD_EFFECT_STATDOWN_RESTORE +HOLD_EFFECT_EVS_UP_SPEED_DOWN +HOLD_EFFECT_EXP_SHARE +HOLD_EFFECT_SOMETIMES_PRIORITY +HOLD_EFFECT_FRIENDSHIP_UP +HOLD_EFFECT_HEAL_INFATUATION +HOLD_EFFECT_CHOICE_ATK +HOLD_EFFECT_SOMETIMES_FLINCH +HOLD_EFFECT_STRENGTHEN_BUG +HOLD_EFFECT_MONEY_UP +HOLD_EFFECT_ENCOUNTERS_DOWN +HOLD_EFFECT_LATI_SPECIAL +HOLD_EFFECT_CLAMPERL_SPATK +HOLD_EFFECT_CLAMPERL_SPDEF +HOLD_EFFECT_FLEE +HOLD_EFFECT_NO_EVOLVE +HOLD_EFFECT_MAYBE_ENDURE +HOLD_EFFECT_EXP_UP +HOLD_EFFECT_CRITRATE_UP +HOLD_EFFECT_STRENGTHEN_STEEL +HOLD_EFFECT_HP_RESTORE_GRADUAL +HOLD_EFFECT_EVOLVE_SEADRA +HOLD_EFFECT_PIKA_SPATK_UP +HOLD_EFFECT_STRENGTHEN_GROUND +HOLD_EFFECT_STRENGTHEN_ROCK +HOLD_EFFECT_STRENGTHEN_GRASS +HOLD_EFFECT_STRENGTHEN_DARK +HOLD_EFFECT_STRENGTHEN_FIGHT +HOLD_EFFECT_STRENGTHEN_ELECTRIC +HOLD_EFFECT_STRENGTHEN_WATER +HOLD_EFFECT_STRENGTHEN_FLYING +HOLD_EFFECT_STRENGTHEN_POISON +HOLD_EFFECT_STRENGTHEN_ICE +HOLD_EFFECT_STRENGTHEN_GHOST +HOLD_EFFECT_STRENGTHEN_PSYCHIC +HOLD_EFFECT_STRENGTHEN_FIRE +HOLD_EFFECT_STRENGTHEN_DRAGON +HOLD_EFFECT_STRENGTHEN_NORMAL +HOLD_EFFECT_EVOLVE_PORYGON +HOLD_EFFECT_HP_RESTORE_ON_DMG +HOLD_EFFECT_CHANSEY_CRITRATE_UP +HOLD_EFFECT_DITTO_DEF_UP +HOLD_EFFECT_CUBONE_ATK_UP +HOLD_EFFECT_FARFETCHD_CRITRATE_UP +HOLD_EFFECT_ACCURACY_UP +HOLD_EFFECT_POWER_UP_PHYS +HOLD_EFFECT_POWER_UP_SPEC +HOLD_EFFECT_POWER_UP_SE +HOLD_EFFECT_EXTEND_SCREENS +HOLD_EFFECT_HP_DRAIN_ON_ATK +HOLD_EFFECT_CHARGE_SKIP +HOLD_EFFECT_PSN_USER +HOLD_EFFECT_BRN_USER +HOLD_EFFECT_DITTO_SPEED_UP +HOLD_EFFECT_ENDURE +HOLD_EFFECT_ACCURACY_UP_SLOWER +HOLD_EFFECT_BOOST_REPEATED +HOLD_EFFECT_SPEED_DOWN_GROUNDED +HOLD_EFFECT_PRIORITY_DOWN +HOLD_EFFECT_RECIPROCATE_INFAT +HOLD_EFFECT_HP_RESTORE_PSN_TYPE +HOLD_EFFECT_EXTEND_HAIL +HOLD_EFFECT_EXTEND_SANDSTORM +HOLD_EFFECT_EXTEND_SUN +HOLD_EFFECT_EXTEND_RAIN +HOLD_EFFECT_EXTEND_TRAPPING +HOLD_EFFECT_CHOICE_SPEED +HOLD_EFFECT_DMG_USER_CONTACT_XFR +HOLD_EFFECT_LVLUP_ATK_EV_UP +HOLD_EFFECT_LVLUP_DEF_EV_UP +HOLD_EFFECT_LVLUP_SPATK_EV_UP +HOLD_EFFECT_LVLUP_SPDEF_EV_UP +HOLD_EFFECT_LVLUP_SPEED_EV_UP +HOLD_EFFECT_LVLUP_HP_EV_UP +HOLD_EFFECT_SWITCH +HOLD_EFFECT_LEECH_BOOST +HOLD_EFFECT_CHOICE_SPATK +HOLD_EFFECT_ARCEUS_FIRE +HOLD_EFFECT_ARCEUS_WATER +HOLD_EFFECT_ARCEUS_ELECTRIC +HOLD_EFFECT_ARCEUS_GRASS +HOLD_EFFECT_ARCEUS_ICE +HOLD_EFFECT_ARCEUS_FIGHTING +HOLD_EFFECT_ARCEUS_POISON +HOLD_EFFECT_ARCEUS_GROUND +HOLD_EFFECT_ARCEUS_FLYING +HOLD_EFFECT_ARCEUS_PSYCHIC +HOLD_EFFECT_ARCEUS_BUG +HOLD_EFFECT_ARCEUS_ROCK +HOLD_EFFECT_ARCEUS_GHOST +HOLD_EFFECT_ARCEUS_DRAGON +HOLD_EFFECT_ARCEUS_DARK +HOLD_EFFECT_ARCEUS_STEEL +HOLD_EFFECT_EVOLVE_RHYDON +HOLD_EFFECT_EVOLVE_ELECTABUZZ +HOLD_EFFECT_EVOLVE_MAGMAR +HOLD_EFFECT_EVOLVE_PORYGON2 +HOLD_EFFECT_EVOLVE_DUSCLOPS diff --git a/generated/items.txt b/generated/items.txt new file mode 100644 index 0000000000..dc446dcad7 --- /dev/null +++ b/generated/items.txt @@ -0,0 +1,469 @@ +ITEM_NONE +ITEM_MASTER_BALL +ITEM_ULTRA_BALL +ITEM_GREAT_BALL +ITEM_POKE_BALL +ITEM_SAFARI_BALL +ITEM_NET_BALL +ITEM_DIVE_BALL +ITEM_NEST_BALL +ITEM_REPEAT_BALL +ITEM_TIMER_BALL +ITEM_LUXURY_BALL +ITEM_PREMIER_BALL +ITEM_DUSK_BALL +ITEM_HEAL_BALL +ITEM_QUICK_BALL +ITEM_CHERISH_BALL +ITEM_POTION +ITEM_ANTIDOTE +ITEM_BURN_HEAL +ITEM_ICE_HEAL +ITEM_AWAKENING +ITEM_PARLYZ_HEAL +ITEM_FULL_RESTORE +ITEM_MAX_POTION +ITEM_HYPER_POTION +ITEM_SUPER_POTION +ITEM_FULL_HEAL +ITEM_REVIVE +ITEM_MAX_REVIVE +ITEM_FRESH_WATER +ITEM_SODA_POP +ITEM_LEMONADE +ITEM_MOOMOO_MILK +ITEM_ENERGYPOWDER +ITEM_ENERGY_ROOT +ITEM_HEAL_POWDER +ITEM_REVIVAL_HERB +ITEM_ETHER +ITEM_MAX_ETHER +ITEM_ELIXIR +ITEM_MAX_ELIXIR +ITEM_LAVA_COOKIE +ITEM_BERRY_JUICE +ITEM_SACRED_ASH +ITEM_HP_UP +ITEM_PROTEIN +ITEM_IRON +ITEM_CARBOS +ITEM_CALCIUM +ITEM_RARE_CANDY +ITEM_PP_UP +ITEM_ZINC +ITEM_PP_MAX +ITEM_OLD_GATEAU +ITEM_GUARD_SPEC_ +ITEM_DIRE_HIT +ITEM_X_ATTACK +ITEM_X_DEFENSE +ITEM_X_SPEED +ITEM_X_ACCURACY +ITEM_X_SPECIAL +ITEM_X_SP__DEF +ITEM_POKE_DOLL +ITEM_FLUFFY_TAIL +ITEM_BLUE_FLUTE +ITEM_YELLOW_FLUTE +ITEM_RED_FLUTE +ITEM_BLACK_FLUTE +ITEM_WHITE_FLUTE +ITEM_SHOAL_SALT +ITEM_SHOAL_SHELL +ITEM_RED_SHARD +ITEM_BLUE_SHARD +ITEM_YELLOW_SHARD +ITEM_GREEN_SHARD +ITEM_SUPER_REPEL +ITEM_MAX_REPEL +ITEM_ESCAPE_ROPE +ITEM_REPEL +ITEM_SUN_STONE +ITEM_MOON_STONE +ITEM_FIRE_STONE +ITEM_THUNDERSTONE +ITEM_WATER_STONE +ITEM_LEAF_STONE +ITEM_TINYMUSHROOM +ITEM_BIG_MUSHROOM +ITEM_PEARL +ITEM_BIG_PEARL +ITEM_STARDUST +ITEM_STAR_PIECE +ITEM_NUGGET +ITEM_HEART_SCALE +ITEM_HONEY +ITEM_GROWTH_MULCH +ITEM_DAMP_MULCH +ITEM_STABLE_MULCH +ITEM_GOOEY_MULCH +ITEM_ROOT_FOSSIL +ITEM_CLAW_FOSSIL +ITEM_HELIX_FOSSIL +ITEM_DOME_FOSSIL +ITEM_OLD_AMBER +ITEM_ARMOR_FOSSIL +ITEM_SKULL_FOSSIL +ITEM_RARE_BONE +ITEM_SHINY_STONE +ITEM_DUSK_STONE +ITEM_DAWN_STONE +ITEM_OVAL_STONE +ITEM_ODD_KEYSTONE +ITEM_GRISEOUS_ORB +ITEM_UNUSED_113 +ITEM_UNUSED_114 +ITEM_UNUSED_115 +ITEM_UNUSED_116 +ITEM_UNUSED_117 +ITEM_UNUSED_118 +ITEM_UNUSED_119 +ITEM_UNUSED_120 +ITEM_UNUSED_121 +ITEM_UNUSED_122 +ITEM_UNUSED_123 +ITEM_UNUSED_124 +ITEM_UNUSED_125 +ITEM_UNUSED_126 +ITEM_UNUSED_127 +ITEM_UNUSED_128 +ITEM_UNUSED_129 +ITEM_UNUSED_130 +ITEM_UNUSED_131 +ITEM_UNUSED_132 +ITEM_UNUSED_133 +ITEM_UNUSED_134 +ITEM_ADAMANT_ORB +ITEM_LUSTROUS_ORB +ITEM_GRASS_MAIL +ITEM_FLAME_MAIL +ITEM_BUBBLE_MAIL +ITEM_BLOOM_MAIL +ITEM_TUNNEL_MAIL +ITEM_STEEL_MAIL +ITEM_HEART_MAIL +ITEM_SNOW_MAIL +ITEM_SPACE_MAIL +ITEM_AIR_MAIL +ITEM_MOSAIC_MAIL +ITEM_BRICK_MAIL +ITEM_CHERI_BERRY +ITEM_CHESTO_BERRY +ITEM_PECHA_BERRY +ITEM_RAWST_BERRY +ITEM_ASPEAR_BERRY +ITEM_LEPPA_BERRY +ITEM_ORAN_BERRY +ITEM_PERSIM_BERRY +ITEM_LUM_BERRY +ITEM_SITRUS_BERRY +ITEM_FIGY_BERRY +ITEM_WIKI_BERRY +ITEM_MAGO_BERRY +ITEM_AGUAV_BERRY +ITEM_IAPAPA_BERRY +ITEM_RAZZ_BERRY +ITEM_BLUK_BERRY +ITEM_NANAB_BERRY +ITEM_WEPEAR_BERRY +ITEM_PINAP_BERRY +ITEM_POMEG_BERRY +ITEM_KELPSY_BERRY +ITEM_QUALOT_BERRY +ITEM_HONDEW_BERRY +ITEM_GREPA_BERRY +ITEM_TAMATO_BERRY +ITEM_CORNN_BERRY +ITEM_MAGOST_BERRY +ITEM_RABUTA_BERRY +ITEM_NOMEL_BERRY +ITEM_SPELON_BERRY +ITEM_PAMTRE_BERRY +ITEM_WATMEL_BERRY +ITEM_DURIN_BERRY +ITEM_BELUE_BERRY +ITEM_OCCA_BERRY +ITEM_PASSHO_BERRY +ITEM_WACAN_BERRY +ITEM_RINDO_BERRY +ITEM_YACHE_BERRY +ITEM_CHOPLE_BERRY +ITEM_KEBIA_BERRY +ITEM_SHUCA_BERRY +ITEM_COBA_BERRY +ITEM_PAYAPA_BERRY +ITEM_TANGA_BERRY +ITEM_CHARTI_BERRY +ITEM_KASIB_BERRY +ITEM_HABAN_BERRY +ITEM_COLBUR_BERRY +ITEM_BABIRI_BERRY +ITEM_CHILAN_BERRY +ITEM_LIECHI_BERRY +ITEM_GANLON_BERRY +ITEM_SALAC_BERRY +ITEM_PETAYA_BERRY +ITEM_APICOT_BERRY +ITEM_LANSAT_BERRY +ITEM_STARF_BERRY +ITEM_ENIGMA_BERRY +ITEM_MICLE_BERRY +ITEM_CUSTAP_BERRY +ITEM_JABOCA_BERRY +ITEM_ROWAP_BERRY +ITEM_BRIGHTPOWDER +ITEM_WHITE_HERB +ITEM_MACHO_BRACE +ITEM_EXP_SHARE +ITEM_QUICK_CLAW +ITEM_SOOTHE_BELL +ITEM_MENTAL_HERB +ITEM_CHOICE_BAND +ITEM_KINGS_ROCK +ITEM_SILVERPOWDER +ITEM_AMULET_COIN +ITEM_CLEANSE_TAG +ITEM_SOUL_DEW +ITEM_DEEPSEATOOTH +ITEM_DEEPSEASCALE +ITEM_SMOKE_BALL +ITEM_EVERSTONE +ITEM_FOCUS_BAND +ITEM_LUCKY_EGG +ITEM_SCOPE_LENS +ITEM_METAL_COAT +ITEM_LEFTOVERS +ITEM_DRAGON_SCALE +ITEM_LIGHT_BALL +ITEM_SOFT_SAND +ITEM_HARD_STONE +ITEM_MIRACLE_SEED +ITEM_BLACKGLASSES +ITEM_BLACK_BELT +ITEM_MAGNET +ITEM_MYSTIC_WATER +ITEM_SHARP_BEAK +ITEM_POISON_BARB +ITEM_NEVERMELTICE +ITEM_SPELL_TAG +ITEM_TWISTEDSPOON +ITEM_CHARCOAL +ITEM_DRAGON_FANG +ITEM_SILK_SCARF +ITEM_UPGRADE +ITEM_SHELL_BELL +ITEM_SEA_INCENSE +ITEM_LAX_INCENSE +ITEM_LUCKY_PUNCH +ITEM_METAL_POWDER +ITEM_THICK_CLUB +ITEM_STICK +ITEM_RED_SCARF +ITEM_BLUE_SCARF +ITEM_PINK_SCARF +ITEM_GREEN_SCARF +ITEM_YELLOW_SCARF +ITEM_WIDE_LENS +ITEM_MUSCLE_BAND +ITEM_WISE_GLASSES +ITEM_EXPERT_BELT +ITEM_LIGHT_CLAY +ITEM_LIFE_ORB +ITEM_POWER_HERB +ITEM_TOXIC_ORB +ITEM_FLAME_ORB +ITEM_QUICK_POWDER +ITEM_FOCUS_SASH +ITEM_ZOOM_LENS +ITEM_METRONOME +ITEM_IRON_BALL +ITEM_LAGGING_TAIL +ITEM_DESTINY_KNOT +ITEM_BLACK_SLUDGE +ITEM_ICY_ROCK +ITEM_SMOOTH_ROCK +ITEM_HEAT_ROCK +ITEM_DAMP_ROCK +ITEM_GRIP_CLAW +ITEM_CHOICE_SCARF +ITEM_STICKY_BARB +ITEM_POWER_BRACER +ITEM_POWER_BELT +ITEM_POWER_LENS +ITEM_POWER_BAND +ITEM_POWER_ANKLET +ITEM_POWER_WEIGHT +ITEM_SHED_SHELL +ITEM_BIG_ROOT +ITEM_CHOICE_SPECS +ITEM_FLAME_PLATE +ITEM_SPLASH_PLATE +ITEM_ZAP_PLATE +ITEM_MEADOW_PLATE +ITEM_ICICLE_PLATE +ITEM_FIST_PLATE +ITEM_TOXIC_PLATE +ITEM_EARTH_PLATE +ITEM_SKY_PLATE +ITEM_MIND_PLATE +ITEM_INSECT_PLATE +ITEM_STONE_PLATE +ITEM_SPOOKY_PLATE +ITEM_DRACO_PLATE +ITEM_DREAD_PLATE +ITEM_IRON_PLATE +ITEM_ODD_INCENSE +ITEM_ROCK_INCENSE +ITEM_FULL_INCENSE +ITEM_WAVE_INCENSE +ITEM_ROSE_INCENSE +ITEM_LUCK_INCENSE +ITEM_PURE_INCENSE +ITEM_PROTECTOR +ITEM_ELECTIRIZER +ITEM_MAGMARIZER +ITEM_DUBIOUS_DISC +ITEM_REAPER_CLOTH +ITEM_RAZOR_CLAW +ITEM_RAZOR_FANG +ITEM_TM01 +ITEM_TM02 +ITEM_TM03 +ITEM_TM04 +ITEM_TM05 +ITEM_TM06 +ITEM_TM07 +ITEM_TM08 +ITEM_TM09 +ITEM_TM10 +ITEM_TM11 +ITEM_TM12 +ITEM_TM13 +ITEM_TM14 +ITEM_TM15 +ITEM_TM16 +ITEM_TM17 +ITEM_TM18 +ITEM_TM19 +ITEM_TM20 +ITEM_TM21 +ITEM_TM22 +ITEM_TM23 +ITEM_TM24 +ITEM_TM25 +ITEM_TM26 +ITEM_TM27 +ITEM_TM28 +ITEM_TM29 +ITEM_TM30 +ITEM_TM31 +ITEM_TM32 +ITEM_TM33 +ITEM_TM34 +ITEM_TM35 +ITEM_TM36 +ITEM_TM37 +ITEM_TM38 +ITEM_TM39 +ITEM_TM40 +ITEM_TM41 +ITEM_TM42 +ITEM_TM43 +ITEM_TM44 +ITEM_TM45 +ITEM_TM46 +ITEM_TM47 +ITEM_TM48 +ITEM_TM49 +ITEM_TM50 +ITEM_TM51 +ITEM_TM52 +ITEM_TM53 +ITEM_TM54 +ITEM_TM55 +ITEM_TM56 +ITEM_TM57 +ITEM_TM58 +ITEM_TM59 +ITEM_TM60 +ITEM_TM61 +ITEM_TM62 +ITEM_TM63 +ITEM_TM64 +ITEM_TM65 +ITEM_TM66 +ITEM_TM67 +ITEM_TM68 +ITEM_TM69 +ITEM_TM70 +ITEM_TM71 +ITEM_TM72 +ITEM_TM73 +ITEM_TM74 +ITEM_TM75 +ITEM_TM76 +ITEM_TM77 +ITEM_TM78 +ITEM_TM79 +ITEM_TM80 +ITEM_TM81 +ITEM_TM82 +ITEM_TM83 +ITEM_TM84 +ITEM_TM85 +ITEM_TM86 +ITEM_TM87 +ITEM_TM88 +ITEM_TM89 +ITEM_TM90 +ITEM_TM91 +ITEM_TM92 +ITEM_HM01 +ITEM_HM02 +ITEM_HM03 +ITEM_HM04 +ITEM_HM05 +ITEM_HM06 +ITEM_HM07 +ITEM_HM08 +ITEM_EXPLORER_KIT +ITEM_LOOT_SACK +ITEM_RULE_BOOK +ITEM_POKE_RADAR +ITEM_POINT_CARD +ITEM_JOURNAL +ITEM_SEAL_CASE +ITEM_FASHION_CASE +ITEM_SEAL_BAG +ITEM_PAL_PAD +ITEM_WORKS_KEY +ITEM_OLD_CHARM +ITEM_GALACTIC_KEY +ITEM_RED_CHAIN +ITEM_TOWN_MAP +ITEM_VS_SEEKER +ITEM_COIN_CASE +ITEM_OLD_ROD +ITEM_GOOD_ROD +ITEM_SUPER_ROD +ITEM_SPRAYDUCK +ITEM_POFFIN_CASE +ITEM_BICYCLE +ITEM_SUITE_KEY +ITEM_OAKS_LETTER +ITEM_LUNAR_WING +ITEM_MEMBER_CARD +ITEM_AZURE_FLUTE +ITEM_S_S_TICKET +ITEM_CONTEST_PASS +ITEM_MAGMA_STONE +ITEM_PARCEL +ITEM_COUPON_1 +ITEM_COUPON_2 +ITEM_COUPON_3 +ITEM_STORAGE_KEY +ITEM_SECRETPOTION +ITEM_VS_RECORDER +ITEM_GRACIDEA +ITEM_SECRET_KEY +MAX_ITEMS diff --git a/generated/meson.build b/generated/meson.build new file mode 100644 index 0000000000..26b9542722 --- /dev/null +++ b/generated/meson.build @@ -0,0 +1,43 @@ +enum_generators = { + 'abilities': ['--tag-name', 'Ability'], + 'egg_groups': ['--tag-name', 'EggGroup'], + 'exp_rates': ['--tag-name', 'ExpRate'], + 'gender_ratios': ['--tag-name', 'GenderRatio'], + 'item_hold_effects': ['--tag-name', 'ItemHoldEffect'], + 'items': ['--tag-name', 'Item'], + 'moves': ['--tag-name', 'Move'], + 'pokemon_colors': ['--tag-name', 'PokemonColor'], + 'pokemon_types': ['--tag-name', 'PokemonType'], + 'species': ['--tag-name', 'Species'], +} + +foreach gen_key : enum_generators.keys() + gen_h = gen_key + '.h' + gen_py = gen_key + '.py' + gen_file = files(gen_key + '.txt') + gen_args = enum_generators.get(gen_key) + c_consts_generators += custom_target(gen_h, + output: gen_h, + input: gen_file, + command: [ + metang_exe, 'enum', + gen_args, + '--guard', 'POKEPLATINUM_GENERATED', + '--output', '@OUTPUT@', + '@INPUT@', + ] + ) + + py_consts_generators += custom_target(gen_py, + output: gen_py, + input: gen_file, + command: [ + metang_exe, 'enum', + gen_args, + '--guard', 'POKEPLATINUM_GENERATED', + '--output', '@OUTPUT@', + '--lang', 'py', + '@INPUT@', + ] + ) +endforeach diff --git a/generated/moves.txt b/generated/moves.txt new file mode 100644 index 0000000000..2b7aaf0c92 --- /dev/null +++ b/generated/moves.txt @@ -0,0 +1,469 @@ +MOVE_NONE +MOVE_POUND +MOVE_KARATE_CHOP +MOVE_DOUBLE_SLAP +MOVE_COMET_PUNCH +MOVE_MEGA_PUNCH +MOVE_PAY_DAY +MOVE_FIRE_PUNCH +MOVE_ICE_PUNCH +MOVE_THUNDER_PUNCH +MOVE_SCRATCH +MOVE_VICE_GRIP +MOVE_GUILLOTINE +MOVE_RAZOR_WIND +MOVE_SWORDS_DANCE +MOVE_CUT +MOVE_GUST +MOVE_WING_ATTACK +MOVE_WHIRLWIND +MOVE_FLY +MOVE_BIND +MOVE_SLAM +MOVE_VINE_WHIP +MOVE_STOMP +MOVE_DOUBLE_KICK +MOVE_MEGA_KICK +MOVE_JUMP_KICK +MOVE_ROLLING_KICK +MOVE_SAND_ATTACK +MOVE_HEADBUTT +MOVE_HORN_ATTACK +MOVE_FURY_ATTACK +MOVE_HORN_DRILL +MOVE_TACKLE +MOVE_BODY_SLAM +MOVE_WRAP +MOVE_TAKE_DOWN +MOVE_THRASH +MOVE_DOUBLE_EDGE +MOVE_TAIL_WHIP +MOVE_POISON_STING +MOVE_TWINEEDLE +MOVE_PIN_MISSILE +MOVE_LEER +MOVE_BITE +MOVE_GROWL +MOVE_ROAR +MOVE_SING +MOVE_SUPERSONIC +MOVE_SONIC_BOOM +MOVE_DISABLE +MOVE_ACID +MOVE_EMBER +MOVE_FLAMETHROWER +MOVE_MIST +MOVE_WATER_GUN +MOVE_HYDRO_PUMP +MOVE_SURF +MOVE_ICE_BEAM +MOVE_BLIZZARD +MOVE_PSYBEAM +MOVE_BUBBLE_BEAM +MOVE_AURORA_BEAM +MOVE_HYPER_BEAM +MOVE_PECK +MOVE_DRILL_PECK +MOVE_SUBMISSION +MOVE_LOW_KICK +MOVE_COUNTER +MOVE_SEISMIC_TOSS +MOVE_STRENGTH +MOVE_ABSORB +MOVE_MEGA_DRAIN +MOVE_LEECH_SEED +MOVE_GROWTH +MOVE_RAZOR_LEAF +MOVE_SOLAR_BEAM +MOVE_POISON_POWDER +MOVE_STUN_SPORE +MOVE_SLEEP_POWDER +MOVE_PETAL_DANCE +MOVE_STRING_SHOT +MOVE_DRAGON_RAGE +MOVE_FIRE_SPIN +MOVE_THUNDER_SHOCK +MOVE_THUNDERBOLT +MOVE_THUNDER_WAVE +MOVE_THUNDER +MOVE_ROCK_THROW +MOVE_EARTHQUAKE +MOVE_FISSURE +MOVE_DIG +MOVE_TOXIC +MOVE_CONFUSION +MOVE_PSYCHIC +MOVE_HYPNOSIS +MOVE_MEDITATE +MOVE_AGILITY +MOVE_QUICK_ATTACK +MOVE_RAGE +MOVE_TELEPORT +MOVE_NIGHT_SHADE +MOVE_MIMIC +MOVE_SCREECH +MOVE_DOUBLE_TEAM +MOVE_RECOVER +MOVE_HARDEN +MOVE_MINIMIZE +MOVE_SMOKE_SCREEN +MOVE_CONFUSE_RAY +MOVE_WITHDRAW +MOVE_DEFENSE_CURL +MOVE_BARRIER +MOVE_LIGHT_SCREEN +MOVE_HAZE +MOVE_REFLECT +MOVE_FOCUS_ENERGY +MOVE_BIDE +MOVE_METRONOME +MOVE_MIRROR_MOVE +MOVE_SELFDESTRUCT +MOVE_EGG_BOMB +MOVE_LICK +MOVE_SMOG +MOVE_SLUDGE +MOVE_BONE_CLUB +MOVE_FIRE_BLAST +MOVE_WATERFALL +MOVE_CLAMP +MOVE_SWIFT +MOVE_SKULL_BASH +MOVE_SPIKE_CANNON +MOVE_CONSTRICT +MOVE_AMNESIA +MOVE_KINESIS +MOVE_SOFTBOILED +MOVE_HI_JUMP_KICK +MOVE_GLARE +MOVE_DREAM_EATER +MOVE_POISON_GAS +MOVE_BARRAGE +MOVE_LEECH_LIFE +MOVE_LOVELY_KISS +MOVE_SKY_ATTACK +MOVE_TRANSFORM +MOVE_BUBBLE +MOVE_DIZZY_PUNCH +MOVE_SPORE +MOVE_FLASH +MOVE_PSYWAVE +MOVE_SPLASH +MOVE_ACID_ARMOR +MOVE_CRABHAMMER +MOVE_EXPLOSION +MOVE_FURY_SWIPES +MOVE_BONEMERANG +MOVE_REST +MOVE_ROCK_SLIDE +MOVE_HYPER_FANG +MOVE_SHARPEN +MOVE_CONVERSION +MOVE_TRI_ATTACK +MOVE_SUPER_FANG +MOVE_SLASH +MOVE_SUBSTITUTE +MOVE_STRUGGLE +MOVE_SKETCH +MOVE_TRIPLE_KICK +MOVE_THIEF +MOVE_SPIDER_WEB +MOVE_MIND_READER +MOVE_NIGHTMARE +MOVE_FLAME_WHEEL +MOVE_SNORE +MOVE_CURSE +MOVE_FLAIL +MOVE_CONVERSION_2 +MOVE_AEROBLAST +MOVE_COTTON_SPORE +MOVE_REVERSAL +MOVE_SPITE +MOVE_POWDER_SNOW +MOVE_PROTECT +MOVE_MACH_PUNCH +MOVE_SCARY_FACE +MOVE_FAINT_ATTACK +MOVE_SWEET_KISS +MOVE_BELLY_DRUM +MOVE_SLUDGE_BOMB +MOVE_MUD_SLAP +MOVE_OCTAZOOKA +MOVE_SPIKES +MOVE_ZAP_CANNON +MOVE_FORESIGHT +MOVE_DESTINY_BOND +MOVE_PERISH_SONG +MOVE_ICY_WIND +MOVE_DETECT +MOVE_BONE_RUSH +MOVE_LOCK_ON +MOVE_OUTRAGE +MOVE_SANDSTORM +MOVE_GIGA_DRAIN +MOVE_ENDURE +MOVE_CHARM +MOVE_ROLLOUT +MOVE_FALSE_SWIPE +MOVE_SWAGGER +MOVE_MILK_DRINK +MOVE_SPARK +MOVE_FURY_CUTTER +MOVE_STEEL_WING +MOVE_MEAN_LOOK +MOVE_ATTRACT +MOVE_SLEEP_TALK +MOVE_HEAL_BELL +MOVE_RETURN +MOVE_PRESENT +MOVE_FRUSTRATION +MOVE_SAFEGUARD +MOVE_PAIN_SPLIT +MOVE_SACRED_FIRE +MOVE_MAGNITUDE +MOVE_DYNAMIC_PUNCH +MOVE_MEGAHORN +MOVE_DRAGON_BREATH +MOVE_BATON_PASS +MOVE_ENCORE +MOVE_PURSUIT +MOVE_RAPID_SPIN +MOVE_SWEET_SCENT +MOVE_IRON_TAIL +MOVE_METAL_CLAW +MOVE_VITAL_THROW +MOVE_MORNING_SUN +MOVE_SYNTHESIS +MOVE_MOONLIGHT +MOVE_HIDDEN_POWER +MOVE_CROSS_CHOP +MOVE_TWISTER +MOVE_RAIN_DANCE +MOVE_SUNNY_DAY +MOVE_CRUNCH +MOVE_MIRROR_COAT +MOVE_PSYCH_UP +MOVE_EXTREME_SPEED +MOVE_ANCIENT_POWER +MOVE_SHADOW_BALL +MOVE_FUTURE_SIGHT +MOVE_ROCK_SMASH +MOVE_WHIRLPOOL +MOVE_BEAT_UP +MOVE_FAKE_OUT +MOVE_UPROAR +MOVE_STOCKPILE +MOVE_SPIT_UP +MOVE_SWALLOW +MOVE_HEAT_WAVE +MOVE_HAIL +MOVE_TORMENT +MOVE_FLATTER +MOVE_WILL_O_WISP +MOVE_MEMENTO +MOVE_FACADE +MOVE_FOCUS_PUNCH +MOVE_SMELLING_SALT +MOVE_FOLLOW_ME +MOVE_NATURE_POWER +MOVE_CHARGE +MOVE_TAUNT +MOVE_HELPING_HAND +MOVE_TRICK +MOVE_ROLE_PLAY +MOVE_WISH +MOVE_ASSIST +MOVE_INGRAIN +MOVE_SUPERPOWER +MOVE_MAGIC_COAT +MOVE_RECYCLE +MOVE_REVENGE +MOVE_BRICK_BREAK +MOVE_YAWN +MOVE_KNOCK_OFF +MOVE_ENDEAVOR +MOVE_ERUPTION +MOVE_SKILL_SWAP +MOVE_IMPRISON +MOVE_REFRESH +MOVE_GRUDGE +MOVE_SNATCH +MOVE_SECRET_POWER +MOVE_DIVE +MOVE_ARM_THRUST +MOVE_CAMOUFLAGE +MOVE_TAIL_GLOW +MOVE_LUSTER_PURGE +MOVE_MIST_BALL +MOVE_FEATHER_DANCE +MOVE_TEETER_DANCE +MOVE_BLAZE_KICK +MOVE_MUD_SPORT +MOVE_ICE_BALL +MOVE_NEEDLE_ARM +MOVE_SLACK_OFF +MOVE_HYPER_VOICE +MOVE_POISON_FANG +MOVE_CRUSH_CLAW +MOVE_BLAST_BURN +MOVE_HYDRO_CANNON +MOVE_METEOR_MASH +MOVE_ASTONISH +MOVE_WEATHER_BALL +MOVE_AROMATHERAPY +MOVE_FAKE_TEARS +MOVE_AIR_CUTTER +MOVE_OVERHEAT +MOVE_ODOR_SLEUTH +MOVE_ROCK_TOMB +MOVE_SILVER_WIND +MOVE_METAL_SOUND +MOVE_GRASS_WHISTLE +MOVE_TICKLE +MOVE_COSMIC_POWER +MOVE_WATER_SPOUT +MOVE_SIGNAL_BEAM +MOVE_SHADOW_PUNCH +MOVE_EXTRASENSORY +MOVE_SKY_UPPERCUT +MOVE_SAND_TOMB +MOVE_SHEER_COLD +MOVE_MUDDY_WATER +MOVE_BULLET_SEED +MOVE_AERIAL_ACE +MOVE_ICICLE_SPEAR +MOVE_IRON_DEFENSE +MOVE_BLOCK +MOVE_HOWL +MOVE_DRAGON_CLAW +MOVE_FRENZY_PLANT +MOVE_BULK_UP +MOVE_BOUNCE +MOVE_MUD_SHOT +MOVE_POISON_TAIL +MOVE_COVET +MOVE_VOLT_TACKLE +MOVE_MAGICAL_LEAF +MOVE_WATER_SPORT +MOVE_CALM_MIND +MOVE_LEAF_BLADE +MOVE_DRAGON_DANCE +MOVE_ROCK_BLAST +MOVE_SHOCK_WAVE +MOVE_WATER_PULSE +MOVE_DOOM_DESIRE +MOVE_PSYCHO_BOOST +MOVE_ROOST +MOVE_GRAVITY +MOVE_MIRACLE_EYE +MOVE_WAKE_UP_SLAP +MOVE_HAMMER_ARM +MOVE_GYRO_BALL +MOVE_HEALING_WISH +MOVE_BRINE +MOVE_NATURAL_GIFT +MOVE_FEINT +MOVE_PLUCK +MOVE_TAILWIND +MOVE_ACUPRESSURE +MOVE_METAL_BURST +MOVE_U_TURN +MOVE_CLOSE_COMBAT +MOVE_PAYBACK +MOVE_ASSURANCE +MOVE_EMBARGO +MOVE_FLING +MOVE_PSYCHO_SHIFT +MOVE_TRUMP_CARD +MOVE_HEAL_BLOCK +MOVE_WRING_OUT +MOVE_POWER_TRICK +MOVE_GASTRO_ACID +MOVE_LUCKY_CHANT +MOVE_ME_FIRST +MOVE_COPYCAT +MOVE_POWER_SWAP +MOVE_GUARD_SWAP +MOVE_PUNISHMENT +MOVE_LAST_RESORT +MOVE_WORRY_SEED +MOVE_SUCKER_PUNCH +MOVE_TOXIC_SPIKES +MOVE_HEART_SWAP +MOVE_AQUA_RING +MOVE_MAGNET_RISE +MOVE_FLARE_BLITZ +MOVE_FORCE_PALM +MOVE_AURA_SPHERE +MOVE_ROCK_POLISH +MOVE_POISON_JAB +MOVE_DARK_PULSE +MOVE_NIGHT_SLASH +MOVE_AQUA_TAIL +MOVE_SEED_BOMB +MOVE_AIR_SLASH +MOVE_X_SCISSOR +MOVE_BUG_BUZZ +MOVE_DRAGON_PULSE +MOVE_DRAGON_RUSH +MOVE_POWER_GEM +MOVE_DRAIN_PUNCH +MOVE_VACUUM_WAVE +MOVE_FOCUS_BLAST +MOVE_ENERGY_BALL +MOVE_BRAVE_BIRD +MOVE_EARTH_POWER +MOVE_SWITCHEROO +MOVE_GIGA_IMPACT +MOVE_NASTY_PLOT +MOVE_BULLET_PUNCH +MOVE_AVALANCHE +MOVE_ICE_SHARD +MOVE_SHADOW_CLAW +MOVE_THUNDER_FANG +MOVE_ICE_FANG +MOVE_FIRE_FANG +MOVE_SHADOW_SNEAK +MOVE_MUD_BOMB +MOVE_PSYCHO_CUT +MOVE_ZEN_HEADBUTT +MOVE_MIRROR_SHOT +MOVE_FLASH_CANNON +MOVE_ROCK_CLIMB +MOVE_DEFOG +MOVE_TRICK_ROOM +MOVE_DRACO_METEOR +MOVE_DISCHARGE +MOVE_LAVA_PLUME +MOVE_LEAF_STORM +MOVE_POWER_WHIP +MOVE_ROCK_WRECKER +MOVE_CROSS_POISON +MOVE_GUNK_SHOT +MOVE_IRON_HEAD +MOVE_MAGNET_BOMB +MOVE_STONE_EDGE +MOVE_CAPTIVATE +MOVE_STEALTH_ROCK +MOVE_GRASS_KNOT +MOVE_CHATTER +MOVE_JUDGMENT +MOVE_BUG_BITE +MOVE_CHARGE_BEAM +MOVE_WOOD_HAMMER +MOVE_AQUA_JET +MOVE_ATTACK_ORDER +MOVE_DEFEND_ORDER +MOVE_HEAL_ORDER +MOVE_HEAD_SMASH +MOVE_DOUBLE_HIT +MOVE_ROAR_OF_TIME +MOVE_SPACIAL_REND +MOVE_LUNAR_DANCE +MOVE_CRUSH_GRIP +MOVE_MAGMA_STORM +MOVE_DARK_VOID +MOVE_SEED_FLARE +MOVE_OMINOUS_WIND +MOVE_SHADOW_FORCE +MAX_MOVES diff --git a/generated/pokemon_colors.txt b/generated/pokemon_colors.txt new file mode 100644 index 0000000000..92cc9eadb7 --- /dev/null +++ b/generated/pokemon_colors.txt @@ -0,0 +1,12 @@ +MON_COLOR_RED +MON_COLOR_BLUE +MON_COLOR_YELLOW +MON_COLOR_GREEN +MON_COLOR_BLACK +MON_COLOR_BROWN +MON_COLOR_PURPLE +MON_COLOR_GRAY +MON_COLOR_WHITE +MON_COLOR_PINK +MON_COLOR_EGG +NUM_MON_COLORS diff --git a/generated/pokemon_types.txt b/generated/pokemon_types.txt new file mode 100644 index 0000000000..3126d51fb7 --- /dev/null +++ b/generated/pokemon_types.txt @@ -0,0 +1,19 @@ +TYPE_NORMAL +TYPE_FIGHTING +TYPE_FLYING +TYPE_POISON +TYPE_GROUND +TYPE_ROCK +TYPE_BUG +TYPE_GHOST +TYPE_STEEL +TYPE_MYSTERY +TYPE_FIRE +TYPE_WATER +TYPE_GRASS +TYPE_ELECTRIC +TYPE_PSYCHIC +TYPE_ICE +TYPE_DRAGON +TYPE_DARK +NUM_POKEMON_TYPES diff --git a/generated/species.txt b/generated/species.txt new file mode 100644 index 0000000000..8726861ed7 --- /dev/null +++ b/generated/species.txt @@ -0,0 +1,496 @@ +SPECIES_NONE +SPECIES_BULBASAUR +SPECIES_IVYSAUR +SPECIES_VENUSAUR +SPECIES_CHARMANDER +SPECIES_CHARMELEON +SPECIES_CHARIZARD +SPECIES_SQUIRTLE +SPECIES_WARTORTLE +SPECIES_BLASTOISE +SPECIES_CATERPIE +SPECIES_METAPOD +SPECIES_BUTTERFREE +SPECIES_WEEDLE +SPECIES_KAKUNA +SPECIES_BEEDRILL +SPECIES_PIDGEY +SPECIES_PIDGEOTTO +SPECIES_PIDGEOT +SPECIES_RATTATA +SPECIES_RATICATE +SPECIES_SPEAROW +SPECIES_FEAROW +SPECIES_EKANS +SPECIES_ARBOK +SPECIES_PIKACHU +SPECIES_RAICHU +SPECIES_SANDSHREW +SPECIES_SANDSLASH +SPECIES_NIDORAN_F +SPECIES_NIDORINA +SPECIES_NIDOQUEEN +SPECIES_NIDORAN_M +SPECIES_NIDORINO +SPECIES_NIDOKING +SPECIES_CLEFAIRY +SPECIES_CLEFABLE +SPECIES_VULPIX +SPECIES_NINETALES +SPECIES_JIGGLYPUFF +SPECIES_WIGGLYTUFF +SPECIES_ZUBAT +SPECIES_GOLBAT +SPECIES_ODDISH +SPECIES_GLOOM +SPECIES_VILEPLUME +SPECIES_PARAS +SPECIES_PARASECT +SPECIES_VENONAT +SPECIES_VENOMOTH +SPECIES_DIGLETT +SPECIES_DUGTRIO +SPECIES_MEOWTH +SPECIES_PERSIAN +SPECIES_PSYDUCK +SPECIES_GOLDUCK +SPECIES_MANKEY +SPECIES_PRIMEAPE +SPECIES_GROWLITHE +SPECIES_ARCANINE +SPECIES_POLIWAG +SPECIES_POLIWHIRL +SPECIES_POLIWRATH +SPECIES_ABRA +SPECIES_KADABRA +SPECIES_ALAKAZAM +SPECIES_MACHOP +SPECIES_MACHOKE +SPECIES_MACHAMP +SPECIES_BELLSPROUT +SPECIES_WEEPINBELL +SPECIES_VICTREEBEL +SPECIES_TENTACOOL +SPECIES_TENTACRUEL +SPECIES_GEODUDE +SPECIES_GRAVELER +SPECIES_GOLEM +SPECIES_PONYTA +SPECIES_RAPIDASH +SPECIES_SLOWPOKE +SPECIES_SLOWBRO +SPECIES_MAGNEMITE +SPECIES_MAGNETON +SPECIES_FARFETCHD +SPECIES_DODUO +SPECIES_DODRIO +SPECIES_SEEL +SPECIES_DEWGONG +SPECIES_GRIMER +SPECIES_MUK +SPECIES_SHELLDER +SPECIES_CLOYSTER +SPECIES_GASTLY +SPECIES_HAUNTER +SPECIES_GENGAR +SPECIES_ONIX +SPECIES_DROWZEE +SPECIES_HYPNO +SPECIES_KRABBY +SPECIES_KINGLER +SPECIES_VOLTORB +SPECIES_ELECTRODE +SPECIES_EXEGGCUTE +SPECIES_EXEGGUTOR +SPECIES_CUBONE +SPECIES_MAROWAK +SPECIES_HITMONLEE +SPECIES_HITMONCHAN +SPECIES_LICKITUNG +SPECIES_KOFFING +SPECIES_WEEZING +SPECIES_RHYHORN +SPECIES_RHYDON +SPECIES_CHANSEY +SPECIES_TANGELA +SPECIES_KANGASKHAN +SPECIES_HORSEA +SPECIES_SEADRA +SPECIES_GOLDEEN +SPECIES_SEAKING +SPECIES_STARYU +SPECIES_STARMIE +SPECIES_MR_MIME +SPECIES_SCYTHER +SPECIES_JYNX +SPECIES_ELECTABUZZ +SPECIES_MAGMAR +SPECIES_PINSIR +SPECIES_TAUROS +SPECIES_MAGIKARP +SPECIES_GYARADOS +SPECIES_LAPRAS +SPECIES_DITTO +SPECIES_EEVEE +SPECIES_VAPOREON +SPECIES_JOLTEON +SPECIES_FLAREON +SPECIES_PORYGON +SPECIES_OMANYTE +SPECIES_OMASTAR +SPECIES_KABUTO +SPECIES_KABUTOPS +SPECIES_AERODACTYL +SPECIES_SNORLAX +SPECIES_ARTICUNO +SPECIES_ZAPDOS +SPECIES_MOLTRES +SPECIES_DRATINI +SPECIES_DRAGONAIR +SPECIES_DRAGONITE +SPECIES_MEWTWO +SPECIES_MEW +SPECIES_CHIKORITA +SPECIES_BAYLEEF +SPECIES_MEGANIUM +SPECIES_CYNDAQUIL +SPECIES_QUILAVA +SPECIES_TYPHLOSION +SPECIES_TOTODILE +SPECIES_CROCONAW +SPECIES_FERALIGATR +SPECIES_SENTRET +SPECIES_FURRET +SPECIES_HOOTHOOT +SPECIES_NOCTOWL +SPECIES_LEDYBA +SPECIES_LEDIAN +SPECIES_SPINARAK +SPECIES_ARIADOS +SPECIES_CROBAT +SPECIES_CHINCHOU +SPECIES_LANTURN +SPECIES_PICHU +SPECIES_CLEFFA +SPECIES_IGGLYBUFF +SPECIES_TOGEPI +SPECIES_TOGETIC +SPECIES_NATU +SPECIES_XATU +SPECIES_MAREEP +SPECIES_FLAAFFY +SPECIES_AMPHAROS +SPECIES_BELLOSSOM +SPECIES_MARILL +SPECIES_AZUMARILL +SPECIES_SUDOWOODO +SPECIES_POLITOED +SPECIES_HOPPIP +SPECIES_SKIPLOOM +SPECIES_JUMPLUFF +SPECIES_AIPOM +SPECIES_SUNKERN +SPECIES_SUNFLORA +SPECIES_YANMA +SPECIES_WOOPER +SPECIES_QUAGSIRE +SPECIES_ESPEON +SPECIES_UMBREON +SPECIES_MURKROW +SPECIES_SLOWKING +SPECIES_MISDREAVUS +SPECIES_UNOWN +SPECIES_WOBBUFFET +SPECIES_GIRAFARIG +SPECIES_PINECO +SPECIES_FORRETRESS +SPECIES_DUNSPARCE +SPECIES_GLIGAR +SPECIES_STEELIX +SPECIES_SNUBBULL +SPECIES_GRANBULL +SPECIES_QWILFISH +SPECIES_SCIZOR +SPECIES_SHUCKLE +SPECIES_HERACROSS +SPECIES_SNEASEL +SPECIES_TEDDIURSA +SPECIES_URSARING +SPECIES_SLUGMA +SPECIES_MAGCARGO +SPECIES_SWINUB +SPECIES_PILOSWINE +SPECIES_CORSOLA +SPECIES_REMORAID +SPECIES_OCTILLERY +SPECIES_DELIBIRD +SPECIES_MANTINE +SPECIES_SKARMORY +SPECIES_HOUNDOUR +SPECIES_HOUNDOOM +SPECIES_KINGDRA +SPECIES_PHANPY +SPECIES_DONPHAN +SPECIES_PORYGON2 +SPECIES_STANTLER +SPECIES_SMEARGLE +SPECIES_TYROGUE +SPECIES_HITMONTOP +SPECIES_SMOOCHUM +SPECIES_ELEKID +SPECIES_MAGBY +SPECIES_MILTANK +SPECIES_BLISSEY +SPECIES_RAIKOU +SPECIES_ENTEI +SPECIES_SUICUNE +SPECIES_LARVITAR +SPECIES_PUPITAR +SPECIES_TYRANITAR +SPECIES_LUGIA +SPECIES_HO_OH +SPECIES_CELEBI +SPECIES_TREECKO +SPECIES_GROVYLE +SPECIES_SCEPTILE +SPECIES_TORCHIC +SPECIES_COMBUSKEN +SPECIES_BLAZIKEN +SPECIES_MUDKIP +SPECIES_MARSHTOMP +SPECIES_SWAMPERT +SPECIES_POOCHYENA +SPECIES_MIGHTYENA +SPECIES_ZIGZAGOON +SPECIES_LINOONE +SPECIES_WURMPLE +SPECIES_SILCOON +SPECIES_BEAUTIFLY +SPECIES_CASCOON +SPECIES_DUSTOX +SPECIES_LOTAD +SPECIES_LOMBRE +SPECIES_LUDICOLO +SPECIES_SEEDOT +SPECIES_NUZLEAF +SPECIES_SHIFTRY +SPECIES_TAILLOW +SPECIES_SWELLOW +SPECIES_WINGULL +SPECIES_PELIPPER +SPECIES_RALTS +SPECIES_KIRLIA +SPECIES_GARDEVOIR +SPECIES_SURSKIT +SPECIES_MASQUERAIN +SPECIES_SHROOMISH +SPECIES_BRELOOM +SPECIES_SLAKOTH +SPECIES_VIGOROTH +SPECIES_SLAKING +SPECIES_NINCADA +SPECIES_NINJASK +SPECIES_SHEDINJA +SPECIES_WHISMUR +SPECIES_LOUDRED +SPECIES_EXPLOUD +SPECIES_MAKUHITA +SPECIES_HARIYAMA +SPECIES_AZURILL +SPECIES_NOSEPASS +SPECIES_SKITTY +SPECIES_DELCATTY +SPECIES_SABLEYE +SPECIES_MAWILE +SPECIES_ARON +SPECIES_LAIRON +SPECIES_AGGRON +SPECIES_MEDITITE +SPECIES_MEDICHAM +SPECIES_ELECTRIKE +SPECIES_MANECTRIC +SPECIES_PLUSLE +SPECIES_MINUN +SPECIES_VOLBEAT +SPECIES_ILLUMISE +SPECIES_ROSELIA +SPECIES_GULPIN +SPECIES_SWALOT +SPECIES_CARVANHA +SPECIES_SHARPEDO +SPECIES_WAILMER +SPECIES_WAILORD +SPECIES_NUMEL +SPECIES_CAMERUPT +SPECIES_TORKOAL +SPECIES_SPOINK +SPECIES_GRUMPIG +SPECIES_SPINDA +SPECIES_TRAPINCH +SPECIES_VIBRAVA +SPECIES_FLYGON +SPECIES_CACNEA +SPECIES_CACTURNE +SPECIES_SWABLU +SPECIES_ALTARIA +SPECIES_ZANGOOSE +SPECIES_SEVIPER +SPECIES_LUNATONE +SPECIES_SOLROCK +SPECIES_BARBOACH +SPECIES_WHISCASH +SPECIES_CORPHISH +SPECIES_CRAWDAUNT +SPECIES_BALTOY +SPECIES_CLAYDOL +SPECIES_LILEEP +SPECIES_CRADILY +SPECIES_ANORITH +SPECIES_ARMALDO +SPECIES_FEEBAS +SPECIES_MILOTIC +SPECIES_CASTFORM +SPECIES_KECLEON +SPECIES_SHUPPET +SPECIES_BANETTE +SPECIES_DUSKULL +SPECIES_DUSCLOPS +SPECIES_TROPIUS +SPECIES_CHIMECHO +SPECIES_ABSOL +SPECIES_WYNAUT +SPECIES_SNORUNT +SPECIES_GLALIE +SPECIES_SPHEAL +SPECIES_SEALEO +SPECIES_WALREIN +SPECIES_CLAMPERL +SPECIES_HUNTAIL +SPECIES_GOREBYSS +SPECIES_RELICANTH +SPECIES_LUVDISC +SPECIES_BAGON +SPECIES_SHELGON +SPECIES_SALAMENCE +SPECIES_BELDUM +SPECIES_METANG +SPECIES_METAGROSS +SPECIES_REGIROCK +SPECIES_REGICE +SPECIES_REGISTEEL +SPECIES_LATIAS +SPECIES_LATIOS +SPECIES_KYOGRE +SPECIES_GROUDON +SPECIES_RAYQUAZA +SPECIES_JIRACHI +SPECIES_DEOXYS +SPECIES_TURTWIG +SPECIES_GROTLE +SPECIES_TORTERRA +SPECIES_CHIMCHAR +SPECIES_MONFERNO +SPECIES_INFERNAPE +SPECIES_PIPLUP +SPECIES_PRINPLUP +SPECIES_EMPOLEON +SPECIES_STARLY +SPECIES_STARAVIA +SPECIES_STARAPTOR +SPECIES_BIDOOF +SPECIES_BIBAREL +SPECIES_KRICKETOT +SPECIES_KRICKETUNE +SPECIES_SHINX +SPECIES_LUXIO +SPECIES_LUXRAY +SPECIES_BUDEW +SPECIES_ROSERADE +SPECIES_CRANIDOS +SPECIES_RAMPARDOS +SPECIES_SHIELDON +SPECIES_BASTIODON +SPECIES_BURMY +SPECIES_WORMADAM +SPECIES_MOTHIM +SPECIES_COMBEE +SPECIES_VESPIQUEN +SPECIES_PACHIRISU +SPECIES_BUIZEL +SPECIES_FLOATZEL +SPECIES_CHERUBI +SPECIES_CHERRIM +SPECIES_SHELLOS +SPECIES_GASTRODON +SPECIES_AMBIPOM +SPECIES_DRIFLOON +SPECIES_DRIFBLIM +SPECIES_BUNEARY +SPECIES_LOPUNNY +SPECIES_MISMAGIUS +SPECIES_HONCHKROW +SPECIES_GLAMEOW +SPECIES_PURUGLY +SPECIES_CHINGLING +SPECIES_STUNKY +SPECIES_SKUNTANK +SPECIES_BRONZOR +SPECIES_BRONZONG +SPECIES_BONSLY +SPECIES_MIME_JR +SPECIES_HAPPINY +SPECIES_CHATOT +SPECIES_SPIRITOMB +SPECIES_GIBLE +SPECIES_GABITE +SPECIES_GARCHOMP +SPECIES_MUNCHLAX +SPECIES_RIOLU +SPECIES_LUCARIO +SPECIES_HIPPOPOTAS +SPECIES_HIPPOWDON +SPECIES_SKORUPI +SPECIES_DRAPION +SPECIES_CROAGUNK +SPECIES_TOXICROAK +SPECIES_CARNIVINE +SPECIES_FINNEON +SPECIES_LUMINEON +SPECIES_MANTYKE +SPECIES_SNOVER +SPECIES_ABOMASNOW +SPECIES_WEAVILE +SPECIES_MAGNEZONE +SPECIES_LICKILICKY +SPECIES_RHYPERIOR +SPECIES_TANGROWTH +SPECIES_ELECTIVIRE +SPECIES_MAGMORTAR +SPECIES_TOGEKISS +SPECIES_YANMEGA +SPECIES_LEAFEON +SPECIES_GLACEON +SPECIES_GLISCOR +SPECIES_MAMOSWINE +SPECIES_PORYGON_Z +SPECIES_GALLADE +SPECIES_PROBOPASS +SPECIES_DUSKNOIR +SPECIES_FROSLASS +SPECIES_ROTOM +SPECIES_UXIE +SPECIES_MESPRIT +SPECIES_AZELF +SPECIES_DIALGA +SPECIES_PALKIA +SPECIES_HEATRAN +SPECIES_REGIGIGAS +SPECIES_GIRATINA +SPECIES_CRESSELIA +SPECIES_PHIONE +SPECIES_MANAPHY +SPECIES_DARKRAI +SPECIES_SHAYMIN +SPECIES_ARCEUS +SPECIES_EGG +SPECIES_BAD_EGG diff --git a/include/constants/items.h b/include/constants/items.h index e27ad51f54..6cfa213cb3 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_CONSTANTS_ITEMS_H #define POKEPLATINUM_CONSTANTS_ITEMS_H -#ifndef __ASM_PM_ -#include "consts/items.h" +#include "generated/item_hold_effects.h" +#include "generated/items.h" +#ifndef __ASM_PM_ enum { BATTLE_ITEM_CATEGORY_RECOVER_HP = 0, BATTLE_ITEM_CATEGORY_RECOVER_STATUS, diff --git a/include/constants/moves.h b/include/constants/moves.h index 2b5d0a9331..12e4ba6705 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_CONSTANTS_MOVES_H #include "consts/moves.h" +#include "generated/moves.h" #define LEARNED_MOVES_MAX 4 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 8fe2d191ff..943ad55b24 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -1,7 +1,8 @@ #ifndef POKEPLATINUM_CONSTANTS_POKEMON_H #define POKEPLATINUM_CONSTANTS_POKEMON_H -#include "consts/pokemon.h" // defs for PokemonType and SpeciesDataParam +#include "consts/pokemon.h" // defs for SpeciesDataParam +#include "generated/pokemon_types.h" // PokemonType /** * @brief Pokemon Stats diff --git a/include/constants/species.h b/include/constants/species.h index d57c2629e8..05f8cce036 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_CONSTANTS_SPECIES_H #define POKEPLATINUM_CONSTANTS_SPECIES_H -#include "consts/species.h" +#include "generated/species.h" #define KANTO_DEX_COUNT (SPECIES_MEW - SPECIES_NONE) #define JOHTO_DEX_COUNT (SPECIES_CELEBI - SPECIES_MEW) diff --git a/include/string_template.h b/include/string_template.h index 2a2ba7fb6f..852cbb78a9 100644 --- a/include/string_template.h +++ b/include/string_template.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_STRING_TEMPLATE_H #define POKEPLATINUM_STRING_TEMPLATE_H -#include "consts/abilities.h" #include "consts/gender.h" #include "consts/moves.h" +#include "generated/abilities.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/trainer_data.h" diff --git a/meson.build b/meson.build index ee1cfd78d2..cfc46227df 100644 --- a/meson.build +++ b/meson.build @@ -31,7 +31,8 @@ c_args = [ '-char', 'signed', '-nosyspath', '-stdinc', - '-sym', 'on' + '-sym', 'on', + '-DPOKEPLATINUM_GENERATED_ENUM', ] if get_option('gdb_debugging') @@ -136,6 +137,7 @@ subdir('lib') ### CONSTS ### ############################################################ subdir('consts') +subdir('generated') ############################################################ diff --git a/res/items/meson.build b/res/items/meson.build index 2bebc138ab..5ad33d1c2c 100644 --- a/res/items/meson.build +++ b/res/items/meson.build @@ -38,8 +38,9 @@ pl_item_data_narc = custom_target('pl_item_data.narc', '--pad', '0xFF', '-i', '@SOURCE_ROOT@/include', '-i', '@SOURCE_ROOT@/build', - ] + ], + depends: [ c_consts_generators, ], ) nitrofs_files += nuts_data_narc -nitrofs_files += pl_item_data_narc \ No newline at end of file +nitrofs_files += pl_item_data_narc diff --git a/res/items/pl_item_data_format.txt b/res/items/pl_item_data_format.txt index 5c8632d4d5..d4e9ba1388 100644 --- a/res/items/pl_item_data_format.txt +++ b/res/items/pl_item_data_format.txt @@ -1,12 +1,12 @@ item:skip:constants/items.h:ITEM_ price:u16 -holdEffect:u8:consts/items.h:HOLD_EFFECT_ +holdEffect:u8:generated/item_hold_effects.h:HOLD_EFFECT_ holdEffectParam:u8 pluckEffect:u8 flingEffect:u8 flingPower:u8 naturalGiftPower:u8 -naturalGiftType:u16.5:consts/pokemon.h:TYPE_ +naturalGiftType:u16.5:generated/pokemon_types.h:TYPE_ prevent_toss:u16.1:bool selectable:u16.1:bool fieldPocket:u16.4:constants/items.h:POCKET_ diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index 22ff76475b..dfbcf57047 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -9,7 +9,7 @@ #include "constants/string.h" #include "consts/moves.h" #include "consts/sdat.h" -#include "consts/species.h" +#include "generated/species.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c index 86634abad9..6f7a90fd0d 100644 --- a/src/applications/pokemon_summary_screen/sprite.c +++ b/src/applications/pokemon_summary_screen/sprite.c @@ -5,7 +5,7 @@ #include "constants/narc.h" #include "constants/pokemon.h" -#include "consts/items.h" +#include "generated/items.h" #include "applications/pokemon_summary_screen/main.h" #include "applications/pokemon_summary_screen/subscreen.h" diff --git a/src/applications/pokemon_summary_screen/window.c b/src/applications/pokemon_summary_screen/window.c index ce62e2202d..f3a316567b 100644 --- a/src/applications/pokemon_summary_screen/window.c +++ b/src/applications/pokemon_summary_screen/window.c @@ -4,7 +4,7 @@ #include #include "consts/gender.h" -#include "consts/items.h" +#include "generated/items.h" #include "struct_defs/struct_02090800.h" diff --git a/src/bag.c b/src/bag.c index 303f0b6145..b2f9a464be 100644 --- a/src/bag.c +++ b/src/bag.c @@ -6,7 +6,7 @@ #include "constants/heap.h" #include "constants/items.h" #include "constants/savedata/save_table.h" -#include "consts/items.h" +#include "generated/items.h" #include "struct_decls/struct_0207CB08_decl.h" diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c index 6b251d5d7a..ab57792fc3 100644 --- a/src/battle/battle_controller.c +++ b/src/battle/battle_controller.c @@ -12,9 +12,9 @@ #include "constants/pokemon.h" #include "constants/species.h" #include "constants/trainer.h" -#include "consts/abilities.h" #include "consts/game_records.h" #include "consts/sdat.h" +#include "generated/abilities.h" #include "struct_decls/battle_system.h" #include "struct_defs/trainer_data.h" diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c index 07adf9b76f..d2b7950d12 100644 --- a/src/battle/battle_lib.c +++ b/src/battle/battle_lib.c @@ -11,9 +11,9 @@ #include "constants/species.h" #include "constants/string.h" #include "constants/trainer.h" -#include "consts/abilities.h" #include "consts/game_records.h" #include "consts/gender.h" +#include "generated/abilities.h" #include "struct_decls/battle_system.h" #include "struct_decls/struct_02098700_decl.h" diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 1cbb826c7c..4cfe1bd644 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -8,9 +8,9 @@ #include "constants/pokemon.h" #include "constants/species.h" #include "constants/trainer.h" -#include "consts/abilities.h" #include "consts/gender.h" #include "consts/sdat.h" +#include "generated/abilities.h" #include "struct_decls/battle_system.h" #include "struct_decls/sprite_decl.h" diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 91b54aae5f..bacb2c9f9d 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -9,7 +9,7 @@ #include "constants/items.h" #include "consts/battle.h" #include "consts/game_records.h" -#include "consts/species.h" +#include "generated/species.h" #include "struct_decls/battle_system.h" #include "struct_decls/pokedexdata_decl.h" diff --git a/src/battle/trainer_ai/trainer_ai.c b/src/battle/trainer_ai/trainer_ai.c index aed71cabe7..347341d499 100644 --- a/src/battle/trainer_ai/trainer_ai.c +++ b/src/battle/trainer_ai/trainer_ai.c @@ -6,7 +6,7 @@ #include "constants/battle.h" #include "constants/items.h" #include "constants/species.h" -#include "consts/abilities.h" +#include "generated/abilities.h" #include "struct_decls/battle_system.h" #include "struct_defs/battle_system.h" diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 3ac86fbd54..a3a023761b 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -10,8 +10,8 @@ #include "constants/pokemon.h" #include "constants/string.h" #include "consts/battle.h" -#include "consts/items.h" -#include "consts/species.h" +#include "generated/items.h" +#include "generated/species.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0203A790_decl.h" diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 8ed602bcfd..ce5bfa2ad0 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -4,8 +4,8 @@ #include #include "consts/game_records.h" -#include "consts/items.h" -#include "consts/species.h" +#include "generated/items.h" +#include "generated/species.h" #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_0202C878_decl.h" diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index dd8a5dfb7b..db47593be3 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -7,10 +7,11 @@ #include "constants/forms.h" #include "constants/overworld_weather.h" #include "constants/species.h" -#include "consts/abilities.h" #include "consts/gender.h" -#include "consts/items.h" #include "consts/pokemon.h" +#include "generated/abilities.h" +#include "generated/gender_ratios.h" +#include "generated/items.h" #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0206C638.h" diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 9822ecd4f7..45242963ea 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -4,7 +4,7 @@ #include #include -#include "consts/items.h" +#include "generated/items.h" #include "struct_decls/font_oam.h" #include "struct_decls/struct_0200C6E4_decl.h" diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 7d58b0767a..82b7eea4c6 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -3,7 +3,7 @@ #include #include -#include "consts/species.h" +#include "generated/species.h" #include "struct_decls/struct_020797DC_decl.h" diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index c11371cdf5..6f3b148f2d 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -4,8 +4,8 @@ #include #include -#include "consts/items.h" -#include "consts/species.h" +#include "generated/items.h" +#include "generated/species.h" #include "struct_decls/struct_020797DC_decl.h" diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index b17d3184a7..0dd0bb5d62 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -4,7 +4,7 @@ #include #include "constants/battle/condition.h" -#include "consts/items.h" +#include "generated/items.h" #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index c6d9544e8e..d305beaba2 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -3,7 +3,7 @@ #include #include -#include "consts/species.h" +#include "generated/species.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_defs/struct_0207F248.h" diff --git a/src/pokedex.c b/src/pokedex.c index 2826913f76..0691af50dc 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4,6 +4,7 @@ #include #include "constants/species.h" +#include "generated/gender_ratios.h" #include "heap.h" #include "inlines.h" diff --git a/src/pokemon.c b/src/pokemon.c index 568e7504b1..d844ccba71 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -10,10 +10,11 @@ #include "constants/narc.h" #include "constants/sound.h" #include "constants/species.h" -#include "consts/abilities.h" #include "consts/gender.h" -#include "consts/items.h" #include "consts/pokemon.h" +#include "generated/abilities.h" +#include "generated/exp_rates.h" +#include "generated/gender_ratios.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/sprite_decl.h" @@ -107,8 +108,8 @@ static void BoxPokemon_SetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam static void Pokemon_IncreaseDataInternal(Pokemon *mon, enum PokemonDataParam param, int value); static void BoxPokemon_IncreaseDataInternal(BoxPokemon *boxMon, enum PokemonDataParam param, int value); static u32 BoxPokemon_GetExpToNextLevel(BoxPokemon *boxMon); -static void Pokemon_LoadExperienceTableOf(enum PokemonExpRate monExpRate, u32 *monExpTable); -static u32 Pokemon_GetExpRateBaseExpAt(enum PokemonExpRate monExpRate, int monLevel); +static void Pokemon_LoadExperienceTableOf(enum ExpRate monExpRate, u32 *monExpTable); +static u32 Pokemon_GetExpRateBaseExpAt(enum ExpRate monExpRate, int monLevel); static u16 Pokemon_GetNatureStatValue(u8 monNature, u16 monStatValue, u8 statType); static u8 BoxPokemon_IsShiny(BoxPokemon *boxMon); static inline BOOL Pokemon_InlineIsPersonalityShiny(u32 monOTID, u32 monPersonality); @@ -2181,14 +2182,14 @@ u32 Pokemon_GetSpeciesBaseExpAt(int monSpecies, int monLevel) return Pokemon_GetExpRateBaseExpAt(SpeciesData_GetSpeciesValue(monSpecies, SPECIES_DATA_EXP_RATE), monLevel); } -static void Pokemon_LoadExperienceTableOf(enum PokemonExpRate monExpRate, u32 *monExpTable) +static void Pokemon_LoadExperienceTableOf(enum ExpRate monExpRate, u32 *monExpTable) { // TODO const for table size GF_ASSERT(monExpRate < 8); NARC_ReadWholeMemberByIndexPair(monExpTable, NARC_INDEX_POKETOOL__PERSONAL__PL_GROWTBL, monExpRate); } -static u32 Pokemon_GetExpRateBaseExpAt(enum PokemonExpRate monExpRate, int monLevel) +static u32 Pokemon_GetExpRateBaseExpAt(enum ExpRate monExpRate, int monLevel) { // TODO const for table size GF_ASSERT(monExpRate < 8); @@ -2234,7 +2235,7 @@ u32 SpeciesData_GetLevelAt(SpeciesData *speciesData, u16 unused_monSpecies, u32 // TODO const for table size static u32 monExpTable[101]; - enum PokemonExpRate monExpRate = SpeciesData_GetValue(speciesData, SPECIES_DATA_EXP_RATE); + enum ExpRate monExpRate = SpeciesData_GetValue(speciesData, SPECIES_DATA_EXP_RATE); Pokemon_LoadExperienceTableOf(monExpRate, monExpTable); int i; diff --git a/src/string_template.c b/src/string_template.c index 48bc2d9eae..c50206070f 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -7,9 +7,9 @@ #include "constants/heap.h" #include "constants/narc.h" #include "constants/pokemon.h" -#include "consts/abilities.h" #include "consts/gender.h" #include "consts/moves.h" +#include "generated/abilities.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/trainer_data.h" diff --git a/src/unk_020131EC.c b/src/unk_020131EC.c index 8a5b188026..780888ce6f 100644 --- a/src/unk_020131EC.c +++ b/src/unk_020131EC.c @@ -3,7 +3,7 @@ #include #include -#include "consts/species.h" +#include "generated/species.h" #include "struct_defs/struct_02013610.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index bc1081d861..e37ccf05b0 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -4,8 +4,8 @@ #include #include "consts/game_records.h" -#include "consts/items.h" -#include "consts/species.h" +#include "generated/items.h" +#include "generated/species.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0207AE68_decl.h" diff --git a/src/unk_02083370.c b/src/unk_02083370.c index bdcea827f0..75986adedd 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -3,7 +3,7 @@ #include #include -#include "consts/items.h" +#include "generated/items.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0207F248.h" diff --git a/src/unk_02096420.c b/src/unk_02096420.c index 74ee8b9ac9..fa265e68a6 100644 --- a/src/unk_02096420.c +++ b/src/unk_02096420.c @@ -3,7 +3,7 @@ #include #include -#include "consts/species.h" +#include "generated/species.h" #include "heap.h" #include "item.h" diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 07c76c6323..28455a2cd1 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -4,7 +4,7 @@ #include #include "consts/game_records.h" -#include "consts/species.h" +#include "generated/species.h" #include "struct_defs/struct_0203E2FC.h" #include "struct_defs/struct_0209843C.h" diff --git a/subprojects/metang.wrap b/subprojects/metang.wrap new file mode 100644 index 0000000000..de7dec75b5 --- /dev/null +++ b/subprojects/metang.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/lhearachel/metang.git +revision = main +depth = 1 + +[provide] +program_names = metang diff --git a/tools/json2bin/catching_show_data.py b/tools/json2bin/catching_show_data.py index e8633baae0..f5259dfed2 100644 --- a/tools/json2bin/catching_show_data.py +++ b/tools/json2bin/catching_show_data.py @@ -2,10 +2,8 @@ import pathlib import json2bin as j2b -from consts import ( - species, - catching_show -) +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([]) @@ -23,7 +21,7 @@ SCHEMA = j2b.Parser() \ def indexer(file_path: pathlib.Path) -> int: name = file_path.parent.stem.upper() - return species.PokemonSpecies[f'SPECIES_{name}'].value + return species.Species[f'SPECIES_{name}'].value args = j2b.ARGPARSER.parse_args() diff --git a/tools/json2bin/convert.py b/tools/json2bin/convert.py index 55c252a8e3..97988b58b2 100644 --- a/tools/json2bin/convert.py +++ b/tools/json2bin/convert.py @@ -2,7 +2,8 @@ import collections import functools -from consts import items, moves, species, trainer, trainer_ai +from generated import items, moves, species +from consts import trainer, trainer_ai def pad(len: int) -> bytes: return (0).to_bytes(len, 'little') @@ -23,7 +24,7 @@ def from_move(s: str) -> int: return moves.Move[s].value def from_species(s: str) -> int: - return species.PokemonSpecies[s].value + return species.Species[s].value def from_trainer_class(s: str) -> int: return trainer.TrainerClass[s].value diff --git a/tools/json2bin/encdata_ex_elusive_rod.py b/tools/json2bin/encdata_ex_elusive_rod.py index f8d8634350..f3dc860463 100644 --- a/tools/json2bin/encdata_ex_elusive_rod.py +++ b/tools/json2bin/encdata_ex_elusive_rod.py @@ -4,11 +4,11 @@ import json import pathlib import sys -from consts import species from convert import u16, u32 +from generated import species def as_species(s: str) -> bytes: - return u32(species.PokemonSpecies[s].value) + return u32(species.Species[s].value) input_path = pathlib.Path(sys.argv[1]) output_path_species = pathlib.Path(sys.argv[2]) diff --git a/tools/json2bin/encdata_ex_great_marsh.py b/tools/json2bin/encdata_ex_great_marsh.py index 46564dd93a..ee1896ef2a 100644 --- a/tools/json2bin/encdata_ex_great_marsh.py +++ b/tools/json2bin/encdata_ex_great_marsh.py @@ -4,11 +4,11 @@ import json import pathlib import sys -from consts import species from convert import u16, u32 +from generated import species def as_species(s: str) -> bytes: - return u32(species.PokemonSpecies[s].value) + return u32(species.Species[s].value) input_path = pathlib.Path(sys.argv[1]) output_path_natdex = pathlib.Path(sys.argv[2]) diff --git a/tools/json2bin/encdata_ex_honey_trees.py b/tools/json2bin/encdata_ex_honey_trees.py index f718d6b857..464dd02023 100644 --- a/tools/json2bin/encdata_ex_honey_trees.py +++ b/tools/json2bin/encdata_ex_honey_trees.py @@ -4,11 +4,11 @@ import json import pathlib import sys -from consts import species from convert import u32 +from generated import species def as_species(s: str) -> bytes: - return u32(species.PokemonSpecies[s].value) + return u32(species.Species[s].value) input_path = pathlib.Path(sys.argv[1]) output_path_common = pathlib.Path(sys.argv[2]) diff --git a/tools/json2bin/encdata_ex_trophy_garden.py b/tools/json2bin/encdata_ex_trophy_garden.py index 262590b2ed..ff60c35d5a 100644 --- a/tools/json2bin/encdata_ex_trophy_garden.py +++ b/tools/json2bin/encdata_ex_trophy_garden.py @@ -4,11 +4,11 @@ import json import pathlib import sys -from consts import species from convert import u32 +from generated import species def as_species(s: str) -> bytes: - return u32(species.PokemonSpecies[s].value) + return u32(species.Species[s].value) input_path = pathlib.Path(sys.argv[1]) output_path = pathlib.Path(sys.argv[2]) diff --git a/tools/json2bin/encounter.py b/tools/json2bin/encounter.py index bcd0f30a0c..5effd05e82 100644 --- a/tools/json2bin/encounter.py +++ b/tools/json2bin/encounter.py @@ -4,11 +4,11 @@ import json import pathlib import sys -from consts import species from convert import pad, u8, u32 +from generated import species def as_species(s: str) -> bytes: - return u32(species.PokemonSpecies[s].value) + return u32(species.Species[s].value) def convert_land(encs: list) -> bytes: return b''.join(itertools.chain.from_iterable([ diff --git a/tools/json2bin/evo.py b/tools/json2bin/evo.py index f7ce70c275..d53e3ac183 100644 --- a/tools/json2bin/evo.py +++ b/tools/json2bin/evo.py @@ -3,11 +3,14 @@ from collections.abc import Sequence import pathlib import json2bin as j2b -from consts import ( +from generated import ( items, moves, + species, +) + +from consts import ( pokemon, - species ) @@ -51,7 +54,7 @@ def get_evo_params(method: pokemon.PokemonEvoMethod, evo: Sequence): elif method == pokemon.PokemonEvoMethod.EVO_LEVEL_KNOW_MOVE: final_param = moves.Move[maybe_param].value elif method == pokemon.PokemonEvoMethod.EVO_LEVEL_SPECIES_IN_PARTY: - final_param = species.PokemonSpecies[maybe_param].value + final_param = species.Species[maybe_param].value return final_param @@ -70,7 +73,7 @@ def parse_evolutions(table: Sequence, _size: int, _enum: None) -> bytes: evo = table[j] method = pokemon.PokemonEvoMethod[evo[0]] params = get_evo_params(method, evo) - target = species.PokemonSpecies[evo[-1]] + target = species.Species[evo[-1]] out.extend(table_line(method.value, params, target.value)) out.extend((0).to_bytes(44 - len(out), 'little')) @@ -118,7 +121,7 @@ def indexer(file_path: pathlib.Path) -> int: species_idx = file_path.parent.parent.parent.stem.upper() form = file_path.parent.stem.upper() return FORM_INDICES[species_idx][form] - return species.PokemonSpecies[f'SPECIES_{name}'].value + return species.Species[f'SPECIES_{name}'].value args = j2b.ARGPARSER.parse_args() diff --git a/tools/json2bin/movedata.py b/tools/json2bin/movedata.py index 971aeae52a..4dbf9b6742 100644 --- a/tools/json2bin/movedata.py +++ b/tools/json2bin/movedata.py @@ -1,6 +1,9 @@ #!/usr/bin/env python3 import pathlib +from generated.moves import Move +from generated.pokemon_types import PokemonType + from consts import ( battle, moves, @@ -15,7 +18,7 @@ SCHEMA = j2b.Parser() \ .register('effect.type', 2, j2b.parse_const, battle.BattleEffect) \ .register('class', 1, j2b.parse_const, moves.MoveClass) \ .register('power', 1, j2b.parse_int) \ - .register('type', 1, j2b.parse_const, pokemon.PokemonType) \ + .register('type', 1, j2b.parse_const, PokemonType) \ .register('accuracy', 1, j2b.parse_int) \ .register('pp', 1, j2b.parse_int) \ .register('effect.chance', 1, j2b.parse_int) \ @@ -31,7 +34,7 @@ def indexer(file_path: pathlib.Path) -> int: if stem.isnumeric(): return int(stem) - return moves.Move[f'MOVE_{file_path.parent.stem.upper()}'].value + return Move[f'MOVE_{file_path.parent.stem.upper()}'].value args = j2b.ARGPARSER.parse_args() diff --git a/tools/json2bin/pl_poke_data.py b/tools/json2bin/pl_poke_data.py index 826af1fc0a..a395f9a429 100644 --- a/tools/json2bin/pl_poke_data.py +++ b/tools/json2bin/pl_poke_data.py @@ -2,10 +2,8 @@ import pathlib import json2bin as j2b -from consts import ( - species, - shadows -) +from consts import shadows +from generated import species def parse_frame(frame: dict) -> bytes: @@ -41,7 +39,7 @@ SCHEMA = j2b.Parser() \ def indexer(file_path: pathlib.Path) -> int: name = file_path.parent.stem.upper() if name == '000': return 0 - return species.PokemonSpecies[f'SPECIES_{name}'].value + return species.Species[f'SPECIES_{name}'].value args = j2b.ARGPARSER.parse_args() diff --git a/tools/json2bin/pokemon_personal_data.py b/tools/json2bin/pokemon_personal_data.py index 004ef7bfe9..a5904113a4 100644 --- a/tools/json2bin/pokemon_personal_data.py +++ b/tools/json2bin/pokemon_personal_data.py @@ -3,14 +3,18 @@ import pathlib import json2bin as j2b -from consts import ( +from generated import ( abilities, + egg_groups, + exp_rates, + gender_ratios, items, - pokemon, + pokemon_colors, + pokemon_types, species, - tm_learnset ) +from consts import tm_learnset def parse_ev_yields(ev_yields: dict, size: int, _: None) -> bytes: packed = ev_yields['hp'] @@ -22,7 +26,7 @@ def parse_ev_yields(ev_yields: dict, size: int, _: None) -> bytes: return packed.to_bytes(size, 'little') def parse_color(sprite: dict, size: int, _: None) -> bytes: - packed = pokemon.PokemonColor[sprite['color']].value + packed = pokemon_colors.PokemonColor[sprite['color']].value packed = packed + ((1 if sprite['flip_sprite'] else 0) << 7) return packed.to_bytes(size, 'little') @@ -34,19 +38,19 @@ SCHEMA = j2b.Parser() \ .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.PokemonType) \ - .register('types.1', 1, j2b.parse_const, pokemon.PokemonType) \ + .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, pokemon.PokemonGenderRatio) \ + .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, pokemon.PokemonExpRate) \ - .register('egg_groups.0', 1, j2b.parse_const, pokemon.PokemonEggGroup) \ - .register('egg_groups.1', 1, j2b.parse_const, pokemon.PokemonEggGroup) \ + .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('great_marsh_flee_rate', 1, j2b.parse_int) \ @@ -91,7 +95,7 @@ def indexer(file_path: pathlib.Path) -> int: species_idx = file_path.parent.parent.parent.stem.upper() form = file_path.parent.stem.upper() return FORM_INDICES[species_idx][form] - return species.PokemonSpecies[f'SPECIES_{name}'].value + return species.Species[f'SPECIES_{name}'].value args = j2b.ARGPARSER.parse_args() diff --git a/tools/json2bin/pokemon_wotbl_data.py b/tools/json2bin/pokemon_wotbl_data.py index 8f0ba0cb8d..6194eb2cf1 100644 --- a/tools/json2bin/pokemon_wotbl_data.py +++ b/tools/json2bin/pokemon_wotbl_data.py @@ -2,9 +2,9 @@ import pathlib import json2bin as j2b -from consts import ( +from generated import ( moves, - species + species, ) @@ -70,7 +70,7 @@ def indexer(file_path: pathlib.Path) -> int: species_idx = file_path.parent.parent.parent.stem.upper() form = file_path.parent.stem.upper() return FORM_INDICES[species_idx][form] - return species.PokemonSpecies[f'SPECIES_{name}'].value + return species.Species[f'SPECIES_{name}'].value args = j2b.ARGPARSER.parse_args() diff --git a/tools/json2bin/trainer_data.py b/tools/json2bin/trainer_data.py index 719e317b68..5c05d644a1 100644 --- a/tools/json2bin/trainer_data.py +++ b/tools/json2bin/trainer_data.py @@ -4,7 +4,7 @@ import json import pathlib import sys -from consts import items +from generated import items from convert import ( TrainerDataFlags, derive_data_flags, diff --git a/tools/json2bin/trainer_party.py b/tools/json2bin/trainer_party.py index 53f7f72d81..325c16caab 100644 --- a/tools/json2bin/trainer_party.py +++ b/tools/json2bin/trainer_party.py @@ -3,7 +3,7 @@ import json import pathlib import sys -from consts import moves +from generated import moves from convert import derive_data_flags, pad, u16, u32, from_item, from_move, from_species diff --git a/tools/meson.build b/tools/meson.build index bcafc78169..67e818a78b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -22,3 +22,4 @@ 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/scripts/make_height.py b/tools/scripts/make_height.py index 394555c3f8..de79643f4d 100644 --- a/tools/scripts/make_height.py +++ b/tools/scripts/make_height.py @@ -4,7 +4,7 @@ import json import pathlib import subprocess -from consts.pokemon import PokemonGenderRatio +from generated.gender_ratios import GenderRatio argparser = argparse.ArgumentParser( @@ -45,10 +45,10 @@ for i, subdir in enumerate(args.subdirs): pkdata = json.load(data_file) gender_ratio = pkdata['gender_ratio'] - female_only = (gender_ratio == PokemonGenderRatio.GENDER_RATIO_FEMALE_ONLY.name) + female_only = (gender_ratio == GenderRatio.GENDER_RATIO_FEMALE_ONLY.name) male_or_genderless = (gender_ratio in [ - PokemonGenderRatio.GENDER_RATIO_MALE_ONLY.name, - PokemonGenderRatio.GENDER_RATIO_NO_GENDER.name + GenderRatio.GENDER_RATIO_MALE_ONLY.name, + GenderRatio.GENDER_RATIO_NO_GENDER.name ]) j = 0 diff --git a/tools/scripts/make_pl_pokezukan.py b/tools/scripts/make_pl_pokezukan.py index 994cf74634..5446a3ab7e 100644 --- a/tools/scripts/make_pl_pokezukan.py +++ b/tools/scripts/make_pl_pokezukan.py @@ -4,7 +4,7 @@ import json import pathlib import subprocess -from consts.species import PokemonSpecies +from generated.species import Species argparser = argparse.ArgumentParser( @@ -40,7 +40,7 @@ pokedex = [0 for i in range(NUM_POKEMON)] with open(args.pokedex) as data_file: dex_data = json.load(data_file) for i, mon in enumerate(dex_data): - pokedex[PokemonSpecies[mon].value] = i + pokedex[Species[mon].value] = i target_fname = private_dir / 'pl_pokezukan_0.bin' with open(target_fname, 'wb+') as target_file: diff --git a/tools/scripts/make_pokedex_data.py b/tools/scripts/make_pokedex_data.py index c354d12b76..8530ab5818 100644 --- a/tools/scripts/make_pokedex_data.py +++ b/tools/scripts/make_pokedex_data.py @@ -4,9 +4,9 @@ import json import pathlib import subprocess -from consts.species import PokemonSpecies -from consts.pokemon import PokemonType from consts.pokemon import PokemonBodyShape +from generated.pokemon_types import PokemonType +from generated.species import Species argparser = argparse.ArgumentParser( @@ -59,8 +59,8 @@ def DataSize(num): return 1 return 2 -NUM_FILES = 26 + PokemonType['NUMBER_OF_MON_TYPES'].value + PokemonBodyShape['NUMBER_OF_BODY_SHAPES'].value -NUM_POKEMON = len(PokemonSpecies)-3 +NUM_FILES = 26 + PokemonType['NUM_POKEMON_TYPES'].value + PokemonBodyShape['NUMBER_OF_BODY_SHAPES'].value +NUM_POKEMON = len(Species)-3 binData = [bytes() for f in range(NUM_FILES)] heightData = [0 for i in range(NUM_POKEMON)] @@ -95,13 +95,13 @@ for i, file in enumerate(args.src_files): binData[11] = binData[11] + i.to_bytes(2, 'little') # body shape - bodyIdx = PokemonBodyShape[pkdexdata['body_shape']].value + PokemonType['NUMBER_OF_MON_TYPES'].value + 26 + bodyIdx = PokemonBodyShape[pkdexdata['body_shape']].value + PokemonType['NUM_POKEMON_TYPES'].value + 26 binData[bodyIdx] = binData[bodyIdx] + i.to_bytes(2, 'little') # pokemon types typeIdx = 27 for type in PokemonType: - if type.name in ['TYPE_MYSTERY', 'NUMBER_OF_MON_TYPES']: + if type.name in ['TYPE_MYSTERY', 'NUM_POKEMON_TYPES']: continue if type.name in pkdata['types']: binData[typeIdx] = binData[typeIdx] + i.to_bytes(2, 'little') @@ -117,7 +117,7 @@ with open(source_dir / 'sinnoh_pokedex.json') as data_file: pokedex = json.load(data_file) for mon in pokedex: if mon not in ['SPECIES_EGG', 'SPECIES_BAD_EGG', 'SPECIES_NONE', 'SPECIES_ARCEUS']: - binData[12] = binData[12] + PokemonSpecies[mon].value.to_bytes(2, 'little') + binData[12] = binData[12] + Species[mon].value.to_bytes(2, 'little') # alphabetical order alpha = sorted(range(len(nameData)), key=lambda k: nameData[k]) diff --git a/tools/scripts/make_pokedex_enc_platinum.py b/tools/scripts/make_pokedex_enc_platinum.py index ff1f177ce7..e6c6f370af 100644 --- a/tools/scripts/make_pokedex_enc_platinum.py +++ b/tools/scripts/make_pokedex_enc_platinum.py @@ -4,7 +4,7 @@ import json import pathlib import subprocess -from consts.species import PokemonSpecies +from generated.species import Species argparser = argparse.ArgumentParser( @@ -232,7 +232,7 @@ honey_tree_fields = [ ] great_marsh_dungeon = 4 -NUM_POKEMON = len(PokemonSpecies) - 1 +NUM_POKEMON = len(Species) - 1 NUM_FILES = NUM_POKEMON * 10 + 4 NUM_DIGITS = len(str(NUM_FILES)) @@ -291,24 +291,24 @@ for file in args.src_files: if (file == args.honey_file): for species in enc_data['common']: for map_num in honey_tree_dungeons: - dungeon_special[PokemonSpecies[species].value].add(map_num) - dungeon_special_natdex[PokemonSpecies[species].value].add(map_num) + dungeon_special[Species[species].value].add(map_num) + dungeon_special_natdex[Species[species].value].add(map_num) for map_num in honey_tree_fields: - field_special[PokemonSpecies[species].value].add(map_num) - field_special_natdex[PokemonSpecies[species].value].add(map_num) + field_special[Species[species].value].add(map_num) + field_special_natdex[Species[species].value].add(map_num) for species in enc_data['uncommon']: for map_num in honey_tree_dungeons: - dungeon_special[PokemonSpecies[species].value].add(map_num) - dungeon_special_natdex[PokemonSpecies[species].value].add(map_num) + dungeon_special[Species[species].value].add(map_num) + dungeon_special_natdex[Species[species].value].add(map_num) for map_num in honey_tree_fields: - field_special[PokemonSpecies[species].value].add(map_num) - field_special_natdex[PokemonSpecies[species].value].add(map_num) + field_special[Species[species].value].add(map_num) + field_special_natdex[Species[species].value].add(map_num) elif (file == args.marsh_file): for species in enc_data['before_national_dex']: - dungeon_special[PokemonSpecies[species].value].add(great_marsh_dungeon) + dungeon_special[Species[species].value].add(great_marsh_dungeon) for species in enc_data['after_national_dex']: - dungeon_special_natdex[PokemonSpecies[species].value].add(great_marsh_dungeon) + dungeon_special_natdex[Species[species].value].add(great_marsh_dungeon) else: map_data = enc_data['map_category'] @@ -318,99 +318,99 @@ for file in args.src_files: if (map_type == 'dungeon'): for i, slot in enumerate(enc_data['land_encounters']): species = slot['species'] - dungeon_morning[PokemonSpecies[species].value].add(map_num) + dungeon_morning[Species[species].value].add(map_num) if ((i == 2) or (i == 3)): species = enc_data['morning'][i - 2] - dungeon_day[PokemonSpecies[species].value].add(map_num) + dungeon_day[Species[species].value].add(map_num) species = enc_data['night'][i - 2] - dungeon_night[PokemonSpecies[species].value].add(map_num) + dungeon_night[Species[species].value].add(map_num) else: - dungeon_day[PokemonSpecies[species].value].add(map_num) - dungeon_night[PokemonSpecies[species].value].add(map_num) + dungeon_day[Species[species].value].add(map_num) + dungeon_night[Species[species].value].add(map_num) for slot in enc_data['surf_encounters']: species = slot['species'] - dungeon_morning[PokemonSpecies[species].value].add(map_num) - dungeon_day[PokemonSpecies[species].value].add(map_num) - dungeon_night[PokemonSpecies[species].value].add(map_num) + dungeon_morning[Species[species].value].add(map_num) + dungeon_day[Species[species].value].add(map_num) + dungeon_night[Species[species].value].add(map_num) for slot in enc_data['old_rod_encounters']: species = slot['species'] - dungeon_morning[PokemonSpecies[species].value].add(map_num) - dungeon_day[PokemonSpecies[species].value].add(map_num) - dungeon_night[PokemonSpecies[species].value].add(map_num) + dungeon_morning[Species[species].value].add(map_num) + dungeon_day[Species[species].value].add(map_num) + dungeon_night[Species[species].value].add(map_num) for slot in enc_data['good_rod_encounters']: species = slot['species'] - dungeon_morning[PokemonSpecies[species].value].add(map_num) - dungeon_day[PokemonSpecies[species].value].add(map_num) - dungeon_night[PokemonSpecies[species].value].add(map_num) + dungeon_morning[Species[species].value].add(map_num) + dungeon_day[Species[species].value].add(map_num) + dungeon_night[Species[species].value].add(map_num) for slot in enc_data['super_rod_encounters']: species = slot['species'] - dungeon_morning[PokemonSpecies[species].value].add(map_num) - dungeon_day[PokemonSpecies[species].value].add(map_num) - dungeon_night[PokemonSpecies[species].value].add(map_num) + dungeon_morning[Species[species].value].add(map_num) + dungeon_day[Species[species].value].add(map_num) + dungeon_night[Species[species].value].add(map_num) dungeon_special[0].add(map_num) for species in enc_data['radar']: - dungeon_special_natdex[PokemonSpecies[species].value].add(map_num) + dungeon_special_natdex[Species[species].value].add(map_num) if (file == args.coronet_file): species = enc_data['elusive_rod_encounter']['species'] - dungeon_special[PokemonSpecies[species].value].add(map_num) - dungeon_special_natdex[PokemonSpecies[species].value].add(map_num) + dungeon_special[Species[species].value].add(map_num) + dungeon_special_natdex[Species[species].value].add(map_num) if (file == args.trophy_file): for species in enc_data['daily_encounters']: - dungeon_special_natdex[PokemonSpecies[species].value].add(map_num) + dungeon_special_natdex[Species[species].value].add(map_num) if (map_type == 'field'): for i, slot in enumerate(enc_data['land_encounters']): species = slot['species'] - field_morning[PokemonSpecies[species].value].add(map_num) + field_morning[Species[species].value].add(map_num) if ((i == 2) or (i == 3)): species = enc_data['morning'][i - 2] - field_day[PokemonSpecies[species].value].add(map_num) + field_day[Species[species].value].add(map_num) species = enc_data['night'][i - 2] - field_night[PokemonSpecies[species].value].add(map_num) + field_night[Species[species].value].add(map_num) else: - field_day[PokemonSpecies[species].value].add(map_num) - field_night[PokemonSpecies[species].value].add(map_num) + field_day[Species[species].value].add(map_num) + field_night[Species[species].value].add(map_num) for slot in enc_data['surf_encounters']: species = slot['species'] - field_morning[PokemonSpecies[species].value].add(map_num) - field_day[PokemonSpecies[species].value].add(map_num) - field_night[PokemonSpecies[species].value].add(map_num) + field_morning[Species[species].value].add(map_num) + field_day[Species[species].value].add(map_num) + field_night[Species[species].value].add(map_num) for slot in enc_data['old_rod_encounters']: species = slot['species'] - field_morning[PokemonSpecies[species].value].add(map_num) - field_day[PokemonSpecies[species].value].add(map_num) - field_night[PokemonSpecies[species].value].add(map_num) + field_morning[Species[species].value].add(map_num) + field_day[Species[species].value].add(map_num) + field_night[Species[species].value].add(map_num) for slot in enc_data['good_rod_encounters']: species = slot['species'] - field_morning[PokemonSpecies[species].value].add(map_num) - field_day[PokemonSpecies[species].value].add(map_num) - field_night[PokemonSpecies[species].value].add(map_num) + field_morning[Species[species].value].add(map_num) + field_day[Species[species].value].add(map_num) + field_night[Species[species].value].add(map_num) for slot in enc_data['super_rod_encounters']: species = slot['species'] - field_morning[PokemonSpecies[species].value].add(map_num) - field_day[PokemonSpecies[species].value].add(map_num) - field_night[PokemonSpecies[species].value].add(map_num) + field_morning[Species[species].value].add(map_num) + field_day[Species[species].value].add(map_num) + field_night[Species[species].value].add(map_num) field_special[0].add(map_num) for species in enc_data['radar']: - field_special_natdex[PokemonSpecies[species].value].add(map_num) + field_special_natdex[Species[species].value].add(map_num) for species in range(NUM_POKEMON): diff --git a/tools/scripts/make_pokedex_message_banks.py b/tools/scripts/make_pokedex_message_banks.py index d733c23c0c..69baf26a57 100644 --- a/tools/scripts/make_pokedex_message_banks.py +++ b/tools/scripts/make_pokedex_message_banks.py @@ -4,7 +4,7 @@ import json import pathlib import xml.etree.ElementTree as ET -from consts.species import PokemonSpecies +from generated.species import Species argparser = argparse.ArgumentParser( prog='make_pokedex_message_banks_py', @@ -58,7 +58,7 @@ def Convert_Height(decimeters): return f'  {feet}’{inches:02}”' # variables -NUM_POKEMON = len(PokemonSpecies) +NUM_POKEMON = len(Species) name_data = ['' for i in range(NUM_POKEMON)] name_articles = ['' for i in range(NUM_POKEMON)] diff --git a/tools/scripts/make_shinzukan.py b/tools/scripts/make_shinzukan.py index d9115bbbb4..33338e4a50 100644 --- a/tools/scripts/make_shinzukan.py +++ b/tools/scripts/make_shinzukan.py @@ -4,7 +4,7 @@ import json import pathlib import subprocess -from consts.species import PokemonSpecies +from generated.species import Species argparser = argparse.ArgumentParser( @@ -40,7 +40,7 @@ pokedex = [0 for i in range(NUM_SINNOH)] with open(args.pokedex) as data_file: dex_data = json.load(data_file) for i, mon in enumerate(dex_data): - pokedex[i] = PokemonSpecies[mon].value + pokedex[i] = Species[mon].value target_fname = private_dir / 'shinzukan_0.bin' with open(target_fname, 'wb+') as target_file: diff --git a/tools/scripts/make_species_tables.py b/tools/scripts/make_species_tables.py index fd5d0991c3..01dee33ad6 100644 --- a/tools/scripts/make_species_tables.py +++ b/tools/scripts/make_species_tables.py @@ -2,9 +2,10 @@ import argparse import json import pathlib -from consts.moves import Move -from consts.species import PokemonSpecies + from consts.pokemon import PokemonFootprintSize +from generated.moves import Move +from generated.species import Species argparser = argparse.ArgumentParser( @@ -83,7 +84,7 @@ for file_path in source_dir.glob("**/data.json"): isForm = True else: - species_id = PokemonSpecies[f"SPECIES_{species_name}"].value + species_id = Species[f"SPECIES_{species_name}"].value # this needs to be increased if more than 40 moves are added to this list From d9df0798296f200b2b19397b2cde2f0bb287ff3c Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 23:33:01 -0800 Subject: [PATCH 06/10] Use array for TM Learnset bitmasks --- include/struct_defs/species.h | 5 +---- src/pokemon.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/struct_defs/species.h b/include/struct_defs/species.h index 69cc3a2793..f9583492ce 100644 --- a/include/struct_defs/species.h +++ b/include/struct_defs/species.h @@ -54,10 +54,7 @@ typedef struct SpeciesData { u8 flipSprite : 1; // u16 padding; - u32 tmLearnsetMask1; // Bitflags for whether this pokemon can learn a TM (TM1 -> TM32) - u32 tmLearnsetMask2; // Bitflags for whether this pokemon can learn a TM (TM33 -> TM64) - u32 tmLearnsetMask3; // Bitflags for whether this pokemon can learn a TM (TM65 -> TM92, HM1 -> HM4) - u32 tmLearnsetMask4; // Bitflags for whether this pokemon can learn a TM (HM5 -> HM8, rest unused) + u32 tmLearnsetMasks[4]; // Bitflags for whether this pokemon can learn a TM } SpeciesData; typedef struct SpeciesEvolution { diff --git a/src/pokemon.c b/src/pokemon.c index d844ccba71..6995957cb1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2099,16 +2099,16 @@ u32 SpeciesData_GetValue(SpeciesData *speciesData, enum SpeciesDataParam param) result = speciesData->flipSprite; break; case SPECIES_DATA_TM_LEARNSET_MASK_1: - result = speciesData->tmLearnsetMask1; + result = speciesData->tmLearnsetMasks[0]; break; case SPECIES_DATA_TM_LEARNSET_MASK_2: - result = speciesData->tmLearnsetMask2; + result = speciesData->tmLearnsetMasks[1]; break; case SPECIES_DATA_TM_LEARNSET_MASK_3: - result = speciesData->tmLearnsetMask3; + result = speciesData->tmLearnsetMasks[2]; break; case SPECIES_DATA_TM_LEARNSET_MASK_4: - result = speciesData->tmLearnsetMask4; + result = speciesData->tmLearnsetMasks[3]; break; } From c0f35c0910ac0bc5eea1f5d7bd9961c853938b15 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 16 Jan 2025 22:28:08 -0800 Subject: [PATCH 07/10] Migrate evolution methods to metang --- consts/pokemon.json | 32 ----------------- generated/evolution_methods.txt | 27 ++++++++++++++ generated/meson.build | 1 + src/pokemon.c | 1 + tools/json2bin/evo.py | 63 ++++++++++++++++----------------- 5 files changed, 59 insertions(+), 65 deletions(-) create mode 100644 generated/evolution_methods.txt diff --git a/consts/pokemon.json b/consts/pokemon.json index 2bcaa0b19b..e234c1a100 100644 --- a/consts/pokemon.json +++ b/consts/pokemon.json @@ -38,38 +38,6 @@ "SPECIES_DATA_TM_LEARNSET_MASK_4" ] }, - "@PokemonEvoMethod": { - "type": "enum", - "values": [ - "EVO_NONE", - "EVO_LEVEL_HAPPINESS", - "EVO_LEVEL_HAPPINESS_DAY", - "EVO_LEVEL_HAPPINESS_NIGHT", - "EVO_LEVEL", - "EVO_TRADE", - "EVO_TRADE_WITH_HELD_ITEM", - "EVO_USE_ITEM", - "EVO_LEVEL_ATK_GT_DEF", - "EVO_LEVEL_ATK_EQ_DEF", - "EVO_LEVEL_ATK_LT_DEF", - "EVO_LEVEL_PID_LOW", - "EVO_LEVEL_PID_HIGH", - "EVO_LEVEL_NINJASK", - "EVO_LEVEL_SHEDINJA", - "EVO_LEVEL_BEAUTY", - "EVO_USE_ITEM_MALE", - "EVO_USE_ITEM_FEMALE", - "EVO_LEVEL_WITH_HELD_ITEM_DAY", - "EVO_LEVEL_WITH_HELD_ITEM_NIGHT", - "EVO_LEVEL_KNOW_MOVE", - "EVO_LEVEL_SPECIES_IN_PARTY", - "EVO_LEVEL_MALE", - "EVO_LEVEL_FEMALE", - "EVO_LEVEL_MAGNETIC_FIELD", - "EVO_LEVEL_MOSS_ROCK", - "EVO_LEVEL_ICE_ROCK" - ] - }, "@PokemonContestType": { "type": "enum", "values": [ diff --git a/generated/evolution_methods.txt b/generated/evolution_methods.txt new file mode 100644 index 0000000000..5046c6081e --- /dev/null +++ b/generated/evolution_methods.txt @@ -0,0 +1,27 @@ +EVO_NONE +EVO_LEVEL_HAPPINESS +EVO_LEVEL_HAPPINESS_DAY +EVO_LEVEL_HAPPINESS_NIGHT +EVO_LEVEL +EVO_TRADE +EVO_TRADE_WITH_HELD_ITEM +EVO_USE_ITEM +EVO_LEVEL_ATK_GT_DEF +EVO_LEVEL_ATK_EQ_DEF +EVO_LEVEL_ATK_LT_DEF +EVO_LEVEL_PID_LOW +EVO_LEVEL_PID_HIGH +EVO_LEVEL_NINJASK +EVO_LEVEL_SHEDINJA +EVO_LEVEL_BEAUTY +EVO_USE_ITEM_MALE +EVO_USE_ITEM_FEMALE +EVO_LEVEL_WITH_HELD_ITEM_DAY +EVO_LEVEL_WITH_HELD_ITEM_NIGHT +EVO_LEVEL_KNOW_MOVE +EVO_LEVEL_SPECIES_IN_PARTY +EVO_LEVEL_MALE +EVO_LEVEL_FEMALE +EVO_LEVEL_MAGNETIC_FIELD +EVO_LEVEL_MOSS_ROCK +EVO_LEVEL_ICE_ROCK diff --git a/generated/meson.build b/generated/meson.build index 26b9542722..9314575b27 100644 --- a/generated/meson.build +++ b/generated/meson.build @@ -1,6 +1,7 @@ enum_generators = { 'abilities': ['--tag-name', 'Ability'], 'egg_groups': ['--tag-name', 'EggGroup'], + 'evolution_methods': ['--tag-name', 'EvolutionMethod'], 'exp_rates': ['--tag-name', 'ExpRate'], 'gender_ratios': ['--tag-name', 'GenderRatio'], 'item_hold_effects': ['--tag-name', 'ItemHoldEffect'], diff --git a/src/pokemon.c b/src/pokemon.c index 6995957cb1..74b400b040 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -13,6 +13,7 @@ #include "consts/gender.h" #include "consts/pokemon.h" #include "generated/abilities.h" +#include "generated/evolution_methods.h" #include "generated/exp_rates.h" #include "generated/gender_ratios.h" diff --git a/tools/json2bin/evo.py b/tools/json2bin/evo.py index d53e3ac183..ae9da934ad 100644 --- a/tools/json2bin/evo.py +++ b/tools/json2bin/evo.py @@ -4,56 +4,53 @@ import pathlib import json2bin as j2b from generated import ( + evolution_methods, items, moves, species, ) -from consts import ( - pokemon, -) - -def get_evo_params(method: pokemon.PokemonEvoMethod, evo: Sequence): +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([ - pokemon.PokemonEvoMethod.EVO_NONE, - pokemon.PokemonEvoMethod.EVO_LEVEL_HAPPINESS, - pokemon.PokemonEvoMethod.EVO_LEVEL_HAPPINESS_DAY, - pokemon.PokemonEvoMethod.EVO_LEVEL_HAPPINESS_NIGHT, - pokemon.PokemonEvoMethod.EVO_TRADE, - pokemon.PokemonEvoMethod.EVO_LEVEL_MAGNETIC_FIELD, - pokemon.PokemonEvoMethod.EVO_LEVEL_MOSS_ROCK, - pokemon.PokemonEvoMethod.EVO_LEVEL_ICE_ROCK]): + 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([ - pokemon.PokemonEvoMethod.EVO_LEVEL, - pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_GT_DEF, - pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_EQ_DEF, - pokemon.PokemonEvoMethod.EVO_LEVEL_ATK_LT_DEF, - pokemon.PokemonEvoMethod.EVO_LEVEL_PID_LOW, - pokemon.PokemonEvoMethod.EVO_LEVEL_PID_HIGH, - pokemon.PokemonEvoMethod.EVO_LEVEL_NINJASK, - pokemon.PokemonEvoMethod.EVO_LEVEL_SHEDINJA, - pokemon.PokemonEvoMethod.EVO_LEVEL_MALE, - pokemon.PokemonEvoMethod.EVO_LEVEL_FEMALE, - pokemon.PokemonEvoMethod.EVO_LEVEL_BEAUTY]): + 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([ - pokemon.PokemonEvoMethod.EVO_TRADE_WITH_HELD_ITEM, - pokemon.PokemonEvoMethod.EVO_USE_ITEM, - pokemon.PokemonEvoMethod.EVO_USE_ITEM_MALE, - pokemon.PokemonEvoMethod.EVO_USE_ITEM_FEMALE, - pokemon.PokemonEvoMethod.EVO_LEVEL_WITH_HELD_ITEM_DAY, - pokemon.PokemonEvoMethod.EVO_LEVEL_WITH_HELD_ITEM_NIGHT]): + 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 == pokemon.PokemonEvoMethod.EVO_LEVEL_KNOW_MOVE: + elif method == evolution_methods.EvolutionMethod.EVO_LEVEL_KNOW_MOVE: final_param = moves.Move[maybe_param].value - elif method == pokemon.PokemonEvoMethod.EVO_LEVEL_SPECIES_IN_PARTY: + elif method == evolution_methods.EvolutionMethod.EVO_LEVEL_SPECIES_IN_PARTY: final_param = species.Species[maybe_param].value return final_param @@ -71,7 +68,7 @@ def parse_evolutions(table: Sequence, _size: int, _enum: None) -> bytes: out = bytearray([]) for j in range(min(len(table), 7)): evo = table[j] - method = pokemon.PokemonEvoMethod[evo[0]] + 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)) From 7361ba16b20b34f7b89b94fc72f3f8299b6741c1 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 16 Jan 2025 23:59:09 -0800 Subject: [PATCH 08/10] Update species data structures --- res/pokemon/000/data.json | 26 ++--- res/pokemon/abomasnow/data.json | 66 +++++------- res/pokemon/abra/data.json | 37 +++---- res/pokemon/absol/data.json | 72 ++++++------- res/pokemon/aerodactyl/data.json | 70 ++++++------ res/pokemon/aggron/data.json | 70 ++++++------ res/pokemon/aipom/data.json | 65 +++++------ res/pokemon/alakazam/data.json | 64 +++++------ res/pokemon/altaria/data.json | 72 ++++++------- res/pokemon/ambipom/data.json | 68 +++++------- res/pokemon/ampharos/data.json | 70 ++++++------ res/pokemon/anorith/data.json | 63 +++++------ res/pokemon/arbok/data.json | 78 ++++++-------- res/pokemon/arcanine/data.json | 48 ++++----- res/pokemon/arceus/data.json | 64 +++++------ res/pokemon/ariados/data.json | 70 ++++++------ res/pokemon/armaldo/data.json | 64 +++++------ res/pokemon/aron/data.json | 63 +++++------ res/pokemon/articuno/data.json | 66 +++++------- res/pokemon/azelf/data.json | 60 +++++------ res/pokemon/azumarill/data.json | 64 +++++------ res/pokemon/azurill/data.json | 52 ++++----- res/pokemon/bad_egg/data.json | 30 ++---- res/pokemon/bagon/data.json | 59 +++++----- res/pokemon/baltoy/data.json | 65 +++++------ res/pokemon/banette/data.json | 72 ++++++------- res/pokemon/barboach/data.json | 67 +++++------- res/pokemon/bastiodon/data.json | 64 +++++------ res/pokemon/bayleef/data.json | 69 +++++------- res/pokemon/beautifly/data.json | 56 +++++----- res/pokemon/beedrill/data.json | 58 +++++----- res/pokemon/beldum/data.json | 37 +++---- res/pokemon/bellossom/data.json | 50 ++++----- res/pokemon/bellsprout/data.json | 61 +++++------ res/pokemon/bibarel/data.json | 64 +++++------ res/pokemon/bidoof/data.json | 61 +++++------ res/pokemon/blastoise/data.json | 72 ++++++------- res/pokemon/blaziken/data.json | 70 ++++++------ res/pokemon/blissey/data.json | 64 +++++------ res/pokemon/bonsly/data.json | 63 +++++------ res/pokemon/breloom/data.json | 68 +++++------- res/pokemon/bronzong/data.json | 72 ++++++------- res/pokemon/bronzor/data.json | 65 +++++------ res/pokemon/budew/data.json | 54 ++++------ res/pokemon/buizel/data.json | 59 +++++----- res/pokemon/bulbasaur/data.json | 65 +++++------ res/pokemon/buneary/data.json | 70 +++++------- res/pokemon/burmy/data.json | 43 +++----- res/pokemon/butterfree/data.json | 64 +++++------ res/pokemon/cacnea/data.json | 69 +++++------- res/pokemon/cacturne/data.json | 76 ++++++------- res/pokemon/camerupt/data.json | 66 +++++------- res/pokemon/carnivine/data.json | 64 +++++------ res/pokemon/carvanha/data.json | 63 +++++------ res/pokemon/cascoon/data.json | 41 +++---- res/pokemon/castform/data.json | 54 ++++------ res/pokemon/caterpie/data.json | 45 +++----- res/pokemon/celebi/data.json | 64 +++++------ res/pokemon/chansey/data.json | 72 +++++-------- res/pokemon/charizard/data.json | 74 ++++++------- res/pokemon/charmander/data.json | 57 ++++------ res/pokemon/charmeleon/data.json | 59 +++++----- res/pokemon/chatot/data.json | 60 +++++------ res/pokemon/cherrim/data.json | 62 +++++------ res/pokemon/cherubi/data.json | 55 ++++------ res/pokemon/chikorita/data.json | 65 +++++------ res/pokemon/chimchar/data.json | 61 +++++------ res/pokemon/chimecho/data.json | 60 +++++------ res/pokemon/chinchou/data.json | 65 +++++------ res/pokemon/chingling/data.json | 52 ++++----- res/pokemon/clamperl/data.json | 45 +++----- res/pokemon/claydol/data.json | 74 ++++++------- res/pokemon/clefable/data.json | 44 +++----- res/pokemon/clefairy/data.json | 69 +++++------- res/pokemon/cleffa/data.json | 58 ++++------ res/pokemon/cloyster/data.json | 50 ++++----- res/pokemon/combee/data.json | 41 +++---- res/pokemon/combusken/data.json | 67 +++++------- res/pokemon/corphish/data.json | 61 +++++------ res/pokemon/corsola/data.json | 64 +++++------ res/pokemon/cradily/data.json | 68 +++++------- res/pokemon/cranidos/data.json | 59 +++++----- res/pokemon/crawdaunt/data.json | 72 ++++++------- res/pokemon/cresselia/data.json | 60 +++++------ res/pokemon/croagunk/data.json | 63 +++++------ res/pokemon/crobat/data.json | 66 +++++------- res/pokemon/croconaw/data.json | 71 ++++++------ res/pokemon/cubone/data.json | 63 +++++------ res/pokemon/cyndaquil/data.json | 63 +++++------ res/pokemon/darkrai/data.json | 60 +++++------ res/pokemon/delcatty/data.json | 44 +++----- res/pokemon/delibird/data.json | 36 +++---- res/pokemon/deoxys/data.json | 66 +++++------- res/pokemon/deoxys/forms/attack/data.json | 60 +++++------ res/pokemon/deoxys/forms/defense/data.json | 68 +++++------- res/pokemon/deoxys/forms/speed/data.json | 60 +++++------ res/pokemon/dewgong/data.json | 76 ++++++------- res/pokemon/dialga/data.json | 60 +++++------ res/pokemon/diglett/data.json | 65 +++++------ res/pokemon/ditto/data.json | 36 +++---- res/pokemon/dodrio/data.json | 66 +++++------- res/pokemon/doduo/data.json | 61 +++++------ res/pokemon/donphan/data.json | 68 +++++------- res/pokemon/dragonair/data.json | 67 +++++------- res/pokemon/dragonite/data.json | 74 ++++++------- res/pokemon/drapion/data.json | 68 +++++------- res/pokemon/dratini/data.json | 65 +++++------ res/pokemon/drifblim/data.json | 68 +++++------- res/pokemon/drifloon/data.json | 67 +++++------- res/pokemon/drowzee/data.json | 67 +++++------- res/pokemon/dugtrio/data.json | 70 ++++++------ res/pokemon/dunsparce/data.json | 62 +++++------ res/pokemon/dusclops/data.json | 79 ++++++-------- res/pokemon/dusknoir/data.json | 76 ++++++------- res/pokemon/duskull/data.json | 63 +++++------ res/pokemon/dustox/data.json | 56 +++++----- res/pokemon/eevee/data.json | 79 +++++--------- res/pokemon/egg/data.json | 30 ++---- res/pokemon/ekans/data.json | 67 +++++------- res/pokemon/electabuzz/data.json | 63 +++++------ res/pokemon/electivire/data.json | 68 +++++------- res/pokemon/electrike/data.json | 61 +++++------ res/pokemon/electrode/data.json | 70 ++++++------ res/pokemon/elekid/data.json | 61 +++++------ res/pokemon/empoleon/data.json | 70 ++++++------ res/pokemon/entei/data.json | 64 +++++------ res/pokemon/espeon/data.json | 64 +++++------ res/pokemon/exeggcute/data.json | 63 +++++------ res/pokemon/exeggutor/data.json | 56 ++++------ res/pokemon/exploud/data.json | 78 ++++++-------- res/pokemon/farfetchd/data.json | 72 ++++++------- res/pokemon/fearow/data.json | 64 +++++------ res/pokemon/feebas/data.json | 43 +++----- res/pokemon/feraligatr/data.json | 72 ++++++------- res/pokemon/finneon/data.json | 61 +++++------ res/pokemon/flaaffy/data.json | 63 +++++------ res/pokemon/flareon/data.json | 64 +++++------ res/pokemon/floatzel/data.json | 64 +++++------ res/pokemon/flygon/data.json | 64 +++++------ res/pokemon/forretress/data.json | 76 ++++++------- res/pokemon/froslass/data.json | 66 +++++------- res/pokemon/furret/data.json | 68 +++++------- res/pokemon/gabite/data.json | 59 +++++----- res/pokemon/gallade/data.json | 72 ++++++------- res/pokemon/garchomp/data.json | 66 +++++------- res/pokemon/gardevoir/data.json | 70 ++++++------ res/pokemon/gastly/data.json | 65 +++++------ res/pokemon/gastrodon/data.json | 62 +++++------ res/pokemon/gengar/data.json | 68 +++++------- res/pokemon/geodude/data.json | 63 +++++------ res/pokemon/gible/data.json | 55 ++++------ res/pokemon/girafarig/data.json | 68 +++++------- res/pokemon/giratina/data.json | 58 +++++----- res/pokemon/giratina/forms/origin/data.json | 54 ++++------ res/pokemon/glaceon/data.json | 64 +++++------ res/pokemon/glalie/data.json | 66 +++++------- res/pokemon/glameow/data.json | 61 +++++------ res/pokemon/gligar/data.json | 61 +++++------ res/pokemon/gliscor/data.json | 74 ++++++------- res/pokemon/gloom/data.json | 63 +++++------ res/pokemon/golbat/data.json | 70 +++++------- res/pokemon/goldeen/data.json | 63 +++++------ res/pokemon/golduck/data.json | 68 +++++------- res/pokemon/golem/data.json | 68 +++++------- res/pokemon/gorebyss/data.json | 58 +++++----- res/pokemon/granbull/data.json | 66 +++++------- res/pokemon/graveler/data.json | 72 +++++-------- res/pokemon/grimer/data.json | 67 +++++------- res/pokemon/grotle/data.json | 65 +++++------ res/pokemon/groudon/data.json | 58 +++++----- res/pokemon/grovyle/data.json | 67 +++++------- res/pokemon/growlithe/data.json | 67 +++++------- res/pokemon/grumpig/data.json | 72 ++++++------- res/pokemon/gulpin/data.json | 65 +++++------ res/pokemon/gyarados/data.json | 56 +++++----- res/pokemon/happiny/data.json | 49 ++++----- res/pokemon/hariyama/data.json | 76 ++++++------- res/pokemon/haunter/data.json | 72 +++++-------- res/pokemon/heatran/data.json | 60 +++++------ res/pokemon/heracross/data.json | 64 +++++------ res/pokemon/hippopotas/data.json | 57 ++++------ res/pokemon/hippowdon/data.json | 66 +++++------- res/pokemon/hitmonchan/data.json | 72 +++++-------- res/pokemon/hitmonlee/data.json | 68 +++++------- res/pokemon/hitmontop/data.json | 64 +++++------ res/pokemon/ho_oh/data.json | 64 +++++------ res/pokemon/honchkrow/data.json | 54 ++++------ res/pokemon/hoothoot/data.json | 69 +++++------- res/pokemon/hoppip/data.json | 67 +++++------- res/pokemon/horsea/data.json | 59 +++++----- res/pokemon/houndoom/data.json | 70 ++++++------ res/pokemon/houndour/data.json | 65 +++++------ res/pokemon/huntail/data.json | 58 +++++----- res/pokemon/hypno/data.json | 74 ++++++------- res/pokemon/igglybuff/data.json | 54 ++++------ res/pokemon/illumise/data.json | 58 +++++----- res/pokemon/infernape/data.json | 66 +++++------- res/pokemon/ivysaur/data.json | 73 ++++++------- res/pokemon/jigglypuff/data.json | 59 +++++----- res/pokemon/jirachi/data.json | 68 +++++------- res/pokemon/jolteon/data.json | 64 +++++------ res/pokemon/jumpluff/data.json | 74 ++++++------- res/pokemon/jynx/data.json | 70 ++++++------ res/pokemon/kabuto/data.json | 61 +++++------ res/pokemon/kabutops/data.json | 72 ++++++------- res/pokemon/kadabra/data.json | 68 +++++------- res/pokemon/kakuna/data.json | 41 +++---- res/pokemon/kangaskhan/data.json | 64 +++++------ res/pokemon/kecleon/data.json | 72 ++++++------- res/pokemon/kingdra/data.json | 68 +++++------- res/pokemon/kingler/data.json | 68 +++++------- res/pokemon/kirlia/data.json | 69 +++++------- res/pokemon/koffing/data.json | 63 +++++------ res/pokemon/krabby/data.json | 67 +++++------- res/pokemon/kricketot/data.json | 43 +++----- res/pokemon/kricketune/data.json | 64 +++++------ res/pokemon/kyogre/data.json | 58 +++++----- res/pokemon/lairon/data.json | 71 ++++++------ res/pokemon/lanturn/data.json | 76 ++++++------- res/pokemon/lapras/data.json | 68 +++++------- res/pokemon/larvitar/data.json | 65 +++++------ res/pokemon/latias/data.json | 64 +++++------ res/pokemon/latios/data.json | 66 +++++------- res/pokemon/leafeon/data.json | 64 +++++------ res/pokemon/ledian/data.json | 68 +++++------- res/pokemon/ledyba/data.json | 65 +++++------ res/pokemon/lickilicky/data.json | 64 +++++------ res/pokemon/lickitung/data.json | 63 +++++------ res/pokemon/lileep/data.json | 65 +++++------ res/pokemon/linoone/data.json | 68 +++++------- res/pokemon/lombre/data.json | 55 ++++------ res/pokemon/lopunny/data.json | 68 +++++------- res/pokemon/lotad/data.json | 59 +++++----- res/pokemon/loudred/data.json | 69 +++++------- res/pokemon/lucario/data.json | 68 +++++------- res/pokemon/ludicolo/data.json | 46 ++++---- res/pokemon/lugia/data.json | 64 +++++------ res/pokemon/lumineon/data.json | 66 +++++------- res/pokemon/lunatone/data.json | 62 +++++------ res/pokemon/luvdisc/data.json | 62 +++++------ res/pokemon/luxio/data.json | 61 +++++------ res/pokemon/luxray/data.json | 62 +++++------ res/pokemon/machamp/data.json | 64 +++++------ res/pokemon/machoke/data.json | 68 +++++------- res/pokemon/machop/data.json | 63 +++++------ res/pokemon/magby/data.json | 63 +++++------ res/pokemon/magcargo/data.json | 66 +++++------- res/pokemon/magikarp/data.json | 43 +++----- res/pokemon/magmar/data.json | 63 +++++------ res/pokemon/magmortar/data.json | 68 +++++------- res/pokemon/magnemite/data.json | 67 +++++------- res/pokemon/magneton/data.json | 78 ++++++-------- res/pokemon/magnezone/data.json | 74 ++++++------- res/pokemon/makuhita/data.json | 69 +++++------- res/pokemon/mamoswine/data.json | 72 ++++++------- res/pokemon/manaphy/data.json | 64 +++++------ res/pokemon/manectric/data.json | 70 ++++++------ res/pokemon/mankey/data.json | 67 +++++------- res/pokemon/mantine/data.json | 72 ++++++------- res/pokemon/mantyke/data.json | 65 +++++------ res/pokemon/mareep/data.json | 57 +++++----- res/pokemon/marill/data.json | 57 +++++----- res/pokemon/marowak/data.json | 72 ++++++------- res/pokemon/marshtomp/data.json | 67 +++++------- res/pokemon/masquerain/data.json | 66 +++++------- res/pokemon/mawile/data.json | 64 +++++------ res/pokemon/medicham/data.json | 76 ++++++------- res/pokemon/meditite/data.json | 63 +++++------ res/pokemon/meganium/data.json | 70 ++++++------ res/pokemon/meowth/data.json | 67 +++++------- res/pokemon/mesprit/data.json | 60 +++++------ res/pokemon/metagross/data.json | 70 +++++------- res/pokemon/metang/data.json | 71 +++++------- res/pokemon/metapod/data.json | 41 +++---- res/pokemon/mew/data.json | 62 +++++------ res/pokemon/mewtwo/data.json | 74 ++++++------- res/pokemon/mightyena/data.json | 70 ++++++------ res/pokemon/milotic/data.json | 64 +++++------ res/pokemon/miltank/data.json | 62 +++++------ res/pokemon/mime_jr/data.json | 75 ++++++------- res/pokemon/minun/data.json | 66 +++++------- res/pokemon/misdreavus/data.json | 63 +++++------ res/pokemon/mismagius/data.json | 48 ++++----- res/pokemon/moltres/data.json | 66 +++++------- res/pokemon/monferno/data.json | 65 +++++------ res/pokemon/mothim/data.json | 62 +++++------ res/pokemon/mr_mime/data.json | 78 ++++++-------- res/pokemon/mudkip/data.json | 61 +++++------ res/pokemon/muk/data.json | 68 +++++------- res/pokemon/munchlax/data.json | 72 +++++-------- res/pokemon/murkrow/data.json | 57 ++++------ res/pokemon/natu/data.json | 69 +++++------- res/pokemon/nidoking/data.json | 50 ++++----- res/pokemon/nidoqueen/data.json | 50 ++++----- res/pokemon/nidoran_f/data.json | 65 +++++------ res/pokemon/nidoran_m/data.json | 65 +++++------ res/pokemon/nidorina/data.json | 63 +++++------ res/pokemon/nidorino/data.json | 61 +++++------ res/pokemon/nincada/data.json | 55 ++++------ res/pokemon/ninetales/data.json | 46 ++++---- res/pokemon/ninjask/data.json | 72 ++++++------- res/pokemon/noctowl/data.json | 70 ++++++------ res/pokemon/nosepass/data.json | 68 +++++------- res/pokemon/numel/data.json | 61 +++++------ res/pokemon/nuzleaf/data.json | 57 ++++------ res/pokemon/octillery/data.json | 70 ++++++------ res/pokemon/oddish/data.json | 59 +++++----- res/pokemon/omanyte/data.json | 65 +++++------ res/pokemon/omastar/data.json | 68 +++++------- res/pokemon/onix/data.json | 71 ++++++------ res/pokemon/pachirisu/data.json | 58 +++++----- res/pokemon/palkia/data.json | 60 +++++------ res/pokemon/paras/data.json | 57 ++++------ res/pokemon/parasect/data.json | 68 +++++------- res/pokemon/pelipper/data.json | 74 ++++++------- res/pokemon/persian/data.json | 74 ++++++------- res/pokemon/phanpy/data.json | 63 +++++------ res/pokemon/phione/data.json | 58 +++++----- res/pokemon/pichu/data.json | 54 ++++------ res/pokemon/pidgeot/data.json | 68 +++++------- res/pokemon/pidgeotto/data.json | 67 +++++------- res/pokemon/pidgey/data.json | 61 +++++------ res/pokemon/pikachu/data.json | 61 +++++------ res/pokemon/piloswine/data.json | 73 ++++++------- res/pokemon/pineco/data.json | 67 +++++------- res/pokemon/pinsir/data.json | 66 +++++------- res/pokemon/piplup/data.json | 61 +++++------ res/pokemon/plusle/data.json | 66 +++++------- res/pokemon/politoed/data.json | 50 ++++----- res/pokemon/poliwag/data.json | 61 +++++------ res/pokemon/poliwhirl/data.json | 67 +++++------- res/pokemon/poliwrath/data.json | 48 ++++----- res/pokemon/ponyta/data.json | 61 +++++------ res/pokemon/poochyena/data.json | 65 +++++------ res/pokemon/porygon/data.json | 69 +++++------- res/pokemon/porygon2/data.json | 69 +++++------- res/pokemon/porygon_z/data.json | 70 ++++++------ res/pokemon/primeape/data.json | 68 +++++------- res/pokemon/prinplup/data.json | 67 +++++------- res/pokemon/probopass/data.json | 74 ++++++------- res/pokemon/psyduck/data.json | 63 +++++------ res/pokemon/pupitar/data.json | 67 +++++------- res/pokemon/purugly/data.json | 66 +++++------- res/pokemon/quagsire/data.json | 68 +++++------- res/pokemon/quilava/data.json | 65 +++++------ res/pokemon/qwilfish/data.json | 76 ++++++------- res/pokemon/raichu/data.json | 44 +++----- res/pokemon/raikou/data.json | 64 +++++------ res/pokemon/ralts/data.json | 63 +++++------ res/pokemon/rampardos/data.json | 60 +++++------ res/pokemon/rapidash/data.json | 70 ++++++------ res/pokemon/raticate/data.json | 70 ++++++------ res/pokemon/rattata/data.json | 63 +++++------ res/pokemon/rayquaza/data.json | 58 +++++----- res/pokemon/regice/data.json | 62 +++++------ res/pokemon/regigigas/data.json | 60 +++++------ res/pokemon/regirock/data.json | 62 +++++------ res/pokemon/registeel/data.json | 70 +++++------- res/pokemon/relicanth/data.json | 64 +++++------ res/pokemon/remoraid/data.json | 57 +++++----- res/pokemon/rhydon/data.json | 65 +++++------ res/pokemon/rhyhorn/data.json | 59 +++++----- res/pokemon/rhyperior/data.json | 68 +++++------- res/pokemon/riolu/data.json | 60 ++++------- res/pokemon/roselia/data.json | 67 +++++------- res/pokemon/roserade/data.json | 46 ++++---- res/pokemon/rotom/data.json | 60 +++++------ res/pokemon/rotom/forms/fan/data.json | 56 ++++------ res/pokemon/rotom/forms/frost/data.json | 56 ++++------ res/pokemon/rotom/forms/heat/data.json | 56 ++++------ res/pokemon/rotom/forms/mow/data.json | 56 ++++------ res/pokemon/rotom/forms/wash/data.json | 56 ++++------ res/pokemon/sableye/data.json | 72 ++++++------- res/pokemon/salamence/data.json | 74 ++++++------- res/pokemon/sandshrew/data.json | 61 +++++------ res/pokemon/sandslash/data.json | 68 +++++------- res/pokemon/sceptile/data.json | 68 +++++------- res/pokemon/scizor/data.json | 72 ++++++------- res/pokemon/scyther/data.json | 73 ++++++------- res/pokemon/seadra/data.json | 67 +++++------- res/pokemon/seaking/data.json | 66 +++++------- res/pokemon/sealeo/data.json | 67 +++++------- res/pokemon/seedot/data.json | 51 ++++----- res/pokemon/seel/data.json | 69 ++++++------ res/pokemon/sentret/data.json | 65 +++++------ res/pokemon/seviper/data.json | 60 +++++------ res/pokemon/sharpedo/data.json | 76 ++++++------- res/pokemon/shaymin/data.json | 58 +++++----- res/pokemon/shaymin/forms/sky/data.json | 54 ++++------ res/pokemon/shedinja/data.json | 62 +++++------ res/pokemon/shelgon/data.json | 69 +++++------- res/pokemon/shellder/data.json | 59 +++++----- res/pokemon/shellos/data.json | 55 ++++------ res/pokemon/shieldon/data.json | 59 +++++----- res/pokemon/shiftry/data.json | 46 ++++---- res/pokemon/shinx/data.json | 57 +++++----- res/pokemon/shroomish/data.json | 59 +++++----- res/pokemon/shuckle/data.json | 56 ++++------ res/pokemon/shuppet/data.json | 63 +++++------ res/pokemon/silcoon/data.json | 41 +++---- res/pokemon/skarmory/data.json | 64 +++++------ res/pokemon/skiploom/data.json | 75 ++++++------- res/pokemon/skitty/data.json | 71 ++++++------ res/pokemon/skorupi/data.json | 61 +++++------ res/pokemon/skuntank/data.json | 64 +++++------ res/pokemon/slaking/data.json | 68 +++++------- res/pokemon/slakoth/data.json | 55 ++++------ res/pokemon/slowbro/data.json | 70 ++++++------ res/pokemon/slowking/data.json | 70 ++++++------ res/pokemon/slowpoke/data.json | 67 +++++------- res/pokemon/slugma/data.json | 65 +++++------ res/pokemon/smeargle/data.json | 54 ++++------ res/pokemon/smoochum/data.json | 63 +++++------ res/pokemon/sneasel/data.json | 65 +++++------ res/pokemon/snorlax/data.json | 64 +++++------ res/pokemon/snorunt/data.json | 61 +++++------ res/pokemon/snover/data.json | 61 +++++------ res/pokemon/snubbull/data.json | 69 +++++------- res/pokemon/solrock/data.json | 64 +++++------ res/pokemon/spearow/data.json | 59 +++++----- res/pokemon/spheal/data.json | 65 +++++------ res/pokemon/spinarak/data.json | 65 +++++------ res/pokemon/spinda/data.json | 60 +++++------ res/pokemon/spiritomb/data.json | 62 +++++------ res/pokemon/spoink/data.json | 65 +++++------ res/pokemon/squirtle/data.json | 63 +++++------ res/pokemon/stantler/data.json | 62 +++++------ res/pokemon/staraptor/data.json | 64 +++++------ res/pokemon/staravia/data.json | 61 +++++------ res/pokemon/starly/data.json | 59 +++++----- res/pokemon/starmie/data.json | 46 ++++---- res/pokemon/staryu/data.json | 63 +++++------ res/pokemon/steelix/data.json | 76 ++++++------- res/pokemon/stunky/data.json | 63 +++++------ res/pokemon/sudowoodo/data.json | 70 ++++++------ res/pokemon/suicune/data.json | 64 +++++------ res/pokemon/sunflora/data.json | 64 +++++------ res/pokemon/sunkern/data.json | 61 +++++------ res/pokemon/surskit/data.json | 55 ++++------ res/pokemon/swablu/data.json | 65 +++++------ res/pokemon/swalot/data.json | 74 ++++++------- res/pokemon/swampert/data.json | 68 +++++------- res/pokemon/swellow/data.json | 62 +++++------ res/pokemon/swinub/data.json | 65 +++++------ res/pokemon/taillow/data.json | 57 ++++------ res/pokemon/tangela/data.json | 71 ++++++------ res/pokemon/tangrowth/data.json | 72 ++++++------- res/pokemon/tauros/data.json | 60 +++++------ res/pokemon/teddiursa/data.json | 67 +++++------- res/pokemon/tentacool/data.json | 61 +++++------ res/pokemon/tentacruel/data.json | 66 +++++------- res/pokemon/togekiss/data.json | 46 ++++---- res/pokemon/togepi/data.json | 68 +++++------- res/pokemon/togetic/data.json | 67 +++++------- res/pokemon/torchic/data.json | 59 +++++----- res/pokemon/torkoal/data.json | 64 +++++------ res/pokemon/torterra/data.json | 72 ++++++------- res/pokemon/totodile/data.json | 67 +++++------- res/pokemon/toxicroak/data.json | 68 +++++------- res/pokemon/trapinch/data.json | 59 +++++----- res/pokemon/treecko/data.json | 61 +++++------ res/pokemon/tropius/data.json | 64 +++++------ res/pokemon/turtwig/data.json | 59 +++++----- res/pokemon/typhlosion/data.json | 68 +++++------- res/pokemon/tyranitar/data.json | 72 ++++++------- res/pokemon/tyrogue/data.json | 43 +++----- res/pokemon/umbreon/data.json | 66 +++++------- res/pokemon/unown/data.json | 36 +++---- res/pokemon/ursaring/data.json | 64 +++++------ res/pokemon/uxie/data.json | 60 +++++------ res/pokemon/vaporeon/data.json | 64 +++++------ res/pokemon/venomoth/data.json | 72 ++++++------- res/pokemon/venonat/data.json | 65 +++++------ res/pokemon/venusaur/data.json | 76 ++++++------- res/pokemon/vespiquen/data.json | 68 +++++------- res/pokemon/vibrava/data.json | 61 +++++------ res/pokemon/victreebel/data.json | 56 ++++------ res/pokemon/vigoroth/data.json | 61 +++++------ res/pokemon/vileplume/data.json | 48 ++++----- res/pokemon/volbeat/data.json | 64 +++++------ res/pokemon/voltorb/data.json | 65 +++++------ res/pokemon/vulpix/data.json | 63 +++++------ res/pokemon/wailmer/data.json | 65 +++++------ res/pokemon/wailord/data.json | 74 ++++++------- res/pokemon/walrein/data.json | 70 +++++------- res/pokemon/wartortle/data.json | 69 +++++------- res/pokemon/weavile/data.json | 70 ++++++------ res/pokemon/weedle/data.json | 43 +++----- res/pokemon/weepinbell/data.json | 67 +++++------- res/pokemon/weezing/data.json | 66 +++++------- res/pokemon/whiscash/data.json | 76 ++++++------- res/pokemon/whismur/data.json | 59 +++++----- res/pokemon/wigglytuff/data.json | 44 +++----- res/pokemon/wingull/data.json | 61 +++++------ res/pokemon/wobbuffet/data.json | 44 +++----- res/pokemon/wooper/data.json | 65 +++++------ res/pokemon/wormadam/data.json | 60 +++++------ res/pokemon/wormadam/forms/sandy/data.json | 56 +++++----- res/pokemon/wormadam/forms/trash/data.json | 56 +++++----- res/pokemon/wurmple/data.json | 47 +++----- res/pokemon/wynaut/data.json | 53 ++++----- res/pokemon/xatu/data.json | 72 ++++++------- res/pokemon/yanma/data.json | 69 +++++------- res/pokemon/yanmega/data.json | 76 ++++++------- res/pokemon/zangoose/data.json | 64 +++++------ res/pokemon/zapdos/data.json | 66 +++++------- res/pokemon/zigzagoon/data.json | 63 +++++------ res/pokemon/zubat/data.json | 57 +++++----- tools/json2bin/pokemon_personal_data.py | 6 +- tools/json2bin/pokemon_wotbl_data.py | 18 ++-- tools/scripts/make_species_tables.py | 10 +- tools/scripts/migration/species_data.py | 114 ++++++++++++++++++++ 512 files changed, 13548 insertions(+), 18715 deletions(-) create mode 100755 tools/scripts/migration/species_data.py diff --git a/res/pokemon/000/data.json b/res/pokemon/000/data.json index 5608f884ac..5c643cdb58 100644 --- a/res/pokemon/000/data.json +++ b/res/pokemon/000/data.json @@ -8,10 +8,7 @@ "special_attack": 0, "special_defense": 0 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 0, "base_exp_reward": 0, "ev_yields": { @@ -30,23 +27,18 @@ "hatch_cycles": 0, "base_friendship": 0, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_NONE", - "EGG_GROUP_NONE" - ], - "abilities": [ - "ABILITY_NONE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_NONE", "EGG_GROUP_NONE" ], + "abilities": [ "ABILITY_NONE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": {} + "by_level": [ ], + "by_tm": [ ] }, + "evolutions": [ ], "pokedex_data": { "height": 7, "weight": 69, @@ -60,6 +52,6 @@ "trainer_pos_m": 9, "pokemon_pos_m": 22, "entry_text": null, - "category": "????? Pokémon" + "category": "????? Pok\u00e9mon" } } \ No newline at end of file diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json index 4cc926c569..322e28c863 100644 --- a/res/pokemon/abomasnow/data.json +++ b/res/pokemon/abomasnow/data.json @@ -8,10 +8,7 @@ "special_attack": 92, "special_defense": 85 }, - "types": [ - "TYPE_GRASS", - "TYPE_ICE" - ], + "types": [ "TYPE_GRASS", "TYPE_ICE" ], "catch_rate": 60, "base_exp_reward": 214, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_SNOW_WARNING", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_SNOW_WARNING", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_PUNCH" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_RAZOR_LEAF" ], + [ 1, "MOVE_ICY_WIND" ], + [ 5, "MOVE_RAZOR_LEAF" ], + [ 9, "MOVE_ICY_WIND" ], + [ 13, "MOVE_GRASS_WHISTLE" ], + [ 17, "MOVE_SWAGGER" ], + [ 21, "MOVE_MIST" ], + [ 26, "MOVE_ICE_SHARD" ], + [ 31, "MOVE_INGRAIN" ], + [ 36, "MOVE_WOOD_HAMMER" ], + [ 47, "MOVE_BLIZZARD" ], + [ 58, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -91,26 +99,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_ICE_PUNCH", - "MOVE_POWDER_SNOW", - "MOVE_LEER", - "MOVE_RAZOR_LEAF", - "MOVE_ICY_WIND" - ], - "5": "MOVE_RAZOR_LEAF", - "9": "MOVE_ICY_WIND", - "13": "MOVE_GRASS_WHISTLE", - "17": "MOVE_SWAGGER", - "21": "MOVE_MIST", - "26": "MOVE_ICE_SHARD", - "31": "MOVE_INGRAIN", - "36": "MOVE_WOOD_HAMMER", - "47": "MOVE_BLIZZARD", - "58": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ICE_PUNCH", @@ -120,9 +109,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 22, @@ -137,7 +127,7 @@ "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émon" + "category": "Frost Tree Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json index f5e87d2543..508e7bef95 100644 --- a/res/pokemon/abra/data.json +++ b/res/pokemon/abra/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 55 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 200, "base_exp_reward": 75, "ev_yields": { @@ -30,21 +27,18 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_INNER_FOCUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TELEPORT" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -90,10 +84,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_TELEPORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_ICE_PUNCH", @@ -112,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -128,7 +119,7 @@ "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émon" + "category": "Psi Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -137,4 +128,4 @@ "rarity": 30, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/absol/data.json b/res/pokemon/absol/data.json index d22b137d4e..10dd9a571c 100644 --- a/res/pokemon/absol/data.json +++ b/res/pokemon/absol/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 60 }, - "types": [ - "TYPE_DARK", - "TYPE_DARK" - ], + "types": [ "TYPE_DARK", "TYPE_DARK" ], "catch_rate": 30, "base_exp_reward": 174, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_SUPER_LUCK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_SUPER_LUCK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_FEINT" ], + [ 4, "MOVE_LEER" ], + [ 9, "MOVE_TAUNT" ], + [ 12, "MOVE_QUICK_ATTACK" ], + [ 17, "MOVE_RAZOR_WIND" ], + [ 20, "MOVE_PURSUIT" ], + [ 25, "MOVE_SWORDS_DANCE" ], + [ 28, "MOVE_BITE" ], + [ 33, "MOVE_DOUBLE_TEAM" ], + [ 36, "MOVE_SLASH" ], + [ 41, "MOVE_FUTURE_SIGHT" ], + [ 44, "MOVE_SUCKER_PUNCH" ], + [ 49, "MOVE_DETECT" ], + [ 52, "MOVE_NIGHT_SLASH" ], + [ 57, "MOVE_ME_FIRST" ], + [ 60, "MOVE_PSYCHO_CUT" ], + [ 65, "MOVE_PERISH_SONG" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -102,29 +113,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_FEINT" - ], - "4": "MOVE_LEER", - "9": "MOVE_TAUNT", - "12": "MOVE_QUICK_ATTACK", - "17": "MOVE_RAZOR_WIND", - "20": "MOVE_PURSUIT", - "25": "MOVE_SWORDS_DANCE", - "28": "MOVE_BITE", - "33": "MOVE_DOUBLE_TEAM", - "36": "MOVE_SLASH", - "41": "MOVE_FUTURE_SIGHT", - "44": "MOVE_SUCKER_PUNCH", - "49": "MOVE_DETECT", - "52": "MOVE_NIGHT_SLASH", - "57": "MOVE_ME_FIRST", - "60": "MOVE_PSYCHO_CUT", - "65": "MOVE_PERISH_SONG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -138,9 +127,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -155,7 +145,7 @@ "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émon" + "category": "Disaster Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/aerodactyl/data.json b/res/pokemon/aerodactyl/data.json index 064e766b34..e33837070d 100644 --- a/res/pokemon/aerodactyl/data.json +++ b/res/pokemon/aerodactyl/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 75 }, - "types": [ - "TYPE_ROCK", - "TYPE_FLYING" - ], + "types": [ "TYPE_ROCK", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 202, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 35, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_PRESSURE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_PRESSURE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_WING_ATTACK" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 9, "MOVE_ROAR" ], + [ 17, "MOVE_AGILITY" ], + [ 25, "MOVE_ANCIENT_POWER" ], + [ 33, "MOVE_CRUNCH" ], + [ 41, "MOVE_TAKE_DOWN" ], + [ 49, "MOVE_IRON_HEAD" ], + [ 57, "MOVE_HYPER_BEAM" ], + [ 65, "MOVE_ROCK_SLIDE" ], + [ 73, "MOVE_GIGA_IMPACT" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -90,27 +99,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_WING_ATTACK", - "MOVE_SUPERSONIC", - "MOVE_BITE", - "MOVE_SCARY_FACE" - ], - "9": "MOVE_ROAR", - "17": "MOVE_AGILITY", - "25": "MOVE_ANCIENT_POWER", - "33": "MOVE_CRUNCH", - "41": "MOVE_TAKE_DOWN", - "49": "MOVE_IRON_HEAD", - "57": "MOVE_HYPER_BEAM", - "65": "MOVE_ROCK_SLIDE", - "73": "MOVE_GIGA_IMPACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_IRON_HEAD", "MOVE_AQUA_TAIL", "MOVE_OMINOUS_WIND", @@ -123,9 +112,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 18, @@ -139,8 +129,8 @@ "pokemon_pos_f": 4, "trainer_pos_m": 9, "pokemon_pos_m": 4, - "entry_text": "A Pokémon that roamed the skies\nin the dinosaur era. Its teeth are\nlike saw blades.", - "category": "Fossil Pokémon" + "entry_text": "A Pok\u00e9mon that roamed the skies\nin the dinosaur era. Its teeth are\nlike saw blades.", + "category": "Fossil Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/aggron/data.json b/res/pokemon/aggron/data.json index af5a1b5d4c..5bfe9882ce 100644 --- a/res/pokemon/aggron/data.json +++ b/res/pokemon/aggron/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_STEEL", - "TYPE_ROCK" - ], + "types": [ "TYPE_STEEL", "TYPE_ROCK" ], "catch_rate": 45, "base_exp_reward": 205, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 35, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_HEADBUTT" ], + [ 4, "MOVE_HARDEN" ], + [ 8, "MOVE_MUD_SLAP" ], + [ 11, "MOVE_HEADBUTT" ], + [ 15, "MOVE_METAL_CLAW" ], + [ 18, "MOVE_IRON_DEFENSE" ], + [ 22, "MOVE_ROAR" ], + [ 25, "MOVE_TAKE_DOWN" ], + [ 29, "MOVE_IRON_HEAD" ], + [ 34, "MOVE_PROTECT" ], + [ 40, "MOVE_METAL_SOUND" ], + [ 48, "MOVE_IRON_TAIL" ], + [ 57, "MOVE_DOUBLE_EDGE" ], + [ 65, "MOVE_METAL_BURST" ] + ], + "by_tm": [ "TM01", "TM02", "TM03", @@ -104,28 +114,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HARDEN", - "MOVE_MUD_SLAP", - "MOVE_HEADBUTT" - ], - "4": "MOVE_HARDEN", - "8": "MOVE_MUD_SLAP", - "11": "MOVE_HEADBUTT", - "15": "MOVE_METAL_CLAW", - "18": "MOVE_IRON_DEFENSE", - "22": "MOVE_ROAR", - "25": "MOVE_TAKE_DOWN", - "29": "MOVE_IRON_HEAD", - "34": "MOVE_PROTECT", - "40": "MOVE_METAL_SOUND", - "48": "MOVE_IRON_TAIL", - "57": "MOVE_DOUBLE_EDGE", - "65": "MOVE_METAL_BURST" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -147,9 +136,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 21, @@ -164,7 +154,7 @@ "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émon" + "category": "Iron Armor Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json index 2f5f7eed40..ea34e14f4d 100644 --- a/res/pokemon/aipom/data.json +++ b/res/pokemon/aipom/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 55 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 94, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_PICKUP" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_PICKUP" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 4, "MOVE_SAND_ATTACK" ], + [ 8, "MOVE_ASTONISH" ], + [ 11, "MOVE_BATON_PASS" ], + [ 15, "MOVE_TICKLE" ], + [ 18, "MOVE_FURY_SWIPES" ], + [ 22, "MOVE_SWIFT" ], + [ 25, "MOVE_SCREECH" ], + [ 29, "MOVE_AGILITY" ], + [ 32, "MOVE_DOUBLE_HIT" ], + [ 36, "MOVE_FLING" ], + [ 39, "MOVE_NASTY_PLOT" ], + [ 43, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -88,25 +95,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_TAIL_WHIP" - ], - "4": "MOVE_SAND_ATTACK", - "8": "MOVE_ASTONISH", - "11": "MOVE_BATON_PASS", - "15": "MOVE_TICKLE", - "18": "MOVE_FURY_SWIPES", - "22": "MOVE_SWIFT", - "25": "MOVE_SCREECH", - "29": "MOVE_AGILITY", - "32": "MOVE_DOUBLE_HIT", - "36": "MOVE_FLING", - "39": "MOVE_NASTY_PLOT", - "43": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -131,8 +120,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -147,7 +136,7 @@ "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émon" + "category": "Long Tail Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -156,4 +145,4 @@ "rarity": 20, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/alakazam/data.json b/res/pokemon/alakazam/data.json index b84e5e0b96..d935d54d43 100644 --- a/res/pokemon/alakazam/data.json +++ b/res/pokemon/alakazam/data.json @@ -8,10 +8,7 @@ "special_attack": 135, "special_defense": 85 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 50, "base_exp_reward": 186, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_INNER_FOCUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TELEPORT" ], + [ 1, "MOVE_KINESIS" ], + [ 1, "MOVE_CONFUSION" ], + [ 16, "MOVE_CONFUSION" ], + [ 18, "MOVE_DISABLE" ], + [ 22, "MOVE_MIRACLE_EYE" ], + [ 24, "MOVE_PSYBEAM" ], + [ 28, "MOVE_REFLECT" ], + [ 30, "MOVE_RECOVER" ], + [ 34, "MOVE_PSYCHO_CUT" ], + [ 36, "MOVE_CALM_MIND" ], + [ 40, "MOVE_PSYCHIC" ], + [ 42, "MOVE_FUTURE_SIGHT" ], + [ 46, "MOVE_TRICK" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -93,25 +100,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_TELEPORT", - "MOVE_KINESIS", - "MOVE_CONFUSION" - ], - "16": "MOVE_CONFUSION", - "18": "MOVE_DISABLE", - "22": "MOVE_MIRACLE_EYE", - "24": "MOVE_PSYBEAM", - "28": "MOVE_REFLECT", - "30": "MOVE_RECOVER", - "34": "MOVE_PSYCHO_CUT", - "36": "MOVE_CALM_MIND", - "40": "MOVE_PSYCHIC", - "42": "MOVE_FUTURE_SIGHT", - "46": "MOVE_TRICK" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_ICE_PUNCH", @@ -122,9 +111,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -139,7 +129,7 @@ "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émon" + "category": "Psi Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/altaria/data.json b/res/pokemon/altaria/data.json index 6d8eedf568..e3eb0a1705 100644 --- a/res/pokemon/altaria/data.json +++ b/res/pokemon/altaria/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 105 }, - "types": [ - "TYPE_DRAGON", - "TYPE_FLYING" - ], + "types": [ "TYPE_DRAGON", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 188, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PLUCK" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_SING" ], + [ 5, "MOVE_ASTONISH" ], + [ 9, "MOVE_SING" ], + [ 13, "MOVE_FURY_ATTACK" ], + [ 18, "MOVE_SAFEGUARD" ], + [ 23, "MOVE_MIST" ], + [ 28, "MOVE_TAKE_DOWN" ], + [ 32, "MOVE_NATURAL_GIFT" ], + [ 35, "MOVE_DRAGON_BREATH" ], + [ 39, "MOVE_DRAGON_DANCE" ], + [ 46, "MOVE_REFRESH" ], + [ 54, "MOVE_DRAGON_PULSE" ], + [ 62, "MOVE_PERISH_SONG" ], + [ 70, "MOVE_SKY_ATTACK" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -85,29 +96,7 @@ "HM02", "HM06" ], - "level_up": { - "1": [ - "MOVE_PLUCK", - "MOVE_PECK", - "MOVE_GROWL", - "MOVE_ASTONISH", - "MOVE_SING" - ], - "5": "MOVE_ASTONISH", - "9": "MOVE_SING", - "13": "MOVE_FURY_ATTACK", - "18": "MOVE_SAFEGUARD", - "23": "MOVE_MIST", - "28": "MOVE_TAKE_DOWN", - "32": "MOVE_NATURAL_GIFT", - "35": "MOVE_DRAGON_BREATH", - "39": "MOVE_DRAGON_DANCE", - "46": "MOVE_REFRESH", - "54": "MOVE_DRAGON_PULSE", - "62": "MOVE_PERISH_SONG", - "70": "MOVE_SKY_ATTACK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -119,9 +108,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 11, @@ -136,7 +126,7 @@ "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émon" + "category": "Humming Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/ambipom/data.json b/res/pokemon/ambipom/data.json index b5ca33c90a..c0431c9464 100644 --- a/res/pokemon/ambipom/data.json +++ b/res/pokemon/ambipom/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 66 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 186, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 100, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_TECHNICIAN", - "ABILITY_PICKUP" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_TECHNICIAN", "ABILITY_PICKUP" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_ASTONISH" ], + [ 4, "MOVE_SAND_ATTACK" ], + [ 8, "MOVE_ASTONISH" ], + [ 11, "MOVE_BATON_PASS" ], + [ 15, "MOVE_TICKLE" ], + [ 18, "MOVE_FURY_SWIPES" ], + [ 22, "MOVE_SWIFT" ], + [ 25, "MOVE_SCREECH" ], + [ 29, "MOVE_AGILITY" ], + [ 32, "MOVE_DOUBLE_HIT" ], + [ 36, "MOVE_FLING" ], + [ 39, "MOVE_NASTY_PLOT" ], + [ 43, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -90,27 +99,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_TAIL_WHIP", - "MOVE_SAND_ATTACK", - "MOVE_ASTONISH" - ], - "4": "MOVE_SAND_ATTACK", - "8": "MOVE_ASTONISH", - "11": "MOVE_BATON_PASS", - "15": "MOVE_TICKLE", - "18": "MOVE_FURY_SWIPES", - "22": "MOVE_SWIFT", - "25": "MOVE_SCREECH", - "29": "MOVE_AGILITY", - "32": "MOVE_DOUBLE_HIT", - "36": "MOVE_FLING", - "39": "MOVE_NASTY_PLOT", - "43": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -127,9 +116,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -144,7 +134,7 @@ "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émon" + "category": "Long Tail Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/ampharos/data.json b/res/pokemon/ampharos/data.json index 18d43e32fc..a1fd492f1b 100644 --- a/res/pokemon/ampharos/data.json +++ b/res/pokemon/ampharos/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 90 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 45, "base_exp_reward": 194, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 5, "MOVE_GROWL" ], + [ 10, "MOVE_THUNDER_SHOCK" ], + [ 14, "MOVE_THUNDER_WAVE" ], + [ 20, "MOVE_COTTON_SPORE" ], + [ 25, "MOVE_CHARGE" ], + [ 30, "MOVE_THUNDER_PUNCH" ], + [ 34, "MOVE_DISCHARGE" ], + [ 42, "MOVE_SIGNAL_BEAM" ], + [ 51, "MOVE_LIGHT_SCREEN" ], + [ 59, "MOVE_POWER_GEM" ], + [ 68, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -80,27 +89,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_THUNDER_SHOCK", - "MOVE_THUNDER_WAVE" - ], - "5": "MOVE_GROWL", - "10": "MOVE_THUNDER_SHOCK", - "14": "MOVE_THUNDER_WAVE", - "20": "MOVE_COTTON_SPORE", - "25": "MOVE_CHARGE", - "30": "MOVE_THUNDER_PUNCH", - "34": "MOVE_DISCHARGE", - "42": "MOVE_SIGNAL_BEAM", - "51": "MOVE_LIGHT_SCREEN", - "59": "MOVE_POWER_GEM", - "68": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_SNORE", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -126,8 +116,8 @@ "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’s light.", - "category": "Light Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json index 0a5655aaf3..363261ca42 100644 --- a/res/pokemon/anorith/data.json +++ b/res/pokemon/anorith/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 50 }, - "types": [ - "TYPE_ROCK", - "TYPE_BUG" - ], + "types": [ "TYPE_ROCK", "TYPE_BUG" ], "catch_rate": 45, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_BATTLE_ARMOR", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 7, "MOVE_MUD_SPORT" ], + [ 13, "MOVE_WATER_GUN" ], + [ 19, "MOVE_METAL_CLAW" ], + [ 25, "MOVE_PROTECT" ], + [ 31, "MOVE_ANCIENT_POWER" ], + [ 37, "MOVE_FURY_CUTTER" ], + [ 43, "MOVE_SLASH" ], + [ 49, "MOVE_ROCK_BLAST" ], + [ 55, "MOVE_CRUSH_CLAW" ], + [ 61, "MOVE_X_SCISSOR" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -77,23 +82,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_HARDEN" - ], - "7": "MOVE_MUD_SPORT", - "13": "MOVE_WATER_GUN", - "19": "MOVE_METAL_CLAW", - "25": "MOVE_PROTECT", - "31": "MOVE_ANCIENT_POWER", - "37": "MOVE_FURY_CUTTER", - "43": "MOVE_SLASH", - "49": "MOVE_ROCK_BLAST", - "55": "MOVE_CRUSH_CLAW", - "61": "MOVE_X_SCISSOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -126,8 +115,8 @@ "pokemon_pos_f": 3, "trainer_pos_m": 9, "pokemon_pos_m": 3, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -136,4 +125,4 @@ "rarity": 20, "unused": 1035 } -} +} \ No newline at end of file diff --git a/res/pokemon/arbok/data.json b/res/pokemon/arbok/data.json index 607884bd7f..8ddedffecf 100644 --- a/res/pokemon/arbok/data.json +++ b/res/pokemon/arbok/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 79 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 90, "base_exp_reward": 147, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_SHED_SKIN" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_SHED_SKIN" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_WRAP" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_BITE" ], + [ 4, "MOVE_POISON_STING" ], + [ 9, "MOVE_BITE" ], + [ 12, "MOVE_GLARE" ], + [ 17, "MOVE_SCREECH" ], + [ 20, "MOVE_ACID" ], + [ 22, "MOVE_CRUNCH" ], + [ 28, "MOVE_STOCKPILE" ], + [ 28, "MOVE_SWALLOW" ], + [ 28, "MOVE_SPIT_UP" ], + [ 34, "MOVE_MUD_BOMB" ], + [ 42, "MOVE_GASTRO_ACID" ], + [ 48, "MOVE_HAZE" ], + [ 56, "MOVE_GUNK_SHOT" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -80,33 +93,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_FIRE_FANG", - "MOVE_WRAP", - "MOVE_LEER", - "MOVE_POISON_STING", - "MOVE_BITE" - ], - "4": "MOVE_POISON_STING", - "9": "MOVE_BITE", - "12": "MOVE_GLARE", - "17": "MOVE_SCREECH", - "20": "MOVE_ACID", - "22": "MOVE_CRUNCH", - "28": [ - "MOVE_STOCKPILE", - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "34": "MOVE_MUD_BOMB", - "42": "MOVE_GASTRO_ACID", - "48": "MOVE_HAZE", - "56": "MOVE_GUNK_SHOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_AQUA_TAIL", "MOVE_GASTRO_ACID", "MOVE_SNORE", @@ -115,9 +102,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 35, @@ -132,7 +120,7 @@ "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émon" + "category": "Cobra Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/arcanine/data.json b/res/pokemon/arcanine/data.json index e312fbd176..2052d2de0f 100644 --- a/res/pokemon/arcanine/data.json +++ b/res/pokemon/arcanine/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 80 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 75, "base_exp_reward": 213, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_FLASH_FIRE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_ROAR" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 39, "MOVE_EXTREME_SPEED" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -79,17 +78,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_THUNDER_FANG", - "MOVE_BITE", - "MOVE_ROAR", - "MOVE_FIRE_FANG", - "MOVE_ODOR_SLEUTH" - ], - "39": "MOVE_EXTREME_SPEED" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -98,9 +87,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 19, @@ -115,7 +105,7 @@ "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émon" + "category": "Legendary Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/arceus/data.json b/res/pokemon/arceus/data.json index 742beb9bb8..360d526685 100644 --- a/res/pokemon/arceus/data.json +++ b/res/pokemon/arceus/data.json @@ -8,10 +8,7 @@ "special_attack": 120, "special_defense": 120 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 3, "base_exp_reward": 255, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_MULTITYPE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_MULTITYPE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SEISMIC_TOSS" ], + [ 1, "MOVE_COSMIC_POWER" ], + [ 1, "MOVE_NATURAL_GIFT" ], + [ 1, "MOVE_PUNISHMENT" ], + [ 10, "MOVE_GRAVITY" ], + [ 20, "MOVE_EARTH_POWER" ], + [ 30, "MOVE_HYPER_VOICE" ], + [ 40, "MOVE_EXTREME_SPEED" ], + [ 50, "MOVE_REFRESH" ], + [ 60, "MOVE_FUTURE_SIGHT" ], + [ 70, "MOVE_RECOVER" ], + [ 80, "MOVE_HYPER_BEAM" ], + [ 90, "MOVE_PERISH_SONG" ], + [ 100, "MOVE_JUDGMENT" ] + ], + "by_tm": [ "TM02", "TM03", "TM04", @@ -125,25 +132,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_SEISMIC_TOSS", - "MOVE_COSMIC_POWER", - "MOVE_NATURAL_GIFT", - "MOVE_PUNISHMENT" - ], - "10": "MOVE_GRAVITY", - "20": "MOVE_EARTH_POWER", - "30": "MOVE_HYPER_VOICE", - "40": "MOVE_EXTREME_SPEED", - "50": "MOVE_REFRESH", - "60": "MOVE_FUTURE_SIGHT", - "70": "MOVE_RECOVER", - "80": "MOVE_HYPER_BEAM", - "90": "MOVE_PERISH_SONG", - "100": "MOVE_JUDGMENT" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -165,9 +154,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 32, @@ -182,7 +172,7 @@ "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émon" + "category": "Alpha Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/ariados/data.json b/res/pokemon/ariados/data.json index c10895a126..bf500d2cac 100644 --- a/res/pokemon/ariados/data.json +++ b/res/pokemon/ariados/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 90, "base_exp_reward": 134, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_INSOMNIA" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_INSOMNIA" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUG_BITE" ], + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_STRING_SHOT" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 1, "MOVE_CONSTRICT" ], + [ 5, "MOVE_SCARY_FACE" ], + [ 8, "MOVE_CONSTRICT" ], + [ 12, "MOVE_LEECH_LIFE" ], + [ 15, "MOVE_NIGHT_SHADE" ], + [ 19, "MOVE_SHADOW_SNEAK" ], + [ 23, "MOVE_FURY_SWIPES" ], + [ 28, "MOVE_SUCKER_PUNCH" ], + [ 32, "MOVE_SPIDER_WEB" ], + [ 37, "MOVE_AGILITY" ], + [ 41, "MOVE_PIN_MISSILE" ], + [ 46, "MOVE_PSYCHIC" ], + [ 50, "MOVE_POISON_JAB" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -73,36 +83,16 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_BUG_BITE", - "MOVE_POISON_STING", - "MOVE_STRING_SHOT", - "MOVE_SCARY_FACE", - "MOVE_CONSTRICT" - ], - "5": "MOVE_SCARY_FACE", - "8": "MOVE_CONSTRICT", - "12": "MOVE_LEECH_LIFE", - "15": "MOVE_NIGHT_SHADE", - "19": "MOVE_SHADOW_SNEAK", - "23": "MOVE_FURY_SWIPES", - "28": "MOVE_SUCKER_PUNCH", - "32": "MOVE_SPIDER_WEB", - "37": "MOVE_AGILITY", - "41": "MOVE_PIN_MISSILE", - "46": "MOVE_PSYCHIC", - "50": "MOVE_POISON_JAB" - }, - "tutor": [ + "by_tutor": [ "MOVE_SIGNAL_BEAM", "MOVE_BOUNCE", "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 11, @@ -117,7 +107,7 @@ "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émon" + "category": "Long Leg Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/armaldo/data.json b/res/pokemon/armaldo/data.json index f3ed48ccfa..3fddc61bb2 100644 --- a/res/pokemon/armaldo/data.json +++ b/res/pokemon/armaldo/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 80 }, - "types": [ - "TYPE_ROCK", - "TYPE_BUG" - ], + "types": [ "TYPE_ROCK", "TYPE_BUG" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_BATTLE_ARMOR", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_WATER_GUN" ], + [ 7, "MOVE_MUD_SPORT" ], + [ 13, "MOVE_WATER_GUN" ], + [ 19, "MOVE_METAL_CLAW" ], + [ 25, "MOVE_PROTECT" ], + [ 31, "MOVE_ANCIENT_POWER" ], + [ 37, "MOVE_FURY_CUTTER" ], + [ 46, "MOVE_SLASH" ], + [ 55, "MOVE_ROCK_BLAST" ], + [ 67, "MOVE_CRUSH_CLAW" ], + [ 73, "MOVE_X_SCISSOR" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -84,25 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_HARDEN", - "MOVE_MUD_SPORT", - "MOVE_WATER_GUN" - ], - "7": "MOVE_MUD_SPORT", - "13": "MOVE_WATER_GUN", - "19": "MOVE_METAL_CLAW", - "25": "MOVE_PROTECT", - "31": "MOVE_ANCIENT_POWER", - "37": "MOVE_FURY_CUTTER", - "46": "MOVE_SLASH", - "55": "MOVE_ROCK_BLAST", - "67": "MOVE_CRUSH_CLAW", - "73": "MOVE_X_SCISSOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SUPERPOWER", @@ -114,9 +103,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -131,7 +121,7 @@ "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émon" + "category": "Plate Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json index c215edfe01..d8dc0f7b07 100644 --- a/res/pokemon/aron/data.json +++ b/res/pokemon/aron/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_STEEL", - "TYPE_ROCK" - ], + "types": [ "TYPE_STEEL", "TYPE_ROCK" ], "catch_rate": 180, "base_exp_reward": 96, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_HARDEN" ], + [ 8, "MOVE_MUD_SLAP" ], + [ 11, "MOVE_HEADBUTT" ], + [ 15, "MOVE_METAL_CLAW" ], + [ 18, "MOVE_IRON_DEFENSE" ], + [ 22, "MOVE_ROAR" ], + [ 25, "MOVE_TAKE_DOWN" ], + [ 29, "MOVE_IRON_HEAD" ], + [ 32, "MOVE_PROTECT" ], + [ 36, "MOVE_METAL_SOUND" ], + [ 39, "MOVE_IRON_TAIL" ], + [ 43, "MOVE_DOUBLE_EDGE" ], + [ 46, "MOVE_METAL_BURST" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -80,23 +87,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_HARDEN", - "8": "MOVE_MUD_SLAP", - "11": "MOVE_HEADBUTT", - "15": "MOVE_METAL_CLAW", - "18": "MOVE_IRON_DEFENSE", - "22": "MOVE_ROAR", - "25": "MOVE_TAKE_DOWN", - "29": "MOVE_IRON_HEAD", - "32": "MOVE_PROTECT", - "36": "MOVE_METAL_SOUND", - "39": "MOVE_IRON_TAIL", - "43": "MOVE_DOUBLE_EDGE", - "46": "MOVE_METAL_BURST" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -120,8 +111,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -136,7 +127,7 @@ "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émon" + "category": "Iron Armor Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -145,4 +136,4 @@ "rarity": 30, "unused": 2830 } -} +} \ No newline at end of file diff --git a/res/pokemon/articuno/data.json b/res/pokemon/articuno/data.json index 35c24f4d61..8c5990b038 100644 --- a/res/pokemon/articuno/data.json +++ b/res/pokemon/articuno/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 125 }, - "types": [ - "TYPE_ICE", - "TYPE_FLYING" - ], + "types": [ "TYPE_ICE", "TYPE_FLYING" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GUST" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 8, "MOVE_MIST" ], + [ 15, "MOVE_ICE_SHARD" ], + [ 22, "MOVE_MIND_READER" ], + [ 29, "MOVE_ANCIENT_POWER" ], + [ 36, "MOVE_AGILITY" ], + [ 43, "MOVE_ICE_BEAM" ], + [ 50, "MOVE_REFLECT" ], + [ 57, "MOVE_ROOST" ], + [ 64, "MOVE_TAILWIND" ], + [ 71, "MOVE_BLIZZARD" ], + [ 78, "MOVE_SHEER_COLD" ], + [ 85, "MOVE_HAIL" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -80,25 +87,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_GUST", - "MOVE_POWDER_SNOW" - ], - "8": "MOVE_MIST", - "15": "MOVE_ICE_SHARD", - "22": "MOVE_MIND_READER", - "29": "MOVE_ANCIENT_POWER", - "36": "MOVE_AGILITY", - "43": "MOVE_ICE_BEAM", - "50": "MOVE_REFLECT", - "57": "MOVE_ROOST", - "64": "MOVE_TAILWIND", - "71": "MOVE_BLIZZARD", - "78": "MOVE_SHEER_COLD", - "85": "MOVE_HAIL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -126,8 +116,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 7, "pokemon_pos_m": 0, - "entry_text": "A legendary bird Pokémon.\nIt can create blizzards by\nfreezing moisture in the air.", - "category": "Freeze Pokémon" + "entry_text": "A legendary bird Pok\u00e9mon.\nIt can create blizzards by\nfreezing moisture in the air.", + "category": "Freeze Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/azelf/data.json b/res/pokemon/azelf/data.json index 738955ba86..2e70dbe2ad 100644 --- a/res/pokemon/azelf/data.json +++ b/res/pokemon/azelf/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 70 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 80, "base_friendship": 140, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REST" ], + [ 1, "MOVE_CONFUSION" ], + [ 6, "MOVE_IMPRISON" ], + [ 16, "MOVE_DETECT" ], + [ 21, "MOVE_SWIFT" ], + [ 31, "MOVE_UPROAR" ], + [ 36, "MOVE_FUTURE_SIGHT" ], + [ 46, "MOVE_NASTY_PLOT" ], + [ 51, "MOVE_EXTRASENSORY" ], + [ 61, "MOVE_LAST_RESORT" ], + [ 66, "MOVE_NATURAL_GIFT" ], + [ 76, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -95,23 +100,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_REST", - "MOVE_CONFUSION" - ], - "6": "MOVE_IMPRISON", - "16": "MOVE_DETECT", - "21": "MOVE_SWIFT", - "31": "MOVE_UPROAR", - "36": "MOVE_FUTURE_SIGHT", - "46": "MOVE_NASTY_PLOT", - "51": "MOVE_EXTRASENSORY", - "61": "MOVE_LAST_RESORT", - "66": "MOVE_NATURAL_GIFT", - "76": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -127,9 +116,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -144,7 +134,7 @@ "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émon" + "category": "Willpower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/azumarill/data.json b/res/pokemon/azumarill/data.json index e84eb4e14d..85004be3f1 100644 --- a/res/pokemon/azumarill/data.json +++ b/res/pokemon/azumarill/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 80 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 75, "base_exp_reward": 153, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_HUGE_POWER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_WATER_GUN" ], + [ 2, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_WATER_GUN" ], + [ 15, "MOVE_ROLLOUT" ], + [ 20, "MOVE_BUBBLE_BEAM" ], + [ 27, "MOVE_AQUA_RING" ], + [ 33, "MOVE_DOUBLE_EDGE" ], + [ 40, "MOVE_RAIN_DANCE" ], + [ 47, "MOVE_AQUA_TAIL" ], + [ 54, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -80,25 +87,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_DEFENSE_CURL", - "MOVE_TAIL_WHIP", - "MOVE_WATER_GUN" - ], - "2": "MOVE_DEFENSE_CURL", - "7": "MOVE_TAIL_WHIP", - "10": "MOVE_WATER_GUN", - "15": "MOVE_ROLLOUT", - "20": "MOVE_BUBBLE_BEAM", - "27": "MOVE_AQUA_RING", - "33": "MOVE_DOUBLE_EDGE", - "40": "MOVE_RAIN_DANCE", - "47": "MOVE_AQUA_TAIL", - "54": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -112,9 +101,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -129,7 +119,7 @@ "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émon" + "category": "Aqua Rabbit Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json index ed8106b370..111e828d57 100644 --- a/res/pokemon/azurill/data.json +++ b/res/pokemon/azurill/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 40 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 150, "base_exp_reward": 33, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_HUGE_POWER" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 2, "MOVE_CHARM" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_BUBBLE" ], + [ 15, "MOVE_SLAM" ], + [ 18, "MOVE_WATER_GUN" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -70,15 +69,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_SPLASH", - "2": "MOVE_CHARM", - "7": "MOVE_TAIL_WHIP", - "10": "MOVE_BUBBLE", - "15": "MOVE_SLAM", - "18": "MOVE_WATER_GUN" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -90,14 +81,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_MARILL" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_MARILL" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 2, @@ -112,7 +100,7 @@ "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émon" + "category": "Polka Dot Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -121,4 +109,4 @@ "rarity": 10, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/bad_egg/data.json b/res/pokemon/bad_egg/data.json index 50f5db6ca3..ff20c3c653 100644 --- a/res/pokemon/bad_egg/data.json +++ b/res/pokemon/bad_egg/data.json @@ -8,10 +8,7 @@ "special_attack": 10, "special_defense": 10 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 3, "base_exp_reward": 255, "ev_yields": { @@ -30,23 +27,18 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_NONE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_NONE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_EGG", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_SPLASH" - } - } + "by_level": [ + [ 1, "MOVE_SPLASH" ] + ], + "by_tm": [ ] + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json index 664a14361f..03762327bc 100644 --- a/res/pokemon/bagon/data.json +++ b/res/pokemon/bagon/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 30 }, - "types": [ - "TYPE_DRAGON", - "TYPE_DRAGON" - ], + "types": [ "TYPE_DRAGON", "TYPE_DRAGON" ], "catch_rate": 45, "base_exp_reward": 89, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_DRAGON", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_DRAGON", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_RAGE" ], + [ 5, "MOVE_BITE" ], + [ 10, "MOVE_LEER" ], + [ 16, "MOVE_HEADBUTT" ], + [ 20, "MOVE_FOCUS_ENERGY" ], + [ 25, "MOVE_EMBER" ], + [ 31, "MOVE_DRAGON_BREATH" ], + [ 35, "MOVE_ZEN_HEADBUTT" ], + [ 40, "MOVE_SCARY_FACE" ], + [ 46, "MOVE_CRUNCH" ], + [ 50, "MOVE_DRAGON_CLAW" ], + [ 55, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -77,21 +82,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_RAGE", - "5": "MOVE_BITE", - "10": "MOVE_LEER", - "16": "MOVE_HEADBUTT", - "20": "MOVE_FOCUS_ENERGY", - "25": "MOVE_EMBER", - "31": "MOVE_DRAGON_BREATH", - "35": "MOVE_ZEN_HEADBUTT", - "40": "MOVE_SCARY_FACE", - "46": "MOVE_CRUNCH", - "50": "MOVE_DRAGON_CLAW", - "55": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -108,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -124,7 +115,7 @@ "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émon" + "category": "Rock Head Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -133,4 +124,4 @@ "rarity": 30, "unused": 3855 } -} +} \ No newline at end of file diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json index 1bd3b0160a..2de986d548 100644 --- a/res/pokemon/baltoy/data.json +++ b/res/pokemon/baltoy/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 70 }, - "types": [ - "TYPE_GROUND", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_GROUND", "TYPE_PSYCHIC" ], "catch_rate": 255, "base_exp_reward": 58, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONFUSION" ], + [ 3, "MOVE_HARDEN" ], + [ 5, "MOVE_RAPID_SPIN" ], + [ 7, "MOVE_MUD_SLAP" ], + [ 11, "MOVE_PSYBEAM" ], + [ 15, "MOVE_ROCK_TOMB" ], + [ 19, "MOVE_SELFDESTRUCT" ], + [ 25, "MOVE_ANCIENT_POWER" ], + [ 31, "MOVE_POWER_TRICK" ], + [ 37, "MOVE_SANDSTORM" ], + [ 45, "MOVE_COSMIC_POWER" ], + [ 53, "MOVE_EARTH_POWER" ], + [ 61, "MOVE_HEAL_BLOCK" ], + [ 71, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -87,23 +94,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_CONFUSION", - "3": "MOVE_HARDEN", - "5": "MOVE_RAPID_SPIN", - "7": "MOVE_MUD_SLAP", - "11": "MOVE_PSYBEAM", - "15": "MOVE_ROCK_TOMB", - "19": "MOVE_SELFDESTRUCT", - "25": "MOVE_ANCIENT_POWER", - "31": "MOVE_POWER_TRICK", - "37": "MOVE_SANDSTORM", - "45": "MOVE_COSMIC_POWER", - "53": "MOVE_EARTH_POWER", - "61": "MOVE_HEAL_BLOCK", - "71": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_ANCIENT_POWER", @@ -121,8 +112,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -136,8 +127,8 @@ "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émon that was\ndiscovered in ancient ruins.", - "category": "Clay Doll Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -146,4 +137,4 @@ "rarity": 30, "unused": 2568 } -} +} \ No newline at end of file diff --git a/res/pokemon/banette/data.json b/res/pokemon/banette/data.json index 47d896f456..dce8a99a45 100644 --- a/res/pokemon/banette/data.json +++ b/res/pokemon/banette/data.json @@ -8,10 +8,7 @@ "special_attack": 83, "special_defense": 63 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 179, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_FRISK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_INSOMNIA", "ABILITY_FRISK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_KNOCK_OFF" ], + [ 1, "MOVE_SCREECH" ], + [ 1, "MOVE_NIGHT_SHADE" ], + [ 1, "MOVE_CURSE" ], + [ 8, "MOVE_SCREECH" ], + [ 5, "MOVE_NIGHT_SHADE" ], + [ 13, "MOVE_CURSE" ], + [ 16, "MOVE_SPITE" ], + [ 20, "MOVE_SHADOW_SNEAK" ], + [ 23, "MOVE_WILL_O_WISP" ], + [ 28, "MOVE_FAINT_ATTACK" ], + [ 31, "MOVE_SHADOW_BALL" ], + [ 35, "MOVE_SUCKER_PUNCH" ], + [ 42, "MOVE_EMBARGO" ], + [ 51, "MOVE_SNATCH" ], + [ 58, "MOVE_GRUDGE" ], + [ 66, "MOVE_TRICK" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -89,28 +99,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_KNOCK_OFF", - "MOVE_SCREECH", - "MOVE_NIGHT_SHADE", - "MOVE_CURSE" - ], - "8": "MOVE_SCREECH", - "5": "MOVE_NIGHT_SHADE", - "13": "MOVE_CURSE", - "16": "MOVE_SPITE", - "20": "MOVE_SHADOW_SNEAK", - "23": "MOVE_WILL_O_WISP", - "28": "MOVE_FAINT_ATTACK", - "31": "MOVE_SHADOW_BALL", - "35": "MOVE_SUCKER_PUNCH", - "42": "MOVE_EMBARGO", - "51": "MOVE_SNATCH", - "58": "MOVE_GRUDGE", - "66": "MOVE_TRICK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -120,9 +109,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 11, @@ -136,8 +126,8 @@ "pokemon_pos_f": 13, "trainer_pos_m": 9, "pokemon_pos_m": 13, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json index 6ac36843ea..a2ba148b92 100644 --- a/res/pokemon/barboach/data.json +++ b/res/pokemon/barboach/data.json @@ -8,10 +8,7 @@ "special_attack": 46, "special_defense": 41 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 190, "base_exp_reward": 92, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_ANTICIPATION" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SLAP" ], + [ 6, "MOVE_MUD_SPORT" ], + [ 6, "MOVE_WATER_SPORT" ], + [ 10, "MOVE_WATER_GUN" ], + [ 14, "MOVE_MUD_BOMB" ], + [ 18, "MOVE_AMNESIA" ], + [ 22, "MOVE_WATER_PULSE" ], + [ 26, "MOVE_MAGNITUDE" ], + [ 31, "MOVE_REST" ], + [ 31, "MOVE_SNORE" ], + [ 35, "MOVE_AQUA_TAIL" ], + [ 39, "MOVE_EARTHQUAKE" ], + [ 43, "MOVE_FUTURE_SIGHT" ], + [ 47, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -72,27 +79,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_MUD_SLAP", - "6": [ - "MOVE_MUD_SPORT", - "MOVE_WATER_SPORT" - ], - "10": "MOVE_WATER_GUN", - "14": "MOVE_MUD_BOMB", - "18": "MOVE_AMNESIA", - "22": "MOVE_WATER_PULSE", - "26": "MOVE_MAGNITUDE", - "31": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "35": "MOVE_AQUA_TAIL", - "39": "MOVE_EARTHQUAKE", - "43": "MOVE_FUTURE_SIGHT", - "47": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -110,8 +97,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -126,7 +113,7 @@ "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émon" + "category": "Whiskers Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -135,4 +122,4 @@ "rarity": 30, "unused": 2051 } -} +} \ No newline at end of file diff --git a/res/pokemon/bastiodon/data.json b/res/pokemon/bastiodon/data.json index 8cd1cd9def..257f2c1614 100644 --- a/res/pokemon/bastiodon/data.json +++ b/res/pokemon/bastiodon/data.json @@ -8,10 +8,7 @@ "special_attack": 47, "special_defense": 138 }, - "types": [ - "TYPE_ROCK", - "TYPE_STEEL" - ], + "types": [ "TYPE_ROCK", "TYPE_STEEL" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_PROTECT" ], + [ 1, "MOVE_TAUNT" ], + [ 1, "MOVE_METAL_SOUND" ], + [ 6, "MOVE_TAUNT" ], + [ 10, "MOVE_METAL_SOUND" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_IRON_DEFENSE" ], + [ 24, "MOVE_SWAGGER" ], + [ 28, "MOVE_ANCIENT_POWER" ], + [ 30, "MOVE_BLOCK" ], + [ 36, "MOVE_ENDURE" ], + [ 43, "MOVE_METAL_BURST" ], + [ 52, "MOVE_IRON_HEAD" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -89,25 +96,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_PROTECT", - "MOVE_TAUNT", - "MOVE_METAL_SOUND" - ], - "6": "MOVE_TAUNT", - "10": "MOVE_METAL_SOUND", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_IRON_DEFENSE", - "24": "MOVE_SWAGGER", - "28": "MOVE_ANCIENT_POWER", - "30": "MOVE_BLOCK", - "36": "MOVE_ENDURE", - "43": "MOVE_METAL_BURST", - "52": "MOVE_IRON_HEAD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -118,9 +107,10 @@ "MOVE_MAGNET_RISE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -135,7 +125,7 @@ "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émon" + "category": "Shield Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json index 0c73c39a30..eae1c3b906 100644 --- a/res/pokemon/bayleef/data.json +++ b/res/pokemon/bayleef/data.json @@ -8,10 +8,7 @@ "special_attack": 63, "special_defense": 80 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 141, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_RAZOR_LEAF" ], + [ 1, "MOVE_POISON_POWDER" ], + [ 6, "MOVE_RAZOR_LEAF" ], + [ 9, "MOVE_POISON_POWDER" ], + [ 12, "MOVE_SYNTHESIS" ], + [ 18, "MOVE_REFLECT" ], + [ 22, "MOVE_MAGICAL_LEAF" ], + [ 26, "MOVE_NATURAL_GIFT" ], + [ 32, "MOVE_SWEET_SCENT" ], + [ 36, "MOVE_LIGHT_SCREEN" ], + [ 40, "MOVE_BODY_SLAM" ], + [ 46, "MOVE_SAFEGUARD" ], + [ 50, "MOVE_AROMATHERAPY" ], + [ 54, "MOVE_SOLAR_BEAM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -77,27 +86,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_RAZOR_LEAF", - "MOVE_POISON_POWDER" - ], - "6": "MOVE_RAZOR_LEAF", - "9": "MOVE_POISON_POWDER", - "12": "MOVE_SYNTHESIS", - "18": "MOVE_REFLECT", - "22": "MOVE_MAGICAL_LEAF", - "26": "MOVE_NATURAL_GIFT", - "32": "MOVE_SWEET_SCENT", - "36": "MOVE_LIGHT_SCREEN", - "40": "MOVE_BODY_SLAM", - "46": "MOVE_SAFEGUARD", - "50": "MOVE_AROMATHERAPY", - "54": "MOVE_SOLAR_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -130,7 +119,7 @@ "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émon" + "category": "Leaf Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -139,4 +128,4 @@ "rarity": 10, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/beautifly/data.json b/res/pokemon/beautifly/data.json index 1ba42ab766..5ec954e0eb 100644 --- a/res/pokemon/beautifly/data.json +++ b/res/pokemon/beautifly/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 50 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 161, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 10, "MOVE_ABSORB" ], + [ 13, "MOVE_GUST" ], + [ 17, "MOVE_STUN_SPORE" ], + [ 20, "MOVE_MORNING_SUN" ], + [ 24, "MOVE_MEGA_DRAIN" ], + [ 27, "MOVE_WHIRLWIND" ], + [ 31, "MOVE_ATTRACT" ], + [ 34, "MOVE_SILVER_WIND" ], + [ 38, "MOVE_GIGA_DRAIN" ], + [ 41, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,20 +82,7 @@ "TM90", "HM05" ], - "level_up": { - "1": "MOVE_ABSORB", - "10": "MOVE_ABSORB", - "13": "MOVE_GUST", - "17": "MOVE_STUN_SPORE", - "20": "MOVE_MORNING_SUN", - "24": "MOVE_MEGA_DRAIN", - "27": "MOVE_WHIRLWIND", - "31": "MOVE_ATTRACT", - "34": "MOVE_SILVER_WIND", - "38": "MOVE_GIGA_DRAIN", - "41": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -100,9 +91,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -117,7 +109,7 @@ "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émon" + "category": "Butterfly Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/beedrill/data.json b/res/pokemon/beedrill/data.json index ccf41a8156..59ce9d32a7 100644 --- a/res/pokemon/beedrill/data.json +++ b/res/pokemon/beedrill/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 80 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 159, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FURY_ATTACK" ], + [ 10, "MOVE_FURY_ATTACK" ], + [ 13, "MOVE_FOCUS_ENERGY" ], + [ 16, "MOVE_TWINEEDLE" ], + [ 19, "MOVE_RAGE" ], + [ 22, "MOVE_PURSUIT" ], + [ 25, "MOVE_TOXIC_SPIKES" ], + [ 28, "MOVE_PIN_MISSILE" ], + [ 31, "MOVE_AGILITY" ], + [ 34, "MOVE_ASSURANCE" ], + [ 37, "MOVE_POISON_JAB" ], + [ 40, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -83,21 +88,7 @@ "HM05", "HM06" ], - "level_up": { - "1": "MOVE_FURY_ATTACK", - "10": "MOVE_FURY_ATTACK", - "13": "MOVE_FOCUS_ENERGY", - "16": "MOVE_TWINEEDLE", - "19": "MOVE_RAGE", - "22": "MOVE_PURSUIT", - "25": "MOVE_TOXIC_SPIKES", - "28": "MOVE_PIN_MISSILE", - "31": "MOVE_AGILITY", - "34": "MOVE_ASSURANCE", - "37": "MOVE_POISON_JAB", - "40": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -107,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 10, @@ -124,7 +116,7 @@ "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émon" + "category": "Poison Bee Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json index a5347a21fb..a6441d6e9c 100644 --- a/res/pokemon/beldum/data.json +++ b/res/pokemon/beldum/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 60 }, - "types": [ - "TYPE_STEEL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_STEEL", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 103, "ev_yields": { @@ -30,25 +27,19 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_TAKE_DOWN" - }, - "tutor": [ + "by_level": [ + [ 1, "MOVE_TAKE_DOWN" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_IRON_HEAD", "MOVE_ZEN_HEADBUTT", "MOVE_IRON_DEFENSE" @@ -62,8 +53,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -78,7 +69,7 @@ "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émon" + "category": "Iron Ball Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -87,4 +78,4 @@ "rarity": 20, "unused": 2574 } -} +} \ No newline at end of file diff --git a/res/pokemon/bellossom/data.json b/res/pokemon/bellossom/data.json index 36c48bf72b..896d446334 100644 --- a/res/pokemon/bellossom/data.json +++ b/res/pokemon/bellossom/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 100 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 184, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEAF_BLADE" ], + [ 1, "MOVE_MEGA_DRAIN" ], + [ 1, "MOVE_SWEET_SCENT" ], + [ 1, "MOVE_STUN_SPORE" ], + [ 1, "MOVE_SUNNY_DAY" ], + [ 23, "MOVE_MAGICAL_LEAF" ], + [ 53, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -77,18 +77,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_LEAF_BLADE", - "MOVE_MEGA_DRAIN", - "MOVE_SWEET_SCENT", - "MOVE_STUN_SPORE", - "MOVE_SUNNY_DAY" - ], - "23": "MOVE_MAGICAL_LEAF", - "53": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -96,9 +85,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -113,7 +103,7 @@ "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émon" + "category": "Flower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json index bbff53c4e0..c1d4da49bf 100644 --- a/res/pokemon/bellsprout/data.json +++ b/res/pokemon/bellsprout/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 30 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 255, "base_exp_reward": 84, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_VINE_WHIP" ], + [ 7, "MOVE_GROWTH" ], + [ 11, "MOVE_WRAP" ], + [ 13, "MOVE_SLEEP_POWDER" ], + [ 15, "MOVE_POISON_POWDER" ], + [ 17, "MOVE_STUN_SPORE" ], + [ 23, "MOVE_ACID" ], + [ 27, "MOVE_KNOCK_OFF" ], + [ 29, "MOVE_SWEET_SCENT" ], + [ 35, "MOVE_GASTRO_ACID" ], + [ 39, "MOVE_RAZOR_LEAF" ], + [ 41, "MOVE_SLAM" ], + [ 47, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,22 +79,7 @@ "TM90", "HM01" ], - "level_up": { - "1": "MOVE_VINE_WHIP", - "7": "MOVE_GROWTH", - "11": "MOVE_WRAP", - "13": "MOVE_SLEEP_POWDER", - "15": "MOVE_POISON_POWDER", - "17": "MOVE_STUN_SPORE", - "23": "MOVE_ACID", - "27": "MOVE_KNOCK_OFF", - "29": "MOVE_SWEET_SCENT", - "35": "MOVE_GASTRO_ACID", - "39": "MOVE_RAZOR_LEAF", - "41": "MOVE_SLAM", - "47": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -105,8 +96,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -121,7 +112,7 @@ "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émon" + "category": "Flower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -130,4 +121,4 @@ "rarity": 50, "unused": 1537 } -} +} \ No newline at end of file diff --git a/res/pokemon/bibarel/data.json b/res/pokemon/bibarel/data.json index 99ebb8ef54..420aa0595f 100644 --- a/res/pokemon/bibarel/data.json +++ b/res/pokemon/bibarel/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 60 }, - "types": [ - "TYPE_NORMAL", - "TYPE_WATER" - ], + "types": [ "TYPE_NORMAL", "TYPE_WATER" ], "catch_rate": 127, "base_exp_reward": 116, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SIMPLE", - "ABILITY_UNAWARE" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SIMPLE", "ABILITY_UNAWARE" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_GROWL" ], + [ 9, "MOVE_DEFENSE_CURL" ], + [ 13, "MOVE_ROLLOUT" ], + [ 15, "MOVE_WATER_GUN" ], + [ 18, "MOVE_HEADBUTT" ], + [ 23, "MOVE_HYPER_FANG" ], + [ 28, "MOVE_YAWN" ], + [ 33, "MOVE_AMNESIA" ], + [ 38, "MOVE_TAKE_DOWN" ], + [ 43, "MOVE_SUPER_FANG" ], + [ 48, "MOVE_SUPERPOWER" ], + [ 53, "MOVE_CURSE" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -90,25 +97,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "5": "MOVE_GROWL", - "9": "MOVE_DEFENSE_CURL", - "13": "MOVE_ROLLOUT", - "15": "MOVE_WATER_GUN", - "18": "MOVE_HEADBUTT", - "23": "MOVE_HYPER_FANG", - "28": "MOVE_YAWN", - "33": "MOVE_AMNESIA", - "38": "MOVE_TAKE_DOWN", - "43": "MOVE_SUPER_FANG", - "48": "MOVE_SUPERPOWER", - "53": "MOVE_CURSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -121,9 +110,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -138,7 +128,7 @@ "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émon" + "category": "Beaver Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json index 97fd252eef..58578e9a23 100644 --- a/res/pokemon/bidoof/data.json +++ b/res/pokemon/bidoof/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 40 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 58, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SIMPLE", - "ABILITY_UNAWARE" - ], - "great_marsh_flee_rate": 90, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SIMPLE", "ABILITY_UNAWARE" ], + "safari_flee_rate": 90, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_GROWL" ], + [ 9, "MOVE_DEFENSE_CURL" ], + [ 13, "MOVE_ROLLOUT" ], + [ 17, "MOVE_HEADBUTT" ], + [ 21, "MOVE_HYPER_FANG" ], + [ 25, "MOVE_YAWN" ], + [ 29, "MOVE_AMNESIA" ], + [ 33, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_SUPER_FANG" ], + [ 41, "MOVE_SUPERPOWER" ], + [ 45, "MOVE_CURSE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -81,21 +86,7 @@ "HM01", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_GROWL", - "9": "MOVE_DEFENSE_CURL", - "13": "MOVE_ROLLOUT", - "17": "MOVE_HEADBUTT", - "21": "MOVE_HYPER_FANG", - "25": "MOVE_YAWN", - "29": "MOVE_AMNESIA", - "33": "MOVE_TAKE_DOWN", - "37": "MOVE_SUPER_FANG", - "41": "MOVE_SUPERPOWER", - "45": "MOVE_CURSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -115,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -130,8 +121,8 @@ "pokemon_pos_f": 25, "trainer_pos_m": 9, "pokemon_pos_m": 25, - "entry_text": "A comparison revealed that\nBIDOOF’s front teeth grow at\nthe same rate as RATTATA’s.", - "category": "Plump Mouse Pokémon" + "entry_text": "A comparison revealed that\nBIDOOF\u2019s front teeth grow at\nthe same rate as RATTATA\u2019s.", + "category": "Plump Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -140,4 +131,4 @@ "rarity": 50, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/blastoise/data.json b/res/pokemon/blastoise/data.json index 418733cf16..77ca6ae434 100644 --- a/res/pokemon/blastoise/data.json +++ b/res/pokemon/blastoise/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 105 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FLASH_CANNON" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_WITHDRAW" ], + [ 4, "MOVE_TAIL_WHIP" ], + [ 7, "MOVE_BUBBLE" ], + [ 10, "MOVE_WITHDRAW" ], + [ 13, "MOVE_WATER_GUN" ], + [ 16, "MOVE_BITE" ], + [ 20, "MOVE_RAPID_SPIN" ], + [ 24, "MOVE_PROTECT" ], + [ 28, "MOVE_WATER_PULSE" ], + [ 32, "MOVE_AQUA_TAIL" ], + [ 39, "MOVE_SKULL_BASH" ], + [ 46, "MOVE_IRON_DEFENSE" ], + [ 53, "MOVE_RAIN_DANCE" ], + [ 60, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -88,29 +99,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_FLASH_CANNON", - "MOVE_TACKLE", - "MOVE_TAIL_WHIP", - "MOVE_BUBBLE", - "MOVE_WITHDRAW" - ], - "4": "MOVE_TAIL_WHIP", - "7": "MOVE_BUBBLE", - "10": "MOVE_WITHDRAW", - "13": "MOVE_WATER_GUN", - "16": "MOVE_BITE", - "20": "MOVE_RAPID_SPIN", - "24": "MOVE_PROTECT", - "28": "MOVE_WATER_PULSE", - "32": "MOVE_AQUA_TAIL", - "39": "MOVE_SKULL_BASH", - "46": "MOVE_IRON_DEFENSE", - "53": "MOVE_RAIN_DANCE", - "60": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -124,9 +113,10 @@ "MOVE_IRON_DEFENSE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 16, @@ -141,7 +131,7 @@ "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émon" + "category": "Shellfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/blaziken/data.json b/res/pokemon/blaziken/data.json index 614f9f0e96..fad5dfcc9a 100644 --- a/res/pokemon/blaziken/data.json +++ b/res/pokemon/blaziken/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 70 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIRE", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 209, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_EMBER" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 13, "MOVE_EMBER" ], + [ 16, "MOVE_DOUBLE_KICK" ], + [ 17, "MOVE_PECK" ], + [ 21, "MOVE_SAND_ATTACK" ], + [ 28, "MOVE_BULK_UP" ], + [ 32, "MOVE_QUICK_ATTACK" ], + [ 36, "MOVE_BLAZE_KICK" ], + [ 42, "MOVE_SLASH" ], + [ 49, "MOVE_BRAVE_BIRD" ], + [ 59, "MOVE_SKY_UPPERCUT" ], + [ 66, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -89,28 +99,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_SCRATCH", - "MOVE_GROWL", - "MOVE_FOCUS_ENERGY", - "MOVE_EMBER" - ], - "7": "MOVE_FOCUS_ENERGY", - "13": "MOVE_EMBER", - "16": "MOVE_DOUBLE_KICK", - "17": "MOVE_PECK", - "21": "MOVE_SAND_ATTACK", - "28": "MOVE_BULK_UP", - "32": "MOVE_QUICK_ATTACK", - "36": "MOVE_BLAZE_KICK", - "42": "MOVE_SLASH", - "49": "MOVE_BRAVE_BIRD", - "59": "MOVE_SKY_UPPERCUT", - "66": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -126,9 +115,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 19, @@ -143,7 +133,7 @@ "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émon" + "category": "Blaze Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/blissey/data.json b/res/pokemon/blissey/data.json index 0eed852761..90cd4362ab 100644 --- a/res/pokemon/blissey/data.json +++ b/res/pokemon/blissey/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 135 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 30, "base_exp_reward": 255, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 40, "base_friendship": 140, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_SERENE_GRACE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_REFRESH" ], + [ 12, "MOVE_SOFTBOILED" ], + [ 16, "MOVE_DOUBLE_SLAP" ], + [ 20, "MOVE_MINIMIZE" ], + [ 23, "MOVE_SING" ], + [ 27, "MOVE_FLING" ], + [ 31, "MOVE_DEFENSE_CURL" ], + [ 34, "MOVE_LIGHT_SCREEN" ], + [ 38, "MOVE_EGG_BOMB" ], + [ 42, "MOVE_HEALING_WISH" ], + [ 46, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -105,25 +112,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_GROWL" - ], - "5": "MOVE_TAIL_WHIP", - "9": "MOVE_REFRESH", - "12": "MOVE_SOFTBOILED", - "16": "MOVE_DOUBLE_SLAP", - "20": "MOVE_MINIMIZE", - "23": "MOVE_SING", - "27": "MOVE_FLING", - "31": "MOVE_DEFENSE_CURL", - "34": "MOVE_LIGHT_SCREEN", - "38": "MOVE_EGG_BOMB", - "42": "MOVE_HEALING_WISH", - "46": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -137,9 +126,10 @@ "MOVE_LAST_RESORT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -154,7 +144,7 @@ "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émon" + "category": "Happiness Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json index 1310296a93..5d2232b150 100644 --- a/res/pokemon/bonsly/data.json +++ b/res/pokemon/bonsly/data.json @@ -8,10 +8,7 @@ "special_attack": 10, "special_defense": 45 }, - "types": [ - "TYPE_ROCK", - "TYPE_ROCK" - ], + "types": [ "TYPE_ROCK", "TYPE_ROCK" ], "catch_rate": 255, "base_exp_reward": 68, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FAKE_TEARS" ], + [ 1, "MOVE_COPYCAT" ], + [ 6, "MOVE_FLAIL" ], + [ 9, "MOVE_LOW_KICK" ], + [ 14, "MOVE_ROCK_THROW" ], + [ 17, "MOVE_MIMIC" ], + [ 22, "MOVE_BLOCK" ], + [ 25, "MOVE_FAINT_ATTACK" ], + [ 30, "MOVE_ROCK_TOMB" ], + [ 33, "MOVE_ROCK_SLIDE" ], + [ 38, "MOVE_SLAM" ], + [ 41, "MOVE_SUCKER_PUNCH" ], + [ 46, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -74,24 +80,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_FAKE_TEARS", - "MOVE_COPYCAT" - ], - "6": "MOVE_FLAIL", - "9": "MOVE_LOW_KICK", - "14": "MOVE_ROCK_THROW", - "17": "MOVE_MIMIC", - "22": "MOVE_BLOCK", - "25": "MOVE_FAINT_ATTACK", - "30": "MOVE_ROCK_TOMB", - "33": "MOVE_ROCK_SLIDE", - "38": "MOVE_SLAM", - "41": "MOVE_SUCKER_PUNCH", - "46": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -108,8 +97,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -124,7 +113,7 @@ "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émon" + "category": "Bonsai Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -133,4 +122,4 @@ "rarity": 3, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/breloom/data.json b/res/pokemon/breloom/data.json index 4d1e016124..edb249a929 100644 --- a/res/pokemon/breloom/data.json +++ b/res/pokemon/breloom/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_GRASS", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_GRASS", "TYPE_FIGHTING" ], "catch_rate": 90, "base_exp_reward": 165, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_EFFECT_SPORE", - "ABILITY_POISON_HEAL" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_STUN_SPORE" ], + [ 1, "MOVE_LEECH_SEED" ], + [ 5, "MOVE_TACKLE" ], + [ 9, "MOVE_STUN_SPORE" ], + [ 13, "MOVE_LEECH_SEED" ], + [ 17, "MOVE_MEGA_DRAIN" ], + [ 21, "MOVE_HEADBUTT" ], + [ 23, "MOVE_MACH_PUNCH" ], + [ 25, "MOVE_COUNTER" ], + [ 29, "MOVE_FORCE_PALM" ], + [ 33, "MOVE_SKY_UPPERCUT" ], + [ 37, "MOVE_MIND_READER" ], + [ 41, "MOVE_SEED_BOMB" ], + [ 45, "MOVE_DYNAMIC_PUNCH" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -88,27 +97,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_ABSORB", - "MOVE_TACKLE", - "MOVE_STUN_SPORE", - "MOVE_LEECH_SEED" - ], - "5": "MOVE_TACKLE", - "9": "MOVE_STUN_SPORE", - "13": "MOVE_LEECH_SEED", - "17": "MOVE_MEGA_DRAIN", - "21": "MOVE_HEADBUTT", - "23": "MOVE_MACH_PUNCH", - "25": "MOVE_COUNTER", - "29": "MOVE_FORCE_PALM", - "33": "MOVE_SKY_UPPERCUT", - "37": "MOVE_MIND_READER", - "41": "MOVE_SEED_BOMB", - "45": "MOVE_DYNAMIC_PUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -120,9 +109,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -137,7 +127,7 @@ "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émon" + "category": "Mushroom Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/bronzong/data.json b/res/pokemon/bronzong/data.json index 381d6f0c33..43754b2ecc 100644 --- a/res/pokemon/bronzong/data.json +++ b/res/pokemon/bronzong/data.json @@ -8,10 +8,7 @@ "special_attack": 79, "special_defense": 116 }, - "types": [ - "TYPE_STEEL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_STEEL", "TYPE_PSYCHIC" ], "catch_rate": 90, "base_exp_reward": 188, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_HEATPROOF" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_HEATPROOF" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SUNNY_DAY" ], + [ 1, "MOVE_RAIN_DANCE" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_IMPRISON" ], + [ 7, "MOVE_HYPNOSIS" ], + [ 12, "MOVE_IMPRISON" ], + [ 14, "MOVE_CONFUSE_RAY" ], + [ 19, "MOVE_EXTRASENSORY" ], + [ 26, "MOVE_IRON_DEFENSE" ], + [ 30, "MOVE_SAFEGUARD" ], + [ 33, "MOVE_BLOCK" ], + [ 38, "MOVE_GYRO_BALL" ], + [ 43, "MOVE_FUTURE_SIGHT" ], + [ 50, "MOVE_FAINT_ATTACK" ], + [ 61, "MOVE_PAYBACK" ], + [ 67, "MOVE_HEAL_BLOCK" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -91,29 +102,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SUNNY_DAY", - "MOVE_RAIN_DANCE", - "MOVE_TACKLE", - "MOVE_CONFUSION", - "MOVE_HYPNOSIS", - "MOVE_IMPRISON" - ], - "7": "MOVE_HYPNOSIS", - "12": "MOVE_IMPRISON", - "14": "MOVE_CONFUSE_RAY", - "19": "MOVE_EXTRASENSORY", - "26": "MOVE_IRON_DEFENSE", - "30": "MOVE_SAFEGUARD", - "33": "MOVE_BLOCK", - "38": "MOVE_GYRO_BALL", - "43": "MOVE_FUTURE_SIGHT", - "50": "MOVE_FAINT_ATTACK", - "61": "MOVE_PAYBACK", - "67": "MOVE_HEAL_BLOCK" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -123,9 +112,10 @@ "MOVE_TRICK" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 13, @@ -140,7 +130,7 @@ "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émon" + "category": "Bronze Bell Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json index d852eb731f..61d61a997c 100644 --- a/res/pokemon/bronzor/data.json +++ b/res/pokemon/bronzor/data.json @@ -8,10 +8,7 @@ "special_attack": 24, "special_defense": 86 }, - "types": [ - "TYPE_STEEL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_STEEL", "TYPE_PSYCHIC" ], "catch_rate": 255, "base_exp_reward": 72, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_HEATPROOF" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_HEATPROOF" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_CONFUSION" ], + [ 7, "MOVE_HYPNOSIS" ], + [ 12, "MOVE_IMPRISON" ], + [ 14, "MOVE_CONFUSE_RAY" ], + [ 19, "MOVE_EXTRASENSORY" ], + [ 26, "MOVE_IRON_DEFENSE" ], + [ 30, "MOVE_SAFEGUARD" ], + [ 35, "MOVE_GYRO_BALL" ], + [ 37, "MOVE_FUTURE_SIGHT" ], + [ 41, "MOVE_FAINT_ATTACK" ], + [ 49, "MOVE_PAYBACK" ], + [ 52, "MOVE_HEAL_BLOCK" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -86,24 +92,7 @@ "TM91", "TM92" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_CONFUSION" - ], - "7": "MOVE_HYPNOSIS", - "12": "MOVE_IMPRISON", - "14": "MOVE_CONFUSE_RAY", - "19": "MOVE_EXTRASENSORY", - "26": "MOVE_IRON_DEFENSE", - "30": "MOVE_SAFEGUARD", - "35": "MOVE_GYRO_BALL", - "37": "MOVE_FUTURE_SIGHT", - "41": "MOVE_FAINT_ATTACK", - "49": "MOVE_PAYBACK", - "52": "MOVE_HEAL_BLOCK" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_ANCIENT_POWER", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 5, @@ -134,8 +123,8 @@ "pokemon_pos_f": 65528, "trainer_pos_m": 9, "pokemon_pos_m": 65528, - "entry_text": "There are researchers who believe\nthis Pokémon reflected like a mirror\nin the distant past.", - "category": "Bronze Pokémon" + "entry_text": "There are researchers who believe\nthis Pok\u00e9mon reflected like a mirror\nin the distant past.", + "category": "Bronze Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -144,4 +133,4 @@ "rarity": 20, "unused": 2574 } -} +} \ No newline at end of file diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json index 656a8ea6a6..ee7e047891 100644 --- a/res/pokemon/budew/data.json +++ b/res/pokemon/budew/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 70 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 255, "base_exp_reward": 68, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_POISON_POINT" - ], - "great_marsh_flee_rate": 120, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 4, "MOVE_GROWTH" ], + [ 7, "MOVE_WATER_SPORT" ], + [ 10, "MOVE_STUN_SPORE" ], + [ 13, "MOVE_MEGA_DRAIN" ], + [ 16, "MOVE_WORRY_SEED" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -75,15 +74,7 @@ "TM90", "HM01" ], - "level_up": { - "1": "MOVE_ABSORB", - "4": "MOVE_GROWTH", - "7": "MOVE_WATER_SPORT", - "10": "MOVE_STUN_SPORE", - "13": "MOVE_MEGA_DRAIN", - "16": "MOVE_WORRY_SEED" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -93,14 +84,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS_DAY", - "SPECIES_ROSELIA" - ] + [ "EVO_LEVEL_HAPPINESS_DAY", "SPECIES_ROSELIA" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 2, @@ -114,8 +102,8 @@ "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’s warm touch.", - "category": "Bud Pokémon" + "entry_text": "Sensitive to changing temperature,\nthe bud is said to bloom when it\nfeels the sun\u2019s warm touch.", + "category": "Bud Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -124,4 +112,4 @@ "rarity": 10, "unused": 1537 } -} +} \ No newline at end of file diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json index 6e49639cf6..980583dd19 100644 --- a/res/pokemon/buizel/data.json +++ b/res/pokemon/buizel/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 30 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 75, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SONIC_BOOM" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 3, "MOVE_QUICK_ATTACK" ], + [ 6, "MOVE_WATER_GUN" ], + [ 10, "MOVE_PURSUIT" ], + [ 15, "MOVE_SWIFT" ], + [ 21, "MOVE_AQUA_JET" ], + [ 28, "MOVE_AGILITY" ], + [ 36, "MOVE_WHIRLPOOL" ], + [ 45, "MOVE_RAZOR_WIND" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -78,22 +82,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_SONIC_BOOM", - "MOVE_GROWL", - "MOVE_WATER_SPORT" - ], - "3": "MOVE_QUICK_ATTACK", - "6": "MOVE_WATER_GUN", - "10": "MOVE_PURSUIT", - "15": "MOVE_SWIFT", - "21": "MOVE_AQUA_JET", - "28": "MOVE_AGILITY", - "36": "MOVE_WHIRLPOOL", - "45": "MOVE_RAZOR_WIND" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -126,7 +115,7 @@ "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émon" + "category": "Sea Weasel Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -135,4 +124,4 @@ "rarity": 20, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json index f8cf3bcdb5..01b43ceae4 100644 --- a/res/pokemon/bulbasaur/data.json +++ b/res/pokemon/bulbasaur/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 3, "MOVE_GROWL" ], + [ 7, "MOVE_LEECH_SEED" ], + [ 9, "MOVE_VINE_WHIP" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 13, "MOVE_SLEEP_POWDER" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_RAZOR_LEAF" ], + [ 21, "MOVE_SWEET_SCENT" ], + [ 25, "MOVE_GROWTH" ], + [ 27, "MOVE_DOUBLE_EDGE" ], + [ 31, "MOVE_WORRY_SEED" ], + [ 33, "MOVE_SYNTHESIS" ], + [ 37, "MOVE_SEED_BOMB" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -74,25 +81,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "3": "MOVE_GROWL", - "7": "MOVE_LEECH_SEED", - "9": "MOVE_VINE_WHIP", - "13": [ - "MOVE_POISON_POWDER", - "MOVE_SLEEP_POWDER" - ], - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_RAZOR_LEAF", - "21": "MOVE_SWEET_SCENT", - "25": "MOVE_GROWTH", - "27": "MOVE_DOUBLE_EDGE", - "31": "MOVE_WORRY_SEED", - "33": "MOVE_SYNTHESIS", - "37": "MOVE_SEED_BOMB" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -109,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -125,7 +114,7 @@ "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émon" + "category": "Seed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -134,4 +123,4 @@ "rarity": 30, "unused": 1537 } -} +} \ No newline at end of file diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json index 8b84397292..1e864f7343 100644 --- a/res/pokemon/buneary/data.json +++ b/res/pokemon/buneary/data.json @@ -8,10 +8,7 @@ "special_attack": 44, "special_defense": 56 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 190, "base_exp_reward": 84, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 0, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_KLUTZ" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_FORESIGHT" ], + [ 6, "MOVE_ENDURE" ], + [ 13, "MOVE_FRUSTRATION" ], + [ 16, "MOVE_QUICK_ATTACK" ], + [ 23, "MOVE_JUMP_KICK" ], + [ 26, "MOVE_BATON_PASS" ], + [ 33, "MOVE_AGILITY" ], + [ 36, "MOVE_DIZZY_PUNCH" ], + [ 43, "MOVE_CHARM" ], + [ 46, "MOVE_BOUNCE" ], + [ 53, "MOVE_HEALING_WISH" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -80,25 +87,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_SPLASH", - "MOVE_POUND", - "MOVE_DEFENSE_CURL", - "MOVE_FORESIGHT" - ], - "6": "MOVE_ENDURE", - "13": "MOVE_FRUSTRATION", - "16": "MOVE_QUICK_ATTACK", - "23": "MOVE_JUMP_KICK", - "26": "MOVE_BATON_PASS", - "33": "MOVE_AGILITY", - "36": "MOVE_DIZZY_PUNCH", - "43": "MOVE_CHARM", - "46": "MOVE_BOUNCE", - "53": "MOVE_HEALING_WISH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -110,14 +99,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_LOPUNNY" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_LOPUNNY" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -132,7 +118,7 @@ "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émon" + "category": "Rabbit Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -141,4 +127,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/burmy/data.json b/res/pokemon/burmy/data.json index ed0c1f4e61..b129bfdb85 100644 --- a/res/pokemon/burmy/data.json +++ b/res/pokemon/burmy/data.json @@ -8,10 +8,7 @@ "special_attack": 29, "special_defense": 45 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 120, "base_exp_reward": 61, "ev_yields": { @@ -30,30 +27,22 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_PROTECT", - "10": "MOVE_TACKLE", - "15": "MOVE_BUG_BITE", - "20": "MOVE_HIDDEN_POWER" - }, - "tutor": [ - "MOVE_SNORE" - ] + "by_level": [ + [ 1, "MOVE_PROTECT" ], + [ 10, "MOVE_TACKLE" ], + [ 15, "MOVE_BUG_BITE" ], + [ 20, "MOVE_HIDDEN_POWER" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_SNORE" ] }, "evolutions": [ [ @@ -68,8 +57,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 2, @@ -84,7 +73,7 @@ "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émon" + "category": "Bagworm Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/butterfree/data.json b/res/pokemon/butterfree/data.json index 0775dd9257..6d4238fab4 100644 --- a/res/pokemon/butterfree/data.json +++ b/res/pokemon/butterfree/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 160, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_COMPOUND_EYES", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_COMPOUND_EYES", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONFUSION" ], + [ 10, "MOVE_CONFUSION" ], + [ 12, "MOVE_POISON_POWDER" ], + [ 12, "MOVE_STUN_SPORE" ], + [ 12, "MOVE_SLEEP_POWDER" ], + [ 16, "MOVE_GUST" ], + [ 18, "MOVE_SUPERSONIC" ], + [ 22, "MOVE_WHIRLWIND" ], + [ 24, "MOVE_PSYBEAM" ], + [ 28, "MOVE_SILVER_WIND" ], + [ 30, "MOVE_TAILWIND" ], + [ 34, "MOVE_SAFEGUARD" ], + [ 36, "MOVE_CAPTIVATE" ], + [ 40, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,25 +89,7 @@ "TM90", "HM05" ], - "level_up": { - "1": "MOVE_CONFUSION", - "10": "MOVE_CONFUSION", - "12": [ - "MOVE_POISON_POWDER", - "MOVE_STUN_SPORE", - "MOVE_SLEEP_POWDER" - ], - "16": "MOVE_GUST", - "18": "MOVE_SUPERSONIC", - "22": "MOVE_WHIRLWIND", - "24": "MOVE_PSYBEAM", - "28": "MOVE_SILVER_WIND", - "30": "MOVE_TAILWIND", - "34": "MOVE_SAFEGUARD", - "36": "MOVE_CAPTIVATE", - "40": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -109,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -126,7 +116,7 @@ "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émon" + "category": "Butterfly Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json index 1676280dc6..115ef2fb02 100644 --- a/res/pokemon/cacnea/data.json +++ b/res/pokemon/cacnea/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 40 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 190, "base_exp_reward": 97, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_ABSORB" ], + [ 9, "MOVE_GROWTH" ], + [ 13, "MOVE_LEECH_SEED" ], + [ 17, "MOVE_SAND_ATTACK" ], + [ 21, "MOVE_PIN_MISSILE" ], + [ 25, "MOVE_INGRAIN" ], + [ 29, "MOVE_FAINT_ATTACK" ], + [ 33, "MOVE_SPIKES" ], + [ 37, "MOVE_SUCKER_PUNCH" ], + [ 41, "MOVE_PAYBACK" ], + [ 45, "MOVE_NEEDLE_ARM" ], + [ 49, "MOVE_COTTON_SPORE" ], + [ 53, "MOVE_SANDSTORM" ], + [ 57, "MOVE_DESTINY_BOND" ] + ], + "by_tm": [ "TM01", "TM06", "TM09", @@ -79,27 +88,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_POISON_STING", - "MOVE_LEER" - ], - "5": "MOVE_ABSORB", - "9": "MOVE_GROWTH", - "13": "MOVE_LEECH_SEED", - "17": "MOVE_SAND_ATTACK", - "21": "MOVE_PIN_MISSILE", - "25": "MOVE_INGRAIN", - "29": "MOVE_FAINT_ATTACK", - "33": "MOVE_SPIKES", - "37": "MOVE_SUCKER_PUNCH", - "41": "MOVE_PAYBACK", - "45": "MOVE_NEEDLE_ARM", - "49": "MOVE_COTTON_SPORE", - "53": "MOVE_SANDSTORM", - "57": "MOVE_DESTINY_BOND" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -134,7 +123,7 @@ "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émon" + "category": "Cactus Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -143,4 +132,4 @@ "rarity": 30, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/cacturne/data.json b/res/pokemon/cacturne/data.json index 4e914bb537..2d46f589af 100644 --- a/res/pokemon/cacturne/data.json +++ b/res/pokemon/cacturne/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 60 }, - "types": [ - "TYPE_GRASS", - "TYPE_DARK" - ], + "types": [ "TYPE_GRASS", "TYPE_DARK" ], "catch_rate": 60, "base_exp_reward": 177, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REVENGE" ], + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_GROWTH" ], + [ 5, "MOVE_ABSORB" ], + [ 9, "MOVE_GROWTH" ], + [ 13, "MOVE_LEECH_SEED" ], + [ 17, "MOVE_SAND_ATTACK" ], + [ 21, "MOVE_PIN_MISSILE" ], + [ 25, "MOVE_INGRAIN" ], + [ 29, "MOVE_FAINT_ATTACK" ], + [ 35, "MOVE_SPIKES" ], + [ 41, "MOVE_SUCKER_PUNCH" ], + [ 47, "MOVE_PAYBACK" ], + [ 53, "MOVE_NEEDLE_ARM" ], + [ 59, "MOVE_COTTON_SPORE" ], + [ 65, "MOVE_SANDSTORM" ], + [ 71, "MOVE_DESTINY_BOND" ] + ], + "by_tm": [ "TM01", "TM06", "TM09", @@ -84,30 +96,7 @@ "HM01", "HM04" ], - "level_up": { - "1": [ - "MOVE_REVENGE", - "MOVE_POISON_STING", - "MOVE_LEER", - "MOVE_ABSORB", - "MOVE_GROWTH" - ], - "5": "MOVE_ABSORB", - "9": "MOVE_GROWTH", - "13": "MOVE_LEECH_SEED", - "17": "MOVE_SAND_ATTACK", - "21": "MOVE_PIN_MISSILE", - "25": "MOVE_INGRAIN", - "29": "MOVE_FAINT_ATTACK", - "35": "MOVE_SPIKES", - "41": "MOVE_SUCKER_PUNCH", - "47": "MOVE_PAYBACK", - "53": "MOVE_NEEDLE_ARM", - "59": "MOVE_COTTON_SPORE", - "65": "MOVE_SANDSTORM", - "71": "MOVE_DESTINY_BOND" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -119,9 +108,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -135,8 +125,8 @@ "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’s desert heat.", - "category": "Scarecrow Pokémon" + "entry_text": "It becomes active at night,\nseeking prey that is exhausted\nfrom the day\u2019s desert heat.", + "category": "Scarecrow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/camerupt/data.json b/res/pokemon/camerupt/data.json index 5f76ff4b70..29b7e1865c 100644 --- a/res/pokemon/camerupt/data.json +++ b/res/pokemon/camerupt/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 75 }, - "types": [ - "TYPE_FIRE", - "TYPE_GROUND" - ], + "types": [ "TYPE_FIRE", "TYPE_GROUND" ], "catch_rate": 150, "base_exp_reward": 175, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_MAGMA_ARMOR", - "ABILITY_SOLID_ROCK" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_MAGNITUDE" ], + [ 5, "MOVE_EMBER" ], + [ 11, "MOVE_MAGNITUDE" ], + [ 15, "MOVE_FOCUS_ENERGY" ], + [ 21, "MOVE_TAKE_DOWN" ], + [ 25, "MOVE_AMNESIA" ], + [ 31, "MOVE_LAVA_PLUME" ], + [ 33, "MOVE_ROCK_SLIDE" ], + [ 39, "MOVE_EARTH_POWER" ], + [ 49, "MOVE_EARTHQUAKE" ], + [ 57, "MOVE_ERUPTION" ], + [ 67, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -83,26 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_TACKLE", - "MOVE_EMBER", - "MOVE_MAGNITUDE" - ], - "5": "MOVE_EMBER", - "11": "MOVE_MAGNITUDE", - "15": "MOVE_FOCUS_ENERGY", - "21": "MOVE_TAKE_DOWN", - "25": "MOVE_AMNESIA", - "31": "MOVE_LAVA_PLUME", - "33": "MOVE_ROCK_SLIDE", - "39": "MOVE_EARTH_POWER", - "49": "MOVE_EARTHQUAKE", - "57": "MOVE_ERUPTION", - "67": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_IRON_HEAD", @@ -111,9 +100,10 @@ "MOVE_HEAT_WAVE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 19, @@ -128,7 +118,7 @@ "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émon" + "category": "Eruption Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/carnivine/data.json b/res/pokemon/carnivine/data.json index a05f43460d..b3114caf15 100644 --- a/res/pokemon/carnivine/data.json +++ b/res/pokemon/carnivine/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 72 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 200, "base_exp_reward": 164, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BIND" ], + [ 1, "MOVE_GROWTH" ], + [ 7, "MOVE_BITE" ], + [ 11, "MOVE_VINE_WHIP" ], + [ 17, "MOVE_SWEET_SCENT" ], + [ 21, "MOVE_INGRAIN" ], + [ 27, "MOVE_FAINT_ATTACK" ], + [ 31, "MOVE_STOCKPILE" ], + [ 31, "MOVE_SPIT_UP" ], + [ 31, "MOVE_SWALLOW" ], + [ 37, "MOVE_CRUNCH" ], + [ 41, "MOVE_WRING_OUT" ], + [ 47, "MOVE_POWER_WHIP" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -77,26 +83,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_BIND", - "MOVE_GROWTH" - ], - "7": "MOVE_BITE", - "11": "MOVE_VINE_WHIP", - "17": "MOVE_SWEET_SCENT", - "21": "MOVE_INGRAIN", - "27": "MOVE_FAINT_ATTACK", - "31": [ - "MOVE_STOCKPILE", - "MOVE_SPIT_UP", - "MOVE_SWALLOW" - ], - "37": "MOVE_CRUNCH", - "41": "MOVE_WRING_OUT", - "47": "MOVE_POWER_WHIP" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_GASTRO_ACID", @@ -106,9 +93,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 14, @@ -123,7 +111,7 @@ "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émon" + "category": "Bug Catcher Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json index 911bd4ddcf..6cff8a259b 100644 --- a/res/pokemon/carvanha/data.json +++ b/res/pokemon/carvanha/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 20 }, - "types": [ - "TYPE_WATER", - "TYPE_DARK" - ], + "types": [ "TYPE_WATER", "TYPE_DARK" ], "catch_rate": 225, "base_exp_reward": 88, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_ROUGH_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 90, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_BITE" ], + [ 6, "MOVE_RAGE" ], + [ 8, "MOVE_FOCUS_ENERGY" ], + [ 11, "MOVE_SCARY_FACE" ], + [ 16, "MOVE_ICE_FANG" ], + [ 18, "MOVE_SCREECH" ], + [ 21, "MOVE_SWAGGER" ], + [ 26, "MOVE_ASSURANCE" ], + [ 28, "MOVE_CRUNCH" ], + [ 31, "MOVE_AQUA_JET" ], + [ 36, "MOVE_AGILITY" ], + [ 38, "MOVE_TAKE_DOWN" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -75,24 +81,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_BITE" - ], - "6": "MOVE_RAGE", - "8": "MOVE_FOCUS_ENERGY", - "11": "MOVE_SCARY_FACE", - "16": "MOVE_ICE_FANG", - "18": "MOVE_SCREECH", - "21": "MOVE_SWAGGER", - "26": "MOVE_ASSURANCE", - "28": "MOVE_CRUNCH", - "31": "MOVE_AQUA_JET", - "36": "MOVE_AGILITY", - "38": "MOVE_TAKE_DOWN" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 8, @@ -130,7 +119,7 @@ "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émon" + "category": "Savage Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -139,4 +128,4 @@ "rarity": 30, "unused": 4099 } -} +} \ No newline at end of file diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json index 5049fdfada..9d6be096b1 100644 --- a/res/pokemon/cascoon/data.json +++ b/res/pokemon/cascoon/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 25 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 120, "base_exp_reward": 72, "ev_yields": { @@ -30,28 +27,20 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_HARDEN", - "7": "MOVE_HARDEN" - }, - "tutor": [ - "MOVE_IRON_DEFENSE" - ] + "by_level": [ + [ 1, "MOVE_HARDEN" ], + [ 7, "MOVE_HARDEN" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_IRON_DEFENSE" ] }, "evolutions": [ [ @@ -61,8 +50,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -77,7 +66,7 @@ "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émon" + "category": "Cocoon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -86,4 +75,4 @@ "rarity": 30, "unused": 1028 } -} +} \ No newline at end of file diff --git a/res/pokemon/castform/data.json b/res/pokemon/castform/data.json index e6b930a5a4..577c31063f 100644 --- a/res/pokemon/castform/data.json +++ b/res/pokemon/castform/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 70 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 145, "ev_yields": { @@ -30,21 +27,25 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_FORECAST", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_FORECAST", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 10, "MOVE_WATER_GUN" ], + [ 10, "MOVE_EMBER" ], + [ 10, "MOVE_POWDER_SNOW" ], + [ 20, "MOVE_RAIN_DANCE" ], + [ 20, "MOVE_SUNNY_DAY" ], + [ 20, "MOVE_HAIL" ], + [ 30, "MOVE_WEATHER_BALL" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -82,21 +83,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "10": [ - "MOVE_WATER_GUN", - "MOVE_EMBER", - "MOVE_POWDER_SNOW" - ], - "20": [ - "MOVE_RAIN_DANCE", - "MOVE_SUNNY_DAY", - "MOVE_HAIL" - ], - "30": "MOVE_WEATHER_BALL" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -104,9 +91,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -121,7 +109,7 @@ "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émon" + "category": "Weather Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json index 211a2d54cb..870137cf88 100644 --- a/res/pokemon/caterpie/data.json +++ b/res/pokemon/caterpie/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 20 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 255, "base_exp_reward": 53, "ev_yields": { @@ -30,31 +27,21 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHIELD_DUST", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_STRING_SHOT" - ], - "15": "MOVE_BUG_BITE" - }, - "tutor": [ - "MOVE_SNORE" - ] + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_STRING_SHOT" ], + [ 15, "MOVE_BUG_BITE" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_SNORE" ] }, "evolutions": [ [ @@ -64,8 +51,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -80,7 +67,7 @@ "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émon" + "category": "Worm Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -89,4 +76,4 @@ "rarity": 50, "unused": 1028 } -} +} \ No newline at end of file diff --git a/res/pokemon/celebi/data.json b/res/pokemon/celebi/data.json index 21b73a4611..1929dc352f 100644 --- a/res/pokemon/celebi/data.json +++ b/res/pokemon/celebi/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_GRASS" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 120, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEECH_SEED" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_RECOVER" ], + [ 1, "MOVE_HEAL_BELL" ], + [ 10, "MOVE_SAFEGUARD" ], + [ 19, "MOVE_MAGICAL_LEAF" ], + [ 28, "MOVE_ANCIENT_POWER" ], + [ 37, "MOVE_BATON_PASS" ], + [ 46, "MOVE_NATURAL_GIFT" ], + [ 55, "MOVE_HEAL_BLOCK" ], + [ 64, "MOVE_FUTURE_SIGHT" ], + [ 73, "MOVE_HEALING_WISH" ], + [ 82, "MOVE_LEAF_STORM" ], + [ 91, "MOVE_PERISH_SONG" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -91,25 +98,7 @@ "TM92", "HM01" ], - "level_up": { - "1": [ - "MOVE_LEECH_SEED", - "MOVE_CONFUSION", - "MOVE_RECOVER", - "MOVE_HEAL_BELL" - ], - "10": "MOVE_SAFEGUARD", - "19": "MOVE_MAGICAL_LEAF", - "28": "MOVE_ANCIENT_POWER", - "37": "MOVE_BATON_PASS", - "46": "MOVE_NATURAL_GIFT", - "55": "MOVE_HEAL_BLOCK", - "64": "MOVE_FUTURE_SIGHT", - "73": "MOVE_HEALING_WISH", - "82": "MOVE_LEAF_STORM", - "91": "MOVE_PERISH_SONG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -126,9 +115,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -143,7 +133,7 @@ "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émon" + "category": "Time Travel Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json index 0d19c8601b..795d9dc658 100644 --- a/res/pokemon/chansey/data.json +++ b/res/pokemon/chansey/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 105 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 30, "base_exp_reward": 255, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 40, "base_friendship": 140, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_SERENE_GRACE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_REFRESH" ], + [ 12, "MOVE_SOFTBOILED" ], + [ 16, "MOVE_DOUBLE_SLAP" ], + [ 20, "MOVE_MINIMIZE" ], + [ 23, "MOVE_SING" ], + [ 27, "MOVE_FLING" ], + [ 31, "MOVE_DEFENSE_CURL" ], + [ 34, "MOVE_LIGHT_SCREEN" ], + [ 38, "MOVE_EGG_BOMB" ], + [ 42, "MOVE_HEALING_WISH" ], + [ 46, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -103,25 +110,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_GROWL" - ], - "5": "MOVE_TAIL_WHIP", - "9": "MOVE_REFRESH", - "12": "MOVE_SOFTBOILED", - "16": "MOVE_DOUBLE_SLAP", - "20": "MOVE_MINIMIZE", - "23": "MOVE_SING", - "27": "MOVE_FLING", - "31": "MOVE_DEFENSE_CURL", - "34": "MOVE_LIGHT_SCREEN", - "38": "MOVE_EGG_BOMB", - "42": "MOVE_HEALING_WISH", - "46": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -136,14 +125,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_BLISSEY" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_BLISSEY" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -157,8 +143,8 @@ "pokemon_pos_f": 10, "trainer_pos_m": 9, "pokemon_pos_m": 10, - "entry_text": "A kindly Pokémon that lays highly\nnutritious eggs and shares them\nwith injured Pokémon or people.", - "category": "Egg Pokémon" + "entry_text": "A kindly Pok\u00e9mon that lays highly\nnutritious eggs and shares them\nwith injured Pok\u00e9mon or people.", + "category": "Egg Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -167,4 +153,4 @@ "rarity": 3, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/charizard/data.json b/res/pokemon/charizard/data.json index e516b71c79..88ac407b98 100644 --- a/res/pokemon/charizard/data.json +++ b/res/pokemon/charizard/data.json @@ -8,10 +8,7 @@ "special_attack": 109, "special_defense": 85 }, - "types": [ - "TYPE_FIRE", - "TYPE_FLYING" - ], + "types": [ "TYPE_FIRE", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 209, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DRAGON_CLAW" ], + [ 1, "MOVE_SHADOW_CLAW" ], + [ 1, "MOVE_AIR_SLASH" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 7, "MOVE_EMBER" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 17, "MOVE_DRAGON_RAGE" ], + [ 21, "MOVE_SCARY_FACE" ], + [ 28, "MOVE_FIRE_FANG" ], + [ 32, "MOVE_SLASH" ], + [ 36, "MOVE_WING_ATTACK" ], + [ 42, "MOVE_FLAMETHROWER" ], + [ 49, "MOVE_FIRE_SPIN" ], + [ 59, "MOVE_HEAT_WAVE" ], + [ 66, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM01", "TM02", "TM05", @@ -92,29 +103,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_DRAGON_CLAW", - "MOVE_SHADOW_CLAW", - "MOVE_AIR_SLASH", - "MOVE_SCRATCH", - "MOVE_GROWL", - "MOVE_EMBER", - "MOVE_SMOKE_SCREEN" - ], - "7": "MOVE_EMBER", - "10": "MOVE_SMOKE_SCREEN", - "17": "MOVE_DRAGON_RAGE", - "21": "MOVE_SCARY_FACE", - "28": "MOVE_FIRE_FANG", - "32": "MOVE_SLASH", - "36": "MOVE_WING_ATTACK", - "42": "MOVE_FLAMETHROWER", - "49": "MOVE_FIRE_SPIN", - "59": "MOVE_HEAT_WAVE", - "66": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -128,9 +117,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -144,8 +134,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "It is said that CHARIZARD’s fire\nburns hotter if it has\nexperienced harsh battles.", - "category": "Flame Pokémon" + "entry_text": "It is said that CHARIZARD\u2019s fire\nburns hotter if it has\nexperienced harsh battles.", + "category": "Flame Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json index 11c08ea2c5..479e6711a7 100644 --- a/res/pokemon/charmander/data.json +++ b/res/pokemon/charmander/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 50 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 7, "MOVE_EMBER" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 16, "MOVE_DRAGON_RAGE" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 25, "MOVE_FIRE_FANG" ], + [ 28, "MOVE_SLASH" ], + [ 34, "MOVE_FLAMETHROWER" ], + [ 37, "MOVE_FIRE_SPIN" ] + ], + "by_tm": [ "TM01", "TM02", "TM06", @@ -81,21 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_GROWL" - ], - "7": "MOVE_EMBER", - "10": "MOVE_SMOKE_SCREEN", - "16": "MOVE_DRAGON_RAGE", - "19": "MOVE_SCARY_FACE", - "25": "MOVE_FIRE_FANG", - "28": "MOVE_SLASH", - "34": "MOVE_FLAMETHROWER", - "37": "MOVE_FIRE_SPIN" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -129,7 +118,7 @@ "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émon" + "category": "Lizard Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -138,4 +127,4 @@ "rarity": 30, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json index 0995f7bb55..ff61d3f382 100644 --- a/res/pokemon/charmeleon/data.json +++ b/res/pokemon/charmeleon/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 65 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 142, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_EMBER" ], + [ 7, "MOVE_EMBER" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 17, "MOVE_DRAGON_RAGE" ], + [ 21, "MOVE_SCARY_FACE" ], + [ 28, "MOVE_FIRE_FANG" ], + [ 32, "MOVE_SLASH" ], + [ 39, "MOVE_FLAMETHROWER" ], + [ 43, "MOVE_FIRE_SPIN" ] + ], + "by_tm": [ "TM01", "TM02", "TM06", @@ -81,22 +85,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_GROWL", - "MOVE_EMBER" - ], - "7": "MOVE_EMBER", - "10": "MOVE_SMOKE_SCREEN", - "17": "MOVE_DRAGON_RAGE", - "21": "MOVE_SCARY_FACE", - "28": "MOVE_FIRE_FANG", - "32": "MOVE_SLASH", - "39": "MOVE_FLAMETHROWER", - "43": "MOVE_FIRE_SPIN" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -130,7 +119,7 @@ "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émon" + "category": "Flame Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -139,4 +128,4 @@ "rarity": 10, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/chatot/data.json b/res/pokemon/chatot/data.json index 39a3a87c1a..20e70470f7 100644 --- a/res/pokemon/chatot/data.json +++ b/res/pokemon/chatot/data.json @@ -8,10 +8,7 @@ "special_attack": 92, "special_defense": 42 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 30, "base_exp_reward": 107, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_TANGLED_FEET" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 5, "MOVE_GROWL" ], + [ 9, "MOVE_MIRROR_MOVE" ], + [ 13, "MOVE_SING" ], + [ 17, "MOVE_FURY_ATTACK" ], + [ 21, "MOVE_CHATTER" ], + [ 25, "MOVE_TAUNT" ], + [ 29, "MOVE_MIMIC" ], + [ 33, "MOVE_ROOST" ], + [ 37, "MOVE_UPROAR" ], + [ 41, "MOVE_FEATHER_DANCE" ], + [ 45, "MOVE_HYPER_VOICE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -74,21 +79,7 @@ "HM02", "HM05" ], - "level_up": { - "1": "MOVE_PECK", - "5": "MOVE_GROWL", - "9": "MOVE_MIRROR_MOVE", - "13": "MOVE_SING", - "17": "MOVE_FURY_ATTACK", - "21": "MOVE_CHATTER", - "25": "MOVE_TAUNT", - "29": "MOVE_MIMIC", - "33": "MOVE_ROOST", - "37": "MOVE_UPROAR", - "41": "MOVE_FEATHER_DANCE", - "45": "MOVE_HYPER_VOICE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -99,9 +90,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -115,8 +107,8 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "Its tongue is just like a human’s.\nAs a result, it can cleverly mimic\nhuman speech.", - "category": "Music Note Pokémon" + "entry_text": "Its tongue is just like a human\u2019s.\nAs a result, it can cleverly mimic\nhuman speech.", + "category": "Music Note Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/cherrim/data.json b/res/pokemon/cherrim/data.json index 75ffde7d26..819b13738b 100644 --- a/res/pokemon/cherrim/data.json +++ b/res/pokemon/cherrim/data.json @@ -8,10 +8,7 @@ "special_attack": 87, "special_defense": 78 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 75, "base_exp_reward": 133, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_FLOWER_GIFT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_FLOWER_GIFT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWTH" ], + [ 7, "MOVE_GROWTH" ], + [ 10, "MOVE_LEECH_SEED" ], + [ 13, "MOVE_HELPING_HAND" ], + [ 19, "MOVE_MAGICAL_LEAF" ], + [ 22, "MOVE_SUNNY_DAY" ], + [ 25, "MOVE_PETAL_DANCE" ], + [ 30, "MOVE_WORRY_SEED" ], + [ 35, "MOVE_TAKE_DOWN" ], + [ 43, "MOVE_SOLAR_BEAM" ], + [ 48, "MOVE_LUCKY_CHANT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,23 +78,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWTH" - ], - "7": "MOVE_GROWTH", - "10": "MOVE_LEECH_SEED", - "13": "MOVE_HELPING_HAND", - "19": "MOVE_MAGICAL_LEAF", - "22": "MOVE_SUNNY_DAY", - "25": "MOVE_PETAL_DANCE", - "30": "MOVE_WORRY_SEED", - "35": "MOVE_TAKE_DOWN", - "43": "MOVE_SOLAR_BEAM", - "48": "MOVE_LUCKY_CHANT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -97,9 +86,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -113,8 +103,8 @@ "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’s rays with its whole body.", - "category": "Blossom Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json index 6e8a66bbdd..1588c27710 100644 --- a/res/pokemon/cherubi/data.json +++ b/res/pokemon/cherubi/data.json @@ -8,10 +8,7 @@ "special_attack": 62, "special_defense": 53 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 190, "base_exp_reward": 68, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 7, "MOVE_GROWTH" ], + [ 10, "MOVE_LEECH_SEED" ], + [ 13, "MOVE_HELPING_HAND" ], + [ 19, "MOVE_MAGICAL_LEAF" ], + [ 22, "MOVE_SUNNY_DAY" ], + [ 28, "MOVE_WORRY_SEED" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_SOLAR_BEAM" ], + [ 40, "MOVE_LUCKY_CHANT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -71,19 +74,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "7": "MOVE_GROWTH", - "10": "MOVE_LEECH_SEED", - "13": "MOVE_HELPING_HAND", - "19": "MOVE_MAGICAL_LEAF", - "22": "MOVE_SUNNY_DAY", - "28": "MOVE_WORRY_SEED", - "31": "MOVE_TAKE_DOWN", - "37": "MOVE_SOLAR_BEAM", - "40": "MOVE_LUCKY_CHANT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -99,8 +90,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -115,7 +106,7 @@ "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émon" + "category": "Cherry Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -124,4 +115,4 @@ "rarity": 10, "unused": 4364 } -} +} \ No newline at end of file diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json index 95f9e783fe..4482b3134c 100644 --- a/res/pokemon/chikorita/data.json +++ b/res/pokemon/chikorita/data.json @@ -8,10 +8,7 @@ "special_attack": 49, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 6, "MOVE_RAZOR_LEAF" ], + [ 9, "MOVE_POISON_POWDER" ], + [ 12, "MOVE_SYNTHESIS" ], + [ 17, "MOVE_REFLECT" ], + [ 20, "MOVE_MAGICAL_LEAF" ], + [ 23, "MOVE_NATURAL_GIFT" ], + [ 28, "MOVE_SWEET_SCENT" ], + [ 31, "MOVE_LIGHT_SCREEN" ], + [ 34, "MOVE_BODY_SLAM" ], + [ 39, "MOVE_SAFEGUARD" ], + [ 42, "MOVE_AROMATHERAPY" ], + [ 45, "MOVE_SOLAR_BEAM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -75,25 +82,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "6": "MOVE_RAZOR_LEAF", - "9": "MOVE_POISON_POWDER", - "12": "MOVE_SYNTHESIS", - "17": "MOVE_REFLECT", - "20": "MOVE_MAGICAL_LEAF", - "23": "MOVE_NATURAL_GIFT", - "28": "MOVE_SWEET_SCENT", - "31": "MOVE_LIGHT_SCREEN", - "34": "MOVE_BODY_SLAM", - "39": "MOVE_SAFEGUARD", - "42": "MOVE_AROMATHERAPY", - "45": "MOVE_SOLAR_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 9, @@ -126,7 +115,7 @@ "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émon" + "category": "Leaf Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -135,4 +124,4 @@ "rarity": 30, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json index e78ee8f1c9..d380643b93 100644 --- a/res/pokemon/chimchar/data.json +++ b/res/pokemon/chimchar/data.json @@ -8,10 +8,7 @@ "special_attack": 58, "special_defense": 44 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 7, "MOVE_EMBER" ], + [ 9, "MOVE_TAUNT" ], + [ 15, "MOVE_FURY_SWIPES" ], + [ 17, "MOVE_FLAME_WHEEL" ], + [ 23, "MOVE_NASTY_PLOT" ], + [ 25, "MOVE_TORMENT" ], + [ 31, "MOVE_FACADE" ], + [ 33, "MOVE_FIRE_SPIN" ], + [ 39, "MOVE_SLACK_OFF" ], + [ 41, "MOVE_FLAMETHROWER" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -85,23 +90,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER" - ], - "7": "MOVE_EMBER", - "9": "MOVE_TAUNT", - "15": "MOVE_FURY_SWIPES", - "17": "MOVE_FLAME_WHEEL", - "23": "MOVE_NASTY_PLOT", - "25": "MOVE_TORMENT", - "31": "MOVE_FACADE", - "33": "MOVE_FIRE_SPIN", - "39": "MOVE_SLACK_OFF", - "41": "MOVE_FLAMETHROWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -124,8 +113,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -140,7 +129,7 @@ "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émon" + "category": "Chimp Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -149,4 +138,4 @@ "rarity": 30, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/chimecho/data.json b/res/pokemon/chimecho/data.json index 9c22ee704e..acffbf55e0 100644 --- a/res/pokemon/chimecho/data.json +++ b/res/pokemon/chimecho/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 80 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 147, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WRAP" ], + [ 6, "MOVE_GROWL" ], + [ 9, "MOVE_ASTONISH" ], + [ 14, "MOVE_CONFUSION" ], + [ 17, "MOVE_UPROAR" ], + [ 22, "MOVE_TAKE_DOWN" ], + [ 25, "MOVE_YAWN" ], + [ 30, "MOVE_PSYWAVE" ], + [ 33, "MOVE_DOUBLE_EDGE" ], + [ 38, "MOVE_HEAL_BELL" ], + [ 41, "MOVE_SAFEGUARD" ], + [ 46, "MOVE_EXTRASENSORY" ], + [ 49, "MOVE_HEALING_WISH" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -84,22 +90,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_WRAP", - "6": "MOVE_GROWL", - "9": "MOVE_ASTONISH", - "14": "MOVE_CONFUSION", - "17": "MOVE_UPROAR", - "22": "MOVE_TAKE_DOWN", - "25": "MOVE_YAWN", - "30": "MOVE_PSYWAVE", - "33": "MOVE_DOUBLE_EDGE", - "38": "MOVE_HEAL_BELL", - "41": "MOVE_SAFEGUARD", - "46": "MOVE_EXTRASENSORY", - "49": "MOVE_HEALING_WISH" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -112,9 +103,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -129,7 +121,7 @@ "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émon" + "category": "Wind Chime Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json index eabb14d298..ee3a0559d8 100644 --- a/res/pokemon/chinchou/data.json +++ b/res/pokemon/chinchou/data.json @@ -8,10 +8,7 @@ "special_attack": 56, "special_defense": 56 }, - "types": [ - "TYPE_WATER", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_WATER", "TYPE_ELECTRIC" ], "catch_rate": 190, "base_exp_reward": 90, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_VOLT_ABSORB", - "ABILITY_ILLUMINATE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 6, "MOVE_THUNDER_WAVE" ], + [ 9, "MOVE_FLAIL" ], + [ 12, "MOVE_WATER_GUN" ], + [ 17, "MOVE_CONFUSE_RAY" ], + [ 20, "MOVE_SPARK" ], + [ 23, "MOVE_TAKE_DOWN" ], + [ 28, "MOVE_BUBBLE_BEAM" ], + [ 31, "MOVE_SIGNAL_BEAM" ], + [ 34, "MOVE_DISCHARGE" ], + [ 39, "MOVE_AQUA_RING" ], + [ 42, "MOVE_HYDRO_PUMP" ], + [ 45, "MOVE_CHARGE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,25 +83,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_BUBBLE", - "MOVE_SUPERSONIC" - ], - "6": "MOVE_THUNDER_WAVE", - "9": "MOVE_FLAIL", - "12": "MOVE_WATER_GUN", - "17": "MOVE_CONFUSE_RAY", - "20": "MOVE_SPARK", - "23": "MOVE_TAKE_DOWN", - "28": "MOVE_BUBBLE_BEAM", - "31": "MOVE_SIGNAL_BEAM", - "34": "MOVE_DISCHARGE", - "39": "MOVE_AQUA_RING", - "42": "MOVE_HYDRO_PUMP", - "45": "MOVE_CHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 5, @@ -127,7 +116,7 @@ "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émon" + "category": "Angler Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -136,4 +125,4 @@ "rarity": 30, "unused": 1795 } -} +} \ No newline at end of file diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json index ebaedf8fba..91f7817003 100644 --- a/res/pokemon/chingling/data.json +++ b/res/pokemon/chingling/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 50 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 120, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WRAP" ], + [ 6, "MOVE_GROWL" ], + [ 9, "MOVE_ASTONISH" ], + [ 14, "MOVE_CONFUSION" ], + [ 17, "MOVE_UPROAR" ], + [ 22, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -83,15 +82,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_WRAP", - "6": "MOVE_GROWL", - "9": "MOVE_ASTONISH", - "14": "MOVE_CONFUSION", - "17": "MOVE_UPROAR", - "22": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -106,14 +97,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS_NIGHT", - "SPECIES_CHIMECHO" - ] + [ "EVO_LEVEL_HAPPINESS_NIGHT", "SPECIES_CHIMECHO" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 2, @@ -128,7 +116,7 @@ "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émon" + "category": "Bell Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -137,4 +125,4 @@ "rarity": 20, "unused": 1297 } -} +} \ No newline at end of file diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json index ccde895d63..dd91955993 100644 --- a/res/pokemon/clamperl/data.json +++ b/res/pokemon/clamperl/data.json @@ -8,10 +8,7 @@ "special_attack": 74, "special_defense": 55 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 255, "base_exp_reward": 142, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_SHELL_ARMOR", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CLAMP" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_WHIRLPOOL" ], + [ 1, "MOVE_IRON_DEFENSE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -70,15 +67,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_CLAMP", - "MOVE_WATER_GUN", - "MOVE_WHIRLPOOL", - "MOVE_IRON_DEFENSE" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -98,8 +87,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -114,7 +103,7 @@ "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émon" + "category": "Bivalve Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -123,4 +112,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/claydol/data.json b/res/pokemon/claydol/data.json index bc462a146a..a1531cfa0b 100644 --- a/res/pokemon/claydol/data.json +++ b/res/pokemon/claydol/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 120 }, - "types": [ - "TYPE_GROUND", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_GROUND", "TYPE_PSYCHIC" ], "catch_rate": 90, "base_exp_reward": 189, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TELEPORT" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_RAPID_SPIN" ], + [ 3, "MOVE_HARDEN" ], + [ 5, "MOVE_RAPID_SPIN" ], + [ 7, "MOVE_MUD_SLAP" ], + [ 11, "MOVE_PSYBEAM" ], + [ 15, "MOVE_ROCK_TOMB" ], + [ 19, "MOVE_SELFDESTRUCT" ], + [ 25, "MOVE_ANCIENT_POWER" ], + [ 31, "MOVE_POWER_TRICK" ], + [ 36, "MOVE_HYPER_BEAM" ], + [ 40, "MOVE_SANDSTORM" ], + [ 51, "MOVE_COSMIC_POWER" ], + [ 62, "MOVE_EARTH_POWER" ], + [ 73, "MOVE_HEAL_BLOCK" ], + [ 86, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -92,29 +103,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TELEPORT", - "MOVE_CONFUSION", - "MOVE_HARDEN", - "MOVE_RAPID_SPIN" - ], - "3": "MOVE_HARDEN", - "5": "MOVE_RAPID_SPIN", - "7": "MOVE_MUD_SLAP", - "11": "MOVE_PSYBEAM", - "15": "MOVE_ROCK_TOMB", - "19": "MOVE_SELFDESTRUCT", - "25": "MOVE_ANCIENT_POWER", - "31": "MOVE_POWER_TRICK", - "36": "MOVE_HYPER_BEAM", - "40": "MOVE_SANDSTORM", - "51": "MOVE_COSMIC_POWER", - "62": "MOVE_EARTH_POWER", - "73": "MOVE_HEAL_BLOCK", - "86": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_ANCIENT_POWER", @@ -124,9 +113,10 @@ "MOVE_TRICK" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 15, @@ -140,8 +130,8 @@ "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émon from exposure\nto a mysterious ray of light.", - "category": "Clay Doll Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/clefable/data.json b/res/pokemon/clefable/data.json index 2e8dd6f273..e8c776b867 100644 --- a/res/pokemon/clefable/data.json +++ b/res/pokemon/clefable/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 90 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 25, "base_exp_reward": 129, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 10, "base_friendship": 140, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_MAGIC_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SING" ], + [ 1, "MOVE_DOUBLE_SLAP" ], + [ 1, "MOVE_MINIMIZE" ], + [ 1, "MOVE_METRONOME" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -99,15 +96,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SING", - "MOVE_DOUBLE_SLAP", - "MOVE_MINIMIZE", - "MOVE_METRONOME" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -125,9 +114,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -142,7 +132,7 @@ "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émon" + "category": "Fairy Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/clefairy/data.json b/res/pokemon/clefairy/data.json index 5dfba4aa80..19d2efc92d 100644 --- a/res/pokemon/clefairy/data.json +++ b/res/pokemon/clefairy/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 150, "base_exp_reward": 68, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 10, "base_friendship": 140, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_MAGIC_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_GROWL" ], + [ 4, "MOVE_ENCORE" ], + [ 7, "MOVE_SING" ], + [ 10, "MOVE_DOUBLE_SLAP" ], + [ 13, "MOVE_DEFENSE_CURL" ], + [ 16, "MOVE_FOLLOW_ME" ], + [ 19, "MOVE_MINIMIZE" ], + [ 22, "MOVE_WAKE_UP_SLAP" ], + [ 25, "MOVE_COSMIC_POWER" ], + [ 28, "MOVE_LUCKY_CHANT" ], + [ 31, "MOVE_METRONOME" ], + [ 34, "MOVE_GRAVITY" ], + [ 37, "MOVE_MOONLIGHT" ], + [ 40, "MOVE_LIGHT_SCREEN" ], + [ 43, "MOVE_METEOR_MASH" ], + [ 46, "MOVE_HEALING_WISH" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -96,28 +106,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_GROWL" - ], - "4": "MOVE_ENCORE", - "7": "MOVE_SING", - "10": "MOVE_DOUBLE_SLAP", - "13": "MOVE_DEFENSE_CURL", - "16": "MOVE_FOLLOW_ME", - "19": "MOVE_MINIMIZE", - "22": "MOVE_WAKE_UP_SLAP", - "25": "MOVE_COSMIC_POWER", - "28": "MOVE_LUCKY_CHANT", - "31": "MOVE_METRONOME", - "34": "MOVE_GRAVITY", - "37": "MOVE_MOONLIGHT", - "40": "MOVE_LIGHT_SCREEN", - "43": "MOVE_METEOR_MASH", - "46": "MOVE_HEALING_WISH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -143,8 +132,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -159,7 +148,7 @@ "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émon" + "category": "Fairy Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json index 6a814bca43..891ef9b227 100644 --- a/res/pokemon/cleffa/data.json +++ b/res/pokemon/cleffa/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 55 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 150, "base_exp_reward": 37, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 10, "base_friendship": 140, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_MAGIC_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_CHARM" ], + [ 4, "MOVE_ENCORE" ], + [ 7, "MOVE_SING" ], + [ 10, "MOVE_SWEET_KISS" ], + [ 13, "MOVE_COPYCAT" ], + [ 16, "MOVE_MAGICAL_LEAF" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -83,18 +83,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_CHARM" - ], - "4": "MOVE_ENCORE", - "7": "MOVE_SING", - "10": "MOVE_SWEET_KISS", - "13": "MOVE_COPYCAT", - "16": "MOVE_MAGICAL_LEAF" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -109,14 +98,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_CLEFAIRY" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_CLEFAIRY" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -130,8 +116,8 @@ "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’s said\nto arrive riding on a shooting star.", - "category": "Star Shape Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -140,4 +126,4 @@ "rarity": 10, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/cloyster/data.json b/res/pokemon/cloyster/data.json index a75bd214b7..f5aafe7ae1 100644 --- a/res/pokemon/cloyster/data.json +++ b/res/pokemon/cloyster/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 45 }, - "types": [ - "TYPE_WATER", - "TYPE_ICE" - ], + "types": [ "TYPE_WATER", "TYPE_ICE" ], "catch_rate": 60, "base_exp_reward": 203, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SHELL_ARMOR", - "ABILITY_SKILL_LINK" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TOXIC_SPIKES" ], + [ 1, "MOVE_WITHDRAW" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_AURORA_BEAM" ], + [ 1, "MOVE_PROTECT" ], + [ 28, "MOVE_SPIKES" ], + [ 40, "MOVE_SPIKE_CANNON" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,18 +76,7 @@ "TM90", "HM03" ], - "level_up": { - "1": [ - "MOVE_TOXIC_SPIKES", - "MOVE_WITHDRAW", - "MOVE_SUPERSONIC", - "MOVE_AURORA_BEAM", - "MOVE_PROTECT" - ], - "28": "MOVE_SPIKES", - "40": "MOVE_SPIKE_CANNON" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -96,9 +85,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 15, @@ -113,7 +103,7 @@ "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émon" + "category": "Bivalve Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/combee/data.json b/res/pokemon/combee/data.json index 64a5e21186..019999fab3 100644 --- a/res/pokemon/combee/data.json +++ b/res/pokemon/combee/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 42 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 120, "base_exp_reward": 63, "ev_yields": { @@ -30,29 +27,21 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_HONEY_GATHER", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_HONEY_GATHER", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_SWEET_SCENT", - "MOVE_GUST" - ], - "13": "MOVE_BUG_BITE" - }, - "tutor": [ + "by_level": [ + [ 1, "MOVE_SWEET_SCENT" ], + [ 1, "MOVE_GUST" ], + [ 13, "MOVE_BUG_BITE" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -69,8 +58,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -85,7 +74,7 @@ "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émon" + "category": "Tiny Bee Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json index d866de071f..75d59608f3 100644 --- a/res/pokemon/combusken/data.json +++ b/res/pokemon/combusken/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 60 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIRE", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 142, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_EMBER" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 13, "MOVE_EMBER" ], + [ 16, "MOVE_DOUBLE_KICK" ], + [ 17, "MOVE_PECK" ], + [ 21, "MOVE_SAND_ATTACK" ], + [ 28, "MOVE_BULK_UP" ], + [ 32, "MOVE_QUICK_ATTACK" ], + [ 39, "MOVE_SLASH" ], + [ 43, "MOVE_MIRROR_MOVE" ], + [ 50, "MOVE_SKY_UPPERCUT" ], + [ 54, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -82,26 +90,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_GROWL", - "MOVE_FOCUS_ENERGY", - "MOVE_EMBER" - ], - "7": "MOVE_FOCUS_ENERGY", - "13": "MOVE_EMBER", - "16": "MOVE_DOUBLE_KICK", - "17": "MOVE_PECK", - "21": "MOVE_SAND_ATTACK", - "28": "MOVE_BULK_UP", - "32": "MOVE_QUICK_ATTACK", - "39": "MOVE_SLASH", - "43": "MOVE_MIRROR_MOVE", - "50": "MOVE_SKY_UPPERCUT", - "54": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -123,8 +112,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -139,7 +128,7 @@ "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émon" + "category": "Young Fowl Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -148,4 +137,4 @@ "rarity": 10, "unused": 2306 } -} +} \ No newline at end of file diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json index 20991f56c5..2ad1452e13 100644 --- a/res/pokemon/corphish/data.json +++ b/res/pokemon/corphish/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 35 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 205, "base_exp_reward": 111, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 7, "MOVE_HARDEN" ], + [ 10, "MOVE_VICE_GRIP" ], + [ 13, "MOVE_LEER" ], + [ 20, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_PROTECT" ], + [ 26, "MOVE_KNOCK_OFF" ], + [ 32, "MOVE_TAUNT" ], + [ 35, "MOVE_NIGHT_SLASH" ], + [ 38, "MOVE_CRABHAMMER" ], + [ 44, "MOVE_SWORDS_DANCE" ], + [ 47, "MOVE_CRUNCH" ], + [ 53, "MOVE_GUILLOTINE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -84,22 +90,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_BUBBLE", - "7": "MOVE_HARDEN", - "10": "MOVE_VICE_GRIP", - "13": "MOVE_LEER", - "20": "MOVE_BUBBLE_BEAM", - "23": "MOVE_PROTECT", - "26": "MOVE_KNOCK_OFF", - "32": "MOVE_TAUNT", - "35": "MOVE_NIGHT_SLASH", - "38": "MOVE_CRABHAMMER", - "44": "MOVE_SWORDS_DANCE", - "47": "MOVE_CRUNCH", - "53": "MOVE_GUILLOTINE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -120,8 +111,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -136,7 +127,7 @@ "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émon" + "category": "Ruffian Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -145,4 +136,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/corsola/data.json b/res/pokemon/corsola/data.json index 73f86003fa..5fd63ad6fd 100644 --- a/res/pokemon/corsola/data.json +++ b/res/pokemon/corsola/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 85 }, - "types": [ - "TYPE_WATER", - "TYPE_ROCK" - ], + "types": [ "TYPE_WATER", "TYPE_ROCK" ], "catch_rate": 60, "base_exp_reward": 113, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_HUSTLE", - "ABILITY_NATURAL_CURE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_HARDEN" ], + [ 8, "MOVE_BUBBLE" ], + [ 13, "MOVE_RECOVER" ], + [ 16, "MOVE_REFRESH" ], + [ 20, "MOVE_ROCK_BLAST" ], + [ 25, "MOVE_BUBBLE_BEAM" ], + [ 28, "MOVE_LUCKY_CHANT" ], + [ 32, "MOVE_ANCIENT_POWER" ], + [ 37, "MOVE_AQUA_RING" ], + [ 40, "MOVE_SPIKE_CANNON" ], + [ 44, "MOVE_POWER_GEM" ], + [ 48, "MOVE_MIRROR_COAT" ], + [ 53, "MOVE_EARTH_POWER" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -87,23 +94,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_HARDEN", - "8": "MOVE_BUBBLE", - "13": "MOVE_RECOVER", - "16": "MOVE_REFRESH", - "20": "MOVE_ROCK_BLAST", - "25": "MOVE_BUBBLE_BEAM", - "28": "MOVE_LUCKY_CHANT", - "32": "MOVE_ANCIENT_POWER", - "37": "MOVE_AQUA_RING", - "40": "MOVE_SPIKE_CANNON", - "44": "MOVE_POWER_GEM", - "48": "MOVE_MIRROR_COAT", - "53": "MOVE_EARTH_POWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -114,9 +105,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -130,8 +122,8 @@ "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’t live\nin polluted waters.", - "category": "Coral Pokémon" + "entry_text": "Many live in the clean seas of the\nsouth. They apparently can\u2019t live\nin polluted waters.", + "category": "Coral Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/cradily/data.json b/res/pokemon/cradily/data.json index 9ed0edd264..caef4ce0e0 100644 --- a/res/pokemon/cradily/data.json +++ b/res/pokemon/cradily/data.json @@ -8,10 +8,7 @@ "special_attack": 81, "special_defense": 107 }, - "types": [ - "TYPE_ROCK", - "TYPE_GRASS" - ], + "types": [ "TYPE_ROCK", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SUCTION_CUPS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_ACID" ], + [ 1, "MOVE_INGRAIN" ], + [ 8, "MOVE_ACID" ], + [ 15, "MOVE_INGRAIN" ], + [ 22, "MOVE_CONFUSE_RAY" ], + [ 29, "MOVE_AMNESIA" ], + [ 36, "MOVE_ANCIENT_POWER" ], + [ 46, "MOVE_GASTRO_ACID" ], + [ 56, "MOVE_ENERGY_BALL" ], + [ 66, "MOVE_STOCKPILE" ], + [ 66, "MOVE_SPIT_UP" ], + [ 66, "MOVE_SWALLOW" ], + [ 76, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -82,28 +90,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_ASTONISH", - "MOVE_CONSTRICT", - "MOVE_ACID", - "MOVE_INGRAIN" - ], - "8": "MOVE_ACID", - "15": "MOVE_INGRAIN", - "22": "MOVE_CONFUSE_RAY", - "29": "MOVE_AMNESIA", - "36": "MOVE_ANCIENT_POWER", - "46": "MOVE_GASTRO_ACID", - "56": "MOVE_ENERGY_BALL", - "66": [ - "MOVE_STOCKPILE", - "MOVE_SPIT_UP", - "MOVE_SWALLOW" - ], - "76": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_GASTRO_ACID", "MOVE_SNORE", @@ -113,9 +100,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -130,7 +118,7 @@ "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émon" + "category": "Barnacle Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json index d7542cdda8..91a59c668e 100644 --- a/res/pokemon/cranidos/data.json +++ b/res/pokemon/cranidos/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_ROCK", - "TYPE_ROCK" - ], + "types": [ "TYPE_ROCK", "TYPE_ROCK" ], "catch_rate": 45, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_MOLD_BREAKER", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_MOLD_BREAKER", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HEADBUTT" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_PURSUIT" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 24, "MOVE_ASSURANCE" ], + [ 28, "MOVE_ANCIENT_POWER" ], + [ 33, "MOVE_ZEN_HEADBUTT" ], + [ 37, "MOVE_SCREECH" ], + [ 43, "MOVE_HEAD_SMASH" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -89,22 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_HEADBUTT", - "MOVE_LEER" - ], - "6": "MOVE_FOCUS_ENERGY", - "10": "MOVE_PURSUIT", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_SCARY_FACE", - "24": "MOVE_ASSURANCE", - "28": "MOVE_ANCIENT_POWER", - "33": "MOVE_ZEN_HEADBUTT", - "37": "MOVE_SCREECH", - "43": "MOVE_HEAD_SMASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -127,8 +116,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -143,7 +132,7 @@ "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émon" + "category": "Head Butt Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -152,4 +141,4 @@ "rarity": 20, "unused": 3595 } -} +} \ No newline at end of file diff --git a/res/pokemon/crawdaunt/data.json b/res/pokemon/crawdaunt/data.json index f7574c49a7..7d3df01156 100644 --- a/res/pokemon/crawdaunt/data.json +++ b/res/pokemon/crawdaunt/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 55 }, - "types": [ - "TYPE_WATER", - "TYPE_DARK" - ], + "types": [ "TYPE_WATER", "TYPE_DARK" ], "catch_rate": 155, "base_exp_reward": 161, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_VICE_GRIP" ], + [ 1, "MOVE_LEER" ], + [ 7, "MOVE_HARDEN" ], + [ 10, "MOVE_VICE_GRIP" ], + [ 13, "MOVE_LEER" ], + [ 20, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_PROTECT" ], + [ 26, "MOVE_KNOCK_OFF" ], + [ 30, "MOVE_SWIFT" ], + [ 34, "MOVE_TAUNT" ], + [ 39, "MOVE_NIGHT_SLASH" ], + [ 44, "MOVE_CRABHAMMER" ], + [ 52, "MOVE_SWORDS_DANCE" ], + [ 57, "MOVE_CRUNCH" ], + [ 65, "MOVE_GUILLOTINE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -88,28 +98,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_BUBBLE", - "MOVE_HARDEN", - "MOVE_VICE_GRIP", - "MOVE_LEER" - ], - "7": "MOVE_HARDEN", - "10": "MOVE_VICE_GRIP", - "13": "MOVE_LEER", - "20": "MOVE_BUBBLE_BEAM", - "23": "MOVE_PROTECT", - "26": "MOVE_KNOCK_OFF", - "30": "MOVE_SWIFT", - "34": "MOVE_TAUNT", - "39": "MOVE_NIGHT_SLASH", - "44": "MOVE_CRABHAMMER", - "52": "MOVE_SWORDS_DANCE", - "57": "MOVE_CRUNCH", - "65": "MOVE_GUILLOTINE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -124,9 +113,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -140,8 +130,8 @@ "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émon from its pond.", - "category": "Rogue Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/cresselia/data.json b/res/pokemon/cresselia/data.json index db2a52a85d..f616c9cff0 100644 --- a/res/pokemon/cresselia/data.json +++ b/res/pokemon/cresselia/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 130 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 100, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 11, "MOVE_SAFEGUARD" ], + [ 20, "MOVE_MIST" ], + [ 29, "MOVE_AURORA_BEAM" ], + [ 38, "MOVE_FUTURE_SIGHT" ], + [ 47, "MOVE_SLASH" ], + [ 57, "MOVE_MOONLIGHT" ], + [ 66, "MOVE_PSYCHO_CUT" ], + [ 75, "MOVE_PSYCHO_SHIFT" ], + [ 84, "MOVE_LUNAR_DANCE" ], + [ 93, "MOVE_PSYCHIC" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -84,23 +89,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_CONFUSION", - "MOVE_DOUBLE_TEAM" - ], - "11": "MOVE_SAFEGUARD", - "20": "MOVE_MIST", - "29": "MOVE_AURORA_BEAM", - "38": "MOVE_FUTURE_SIGHT", - "47": "MOVE_SLASH", - "57": "MOVE_MOONLIGHT", - "66": "MOVE_PSYCHO_CUT", - "75": "MOVE_PSYCHO_SHIFT", - "84": "MOVE_LUNAR_DANCE", - "93": "MOVE_PSYCHIC" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -112,9 +101,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 15, @@ -129,7 +119,7 @@ "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émon" + "category": "Lunar Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json index 5e980e2fd8..1488241dfa 100644 --- a/res/pokemon/croagunk/data.json +++ b/res/pokemon/croagunk/data.json @@ -8,10 +8,7 @@ "special_attack": 61, "special_defense": 40 }, - "types": [ - "TYPE_POISON", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_POISON", "TYPE_FIGHTING" ], "catch_rate": 140, "base_exp_reward": 83, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 10, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_ANTICIPATION", - "ABILITY_DRY_SKIN" - ], - "great_marsh_flee_rate": 150, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 3, "MOVE_MUD_SLAP" ], + [ 8, "MOVE_POISON_STING" ], + [ 10, "MOVE_TAUNT" ], + [ 15, "MOVE_PURSUIT" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 22, "MOVE_REVENGE" ], + [ 24, "MOVE_SWAGGER" ], + [ 29, "MOVE_MUD_BOMB" ], + [ 31, "MOVE_SUCKER_PUNCH" ], + [ 36, "MOVE_NASTY_PLOT" ], + [ 38, "MOVE_POISON_JAB" ], + [ 43, "MOVE_SLUDGE_BOMB" ], + [ 45, "MOVE_FLATTER" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -87,23 +94,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_ASTONISH", - "3": "MOVE_MUD_SLAP", - "8": "MOVE_POISON_STING", - "10": "MOVE_TAUNT", - "15": "MOVE_PURSUIT", - "17": "MOVE_FAINT_ATTACK", - "22": "MOVE_REVENGE", - "24": "MOVE_SWAGGER", - "29": "MOVE_MUD_BOMB", - "31": "MOVE_SUCKER_PUNCH", - "36": "MOVE_NASTY_PLOT", - "38": "MOVE_POISON_JAB", - "43": "MOVE_SLUDGE_BOMB", - "45": "MOVE_FLATTER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -127,8 +118,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -143,7 +134,7 @@ "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émon" + "category": "Toxic Mouth Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -152,4 +143,4 @@ "rarity": 3, "unused": 4108 } -} +} \ No newline at end of file diff --git a/res/pokemon/crobat/data.json b/res/pokemon/crobat/data.json index 2bcb126992..295357921b 100644 --- a/res/pokemon/crobat/data.json +++ b/res/pokemon/crobat/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 80 }, - "types": [ - "TYPE_POISON", - "TYPE_FLYING" - ], + "types": [ "TYPE_POISON", "TYPE_FLYING" ], "catch_rate": 90, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CROSS_POISON" ], + [ 1, "MOVE_SCREECH" ], + [ 1, "MOVE_LEECH_LIFE" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_ASTONISH" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_ASTONISH" ], + [ 13, "MOVE_BITE" ], + [ 17, "MOVE_WING_ATTACK" ], + [ 21, "MOVE_CONFUSE_RAY" ], + [ 27, "MOVE_AIR_CUTTER" ], + [ 33, "MOVE_MEAN_LOOK" ], + [ 39, "MOVE_POISON_FANG" ], + [ 45, "MOVE_HAZE" ], + [ 51, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -83,26 +91,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_CROSS_POISON", - "MOVE_SCREECH", - "MOVE_LEECH_LIFE", - "MOVE_SUPERSONIC", - "MOVE_ASTONISH" - ], - "5": "MOVE_SUPERSONIC", - "9": "MOVE_ASTONISH", - "13": "MOVE_BITE", - "17": "MOVE_WING_ATTACK", - "21": "MOVE_CONFUSE_RAY", - "27": "MOVE_AIR_CUTTER", - "33": "MOVE_MEAN_LOOK", - "39": "MOVE_POISON_FANG", - "45": "MOVE_HAZE", - "51": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -113,9 +102,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -130,7 +120,7 @@ "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émon" + "category": "Bat Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json index 31d1cdab51..0834026fa6 100644 --- a/res/pokemon/croconaw/data.json +++ b/res/pokemon/croconaw/data.json @@ -8,10 +8,7 @@ "special_attack": 59, "special_defense": 63 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 143, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WATER_GUN" ], + [ 6, "MOVE_WATER_GUN" ], + [ 8, "MOVE_RAGE" ], + [ 13, "MOVE_BITE" ], + [ 15, "MOVE_SCARY_FACE" ], + [ 21, "MOVE_ICE_FANG" ], + [ 24, "MOVE_FLAIL" ], + [ 30, "MOVE_CRUNCH" ], + [ 33, "MOVE_SLASH" ], + [ 39, "MOVE_SCREECH" ], + [ 42, "MOVE_THRASH" ], + [ 48, "MOVE_AQUA_TAIL" ], + [ 51, "MOVE_SUPERPOWER" ], + [ 57, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -83,27 +92,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_WATER_GUN" - ], - "6": "MOVE_WATER_GUN", - "8": "MOVE_RAGE", - "13": "MOVE_BITE", - "15": "MOVE_SCARY_FACE", - "21": "MOVE_ICE_FANG", - "24": "MOVE_FLAIL", - "30": "MOVE_CRUNCH", - "33": "MOVE_SLASH", - "39": "MOVE_SCREECH", - "42": "MOVE_THRASH", - "48": "MOVE_AQUA_TAIL", - "51": "MOVE_SUPERPOWER", - "57": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -124,8 +113,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -139,8 +128,8 @@ "pokemon_pos_f": 13, "trainer_pos_m": 9, "pokemon_pos_m": 13, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -149,4 +138,4 @@ "rarity": 10, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/cubone/data.json b/res/pokemon/cubone/data.json index 21396034cb..6d513aa697 100644 --- a/res/pokemon/cubone/data.json +++ b/res/pokemon/cubone/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 50 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 190, "base_exp_reward": 87, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_LIGHTNING_ROD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 3, "MOVE_TAIL_WHIP" ], + [ 7, "MOVE_BONE_CLUB" ], + [ 11, "MOVE_HEADBUTT" ], + [ 13, "MOVE_LEER" ], + [ 17, "MOVE_FOCUS_ENERGY" ], + [ 21, "MOVE_BONEMERANG" ], + [ 23, "MOVE_RAGE" ], + [ 27, "MOVE_FALSE_SWIPE" ], + [ 31, "MOVE_THRASH" ], + [ 33, "MOVE_FLING" ], + [ 37, "MOVE_BONE_RUSH" ], + [ 41, "MOVE_ENDEAVOR" ], + [ 43, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -84,23 +91,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_GROWL", - "3": "MOVE_TAIL_WHIP", - "7": "MOVE_BONE_CLUB", - "11": "MOVE_HEADBUTT", - "13": "MOVE_LEER", - "17": "MOVE_FOCUS_ENERGY", - "21": "MOVE_BONEMERANG", - "23": "MOVE_RAGE", - "27": "MOVE_FALSE_SWIPE", - "31": "MOVE_THRASH", - "33": "MOVE_FLING", - "37": "MOVE_BONE_RUSH", - "41": "MOVE_ENDEAVOR", - "43": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -122,8 +113,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -138,7 +129,7 @@ "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émon" + "category": "Lonely Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -147,4 +138,4 @@ "rarity": 30, "unused": 2056 } -} +} \ No newline at end of file diff --git a/res/pokemon/cyndaquil/data.json b/res/pokemon/cyndaquil/data.json index 118544e6b8..1dbe14d08f 100644 --- a/res/pokemon/cyndaquil/data.json +++ b/res/pokemon/cyndaquil/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 50 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_LEER" ], + [ 4, "MOVE_SMOKE_SCREEN" ], + [ 10, "MOVE_EMBER" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 19, "MOVE_FLAME_WHEEL" ], + [ 22, "MOVE_DEFENSE_CURL" ], + [ 28, "MOVE_SWIFT" ], + [ 31, "MOVE_LAVA_PLUME" ], + [ 37, "MOVE_FLAMETHROWER" ], + [ 40, "MOVE_ROLLOUT" ], + [ 46, "MOVE_DOUBLE_EDGE" ], + [ 49, "MOVE_ERUPTION" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -70,24 +76,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_LEER" - ], - "4": "MOVE_SMOKE_SCREEN", - "10": "MOVE_EMBER", - "13": "MOVE_QUICK_ATTACK", - "19": "MOVE_FLAME_WHEEL", - "22": "MOVE_DEFENSE_CURL", - "28": "MOVE_SWIFT", - "31": "MOVE_LAVA_PLUME", - "37": "MOVE_FLAMETHROWER", - "40": "MOVE_ROLLOUT", - "46": "MOVE_DOUBLE_EDGE", - "49": "MOVE_ERUPTION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -103,8 +92,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -119,7 +108,7 @@ "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émon" + "category": "Fire Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -128,4 +117,4 @@ "rarity": 30, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/darkrai/data.json b/res/pokemon/darkrai/data.json index 3314b67bf1..bb73984a98 100644 --- a/res/pokemon/darkrai/data.json +++ b/res/pokemon/darkrai/data.json @@ -8,10 +8,7 @@ "special_attack": 135, "special_defense": 90 }, - "types": [ - "TYPE_DARK", - "TYPE_DARK" - ], + "types": [ "TYPE_DARK", "TYPE_DARK" ], "catch_rate": 3, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_BAD_DREAMS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_BAD_DREAMS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_OMINOUS_WIND" ], + [ 1, "MOVE_DISABLE" ], + [ 11, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_HYPNOSIS" ], + [ 29, "MOVE_FAINT_ATTACK" ], + [ 38, "MOVE_NIGHTMARE" ], + [ 47, "MOVE_DOUBLE_TEAM" ], + [ 57, "MOVE_HAZE" ], + [ 66, "MOVE_DARK_VOID" ], + [ 75, "MOVE_NASTY_PLOT" ], + [ 84, "MOVE_DREAM_EATER" ], + [ 93, "MOVE_DARK_PULSE" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -102,23 +107,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_OMINOUS_WIND", - "MOVE_DISABLE" - ], - "11": "MOVE_QUICK_ATTACK", - "20": "MOVE_HYPNOSIS", - "29": "MOVE_FAINT_ATTACK", - "38": "MOVE_NIGHTMARE", - "47": "MOVE_DOUBLE_TEAM", - "57": "MOVE_HAZE", - "66": "MOVE_DARK_VOID", - "75": "MOVE_NASTY_PLOT", - "84": "MOVE_DREAM_EATER", - "93": "MOVE_DARK_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -131,9 +120,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 15, @@ -148,7 +138,7 @@ "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émon" + "category": "Pitch-Black Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/delcatty/data.json b/res/pokemon/delcatty/data.json index ca053f833f..cfa72e54da 100644 --- a/res/pokemon/delcatty/data.json +++ b/res/pokemon/delcatty/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 60, "base_exp_reward": 138, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_NORMALIZE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NORMALIZE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FAKE_OUT" ], + [ 1, "MOVE_ATTRACT" ], + [ 1, "MOVE_SING" ], + [ 1, "MOVE_DOUBLE_SLAP" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -87,15 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_FAKE_OUT", - "MOVE_ATTRACT", - "MOVE_SING", - "MOVE_DOUBLE_SLAP" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -107,9 +96,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -124,7 +114,7 @@ "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émon" + "category": "Prim Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/delibird/data.json b/res/pokemon/delibird/data.json index 44de8b5510..ac905d9bb0 100644 --- a/res/pokemon/delibird/data.json +++ b/res/pokemon/delibird/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 45 }, - "types": [ - "TYPE_ICE", - "TYPE_FLYING" - ], + "types": [ "TYPE_ICE", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 183, "ev_yields": { @@ -30,21 +27,18 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_VITAL_SPIRIT", - "ABILITY_HUSTLE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PRESENT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -77,10 +71,7 @@ "HM02", "HM05" ], - "level_up": { - "1": "MOVE_PRESENT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -91,9 +82,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -108,7 +100,7 @@ "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émon" + "category": "Delivery Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/deoxys/data.json b/res/pokemon/deoxys/data.json index a19887308e..dacc29844f 100644 --- a/res/pokemon/deoxys/data.json +++ b/res/pokemon/deoxys/data.json @@ -8,10 +8,7 @@ "special_attack": 150, "special_defense": 50 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WRAP" ], + [ 9, "MOVE_NIGHT_SHADE" ], + [ 17, "MOVE_TELEPORT" ], + [ 25, "MOVE_KNOCK_OFF" ], + [ 33, "MOVE_PURSUIT" ], + [ 41, "MOVE_PSYCHIC" ], + [ 49, "MOVE_SNATCH" ], + [ 57, "MOVE_PSYCHO_SHIFT" ], + [ 65, "MOVE_ZEN_HEADBUTT" ], + [ 73, "MOVE_COSMIC_POWER" ], + [ 81, "MOVE_RECOVER" ], + [ 89, "MOVE_PSYCHO_BOOST" ], + [ 97, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -104,25 +111,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_WRAP" - ], - "9": "MOVE_NIGHT_SHADE", - "17": "MOVE_TELEPORT", - "25": "MOVE_KNOCK_OFF", - "33": "MOVE_PURSUIT", - "41": "MOVE_PSYCHIC", - "49": "MOVE_SNATCH", - "57": "MOVE_PSYCHO_SHIFT", - "65": "MOVE_ZEN_HEADBUTT", - "73": "MOVE_COSMIC_POWER", - "81": "MOVE_RECOVER", - "89": "MOVE_PSYCHO_BOOST", - "97": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -136,9 +125,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 17, @@ -152,8 +142,8 @@ "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émon.", - "category": "DNA Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/deoxys/forms/attack/data.json b/res/pokemon/deoxys/forms/attack/data.json index 9bbe18419d..c2f58d03a7 100644 --- a/res/pokemon/deoxys/forms/attack/data.json +++ b/res/pokemon/deoxys/forms/attack/data.json @@ -8,10 +8,7 @@ "special_attack": 180, "special_defense": 20 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WRAP" ], + [ 9, "MOVE_NIGHT_SHADE" ], + [ 17, "MOVE_TELEPORT" ], + [ 25, "MOVE_TAUNT" ], + [ 33, "MOVE_PURSUIT" ], + [ 41, "MOVE_PSYCHIC" ], + [ 49, "MOVE_SUPERPOWER" ], + [ 57, "MOVE_PSYCHO_SHIFT" ], + [ 65, "MOVE_ZEN_HEADBUTT" ], + [ 73, "MOVE_COSMIC_POWER" ], + [ 81, "MOVE_ZAP_CANNON" ], + [ 89, "MOVE_PSYCHO_BOOST" ], + [ 97, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -104,25 +111,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_WRAP" - ], - "9": "MOVE_NIGHT_SHADE", - "17": "MOVE_TELEPORT", - "25": "MOVE_TAUNT", - "33": "MOVE_PURSUIT", - "41": "MOVE_PSYCHIC", - "49": "MOVE_SUPERPOWER", - "57": "MOVE_PSYCHO_SHIFT", - "65": "MOVE_ZEN_HEADBUTT", - "73": "MOVE_COSMIC_POWER", - "81": "MOVE_ZAP_CANNON", - "89": "MOVE_PSYCHO_BOOST", - "97": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -130,5 +119,6 @@ "MOVE_ZEN_HEADBUTT", "MOVE_TRICK" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/deoxys/forms/defense/data.json b/res/pokemon/deoxys/forms/defense/data.json index 619aa9f8d0..44c3ef8c35 100644 --- a/res/pokemon/deoxys/forms/defense/data.json +++ b/res/pokemon/deoxys/forms/defense/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 160 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WRAP" ], + [ 9, "MOVE_NIGHT_SHADE" ], + [ 17, "MOVE_TELEPORT" ], + [ 25, "MOVE_KNOCK_OFF" ], + [ 33, "MOVE_SPIKES" ], + [ 41, "MOVE_PSYCHIC" ], + [ 49, "MOVE_SNATCH" ], + [ 57, "MOVE_PSYCHO_SHIFT" ], + [ 65, "MOVE_ZEN_HEADBUTT" ], + [ 73, "MOVE_IRON_DEFENSE" ], + [ 73, "MOVE_AMNESIA" ], + [ 81, "MOVE_RECOVER" ], + [ 89, "MOVE_PSYCHO_BOOST" ], + [ 97, "MOVE_COUNTER" ], + [ 97, "MOVE_MIRROR_COAT" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -104,31 +113,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_WRAP" - ], - "9": "MOVE_NIGHT_SHADE", - "17": "MOVE_TELEPORT", - "25": "MOVE_KNOCK_OFF", - "33": "MOVE_SPIKES", - "41": "MOVE_PSYCHIC", - "49": "MOVE_SNATCH", - "57": "MOVE_PSYCHO_SHIFT", - "65": "MOVE_ZEN_HEADBUTT", - "73": [ - "MOVE_IRON_DEFENSE", - "MOVE_AMNESIA" - ], - "81": "MOVE_RECOVER", - "89": "MOVE_PSYCHO_BOOST", - "97": [ - "MOVE_COUNTER", - "MOVE_MIRROR_COAT" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -137,5 +122,6 @@ "MOVE_TRICK", "MOVE_KNOCK_OFF" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/deoxys/forms/speed/data.json b/res/pokemon/deoxys/forms/speed/data.json index db0064f169..de1c0120f2 100644 --- a/res/pokemon/deoxys/forms/speed/data.json +++ b/res/pokemon/deoxys/forms/speed/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 90 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WRAP" ], + [ 9, "MOVE_NIGHT_SHADE" ], + [ 17, "MOVE_DOUBLE_TEAM" ], + [ 25, "MOVE_KNOCK_OFF" ], + [ 33, "MOVE_PURSUIT" ], + [ 41, "MOVE_PSYCHIC" ], + [ 49, "MOVE_SWIFT" ], + [ 57, "MOVE_PSYCHO_SHIFT" ], + [ 65, "MOVE_ZEN_HEADBUTT" ], + [ 73, "MOVE_AGILITY" ], + [ 81, "MOVE_RECOVER" ], + [ 89, "MOVE_PSYCHO_BOOST" ], + [ 97, "MOVE_EXTREME_SPEED" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -104,25 +111,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_WRAP" - ], - "9": "MOVE_NIGHT_SHADE", - "17": "MOVE_DOUBLE_TEAM", - "25": "MOVE_KNOCK_OFF", - "33": "MOVE_PURSUIT", - "41": "MOVE_PSYCHIC", - "49": "MOVE_SWIFT", - "57": "MOVE_PSYCHO_SHIFT", - "65": "MOVE_ZEN_HEADBUTT", - "73": "MOVE_AGILITY", - "81": "MOVE_RECOVER", - "89": "MOVE_PSYCHO_BOOST", - "97": "MOVE_EXTREME_SPEED" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -131,5 +120,6 @@ "MOVE_KNOCK_OFF", "MOVE_SWIFT" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/dewgong/data.json b/res/pokemon/dewgong/data.json index 3b4def45ce..b457dfd458 100644 --- a/res/pokemon/dewgong/data.json +++ b/res/pokemon/dewgong/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 95 }, - "types": [ - "TYPE_WATER", - "TYPE_ICE" - ], + "types": [ "TYPE_WATER", "TYPE_ICE" ], "catch_rate": 75, "base_exp_reward": 176, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_HYDRATION" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HEADBUTT" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_SIGNAL_BEAM" ], + [ 1, "MOVE_ICY_WIND" ], + [ 3, "MOVE_GROWL" ], + [ 7, "MOVE_SIGNAL_BEAM" ], + [ 11, "MOVE_ICY_WIND" ], + [ 13, "MOVE_ENCORE" ], + [ 17, "MOVE_ICE_SHARD" ], + [ 21, "MOVE_REST" ], + [ 23, "MOVE_AQUA_RING" ], + [ 27, "MOVE_AURORA_BEAM" ], + [ 31, "MOVE_AQUA_JET" ], + [ 33, "MOVE_BRINE" ], + [ 34, "MOVE_SHEER_COLD" ], + [ 37, "MOVE_TAKE_DOWN" ], + [ 41, "MOVE_DIVE" ], + [ 43, "MOVE_AQUA_TAIL" ], + [ 47, "MOVE_ICE_BEAM" ], + [ 51, "MOVE_SAFEGUARD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,31 +89,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_HEADBUTT", - "MOVE_GROWL", - "MOVE_SIGNAL_BEAM", - "MOVE_ICY_WIND" - ], - "3": "MOVE_GROWL", - "7": "MOVE_SIGNAL_BEAM", - "11": "MOVE_ICY_WIND", - "13": "MOVE_ENCORE", - "17": "MOVE_ICE_SHARD", - "21": "MOVE_REST", - "23": "MOVE_AQUA_RING", - "27": "MOVE_AURORA_BEAM", - "31": "MOVE_AQUA_JET", - "33": "MOVE_BRINE", - "34": "MOVE_SHEER_COLD", - "37": "MOVE_TAKE_DOWN", - "41": "MOVE_DIVE", - "43": "MOVE_AQUA_TAIL", - "47": "MOVE_ICE_BEAM", - "51": "MOVE_SAFEGUARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", @@ -108,9 +97,10 @@ "MOVE_SIGNAL_BEAM" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -125,7 +115,7 @@ "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émon" + "category": "Sea Lion Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/dialga/data.json b/res/pokemon/dialga/data.json index dce7c94a31..2cc013dc1e 100644 --- a/res/pokemon/dialga/data.json +++ b/res/pokemon/dialga/data.json @@ -8,10 +8,7 @@ "special_attack": 150, "special_defense": 100 }, - "types": [ - "TYPE_STEEL", - "TYPE_DRAGON" - ], + "types": [ "TYPE_STEEL", "TYPE_DRAGON" ], "catch_rate": 30, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DRAGON_BREATH" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 10, "MOVE_METAL_CLAW" ], + [ 20, "MOVE_ANCIENT_POWER" ], + [ 30, "MOVE_DRAGON_CLAW" ], + [ 40, "MOVE_ROAR_OF_TIME" ], + [ 50, "MOVE_HEAL_BLOCK" ], + [ 60, "MOVE_EARTH_POWER" ], + [ 70, "MOVE_SLASH" ], + [ 80, "MOVE_FLASH_CANNON" ], + [ 90, "MOVE_AURA_SPHERE" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -95,22 +99,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_DRAGON_BREATH", - "MOVE_SCARY_FACE" - ], - "10": "MOVE_METAL_CLAW", - "20": "MOVE_ANCIENT_POWER", - "30": "MOVE_DRAGON_CLAW", - "40": "MOVE_ROAR_OF_TIME", - "50": "MOVE_HEAL_BLOCK", - "60": "MOVE_EARTH_POWER", - "70": "MOVE_SLASH", - "80": "MOVE_FLASH_CANNON", - "90": "MOVE_AURA_SPHERE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_IRON_HEAD", @@ -124,9 +113,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 54, @@ -140,8 +130,8 @@ "pokemon_pos_f": 2, "trainer_pos_m": 26, "pokemon_pos_m": 2, - "entry_text": "A legendary Pokémon of Sinnoh.\nIt is said that time flows when\nDIALGA’s heart beats.", - "category": "Temporal Pokémon" + "entry_text": "A legendary Pok\u00e9mon of Sinnoh.\nIt is said that time flows when\nDIALGA\u2019s heart beats.", + "category": "Temporal Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/diglett/data.json b/res/pokemon/diglett/data.json index 050353c77e..970c035034 100644 --- a/res/pokemon/diglett/data.json +++ b/res/pokemon/diglett/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 45 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 81, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_ARENA_TRAP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 4, "MOVE_GROWL" ], + [ 7, "MOVE_ASTONISH" ], + [ 12, "MOVE_MAGNITUDE" ], + [ 15, "MOVE_MUD_SLAP" ], + [ 18, "MOVE_DIG" ], + [ 23, "MOVE_SUCKER_PUNCH" ], + [ 26, "MOVE_EARTH_POWER" ], + [ 29, "MOVE_MUD_BOMB" ], + [ 34, "MOVE_SLASH" ], + [ 37, "MOVE_EARTHQUAKE" ], + [ 40, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -75,24 +81,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_SAND_ATTACK" - ], - "4": "MOVE_GROWL", - "7": "MOVE_ASTONISH", - "12": "MOVE_MAGNITUDE", - "15": "MOVE_MUD_SLAP", - "18": "MOVE_DIG", - "23": "MOVE_SUCKER_PUNCH", - "26": "MOVE_EARTH_POWER", - "29": "MOVE_MUD_BOMB", - "34": "MOVE_SLASH", - "37": "MOVE_EARTHQUAKE", - "40": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_EARTH_POWER", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 2, @@ -122,8 +111,8 @@ "pokemon_pos_f": 32, "trainer_pos_m": 9, "pokemon_pos_m": 32, - "entry_text": "A Pokémon that lives underground.\nBecause of its dark habitat, it is\nrepelled by bright sunlight.", - "category": "Mole Pokémon" + "entry_text": "A Pok\u00e9mon that lives underground.\nBecause of its dark habitat, it is\nrepelled by bright sunlight.", + "category": "Mole Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -132,4 +121,4 @@ "rarity": 50, "unused": 2056 } -} +} \ No newline at end of file diff --git a/res/pokemon/ditto/data.json b/res/pokemon/ditto/data.json index 80b92946f4..1babe2e950 100644 --- a/res/pokemon/ditto/data.json +++ b/res/pokemon/ditto/data.json @@ -8,10 +8,7 @@ "special_attack": 48, "special_defense": 48 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 35, "base_exp_reward": 61, "ev_yields": { @@ -30,29 +27,24 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_DITTO", - "EGG_GROUP_DITTO" - ], - "abilities": [ - "ABILITY_LIMBER", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_DITTO", "EGG_GROUP_DITTO" ], + "abilities": [ "ABILITY_LIMBER", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_TRANSFORM" - }, - "tutor": [] + "by_level": [ + [ 1, "MOVE_TRANSFORM" ] + ], + "by_tm": [ ], + "by_tutor": [ ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -67,7 +59,7 @@ "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émon" + "category": "Transform Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/dodrio/data.json b/res/pokemon/dodrio/data.json index 200fc461b1..ff334814d6 100644 --- a/res/pokemon/dodrio/data.json +++ b/res/pokemon/dodrio/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 158, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PLUCK" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_RAGE" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 10, "MOVE_RAGE" ], + [ 14, "MOVE_FURY_ATTACK" ], + [ 19, "MOVE_PURSUIT" ], + [ 23, "MOVE_UPROAR" ], + [ 28, "MOVE_ACUPRESSURE" ], + [ 34, "MOVE_TRI_ATTACK" ], + [ 41, "MOVE_AGILITY" ], + [ 47, "MOVE_DRILL_PECK" ], + [ 54, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -74,26 +82,7 @@ "TM90", "HM02" ], - "level_up": { - "1": [ - "MOVE_PLUCK", - "MOVE_PECK", - "MOVE_GROWL", - "MOVE_QUICK_ATTACK", - "MOVE_RAGE" - ], - "5": "MOVE_QUICK_ATTACK", - "10": "MOVE_RAGE", - "14": "MOVE_FURY_ATTACK", - "19": "MOVE_PURSUIT", - "23": "MOVE_UPROAR", - "28": "MOVE_ACUPRESSURE", - "34": "MOVE_TRI_ATTACK", - "41": "MOVE_AGILITY", - "47": "MOVE_DRILL_PECK", - "54": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -103,9 +92,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -120,7 +110,7 @@ "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émon" + "category": "Triple Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/doduo/data.json b/res/pokemon/doduo/data.json index 766bdd0ed5..34a1797692 100644 --- a/res/pokemon/doduo/data.json +++ b/res/pokemon/doduo/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 190, "base_exp_reward": 96, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 10, "MOVE_RAGE" ], + [ 14, "MOVE_FURY_ATTACK" ], + [ 19, "MOVE_PURSUIT" ], + [ 23, "MOVE_UPROAR" ], + [ 28, "MOVE_ACUPRESSURE" ], + [ 32, "MOVE_DOUBLE_HIT" ], + [ 37, "MOVE_AGILITY" ], + [ 41, "MOVE_DRILL_PECK" ], + [ 46, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -69,23 +74,7 @@ "TM90", "HM02" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_GROWL" - ], - "5": "MOVE_QUICK_ATTACK", - "10": "MOVE_RAGE", - "14": "MOVE_FURY_ATTACK", - "19": "MOVE_PURSUIT", - "23": "MOVE_UPROAR", - "28": "MOVE_ACUPRESSURE", - "32": "MOVE_DOUBLE_HIT", - "37": "MOVE_AGILITY", - "41": "MOVE_DRILL_PECK", - "46": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -103,8 +92,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -119,7 +108,7 @@ "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émon" + "category": "Twin Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -128,4 +117,4 @@ "rarity": 30, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/donphan/data.json b/res/pokemon/donphan/data.json index cda35dea1b..b62ce11870 100644 --- a/res/pokemon/donphan/data.json +++ b/res/pokemon/donphan/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 60, "base_exp_reward": 189, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_HORN_ATTACK" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_FLAIL" ], + [ 6, "MOVE_RAPID_SPIN" ], + [ 10, "MOVE_KNOCK_OFF" ], + [ 15, "MOVE_ROLLOUT" ], + [ 19, "MOVE_MAGNITUDE" ], + [ 24, "MOVE_SLAM" ], + [ 25, "MOVE_FURY_ATTACK" ], + [ 31, "MOVE_ASSURANCE" ], + [ 39, "MOVE_SCARY_FACE" ], + [ 46, "MOVE_EARTHQUAKE" ], + [ 54, "MOVE_GIGA_IMPACT" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -78,27 +87,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_HORN_ATTACK", - "MOVE_GROWL", - "MOVE_DEFENSE_CURL", - "MOVE_FLAIL" - ], - "6": "MOVE_RAPID_SPIN", - "10": "MOVE_KNOCK_OFF", - "15": "MOVE_ROLLOUT", - "19": "MOVE_MAGNITUDE", - "24": "MOVE_SLAM", - "25": "MOVE_FURY_ATTACK", - "31": "MOVE_ASSURANCE", - "39": "MOVE_SCARY_FACE", - "46": "MOVE_EARTHQUAKE", - "54": "MOVE_GIGA_IMPACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SUPERPOWER", @@ -113,9 +102,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -130,7 +120,7 @@ "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émon" + "category": "Armor Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/dragonair/data.json b/res/pokemon/dragonair/data.json index 03a9f50916..ab0e2b81cf 100644 --- a/res/pokemon/dragonair/data.json +++ b/res/pokemon/dragonair/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 70 }, - "types": [ - "TYPE_DRAGON", - "TYPE_DRAGON" - ], + "types": [ "TYPE_DRAGON", "TYPE_DRAGON" ], "catch_rate": 45, "base_exp_reward": 144, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WRAP" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_TWISTER" ], + [ 5, "MOVE_THUNDER_WAVE" ], + [ 11, "MOVE_TWISTER" ], + [ 15, "MOVE_DRAGON_RAGE" ], + [ 21, "MOVE_SLAM" ], + [ 25, "MOVE_AGILITY" ], + [ 33, "MOVE_AQUA_TAIL" ], + [ 39, "MOVE_DRAGON_RUSH" ], + [ 47, "MOVE_SAFEGUARD" ], + [ 53, "MOVE_DRAGON_DANCE" ], + [ 61, "MOVE_OUTRAGE" ], + [ 67, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -80,26 +88,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_WRAP", - "MOVE_LEER", - "MOVE_THUNDER_WAVE", - "MOVE_TWISTER" - ], - "5": "MOVE_THUNDER_WAVE", - "11": "MOVE_TWISTER", - "15": "MOVE_DRAGON_RAGE", - "21": "MOVE_SLAM", - "25": "MOVE_AGILITY", - "33": "MOVE_AQUA_TAIL", - "39": "MOVE_DRAGON_RUSH", - "47": "MOVE_SAFEGUARD", - "53": "MOVE_DRAGON_DANCE", - "61": "MOVE_OUTRAGE", - "67": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", "MOVE_SNORE", @@ -116,8 +105,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 40, @@ -132,7 +121,7 @@ "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émon" + "category": "Dragon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -141,4 +130,4 @@ "rarity": 10, "unused": 3855 } -} +} \ No newline at end of file diff --git a/res/pokemon/dragonite/data.json b/res/pokemon/dragonite/data.json index 2b2996595e..ee731287ba 100644 --- a/res/pokemon/dragonite/data.json +++ b/res/pokemon/dragonite/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_DRAGON", - "TYPE_FLYING" - ], + "types": [ "TYPE_DRAGON", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 218, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_THUNDER_PUNCH" ], + [ 1, "MOVE_ROOST" ], + [ 1, "MOVE_WRAP" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_TWISTER" ], + [ 5, "MOVE_THUNDER_WAVE" ], + [ 11, "MOVE_TWISTER" ], + [ 15, "MOVE_DRAGON_RAGE" ], + [ 21, "MOVE_SLAM" ], + [ 25, "MOVE_AGILITY" ], + [ 33, "MOVE_AQUA_TAIL" ], + [ 39, "MOVE_DRAGON_RUSH" ], + [ 47, "MOVE_SAFEGUARD" ], + [ 53, "MOVE_DRAGON_DANCE" ], + [ 55, "MOVE_WING_ATTACK" ], + [ 64, "MOVE_OUTRAGE" ], + [ 73, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM02", "TM03", @@ -100,30 +112,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_THUNDER_PUNCH", - "MOVE_ROOST", - "MOVE_WRAP", - "MOVE_LEER", - "MOVE_THUNDER_WAVE", - "MOVE_TWISTER" - ], - "5": "MOVE_THUNDER_WAVE", - "11": "MOVE_TWISTER", - "15": "MOVE_DRAGON_RAGE", - "21": "MOVE_SLAM", - "25": "MOVE_AGILITY", - "33": "MOVE_AQUA_TAIL", - "39": "MOVE_DRAGON_RUSH", - "47": "MOVE_SAFEGUARD", - "53": "MOVE_DRAGON_DANCE", - "55": "MOVE_WING_ATTACK", - "64": "MOVE_OUTRAGE", - "73": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -143,9 +132,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 22, @@ -160,7 +150,7 @@ "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émon" + "category": "Dragon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/drapion/data.json b/res/pokemon/drapion/data.json index 0c7d5f5193..540f53e471 100644 --- a/res/pokemon/drapion/data.json +++ b/res/pokemon/drapion/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 75 }, - "types": [ - "TYPE_POISON", - "TYPE_DARK" - ], + "types": [ "TYPE_POISON", "TYPE_DARK" ], "catch_rate": 45, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_BATTLE_ARMOR", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 60, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_KNOCK_OFF" ], + [ 6, "MOVE_KNOCK_OFF" ], + [ 12, "MOVE_PIN_MISSILE" ], + [ 17, "MOVE_ACUPRESSURE" ], + [ 23, "MOVE_SCARY_FACE" ], + [ 28, "MOVE_TOXIC_SPIKES" ], + [ 34, "MOVE_BUG_BITE" ], + [ 39, "MOVE_POISON_FANG" ], + [ 49, "MOVE_CRUNCH" ], + [ 58, "MOVE_CROSS_POISON" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -91,27 +100,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_THUNDER_FANG", - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_BITE", - "MOVE_POISON_STING", - "MOVE_LEER", - "MOVE_KNOCK_OFF" - ], - "6": "MOVE_KNOCK_OFF", - "12": "MOVE_PIN_MISSILE", - "17": "MOVE_ACUPRESSURE", - "23": "MOVE_SCARY_FACE", - "28": "MOVE_TOXIC_SPIKES", - "34": "MOVE_BUG_BITE", - "39": "MOVE_POISON_FANG", - "49": "MOVE_CRUNCH", - "58": "MOVE_CROSS_POISON" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_AQUA_TAIL", @@ -119,9 +108,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 13, @@ -136,7 +126,7 @@ "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émon" + "category": "Ogre Scorp Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index f1ecd55cde..2fd6ba654d 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_DRAGON", - "TYPE_DRAGON" - ], + "types": [ "TYPE_DRAGON", "TYPE_DRAGON" ], "catch_rate": 45, "base_exp_reward": 67, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WRAP" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_THUNDER_WAVE" ], + [ 11, "MOVE_TWISTER" ], + [ 15, "MOVE_DRAGON_RAGE" ], + [ 21, "MOVE_SLAM" ], + [ 25, "MOVE_AGILITY" ], + [ 31, "MOVE_AQUA_TAIL" ], + [ 35, "MOVE_DRAGON_RUSH" ], + [ 41, "MOVE_SAFEGUARD" ], + [ 45, "MOVE_DRAGON_DANCE" ], + [ 51, "MOVE_OUTRAGE" ], + [ 55, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -80,24 +86,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_WRAP", - "MOVE_LEER" - ], - "5": "MOVE_THUNDER_WAVE", - "11": "MOVE_TWISTER", - "15": "MOVE_DRAGON_RAGE", - "21": "MOVE_SLAM", - "25": "MOVE_AGILITY", - "31": "MOVE_AQUA_TAIL", - "35": "MOVE_DRAGON_RUSH", - "41": "MOVE_SAFEGUARD", - "45": "MOVE_DRAGON_DANCE", - "51": "MOVE_OUTRAGE", - "55": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", "MOVE_SNORE", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -129,8 +118,8 @@ "pokemon_pos_f": 6, "trainer_pos_m": 5, "pokemon_pos_m": 6, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -139,4 +128,4 @@ "rarity": 20, "unused": 3855 } -} +} \ No newline at end of file diff --git a/res/pokemon/drifblim/data.json b/res/pokemon/drifblim/data.json index a578445949..c70ed20fb7 100644 --- a/res/pokemon/drifblim/data.json +++ b/res/pokemon/drifblim/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 54 }, - "types": [ - "TYPE_GHOST", - "TYPE_FLYING" - ], + "types": [ "TYPE_GHOST", "TYPE_FLYING" ], "catch_rate": 60, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_AFTERMATH", - "ABILITY_UNBURDEN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_AFTERMATH", "ABILITY_UNBURDEN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_MINIMIZE" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_GUST" ], + [ 6, "MOVE_ASTONISH" ], + [ 11, "MOVE_GUST" ], + [ 14, "MOVE_FOCUS_ENERGY" ], + [ 17, "MOVE_PAYBACK" ], + [ 22, "MOVE_STOCKPILE" ], + [ 27, "MOVE_SWALLOW" ], + [ 27, "MOVE_SPIT_UP" ], + [ 32, "MOVE_OMINOUS_WIND" ], + [ 37, "MOVE_BATON_PASS" ], + [ 44, "MOVE_SHADOW_BALL" ], + [ 51, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -89,28 +97,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_CONSTRICT", - "MOVE_MINIMIZE", - "MOVE_ASTONISH", - "MOVE_GUST" - ], - "6": "MOVE_ASTONISH", - "11": "MOVE_GUST", - "14": "MOVE_FOCUS_ENERGY", - "17": "MOVE_PAYBACK", - "22": "MOVE_STOCKPILE", - "27": [ - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "32": "MOVE_OMINOUS_WIND", - "37": "MOVE_BATON_PASS", - "44": "MOVE_SHADOW_BALL", - "51": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -124,9 +111,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -141,7 +129,7 @@ "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émon" + "category": "Blimp Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 1d32469fe6..32dddddc53 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 44 }, - "types": [ - "TYPE_GHOST", - "TYPE_FLYING" - ], + "types": [ "TYPE_GHOST", "TYPE_FLYING" ], "catch_rate": 125, "base_exp_reward": 127, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_AFTERMATH", - "ABILITY_UNBURDEN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_AFTERMATH", "ABILITY_UNBURDEN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_MINIMIZE" ], + [ 6, "MOVE_ASTONISH" ], + [ 11, "MOVE_GUST" ], + [ 14, "MOVE_FOCUS_ENERGY" ], + [ 17, "MOVE_PAYBACK" ], + [ 22, "MOVE_STOCKPILE" ], + [ 27, "MOVE_SWALLOW" ], + [ 27, "MOVE_SPIT_UP" ], + [ 30, "MOVE_OMINOUS_WIND" ], + [ 33, "MOVE_BATON_PASS" ], + [ 38, "MOVE_SHADOW_BALL" ], + [ 43, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -86,26 +92,7 @@ "HM01", "HM05" ], - "level_up": { - "1": [ - "MOVE_CONSTRICT", - "MOVE_MINIMIZE" - ], - "6": "MOVE_ASTONISH", - "11": "MOVE_GUST", - "14": "MOVE_FOCUS_ENERGY", - "17": "MOVE_PAYBACK", - "22": "MOVE_STOCKPILE", - "27": [ - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "30": "MOVE_OMINOUS_WIND", - "33": "MOVE_BATON_PASS", - "38": "MOVE_SHADOW_BALL", - "43": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -127,8 +114,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -142,8 +129,8 @@ "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“Signpost for Wandering Spirits.”", - "category": "Balloon Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -152,4 +139,4 @@ "rarity": 20, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/drowzee/data.json b/res/pokemon/drowzee/data.json index b666314c27..6a92b0129b 100644 --- a/res/pokemon/drowzee/data.json +++ b/res/pokemon/drowzee/data.json @@ -8,10 +8,7 @@ "special_attack": 43, "special_defense": 90 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 190, "base_exp_reward": 102, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_FOREWARN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 7, "MOVE_DISABLE" ], + [ 9, "MOVE_CONFUSION" ], + [ 15, "MOVE_HEADBUTT" ], + [ 18, "MOVE_POISON_GAS" ], + [ 21, "MOVE_MEDITATE" ], + [ 26, "MOVE_PSYBEAM" ], + [ 29, "MOVE_PSYCH_UP" ], + [ 32, "MOVE_HEADBUTT" ], + [ 37, "MOVE_SWAGGER" ], + [ 40, "MOVE_PSYCHIC" ], + [ 43, "MOVE_NASTY_PLOT" ], + [ 50, "MOVE_ZEN_HEADBUTT" ], + [ 53, "MOVE_FUTURE_SIGHT" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -86,26 +94,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_HYPNOSIS" - ], - "7": "MOVE_DISABLE", - "9": "MOVE_CONFUSION", - "15": "MOVE_HEADBUTT", - "18": "MOVE_POISON_GAS", - "21": "MOVE_MEDITATE", - "26": "MOVE_PSYBEAM", - "29": "MOVE_PSYCH_UP", - "32": "MOVE_HEADBUTT", - "37": "MOVE_SWAGGER", - "40": "MOVE_PSYCHIC", - "43": "MOVE_NASTY_PLOT", - "50": "MOVE_ZEN_HEADBUTT", - "53": "MOVE_FUTURE_SIGHT" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_ICE_PUNCH", @@ -122,8 +111,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -138,7 +127,7 @@ "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émon" + "category": "Hypnosis Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -147,4 +136,4 @@ "rarity": 30, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/dugtrio/data.json b/res/pokemon/dugtrio/data.json index 4fe2502eec..4243fcc488 100644 --- a/res/pokemon/dugtrio/data.json +++ b/res/pokemon/dugtrio/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 70 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 50, "base_exp_reward": 153, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_ARENA_TRAP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_NIGHT_SLASH" ], + [ 1, "MOVE_TRI_ATTACK" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_GROWL" ], + [ 4, "MOVE_GROWL" ], + [ 7, "MOVE_ASTONISH" ], + [ 12, "MOVE_MAGNITUDE" ], + [ 15, "MOVE_MUD_SLAP" ], + [ 18, "MOVE_DIG" ], + [ 23, "MOVE_SUCKER_PUNCH" ], + [ 26, "MOVE_SAND_TOMB" ], + [ 28, "MOVE_EARTH_POWER" ], + [ 33, "MOVE_MUD_BOMB" ], + [ 40, "MOVE_SLASH" ], + [ 45, "MOVE_EARTHQUAKE" ], + [ 50, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,37 +88,17 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_NIGHT_SLASH", - "MOVE_TRI_ATTACK", - "MOVE_SCRATCH", - "MOVE_SAND_ATTACK", - "MOVE_GROWL" - ], - "4": "MOVE_GROWL", - "7": "MOVE_ASTONISH", - "12": "MOVE_MAGNITUDE", - "15": "MOVE_MUD_SLAP", - "18": "MOVE_DIG", - "23": "MOVE_SUCKER_PUNCH", - "26": "MOVE_SAND_TOMB", - "28": "MOVE_EARTH_POWER", - "33": "MOVE_MUD_BOMB", - "40": "MOVE_SLASH", - "45": "MOVE_EARTHQUAKE", - "50": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_EARTH_POWER", "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -123,7 +113,7 @@ "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émon" + "category": "Mole Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/dunsparce/data.json b/res/pokemon/dunsparce/data.json index d75a87aca9..5615158ab5 100644 --- a/res/pokemon/dunsparce/data.json +++ b/res/pokemon/dunsparce/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 190, "base_exp_reward": 125, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SERENE_GRACE", - "ABILITY_RUN_AWAY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_RAGE" ], + [ 5, "MOVE_DEFENSE_CURL" ], + [ 9, "MOVE_YAWN" ], + [ 13, "MOVE_GLARE" ], + [ 17, "MOVE_ROLLOUT" ], + [ 21, "MOVE_SPITE" ], + [ 25, "MOVE_PURSUIT" ], + [ 29, "MOVE_SCREECH" ], + [ 33, "MOVE_ROOST" ], + [ 37, "MOVE_TAKE_DOWN" ], + [ 41, "MOVE_ANCIENT_POWER" ], + [ 45, "MOVE_DIG" ], + [ 49, "MOVE_ENDEAVOR" ], + [ 53, "MOVE_FLAIL" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -91,23 +98,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_RAGE", - "5": "MOVE_DEFENSE_CURL", - "9": "MOVE_YAWN", - "13": "MOVE_GLARE", - "17": "MOVE_ROLLOUT", - "21": "MOVE_SPITE", - "25": "MOVE_PURSUIT", - "29": "MOVE_SCREECH", - "33": "MOVE_ROOST", - "37": "MOVE_TAKE_DOWN", - "41": "MOVE_ANCIENT_POWER", - "45": "MOVE_DIG", - "49": "MOVE_ENDEAVOR", - "53": "MOVE_FLAIL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_AQUA_TAIL", @@ -119,9 +110,10 @@ "MOVE_LAST_RESORT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 15, @@ -136,7 +128,7 @@ "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émon" + "category": "Land Snake Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/dusclops/data.json b/res/pokemon/dusclops/data.json index 444fa66fb9..34e3633f22 100644 --- a/res/pokemon/dusclops/data.json +++ b/res/pokemon/dusclops/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 130 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 90, "base_exp_reward": 179, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_ICE_PUNCH" ], + [ 1, "MOVE_THUNDER_PUNCH" ], + [ 1, "MOVE_GRAVITY" ], + [ 1, "MOVE_BIND" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_NIGHT_SHADE" ], + [ 1, "MOVE_DISABLE" ], + [ 6, "MOVE_DISABLE" ], + [ 9, "MOVE_FORESIGHT" ], + [ 14, "MOVE_ASTONISH" ], + [ 17, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_SHADOW_SNEAK" ], + [ 25, "MOVE_PURSUIT" ], + [ 30, "MOVE_CURSE" ], + [ 33, "MOVE_WILL_O_WISP" ], + [ 37, "MOVE_SHADOW_PUNCH" ], + [ 43, "MOVE_MEAN_LOOK" ], + [ 51, "MOVE_PAYBACK" ], + [ 61, "MOVE_FUTURE_SIGHT" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -93,31 +106,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_ICE_PUNCH", - "MOVE_THUNDER_PUNCH", - "MOVE_GRAVITY", - "MOVE_BIND", - "MOVE_LEER", - "MOVE_NIGHT_SHADE", - "MOVE_DISABLE" - ], - "6": "MOVE_DISABLE", - "9": "MOVE_FORESIGHT", - "14": "MOVE_ASTONISH", - "17": "MOVE_CONFUSE_RAY", - "22": "MOVE_SHADOW_SNEAK", - "25": "MOVE_PURSUIT", - "30": "MOVE_CURSE", - "33": "MOVE_WILL_O_WISP", - "37": "MOVE_SHADOW_PUNCH", - "43": "MOVE_MEAN_LOOK", - "51": "MOVE_PAYBACK", - "61": "MOVE_FUTURE_SIGHT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -138,8 +127,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 16, @@ -153,8 +142,8 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -163,4 +152,4 @@ "rarity": 20, "unused": 3084 } -} +} \ No newline at end of file diff --git a/res/pokemon/dusknoir/data.json b/res/pokemon/dusknoir/data.json index e179a2d76c..56ad72b51d 100644 --- a/res/pokemon/dusknoir/data.json +++ b/res/pokemon/dusknoir/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 135 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_ICE_PUNCH" ], + [ 1, "MOVE_THUNDER_PUNCH" ], + [ 1, "MOVE_GRAVITY" ], + [ 1, "MOVE_BIND" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_NIGHT_SHADE" ], + [ 1, "MOVE_DISABLE" ], + [ 6, "MOVE_DISABLE" ], + [ 9, "MOVE_FORESIGHT" ], + [ 14, "MOVE_ASTONISH" ], + [ 17, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_SHADOW_SNEAK" ], + [ 25, "MOVE_PURSUIT" ], + [ 30, "MOVE_CURSE" ], + [ 33, "MOVE_WILL_O_WISP" ], + [ 37, "MOVE_SHADOW_PUNCH" ], + [ 43, "MOVE_MEAN_LOOK" ], + [ 51, "MOVE_PAYBACK" ], + [ 61, "MOVE_FUTURE_SIGHT" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -94,31 +107,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_ICE_PUNCH", - "MOVE_THUNDER_PUNCH", - "MOVE_GRAVITY", - "MOVE_BIND", - "MOVE_LEER", - "MOVE_NIGHT_SHADE", - "MOVE_DISABLE" - ], - "6": "MOVE_DISABLE", - "9": "MOVE_FORESIGHT", - "14": "MOVE_ASTONISH", - "17": "MOVE_CONFUSE_RAY", - "22": "MOVE_SHADOW_SNEAK", - "25": "MOVE_PURSUIT", - "30": "MOVE_CURSE", - "33": "MOVE_WILL_O_WISP", - "37": "MOVE_SHADOW_PUNCH", - "43": "MOVE_MEAN_LOOK", - "51": "MOVE_PAYBACK", - "61": "MOVE_FUTURE_SIGHT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -131,9 +120,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 22, @@ -148,7 +138,7 @@ "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émon" + "category": "Gripper Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/duskull/data.json b/res/pokemon/duskull/data.json index be399aec1c..fb91dc1bb4 100644 --- a/res/pokemon/duskull/data.json +++ b/res/pokemon/duskull/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 90 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 190, "base_exp_reward": 97, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_NIGHT_SHADE" ], + [ 6, "MOVE_DISABLE" ], + [ 9, "MOVE_FORESIGHT" ], + [ 14, "MOVE_ASTONISH" ], + [ 17, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_SHADOW_SNEAK" ], + [ 25, "MOVE_PURSUIT" ], + [ 30, "MOVE_CURSE" ], + [ 33, "MOVE_WILL_O_WISP" ], + [ 38, "MOVE_MEAN_LOOK" ], + [ 41, "MOVE_PAYBACK" ], + [ 46, "MOVE_FUTURE_SIGHT" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -84,24 +90,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_NIGHT_SHADE" - ], - "6": "MOVE_DISABLE", - "9": "MOVE_FORESIGHT", - "14": "MOVE_ASTONISH", - "17": "MOVE_CONFUSE_RAY", - "22": "MOVE_SHADOW_SNEAK", - "25": "MOVE_PURSUIT", - "30": "MOVE_CURSE", - "33": "MOVE_WILL_O_WISP", - "38": "MOVE_MEAN_LOOK", - "41": "MOVE_PAYBACK", - "46": "MOVE_FUTURE_SIGHT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 8, @@ -134,7 +123,7 @@ "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émon" + "category": "Requiem Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -143,4 +132,4 @@ "rarity": 30, "unused": 3084 } -} +} \ No newline at end of file diff --git a/res/pokemon/dustox/data.json b/res/pokemon/dustox/data.json index 6128127278..6b72d076ea 100644 --- a/res/pokemon/dustox/data.json +++ b/res/pokemon/dustox/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 90 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 161, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHIELD_DUST", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONFUSION" ], + [ 10, "MOVE_CONFUSION" ], + [ 13, "MOVE_GUST" ], + [ 17, "MOVE_PROTECT" ], + [ 20, "MOVE_MOONLIGHT" ], + [ 24, "MOVE_PSYBEAM" ], + [ 27, "MOVE_WHIRLWIND" ], + [ 31, "MOVE_LIGHT_SCREEN" ], + [ 34, "MOVE_SILVER_WIND" ], + [ 38, "MOVE_TOXIC" ], + [ 41, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,20 +83,7 @@ "TM90", "HM05" ], - "level_up": { - "1": "MOVE_CONFUSION", - "10": "MOVE_CONFUSION", - "13": "MOVE_GUST", - "17": "MOVE_PROTECT", - "20": "MOVE_MOONLIGHT", - "24": "MOVE_PSYBEAM", - "27": "MOVE_WHIRLWIND", - "31": "MOVE_LIGHT_SCREEN", - "34": "MOVE_SILVER_WIND", - "38": "MOVE_TOXIC", - "41": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -101,9 +92,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -118,7 +110,7 @@ "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émon" + "category": "Poison Moth Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/eevee/data.json b/res/pokemon/eevee/data.json index 13bba39656..aee78cc4b5 100644 --- a/res/pokemon/eevee/data.json +++ b/res/pokemon/eevee/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 92, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 35, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_ADAPTABILITY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_ADAPTABILITY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_GROWL" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_BITE" ], + [ 36, "MOVE_BATON_PASS" ], + [ 43, "MOVE_TAKE_DOWN" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_TRUMP_CARD" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -67,22 +71,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_GROWL", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_BITE", - "36": "MOVE_BATON_PASS", - "43": "MOVE_TAKE_DOWN", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_TRUMP_CARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -91,14 +80,8 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_MOSS_ROCK", - "SPECIES_LEAFEON" - ], - [ - "EVO_LEVEL_ICE_ROCK", - "SPECIES_GLACEON" - ], + [ "EVO_LEVEL_MOSS_ROCK", "SPECIES_LEAFEON" ], + [ "EVO_LEVEL_ICE_ROCK", "SPECIES_GLACEON" ], [ "EVO_USE_ITEM", "ITEM_THUNDERSTONE", @@ -114,18 +97,12 @@ "ITEM_FIRE_STONE", "SPECIES_FLAREON" ], - [ - "EVO_LEVEL_HAPPINESS_DAY", - "SPECIES_ESPEON" - ], - [ - "EVO_LEVEL_HAPPINESS_NIGHT", - "SPECIES_UMBREON" - ] + [ "EVO_LEVEL_HAPPINESS_DAY", "SPECIES_ESPEON" ], + [ "EVO_LEVEL_HAPPINESS_NIGHT", "SPECIES_UMBREON" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -140,7 +117,7 @@ "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émon" + "category": "Evolution Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -149,4 +126,4 @@ "rarity": 3, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/egg/data.json b/res/pokemon/egg/data.json index 76a6bcf139..caddb82cf6 100644 --- a/res/pokemon/egg/data.json +++ b/res/pokemon/egg/data.json @@ -8,10 +8,7 @@ "special_attack": 10, "special_defense": 10 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 3, "base_exp_reward": 255, "ev_yields": { @@ -30,23 +27,18 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_NONE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_NONE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_EGG", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_SPLASH" - } - } + "by_level": [ + [ 1, "MOVE_SPLASH" ] + ], + "by_tm": [ ] + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/ekans/data.json b/res/pokemon/ekans/data.json index e5415a60c5..59f7084f10 100644 --- a/res/pokemon/ekans/data.json +++ b/res/pokemon/ekans/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 54 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 255, "base_exp_reward": 62, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_SHED_SKIN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_SHED_SKIN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WRAP" ], + [ 1, "MOVE_LEER" ], + [ 4, "MOVE_POISON_STING" ], + [ 9, "MOVE_BITE" ], + [ 12, "MOVE_GLARE" ], + [ 17, "MOVE_SCREECH" ], + [ 20, "MOVE_ACID" ], + [ 25, "MOVE_STOCKPILE" ], + [ 25, "MOVE_SWALLOW" ], + [ 25, "MOVE_SPIT_UP" ], + [ 28, "MOVE_MUD_BOMB" ], + [ 33, "MOVE_GASTRO_ACID" ], + [ 36, "MOVE_HAZE" ], + [ 41, "MOVE_GUNK_SHOT" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,27 +85,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_WRAP", - "MOVE_LEER" - ], - "4": "MOVE_POISON_STING", - "9": "MOVE_BITE", - "12": "MOVE_GLARE", - "17": "MOVE_SCREECH", - "20": "MOVE_ACID", - "25": [ - "MOVE_STOCKPILE", - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "28": "MOVE_MUD_BOMB", - "33": "MOVE_GASTRO_ACID", - "36": "MOVE_HAZE", - "41": "MOVE_GUNK_SHOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_AQUA_TAIL", "MOVE_GASTRO_ACID", "MOVE_SNORE", @@ -115,8 +102,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -131,7 +118,7 @@ "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émon" + "category": "Snake Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -140,4 +127,4 @@ "rarity": 50, "unused": 1542 } -} +} \ No newline at end of file diff --git a/res/pokemon/electabuzz/data.json b/res/pokemon/electabuzz/data.json index e395d8fa49..8faf92a227 100644 --- a/res/pokemon/electabuzz/data.json +++ b/res/pokemon/electabuzz/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 85 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 45, "base_exp_reward": 156, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 7, "MOVE_THUNDER_SHOCK" ], + [ 10, "MOVE_LOW_KICK" ], + [ 16, "MOVE_SWIFT" ], + [ 19, "MOVE_SHOCK_WAVE" ], + [ 25, "MOVE_LIGHT_SCREEN" ], + [ 28, "MOVE_THUNDER_PUNCH" ], + [ 37, "MOVE_DISCHARGE" ], + [ 43, "MOVE_THUNDERBOLT" ], + [ 52, "MOVE_SCREECH" ], + [ 58, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -82,24 +88,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_QUICK_ATTACK", - "MOVE_LEER", - "MOVE_THUNDER_SHOCK" - ], - "7": "MOVE_THUNDER_SHOCK", - "10": "MOVE_LOW_KICK", - "16": "MOVE_SWIFT", - "19": "MOVE_SHOCK_WAVE", - "25": "MOVE_LIGHT_SCREEN", - "28": "MOVE_THUNDER_PUNCH", - "37": "MOVE_DISCHARGE", - "43": "MOVE_THUNDERBOLT", - "52": "MOVE_SCREECH", - "58": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -135,7 +124,7 @@ "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émon" + "category": "Electric Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -144,4 +133,4 @@ "rarity": 20, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/electivire/data.json b/res/pokemon/electivire/data.json index 83218ba307..7caa8e3043 100644 --- a/res/pokemon/electivire/data.json +++ b/res/pokemon/electivire/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 85 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 30, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_MOTOR_DRIVE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_LOW_KICK" ], + [ 7, "MOVE_THUNDER_SHOCK" ], + [ 10, "MOVE_LOW_KICK" ], + [ 16, "MOVE_SWIFT" ], + [ 19, "MOVE_SHOCK_WAVE" ], + [ 25, "MOVE_LIGHT_SCREEN" ], + [ 28, "MOVE_THUNDER_PUNCH" ], + [ 37, "MOVE_DISCHARGE" ], + [ 43, "MOVE_THUNDERBOLT" ], + [ 52, "MOVE_SCREECH" ], + [ 58, "MOVE_THUNDER" ], + [ 67, "MOVE_GIGA_IMPACT" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -89,27 +98,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_QUICK_ATTACK", - "MOVE_LEER", - "MOVE_THUNDER_SHOCK", - "MOVE_LOW_KICK" - ], - "7": "MOVE_THUNDER_SHOCK", - "10": "MOVE_LOW_KICK", - "16": "MOVE_SWIFT", - "19": "MOVE_SHOCK_WAVE", - "25": "MOVE_LIGHT_SCREEN", - "28": "MOVE_THUNDER_PUNCH", - "37": "MOVE_DISCHARGE", - "43": "MOVE_THUNDERBOLT", - "52": "MOVE_SCREECH", - "58": "MOVE_THUNDER", - "67": "MOVE_GIGA_IMPACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -121,9 +110,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 18, @@ -138,7 +128,7 @@ "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émon" + "category": "Thunderbolt Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/electrike/data.json b/res/pokemon/electrike/data.json index b371adc7e6..44862bd249 100644 --- a/res/pokemon/electrike/data.json +++ b/res/pokemon/electrike/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 40 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 120, "base_exp_reward": 104, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_LIGHTNING_ROD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_LIGHTNING_ROD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_THUNDER_WAVE" ], + [ 9, "MOVE_LEER" ], + [ 12, "MOVE_HOWL" ], + [ 17, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_SPARK" ], + [ 25, "MOVE_ODOR_SLEUTH" ], + [ 28, "MOVE_BITE" ], + [ 33, "MOVE_THUNDER_FANG" ], + [ 36, "MOVE_ROAR" ], + [ 41, "MOVE_DISCHARGE" ], + [ 44, "MOVE_CHARGE" ], + [ 49, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -75,22 +81,7 @@ "TM90", "HM04" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_THUNDER_WAVE", - "9": "MOVE_LEER", - "12": "MOVE_HOWL", - "17": "MOVE_QUICK_ATTACK", - "20": "MOVE_SPARK", - "25": "MOVE_ODOR_SLEUTH", - "28": "MOVE_BITE", - "33": "MOVE_THUNDER_FANG", - "36": "MOVE_ROAR", - "41": "MOVE_DISCHARGE", - "44": "MOVE_CHARGE", - "49": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -106,8 +97,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -122,7 +113,7 @@ "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émon" + "category": "Lightning Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -131,4 +122,4 @@ "rarity": 30, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/electrode/data.json b/res/pokemon/electrode/data.json index e2e0e385f2..9e23242604 100644 --- a/res/pokemon/electrode/data.json +++ b/res/pokemon/electrode/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 60, "base_exp_reward": 150, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_STATIC" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_STATIC" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CHARGE" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SONIC_BOOM" ], + [ 1, "MOVE_SPARK" ], + [ 5, "MOVE_TACKLE" ], + [ 8, "MOVE_SONIC_BOOM" ], + [ 12, "MOVE_SPARK" ], + [ 15, "MOVE_ROLLOUT" ], + [ 19, "MOVE_SCREECH" ], + [ 22, "MOVE_LIGHT_SCREEN" ], + [ 26, "MOVE_CHARGE_BEAM" ], + [ 29, "MOVE_SELFDESTRUCT" ], + [ 35, "MOVE_SWIFT" ], + [ 40, "MOVE_MAGNET_RISE" ], + [ 46, "MOVE_GYRO_BALL" ], + [ 51, "MOVE_EXPLOSION" ], + [ 57, "MOVE_MIRROR_COAT" ] + ], + "by_tm": [ "TM06", "TM10", "TM12", @@ -75,28 +85,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_CHARGE", - "MOVE_TACKLE", - "MOVE_SONIC_BOOM", - "MOVE_SPARK" - ], - "5": "MOVE_TACKLE", - "8": "MOVE_SONIC_BOOM", - "12": "MOVE_SPARK", - "15": "MOVE_ROLLOUT", - "19": "MOVE_SCREECH", - "22": "MOVE_LIGHT_SCREEN", - "26": "MOVE_CHARGE_BEAM", - "29": "MOVE_SELFDESTRUCT", - "35": "MOVE_SWIFT", - "40": "MOVE_MAGNET_RISE", - "46": "MOVE_GYRO_BALL", - "51": "MOVE_EXPLOSION", - "57": "MOVE_MIRROR_COAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -105,9 +94,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -122,7 +112,7 @@ "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émon" + "category": "Ball Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/elekid/data.json b/res/pokemon/elekid/data.json index eb1da51bff..574bf8b80a 100644 --- a/res/pokemon/elekid/data.json +++ b/res/pokemon/elekid/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 55 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 45, "base_exp_reward": 106, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_LEER" ], + [ 7, "MOVE_THUNDER_SHOCK" ], + [ 10, "MOVE_LOW_KICK" ], + [ 16, "MOVE_SWIFT" ], + [ 19, "MOVE_SHOCK_WAVE" ], + [ 25, "MOVE_LIGHT_SCREEN" ], + [ 28, "MOVE_THUNDER_PUNCH" ], + [ 34, "MOVE_DISCHARGE" ], + [ 37, "MOVE_THUNDERBOLT" ], + [ 43, "MOVE_SCREECH" ], + [ 46, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -76,23 +81,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_QUICK_ATTACK", - "MOVE_LEER" - ], - "7": "MOVE_THUNDER_SHOCK", - "10": "MOVE_LOW_KICK", - "16": "MOVE_SWIFT", - "19": "MOVE_SHOCK_WAVE", - "25": "MOVE_LIGHT_SCREEN", - "28": "MOVE_THUNDER_PUNCH", - "34": "MOVE_DISCHARGE", - "37": "MOVE_THUNDERBOLT", - "43": "MOVE_SCREECH", - "46": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -129,7 +118,7 @@ "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émon" + "category": "Electric Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -138,4 +127,4 @@ "rarity": 10, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/empoleon/data.json b/res/pokemon/empoleon/data.json index cb767e2716..199f4aaaa8 100644 --- a/res/pokemon/empoleon/data.json +++ b/res/pokemon/empoleon/data.json @@ -8,10 +8,7 @@ "special_attack": 111, "special_defense": 101 }, - "types": [ - "TYPE_WATER", - "TYPE_STEEL" - ], + "types": [ "TYPE_WATER", "TYPE_STEEL" ], "catch_rate": 45, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_BUBBLE" ], + [ 4, "MOVE_GROWL" ], + [ 8, "MOVE_BUBBLE" ], + [ 11, "MOVE_SWORDS_DANCE" ], + [ 15, "MOVE_PECK" ], + [ 16, "MOVE_METAL_CLAW" ], + [ 19, "MOVE_BUBBLE_BEAM" ], + [ 24, "MOVE_SWAGGER" ], + [ 28, "MOVE_FURY_ATTACK" ], + [ 33, "MOVE_BRINE" ], + [ 36, "MOVE_AQUA_JET" ], + [ 39, "MOVE_WHIRLPOOL" ], + [ 46, "MOVE_MIST" ], + [ 52, "MOVE_DRILL_PECK" ], + [ 59, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -93,28 +103,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_BUBBLE" - ], - "4": "MOVE_GROWL", - "8": "MOVE_BUBBLE", - "11": "MOVE_SWORDS_DANCE", - "15": "MOVE_PECK", - "16": "MOVE_METAL_CLAW", - "19": "MOVE_BUBBLE_BEAM", - "24": "MOVE_SWAGGER", - "28": "MOVE_FURY_ATTACK", - "33": "MOVE_BRINE", - "36": "MOVE_AQUA_JET", - "39": "MOVE_WHIRLPOOL", - "46": "MOVE_MIST", - "52": "MOVE_DRILL_PECK", - "59": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -125,9 +114,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -142,7 +132,7 @@ "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émon" + "category": "Emperor Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/entei/data.json b/res/pokemon/entei/data.json index f6993fef28..84503793d7 100644 --- a/res/pokemon/entei/data.json +++ b/res/pokemon/entei/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 75 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 3, "base_exp_reward": 217, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 8, "MOVE_EMBER" ], + [ 15, "MOVE_ROAR" ], + [ 22, "MOVE_FIRE_SPIN" ], + [ 29, "MOVE_STOMP" ], + [ 36, "MOVE_FLAMETHROWER" ], + [ 43, "MOVE_SWAGGER" ], + [ 50, "MOVE_FIRE_FANG" ], + [ 57, "MOVE_LAVA_PLUME" ], + [ 64, "MOVE_EXTRASENSORY" ], + [ 71, "MOVE_FIRE_BLAST" ], + [ 78, "MOVE_CALM_MIND" ], + [ 85, "MOVE_ERUPTION" ] + ], + "by_tm": [ "TM04", "TM05", "TM06", @@ -83,25 +90,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_LEER" - ], - "8": "MOVE_EMBER", - "15": "MOVE_ROAR", - "22": "MOVE_FIRE_SPIN", - "29": "MOVE_STOMP", - "36": "MOVE_FLAMETHROWER", - "43": "MOVE_SWAGGER", - "50": "MOVE_FIRE_FANG", - "57": "MOVE_LAVA_PLUME", - "64": "MOVE_EXTRASENSORY", - "71": "MOVE_FIRE_BLAST", - "78": "MOVE_CALM_MIND", - "85": "MOVE_ERUPTION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -109,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 21, @@ -126,7 +116,7 @@ "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émon" + "category": "Volcano Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/espeon/data.json b/res/pokemon/espeon/data.json index 1eb707406f..7574dfa55c 100644 --- a/res/pokemon/espeon/data.json +++ b/res/pokemon/espeon/data.json @@ -8,10 +8,7 @@ "special_attack": 130, "special_defense": 95 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 197, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_SYNCHRONIZE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_SYNCHRONIZE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_CONFUSION" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_SWIFT" ], + [ 36, "MOVE_PSYBEAM" ], + [ 43, "MOVE_FUTURE_SIGHT" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_PSYCH_UP" ], + [ 64, "MOVE_PSYCHIC" ], + [ 71, "MOVE_MORNING_SUN" ], + [ 78, "MOVE_POWER_SWAP" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -80,25 +87,7 @@ "TM92", "HM01" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_CONFUSION", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_SWIFT", - "36": "MOVE_PSYBEAM", - "43": "MOVE_FUTURE_SIGHT", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_PSYCH_UP", - "64": "MOVE_PSYCHIC", - "71": "MOVE_MORNING_SUN", - "78": "MOVE_POWER_SWAP" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -109,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -126,7 +116,7 @@ "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émon" + "category": "Sun Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/exeggcute/data.json b/res/pokemon/exeggcute/data.json index 9fa3b8c48c..346c8ca0d2 100644 --- a/res/pokemon/exeggcute/data.json +++ b/res/pokemon/exeggcute/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 45 }, - "types": [ - "TYPE_GRASS", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_GRASS", "TYPE_PSYCHIC" ], "catch_rate": 90, "base_exp_reward": 98, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 120, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 120, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BARRAGE" ], + [ 1, "MOVE_UPROAR" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 7, "MOVE_REFLECT" ], + [ 11, "MOVE_LEECH_SEED" ], + [ 17, "MOVE_BULLET_SEED" ], + [ 19, "MOVE_STUN_SPORE" ], + [ 21, "MOVE_POISON_POWDER" ], + [ 23, "MOVE_SLEEP_POWDER" ], + [ 27, "MOVE_CONFUSION" ], + [ 33, "MOVE_WORRY_SEED" ], + [ 37, "MOVE_NATURAL_GIFT" ], + [ 43, "MOVE_SOLAR_BEAM" ], + [ 47, "MOVE_PSYCHIC" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -81,25 +88,7 @@ "TM92", "HM04" ], - "level_up": { - "1": [ - "MOVE_BARRAGE", - "MOVE_UPROAR", - "MOVE_HYPNOSIS" - ], - "7": "MOVE_REFLECT", - "11": "MOVE_LEECH_SEED", - "17": "MOVE_BULLET_SEED", - "19": "MOVE_STUN_SPORE", - "21": "MOVE_POISON_POWDER", - "23": "MOVE_SLEEP_POWDER", - "27": "MOVE_CONFUSION", - "33": "MOVE_WORRY_SEED", - "37": "MOVE_NATURAL_GIFT", - "43": "MOVE_SOLAR_BEAM", - "47": "MOVE_PSYCHIC" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_ANCIENT_POWER", @@ -116,8 +105,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -132,7 +121,7 @@ "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émon" + "category": "Egg Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/exeggutor/data.json b/res/pokemon/exeggutor/data.json index 5a05a174ba..842c805652 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_GRASS", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 212, "ev_yields": { @@ -30,21 +27,26 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SEED_BOMB" ], + [ 1, "MOVE_BARRAGE" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_STOMP" ], + [ 17, "MOVE_STOMP" ], + [ 27, "MOVE_EGG_BOMB" ], + [ 37, "MOVE_WOOD_HAMMER" ], + [ 47, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -83,20 +85,7 @@ "TM92", "HM04" ], - "level_up": { - "1": [ - "MOVE_SEED_BOMB", - "MOVE_BARRAGE", - "MOVE_HYPNOSIS", - "MOVE_CONFUSION", - "MOVE_STOMP" - ], - "17": "MOVE_STOMP", - "27": "MOVE_EGG_BOMB", - "37": "MOVE_WOOD_HAMMER", - "47": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_ANCIENT_POWER", @@ -105,9 +94,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -121,8 +111,8 @@ "pokemon_pos_f": 2, "trainer_pos_m": 14, "pokemon_pos_m": 2, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/exploud/data.json b/res/pokemon/exploud/data.json index 3e3b2713e5..414fb56859 100644 --- a/res/pokemon/exploud/data.json +++ b/res/pokemon/exploud/data.json @@ -8,10 +8,7 @@ "special_attack": 91, "special_defense": 63 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 184, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_UPROAR" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_HOWL" ], + [ 5, "MOVE_UPROAR" ], + [ 11, "MOVE_ASTONISH" ], + [ 15, "MOVE_HOWL" ], + [ 20, "MOVE_BITE" ], + [ 23, "MOVE_SUPERSONIC" ], + [ 29, "MOVE_STOMP" ], + [ 37, "MOVE_SCREECH" ], + [ 40, "MOVE_CRUNCH" ], + [ 45, "MOVE_ROAR" ], + [ 55, "MOVE_REST" ], + [ 55, "MOVE_SLEEP_TALK" ], + [ 63, "MOVE_HYPER_VOICE" ], + [ 71, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -89,33 +102,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_POUND", - "MOVE_UPROAR", - "MOVE_ASTONISH", - "MOVE_HOWL" - ], - "5": "MOVE_UPROAR", - "11": "MOVE_ASTONISH", - "15": "MOVE_HOWL", - "20": "MOVE_BITE", - "23": "MOVE_SUPERSONIC", - "29": "MOVE_STOMP", - "37": "MOVE_SCREECH", - "40": "MOVE_CRUNCH", - "45": "MOVE_ROAR", - "55": [ - "MOVE_REST", - "MOVE_SLEEP_TALK" - ], - "63": "MOVE_HYPER_VOICE", - "71": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -128,9 +115,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -145,7 +133,7 @@ "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émon" + "category": "Loud Noise Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/farfetchd/data.json b/res/pokemon/farfetchd/data.json index 859e1431de..b8aeec3838 100644 --- a/res/pokemon/farfetchd/data.json +++ b/res/pokemon/farfetchd/data.json @@ -1,5 +1,5 @@ { - "name": "Farfetch’d", + "name": "Farfetch\u2019d", "base_stats": { "hp": 52, "attack": 65, @@ -8,10 +8,7 @@ "special_attack": 58, "special_defense": 62 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 94, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_INNER_FOCUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_JAB" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_FURY_CUTTER" ], + [ 7, "MOVE_FURY_ATTACK" ], + [ 9, "MOVE_KNOCK_OFF" ], + [ 13, "MOVE_AERIAL_ACE" ], + [ 19, "MOVE_SLASH" ], + [ 21, "MOVE_AIR_CUTTER" ], + [ 25, "MOVE_SWORDS_DANCE" ], + [ 31, "MOVE_AGILITY" ], + [ 33, "MOVE_NIGHT_SLASH" ], + [ 37, "MOVE_AIR_SLASH" ], + [ 43, "MOVE_FEINT" ], + [ 45, "MOVE_FALSE_SWIPE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,27 +86,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_POISON_JAB", - "MOVE_PECK", - "MOVE_SAND_ATTACK", - "MOVE_LEER", - "MOVE_FURY_CUTTER" - ], - "7": "MOVE_FURY_ATTACK", - "9": "MOVE_KNOCK_OFF", - "13": "MOVE_AERIAL_ACE", - "19": "MOVE_SLASH", - "21": "MOVE_AIR_CUTTER", - "25": "MOVE_SWORDS_DANCE", - "31": "MOVE_AGILITY", - "33": "MOVE_NIGHT_SLASH", - "37": "MOVE_AIR_SLASH", - "43": "MOVE_FEINT", - "45": "MOVE_FALSE_SWIPE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", @@ -111,9 +100,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -127,8 +117,8 @@ "pokemon_pos_f": 20, "trainer_pos_m": 9, "pokemon_pos_m": 20, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/fearow/data.json b/res/pokemon/fearow/data.json index 9ab92cd38d..cf03478718 100644 --- a/res/pokemon/fearow/data.json +++ b/res/pokemon/fearow/data.json @@ -8,10 +8,7 @@ "special_attack": 61, "special_defense": 61 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 90, "base_exp_reward": 162, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PLUCK" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_FURY_ATTACK" ], + [ 5, "MOVE_LEER" ], + [ 9, "MOVE_FURY_ATTACK" ], + [ 13, "MOVE_PURSUIT" ], + [ 17, "MOVE_AERIAL_ACE" ], + [ 23, "MOVE_MIRROR_MOVE" ], + [ 29, "MOVE_AGILITY" ], + [ 35, "MOVE_ASSURANCE" ], + [ 41, "MOVE_ROOST" ], + [ 47, "MOVE_DRILL_PECK" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -74,25 +81,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_PLUCK", - "MOVE_PECK", - "MOVE_GROWL", - "MOVE_LEER", - "MOVE_FURY_ATTACK" - ], - "5": "MOVE_LEER", - "9": "MOVE_FURY_ATTACK", - "13": "MOVE_PURSUIT", - "17": "MOVE_AERIAL_ACE", - "23": "MOVE_MIRROR_MOVE", - "29": "MOVE_AGILITY", - "35": "MOVE_ASSURANCE", - "41": "MOVE_ROOST", - "47": "MOVE_DRILL_PECK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -102,9 +91,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -119,7 +109,7 @@ "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émon" + "category": "Beak Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/feebas/data.json b/res/pokemon/feebas/data.json index 4c60f32098..c6a7f801a8 100644 --- a/res/pokemon/feebas/data.json +++ b/res/pokemon/feebas/data.json @@ -8,10 +8,7 @@ "special_attack": 10, "special_defense": 55 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 255, "base_exp_reward": 61, "ev_yields": { @@ -30,21 +27,20 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 15, "MOVE_TACKLE" ], + [ 30, "MOVE_FLAIL" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -69,12 +65,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_SPLASH", - "15": "MOVE_TACKLE", - "30": "MOVE_FLAIL" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -89,8 +80,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -104,8 +95,8 @@ "pokemon_pos_f": 65535, "trainer_pos_m": 9, "pokemon_pos_m": 65535, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -114,4 +105,4 @@ "rarity": 20, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/feraligatr/data.json b/res/pokemon/feraligatr/data.json index 022b5f4088..e6e5677fa1 100644 --- a/res/pokemon/feraligatr/data.json +++ b/res/pokemon/feraligatr/data.json @@ -8,10 +8,7 @@ "special_attack": 79, "special_defense": 83 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_RAGE" ], + [ 6, "MOVE_WATER_GUN" ], + [ 8, "MOVE_RAGE" ], + [ 13, "MOVE_BITE" ], + [ 15, "MOVE_SCARY_FACE" ], + [ 21, "MOVE_ICE_FANG" ], + [ 24, "MOVE_FLAIL" ], + [ 30, "MOVE_AGILITY" ], + [ 32, "MOVE_CRUNCH" ], + [ 37, "MOVE_SLASH" ], + [ 45, "MOVE_SCREECH" ], + [ 50, "MOVE_THRASH" ], + [ 58, "MOVE_AQUA_TAIL" ], + [ 63, "MOVE_SUPERPOWER" ], + [ 71, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM02", "TM03", @@ -91,29 +102,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_WATER_GUN", - "MOVE_RAGE" - ], - "6": "MOVE_WATER_GUN", - "8": "MOVE_RAGE", - "13": "MOVE_BITE", - "15": "MOVE_SCARY_FACE", - "21": "MOVE_ICE_FANG", - "24": "MOVE_FLAIL", - "30": "MOVE_AGILITY", - "32": "MOVE_CRUNCH", - "37": "MOVE_SLASH", - "45": "MOVE_SCREECH", - "50": "MOVE_THRASH", - "58": "MOVE_AQUA_TAIL", - "63": "MOVE_SUPERPOWER", - "71": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -128,9 +117,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 23, @@ -145,7 +135,7 @@ "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émon" + "category": "Big Jaw Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/finneon/data.json b/res/pokemon/finneon/data.json index 727631b71f..c50dcc2c9c 100644 --- a/res/pokemon/finneon/data.json +++ b/res/pokemon/finneon/data.json @@ -8,10 +8,7 @@ "special_attack": 49, "special_defense": 61 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 90, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_STORM_DRAIN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 6, "MOVE_WATER_GUN" ], + [ 10, "MOVE_ATTRACT" ], + [ 13, "MOVE_RAIN_DANCE" ], + [ 17, "MOVE_GUST" ], + [ 22, "MOVE_WATER_PULSE" ], + [ 26, "MOVE_CAPTIVATE" ], + [ 29, "MOVE_SAFEGUARD" ], + [ 33, "MOVE_AQUA_RING" ], + [ 38, "MOVE_WHIRLPOOL" ], + [ 42, "MOVE_U_TURN" ], + [ 45, "MOVE_BOUNCE" ], + [ 49, "MOVE_SILVER_WIND" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -77,22 +83,7 @@ "HM05", "HM07" ], - "level_up": { - "1": "MOVE_POUND", - "6": "MOVE_WATER_GUN", - "10": "MOVE_ATTRACT", - "13": "MOVE_RAIN_DANCE", - "17": "MOVE_GUST", - "22": "MOVE_WATER_PULSE", - "26": "MOVE_CAPTIVATE", - "29": "MOVE_SAFEGUARD", - "33": "MOVE_AQUA_RING", - "38": "MOVE_WHIRLPOOL", - "42": "MOVE_U_TURN", - "45": "MOVE_BOUNCE", - "49": "MOVE_SILVER_WIND" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", @@ -112,8 +103,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -128,7 +119,7 @@ "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émon" + "category": "Wing Fish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -137,4 +128,4 @@ "rarity": 10, "unused": 3344 } -} +} \ No newline at end of file diff --git a/res/pokemon/flaaffy/data.json b/res/pokemon/flaaffy/data.json index f5c017dfb2..589d591d94 100644 --- a/res/pokemon/flaaffy/data.json +++ b/res/pokemon/flaaffy/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 60 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 120, "base_exp_reward": 117, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 5, "MOVE_GROWL" ], + [ 10, "MOVE_THUNDER_SHOCK" ], + [ 14, "MOVE_THUNDER_WAVE" ], + [ 20, "MOVE_COTTON_SPORE" ], + [ 25, "MOVE_CHARGE" ], + [ 31, "MOVE_DISCHARGE" ], + [ 36, "MOVE_SIGNAL_BEAM" ], + [ 42, "MOVE_LIGHT_SCREEN" ], + [ 47, "MOVE_POWER_GEM" ], + [ 53, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -76,24 +82,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_THUNDER_SHOCK" - ], - "5": "MOVE_GROWL", - "10": "MOVE_THUNDER_SHOCK", - "14": "MOVE_THUNDER_WAVE", - "20": "MOVE_COTTON_SPORE", - "25": "MOVE_CHARGE", - "31": "MOVE_DISCHARGE", - "36": "MOVE_SIGNAL_BEAM", - "42": "MOVE_LIGHT_SCREEN", - "47": "MOVE_POWER_GEM", - "53": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_SNORE", @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 8, @@ -126,7 +115,7 @@ "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émon" + "category": "Wool Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -135,4 +124,4 @@ "rarity": 20, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/flareon/data.json b/res/pokemon/flareon/data.json index c012490ef5..29a3d4b9d9 100644 --- a/res/pokemon/flareon/data.json +++ b/res/pokemon/flareon/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 110 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 198, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_FLASH_FIRE", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_EMBER" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_BITE" ], + [ 36, "MOVE_FIRE_SPIN" ], + [ 43, "MOVE_FIRE_FANG" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_SMOG" ], + [ 64, "MOVE_SCARY_FACE" ], + [ 71, "MOVE_FIRE_BLAST" ], + [ 78, "MOVE_LAVA_PLUME" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -76,25 +83,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_EMBER", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_BITE", - "36": "MOVE_FIRE_SPIN", - "43": "MOVE_FIRE_FANG", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_SMOG", - "64": "MOVE_SCARY_FACE", - "71": "MOVE_FIRE_BLAST", - "78": "MOVE_LAVA_PLUME" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -104,9 +93,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -121,7 +111,7 @@ "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émon" + "category": "Flame Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/floatzel/data.json b/res/pokemon/floatzel/data.json index 042b99eced..00dd39021e 100644 --- a/res/pokemon/floatzel/data.json +++ b/res/pokemon/floatzel/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 75, "base_exp_reward": 178, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_SONIC_BOOM" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 3, "MOVE_QUICK_ATTACK" ], + [ 6, "MOVE_WATER_GUN" ], + [ 10, "MOVE_PURSUIT" ], + [ 15, "MOVE_SWIFT" ], + [ 21, "MOVE_AQUA_JET" ], + [ 26, "MOVE_CRUNCH" ], + [ 29, "MOVE_AGILITY" ], + [ 39, "MOVE_WHIRLPOOL" ], + [ 50, "MOVE_RAZOR_WIND" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -85,25 +92,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_SONIC_BOOM", - "MOVE_GROWL", - "MOVE_WATER_SPORT", - "MOVE_QUICK_ATTACK" - ], - "3": "MOVE_QUICK_ATTACK", - "6": "MOVE_WATER_GUN", - "10": "MOVE_PURSUIT", - "15": "MOVE_SWIFT", - "21": "MOVE_AQUA_JET", - "26": "MOVE_CRUNCH", - "29": "MOVE_AGILITY", - "39": "MOVE_WHIRLPOOL", - "50": "MOVE_RAZOR_WIND" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -113,9 +102,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -130,7 +120,7 @@ "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émon" + "category": "Sea Weasel Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/flygon/data.json b/res/pokemon/flygon/data.json index f8092704cf..634790ea77 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_GROUND", - "TYPE_DRAGON" - ], + "types": [ "TYPE_GROUND", "TYPE_DRAGON" ], "catch_rate": 45, "base_exp_reward": 197, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_LEVITATE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_LEVITATE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SONIC_BOOM" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_FAINT_ATTACK" ], + [ 1, "MOVE_SAND_TOMB" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_SAND_TOMB" ], + [ 33, "MOVE_SUPERSONIC" ], + [ 35, "MOVE_DRAGON_BREATH" ], + [ 41, "MOVE_SCREECH" ], + [ 45, "MOVE_DRAGON_CLAW" ], + [ 49, "MOVE_SANDSTORM" ], + [ 57, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM02", "TM06", "TM10", @@ -87,24 +93,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_SONIC_BOOM", - "MOVE_SAND_ATTACK", - "MOVE_FAINT_ATTACK", - "MOVE_SAND_TOMB" - ], - "9": "MOVE_SAND_ATTACK", - "17": "MOVE_FAINT_ATTACK", - "25": "MOVE_SAND_TOMB", - "33": "MOVE_SUPERSONIC", - "35": "MOVE_DRAGON_BREATH", - "41": "MOVE_SCREECH", - "45": "MOVE_DRAGON_CLAW", - "49": "MOVE_SANDSTORM", - "57": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -119,9 +108,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -135,8 +125,8 @@ "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 “The Desert Spirit.”", - "category": "Mystic Pokémon" + "entry_text": "It whips up sandstorms with\npowerful flaps of its wings. It is\nknown as \u201cThe Desert Spirit.\u201d", + "category": "Mystic Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/forretress/data.json b/res/pokemon/forretress/data.json index 5b16e634eb..63e7050c0d 100644 --- a/res/pokemon/forretress/data.json +++ b/res/pokemon/forretress/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_BUG", - "TYPE_STEEL" - ], + "types": [ "TYPE_BUG", "TYPE_STEEL" ], "catch_rate": 75, "base_exp_reward": 118, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TOXIC_SPIKES" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_PROTECT" ], + [ 1, "MOVE_SELFDESTRUCT" ], + [ 1, "MOVE_BUG_BITE" ], + [ 6, "MOVE_SELFDESTRUCT" ], + [ 9, "MOVE_BUG_BITE" ], + [ 12, "MOVE_TAKE_DOWN" ], + [ 17, "MOVE_RAPID_SPIN" ], + [ 20, "MOVE_BIDE" ], + [ 23, "MOVE_NATURAL_GIFT" ], + [ 28, "MOVE_SPIKES" ], + [ 31, "MOVE_MIRROR_SHOT" ], + [ 33, "MOVE_PAYBACK" ], + [ 38, "MOVE_EXPLOSION" ], + [ 45, "MOVE_IRON_DEFENSE" ], + [ 50, "MOVE_GYRO_BALL" ], + [ 55, "MOVE_DOUBLE_EDGE" ], + [ 62, "MOVE_MAGNET_RISE" ], + [ 67, "MOVE_ZAP_CANNON" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,31 +95,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TOXIC_SPIKES", - "MOVE_TACKLE", - "MOVE_PROTECT", - "MOVE_SELFDESTRUCT", - "MOVE_BUG_BITE" - ], - "6": "MOVE_SELFDESTRUCT", - "9": "MOVE_BUG_BITE", - "12": "MOVE_TAKE_DOWN", - "17": "MOVE_RAPID_SPIN", - "20": "MOVE_BIDE", - "23": "MOVE_NATURAL_GIFT", - "28": "MOVE_SPIKES", - "31": "MOVE_MIRROR_SHOT", - "33": "MOVE_PAYBACK", - "38": "MOVE_EXPLOSION", - "45": "MOVE_IRON_DEFENSE", - "50": "MOVE_GYRO_BALL", - "55": "MOVE_DOUBLE_EDGE", - "62": "MOVE_MAGNET_RISE", - "67": "MOVE_ZAP_CANNON" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -114,9 +103,10 @@ "MOVE_MAGNET_RISE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -131,7 +121,7 @@ "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émon" + "category": "Bagworm Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/froslass/data.json b/res/pokemon/froslass/data.json index 011b9b738a..56991a9c93 100644 --- a/res/pokemon/froslass/data.json +++ b/res/pokemon/froslass/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 70 }, - "types": [ - "TYPE_ICE", - "TYPE_GHOST" - ], + "types": [ "TYPE_ICE", "TYPE_GHOST" ], "catch_rate": 75, "base_exp_reward": 187, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_SNOW_CLOAK", - "ABILITY_SNOW_CLOAK" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 1, "MOVE_ASTONISH" ], + [ 4, "MOVE_DOUBLE_TEAM" ], + [ 10, "MOVE_ASTONISH" ], + [ 13, "MOVE_ICY_WIND" ], + [ 19, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_OMINOUS_WIND" ], + [ 28, "MOVE_WAKE_UP_SLAP" ], + [ 31, "MOVE_CAPTIVATE" ], + [ 37, "MOVE_ICE_SHARD" ], + [ 40, "MOVE_HAIL" ], + [ 51, "MOVE_BLIZZARD" ], + [ 59, "MOVE_DESTINY_BOND" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -87,26 +95,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POWDER_SNOW", - "MOVE_LEER", - "MOVE_DOUBLE_TEAM", - "MOVE_ASTONISH" - ], - "4": "MOVE_DOUBLE_TEAM", - "10": "MOVE_ASTONISH", - "13": "MOVE_ICY_WIND", - "19": "MOVE_CONFUSE_RAY", - "22": "MOVE_OMINOUS_WIND", - "28": "MOVE_WAKE_UP_SLAP", - "31": "MOVE_CAPTIVATE", - "37": "MOVE_ICE_SHARD", - "40": "MOVE_HAIL", - "51": "MOVE_BLIZZARD", - "59": "MOVE_DESTINY_BOND" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -119,9 +108,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 13, @@ -136,7 +126,7 @@ "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émon" + "category": "Snow Land Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/furret/data.json b/res/pokemon/furret/data.json index ec6a3558f3..953d282e1f 100644 --- a/res/pokemon/furret/data.json +++ b/res/pokemon/furret/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 55 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 90, "base_exp_reward": 116, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_KEEN_EYE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_FORESIGHT" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 4, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_QUICK_ATTACK" ], + [ 13, "MOVE_FURY_SWIPES" ], + [ 17, "MOVE_HELPING_HAND" ], + [ 21, "MOVE_FOLLOW_ME" ], + [ 28, "MOVE_SLAM" ], + [ 32, "MOVE_REST" ], + [ 36, "MOVE_SUCKER_PUNCH" ], + [ 42, "MOVE_AMNESIA" ], + [ 46, "MOVE_BATON_PASS" ], + [ 50, "MOVE_ME_FIRST" ], + [ 56, "MOVE_HYPER_VOICE" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -90,27 +99,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_FORESIGHT", - "MOVE_DEFENSE_CURL", - "MOVE_QUICK_ATTACK" - ], - "4": "MOVE_DEFENSE_CURL", - "7": "MOVE_QUICK_ATTACK", - "13": "MOVE_FURY_SWIPES", - "17": "MOVE_HELPING_HAND", - "21": "MOVE_FOLLOW_ME", - "28": "MOVE_SLAM", - "32": "MOVE_REST", - "36": "MOVE_SUCKER_PUNCH", - "42": "MOVE_AMNESIA", - "46": "MOVE_BATON_PASS", - "50": "MOVE_ME_FIRST", - "56": "MOVE_HYPER_VOICE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -127,9 +116,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 18, @@ -144,7 +134,7 @@ "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émon" + "category": "Long Body Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/gabite/data.json b/res/pokemon/gabite/data.json index 9cc9e1d53f..334071771b 100644 --- a/res/pokemon/gabite/data.json +++ b/res/pokemon/gabite/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 55 }, - "types": [ - "TYPE_DRAGON", - "TYPE_GROUND" - ], + "types": [ "TYPE_DRAGON", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 144, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 3, "MOVE_SAND_ATTACK" ], + [ 7, "MOVE_DRAGON_RAGE" ], + [ 13, "MOVE_SANDSTORM" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_SAND_TOMB" ], + [ 28, "MOVE_SLASH" ], + [ 33, "MOVE_DRAGON_CLAW" ], + [ 40, "MOVE_DIG" ], + [ 49, "MOVE_DRAGON_RUSH" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -83,22 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_SAND_ATTACK" - ], - "3": "MOVE_SAND_ATTACK", - "7": "MOVE_DRAGON_RAGE", - "13": "MOVE_SANDSTORM", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_SAND_TOMB", - "28": "MOVE_SLASH", - "33": "MOVE_DRAGON_CLAW", - "40": "MOVE_DIG", - "49": "MOVE_DRAGON_RUSH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_IRON_HEAD", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -133,7 +122,7 @@ "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émon" + "category": "Cave Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -142,4 +131,4 @@ "rarity": 20, "unused": 4102 } -} +} \ No newline at end of file diff --git a/res/pokemon/gallade/data.json b/res/pokemon/gallade/data.json index 23520710a9..b08f62bf32 100644 --- a/res/pokemon/gallade/data.json +++ b/res/pokemon/gallade/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 115 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 208, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_STEADFAST", - "ABILITY_STEADFAST" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_STEADFAST", "ABILITY_STEADFAST" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEAF_BLADE" ], + [ 1, "MOVE_NIGHT_SLASH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 1, "MOVE_TELEPORT" ], + [ 6, "MOVE_CONFUSION" ], + [ 10, "MOVE_DOUBLE_TEAM" ], + [ 12, "MOVE_TELEPORT" ], + [ 17, "MOVE_FURY_CUTTER" ], + [ 22, "MOVE_SLASH" ], + [ 25, "MOVE_SWORDS_DANCE" ], + [ 31, "MOVE_PSYCHO_CUT" ], + [ 36, "MOVE_HELPING_HAND" ], + [ 39, "MOVE_FEINT" ], + [ 45, "MOVE_FALSE_SWIPE" ], + [ 50, "MOVE_PROTECT" ], + [ 53, "MOVE_CLOSE_COMBAT" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -105,29 +116,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEAF_BLADE", - "MOVE_NIGHT_SLASH", - "MOVE_LEER", - "MOVE_CONFUSION", - "MOVE_DOUBLE_TEAM", - "MOVE_TELEPORT" - ], - "6": "MOVE_CONFUSION", - "10": "MOVE_DOUBLE_TEAM", - "12": "MOVE_TELEPORT", - "17": "MOVE_FURY_CUTTER", - "22": "MOVE_SLASH", - "25": "MOVE_SWORDS_DANCE", - "31": "MOVE_PSYCHO_CUT", - "36": "MOVE_HELPING_HAND", - "39": "MOVE_FEINT", - "45": "MOVE_FALSE_SWIPE", - "50": "MOVE_PROTECT", - "53": "MOVE_CLOSE_COMBAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -143,9 +132,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -160,7 +150,7 @@ "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émon" + "category": "Blade Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/garchomp/data.json b/res/pokemon/garchomp/data.json index 5853bcf7de..d1aca84859 100644 --- a/res/pokemon/garchomp/data.json +++ b/res/pokemon/garchomp/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 85 }, - "types": [ - "TYPE_DRAGON", - "TYPE_GROUND" - ], + "types": [ "TYPE_DRAGON", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 218, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_DRAGON_RAGE" ], + [ 1, "MOVE_SANDSTORM" ], + [ 3, "MOVE_SAND_ATTACK" ], + [ 7, "MOVE_DRAGON_RAGE" ], + [ 13, "MOVE_SANDSTORM" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_SAND_TOMB" ], + [ 28, "MOVE_SLASH" ], + [ 33, "MOVE_DRAGON_CLAW" ], + [ 40, "MOVE_DIG" ], + [ 48, "MOVE_CRUNCH" ], + [ 55, "MOVE_DRAGON_RUSH" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -91,26 +99,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_FIRE_FANG", - "MOVE_TACKLE", - "MOVE_SAND_ATTACK", - "MOVE_DRAGON_RAGE", - "MOVE_SANDSTORM" - ], - "3": "MOVE_SAND_ATTACK", - "7": "MOVE_DRAGON_RAGE", - "13": "MOVE_SANDSTORM", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_SAND_TOMB", - "28": "MOVE_SLASH", - "33": "MOVE_DRAGON_CLAW", - "40": "MOVE_DIG", - "48": "MOVE_CRUNCH", - "55": "MOVE_DRAGON_RUSH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_IRON_HEAD", @@ -122,9 +111,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 19, @@ -139,7 +129,7 @@ "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émon" + "category": "Mach Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/gardevoir/data.json b/res/pokemon/gardevoir/data.json index 2acd5e2244..afbcfac8d9 100644 --- a/res/pokemon/gardevoir/data.json +++ b/res/pokemon/gardevoir/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 115 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 208, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_TRACE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_TRACE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HEALING_WISH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 1, "MOVE_TELEPORT" ], + [ 6, "MOVE_CONFUSION" ], + [ 10, "MOVE_DOUBLE_TEAM" ], + [ 12, "MOVE_TELEPORT" ], + [ 17, "MOVE_WISH" ], + [ 22, "MOVE_MAGICAL_LEAF" ], + [ 25, "MOVE_CALM_MIND" ], + [ 33, "MOVE_PSYCHIC" ], + [ 40, "MOVE_IMPRISON" ], + [ 45, "MOVE_FUTURE_SIGHT" ], + [ 53, "MOVE_CAPTIVATE" ], + [ 60, "MOVE_HYPNOSIS" ], + [ 65, "MOVE_DREAM_EATER" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -90,28 +100,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_HEALING_WISH", - "MOVE_GROWL", - "MOVE_CONFUSION", - "MOVE_DOUBLE_TEAM", - "MOVE_TELEPORT" - ], - "6": "MOVE_CONFUSION", - "10": "MOVE_DOUBLE_TEAM", - "12": "MOVE_TELEPORT", - "17": "MOVE_WISH", - "22": "MOVE_MAGICAL_LEAF", - "25": "MOVE_CALM_MIND", - "33": "MOVE_PSYCHIC", - "40": "MOVE_IMPRISON", - "45": "MOVE_FUTURE_SIGHT", - "53": "MOVE_CAPTIVATE", - "60": "MOVE_HYPNOSIS", - "65": "MOVE_DREAM_EATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -125,9 +114,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 16, @@ -142,7 +132,7 @@ "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émon" + "category": "Embrace Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/gastly/data.json b/res/pokemon/gastly/data.json index 62923e2259..80844822cc 100644 --- a/res/pokemon/gastly/data.json +++ b/res/pokemon/gastly/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 35 }, - "types": [ - "TYPE_GHOST", - "TYPE_POISON" - ], + "types": [ "TYPE_GHOST", "TYPE_POISON" ], "catch_rate": 190, "base_exp_reward": 95, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_LICK" ], + [ 5, "MOVE_SPITE" ], + [ 8, "MOVE_MEAN_LOOK" ], + [ 12, "MOVE_CURSE" ], + [ 15, "MOVE_NIGHT_SHADE" ], + [ 19, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_SUCKER_PUNCH" ], + [ 26, "MOVE_PAYBACK" ], + [ 29, "MOVE_SHADOW_BALL" ], + [ 33, "MOVE_DREAM_EATER" ], + [ 36, "MOVE_DARK_PULSE" ], + [ 40, "MOVE_DESTINY_BOND" ], + [ 43, "MOVE_NIGHTMARE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -83,25 +90,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_HYPNOSIS", - "MOVE_LICK" - ], - "5": "MOVE_SPITE", - "8": "MOVE_MEAN_LOOK", - "12": "MOVE_CURSE", - "15": "MOVE_NIGHT_SHADE", - "19": "MOVE_CONFUSE_RAY", - "22": "MOVE_SUCKER_PUNCH", - "26": "MOVE_PAYBACK", - "29": "MOVE_SHADOW_BALL", - "33": "MOVE_DREAM_EATER", - "36": "MOVE_DARK_PULSE", - "40": "MOVE_DESTINY_BOND", - "43": "MOVE_NIGHTMARE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -123,8 +112,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 13, @@ -139,7 +128,7 @@ "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émon" + "category": "Gas Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -148,4 +137,4 @@ "rarity": 30, "unused": 1548 } -} +} \ No newline at end of file diff --git a/res/pokemon/gastrodon/data.json b/res/pokemon/gastrodon/data.json index 21fe0943aa..029289b8f7 100644 --- a/res/pokemon/gastrodon/data.json +++ b/res/pokemon/gastrodon/data.json @@ -8,10 +8,7 @@ "special_attack": 92, "special_defense": 82 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 75, "base_exp_reward": 176, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_STICKY_HOLD", - "ABILITY_STORM_DRAIN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_WATER_PULSE" ], + [ 2, "MOVE_MUD_SPORT" ], + [ 4, "MOVE_HARDEN" ], + [ 7, "MOVE_WATER_PULSE" ], + [ 11, "MOVE_MUD_BOMB" ], + [ 16, "MOVE_HIDDEN_POWER" ], + [ 22, "MOVE_RAIN_DANCE" ], + [ 29, "MOVE_BODY_SLAM" ], + [ 41, "MOVE_MUDDY_WATER" ], + [ 54, "MOVE_RECOVER" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -82,24 +88,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_MUD_SLAP", - "MOVE_MUD_SPORT", - "MOVE_HARDEN", - "MOVE_WATER_PULSE" - ], - "2": "MOVE_MUD_SPORT", - "4": "MOVE_HARDEN", - "7": "MOVE_WATER_PULSE", - "11": "MOVE_MUD_BOMB", - "16": "MOVE_HIDDEN_POWER", - "22": "MOVE_RAIN_DANCE", - "29": "MOVE_BODY_SLAM", - "41": "MOVE_MUDDY_WATER", - "54": "MOVE_RECOVER" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -108,9 +97,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -125,7 +115,7 @@ "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émon" + "category": "Sea Slug Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/gengar/data.json b/res/pokemon/gengar/data.json index 96cf8b7c2c..42f84601ad 100644 --- a/res/pokemon/gengar/data.json +++ b/res/pokemon/gengar/data.json @@ -8,10 +8,7 @@ "special_attack": 130, "special_defense": 75 }, - "types": [ - "TYPE_GHOST", - "TYPE_POISON" - ], + "types": [ "TYPE_GHOST", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 190, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_LICK" ], + [ 1, "MOVE_SPITE" ], + [ 5, "MOVE_SPITE" ], + [ 8, "MOVE_MEAN_LOOK" ], + [ 12, "MOVE_CURSE" ], + [ 15, "MOVE_NIGHT_SHADE" ], + [ 19, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_SUCKER_PUNCH" ], + [ 25, "MOVE_SHADOW_PUNCH" ], + [ 28, "MOVE_PAYBACK" ], + [ 33, "MOVE_SHADOW_BALL" ], + [ 39, "MOVE_DREAM_EATER" ], + [ 44, "MOVE_DARK_PULSE" ], + [ 50, "MOVE_DESTINY_BOND" ], + [ 55, "MOVE_NIGHTMARE" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -95,27 +104,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_HYPNOSIS", - "MOVE_LICK", - "MOVE_SPITE" - ], - "5": "MOVE_SPITE", - "8": "MOVE_MEAN_LOOK", - "12": "MOVE_CURSE", - "15": "MOVE_NIGHT_SHADE", - "19": "MOVE_CONFUSE_RAY", - "22": "MOVE_SUCKER_PUNCH", - "25": "MOVE_SHADOW_PUNCH", - "28": "MOVE_PAYBACK", - "33": "MOVE_SHADOW_BALL", - "39": "MOVE_DREAM_EATER", - "44": "MOVE_DARK_PULSE", - "50": "MOVE_DESTINY_BOND", - "55": "MOVE_NIGHTMARE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -129,9 +118,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -146,7 +136,7 @@ "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émon" + "category": "Shadow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/geodude/data.json b/res/pokemon/geodude/data.json index 6ec6074d79..35136112e3 100644 --- a/res/pokemon/geodude/data.json +++ b/res/pokemon/geodude/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_ROCK", - "TYPE_GROUND" - ], + "types": [ "TYPE_ROCK", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 73, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 4, "MOVE_MUD_SPORT" ], + [ 8, "MOVE_ROCK_POLISH" ], + [ 11, "MOVE_ROCK_THROW" ], + [ 15, "MOVE_MAGNITUDE" ], + [ 18, "MOVE_SELFDESTRUCT" ], + [ 22, "MOVE_ROLLOUT" ], + [ 25, "MOVE_ROCK_BLAST" ], + [ 29, "MOVE_EARTHQUAKE" ], + [ 32, "MOVE_EXPLOSION" ], + [ 36, "MOVE_DOUBLE_EDGE" ], + [ 39, "MOVE_STONE_EDGE" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -81,24 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_DEFENSE_CURL" - ], - "4": "MOVE_MUD_SPORT", - "8": "MOVE_ROCK_POLISH", - "11": "MOVE_ROCK_THROW", - "15": "MOVE_MAGNITUDE", - "18": "MOVE_SELFDESTRUCT", - "22": "MOVE_ROLLOUT", - "25": "MOVE_ROCK_BLAST", - "29": "MOVE_EARTHQUAKE", - "32": "MOVE_EXPLOSION", - "36": "MOVE_DOUBLE_EDGE", - "39": "MOVE_STONE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -134,7 +123,7 @@ "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émon" + "category": "Rock Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -143,4 +132,4 @@ "rarity": 50, "unused": 2059 } -} +} \ No newline at end of file diff --git a/res/pokemon/gible/data.json b/res/pokemon/gible/data.json index 5a5a991419..1f401c00a1 100644 --- a/res/pokemon/gible/data.json +++ b/res/pokemon/gible/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 45 }, - "types": [ - "TYPE_DRAGON", - "TYPE_GROUND" - ], + "types": [ "TYPE_DRAGON", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 67, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 3, "MOVE_SAND_ATTACK" ], + [ 7, "MOVE_DRAGON_RAGE" ], + [ 13, "MOVE_SANDSTORM" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_SAND_TOMB" ], + [ 25, "MOVE_SLASH" ], + [ 27, "MOVE_DRAGON_CLAW" ], + [ 31, "MOVE_DIG" ], + [ 37, "MOVE_DRAGON_RUSH" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -82,19 +85,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_TACKLE", - "3": "MOVE_SAND_ATTACK", - "7": "MOVE_DRAGON_RAGE", - "13": "MOVE_SANDSTORM", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_SAND_TOMB", - "25": "MOVE_SLASH", - "27": "MOVE_DRAGON_CLAW", - "31": "MOVE_DIG", - "37": "MOVE_DRAGON_RUSH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_IRON_HEAD", @@ -113,8 +104,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -129,7 +120,7 @@ "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émon" + "category": "Land Shark Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -138,4 +129,4 @@ "rarity": 30, "unused": 1030 } -} +} \ No newline at end of file diff --git a/res/pokemon/girafarig/data.json b/res/pokemon/girafarig/data.json index 3330cda85a..0b90c61dab 100644 --- a/res/pokemon/girafarig/data.json +++ b/res/pokemon/girafarig/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_NORMAL", "TYPE_PSYCHIC" ], "catch_rate": 60, "base_exp_reward": 149, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWER_SWAP" ], + [ 1, "MOVE_GUARD_SWAP" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_CONFUSION" ], + [ 5, "MOVE_ODOR_SLEUTH" ], + [ 10, "MOVE_STOMP" ], + [ 14, "MOVE_AGILITY" ], + [ 19, "MOVE_PSYBEAM" ], + [ 23, "MOVE_BATON_PASS" ], + [ 28, "MOVE_ASSURANCE" ], + [ 32, "MOVE_DOUBLE_HIT" ], + [ 37, "MOVE_PSYCHIC" ], + [ 41, "MOVE_ZEN_HEADBUTT" ], + [ 46, "MOVE_CRUNCH" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -87,27 +96,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POWER_SWAP", - "MOVE_GUARD_SWAP", - "MOVE_ASTONISH", - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_CONFUSION" - ], - "5": "MOVE_ODOR_SLEUTH", - "10": "MOVE_STOMP", - "14": "MOVE_AGILITY", - "19": "MOVE_PSYBEAM", - "23": "MOVE_BATON_PASS", - "28": "MOVE_ASSURANCE", - "32": "MOVE_DOUBLE_HIT", - "37": "MOVE_PSYCHIC", - "41": "MOVE_ZEN_HEADBUTT", - "46": "MOVE_CRUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -118,9 +107,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 15, @@ -135,7 +125,7 @@ "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émon" + "category": "Long Neck Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/giratina/data.json b/res/pokemon/giratina/data.json index 5140007b85..04bdfa78e2 100644 --- a/res/pokemon/giratina/data.json +++ b/res/pokemon/giratina/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 120 }, - "types": [ - "TYPE_GHOST", - "TYPE_DRAGON" - ], + "types": [ "TYPE_GHOST", "TYPE_DRAGON" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DRAGON_BREATH" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 10, "MOVE_OMINOUS_WIND" ], + [ 20, "MOVE_ANCIENT_POWER" ], + [ 30, "MOVE_DRAGON_CLAW" ], + [ 40, "MOVE_SHADOW_FORCE" ], + [ 50, "MOVE_HEAL_BLOCK" ], + [ 60, "MOVE_EARTH_POWER" ], + [ 70, "MOVE_SLASH" ], + [ 80, "MOVE_SHADOW_CLAW" ], + [ 90, "MOVE_AURA_SPHERE" ] + ], + "by_tm": [ "TM02", "TM04", "TM05", @@ -95,22 +99,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_DRAGON_BREATH", - "MOVE_SCARY_FACE" - ], - "10": "MOVE_OMINOUS_WIND", - "20": "MOVE_ANCIENT_POWER", - "30": "MOVE_DRAGON_CLAW", - "40": "MOVE_SHADOW_FORCE", - "50": "MOVE_HEAL_BLOCK", - "60": "MOVE_EARTH_POWER", - "70": "MOVE_SLASH", - "80": "MOVE_SHADOW_CLAW", - "90": "MOVE_AURA_SPHERE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -127,9 +116,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": [ { @@ -145,7 +135,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émon" + "category": "Renegade Pok\u00e9mon" }, { "height": 45, diff --git a/res/pokemon/giratina/forms/origin/data.json b/res/pokemon/giratina/forms/origin/data.json index 50f413f488..e5e2cc7a3d 100644 --- a/res/pokemon/giratina/forms/origin/data.json +++ b/res/pokemon/giratina/forms/origin/data.json @@ -8,10 +8,7 @@ "special_attack": 120, "special_defense": 100 }, - "types": [ - "TYPE_GHOST", - "TYPE_DRAGON" - ], + "types": [ "TYPE_GHOST", "TYPE_DRAGON" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DRAGON_BREATH" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 10, "MOVE_OMINOUS_WIND" ], + [ 20, "MOVE_ANCIENT_POWER" ], + [ 30, "MOVE_DRAGON_CLAW" ], + [ 40, "MOVE_SHADOW_FORCE" ], + [ 50, "MOVE_HEAL_BLOCK" ], + [ 60, "MOVE_EARTH_POWER" ], + [ 70, "MOVE_SLASH" ], + [ 80, "MOVE_SHADOW_CLAW" ], + [ 90, "MOVE_AURA_SPHERE" ] + ], + "by_tm": [ "TM02", "TM04", "TM05", @@ -95,22 +99,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_DRAGON_BREATH", - "MOVE_SCARY_FACE" - ], - "10": "MOVE_OMINOUS_WIND", - "20": "MOVE_ANCIENT_POWER", - "30": "MOVE_DRAGON_CLAW", - "40": "MOVE_SHADOW_FORCE", - "50": "MOVE_HEAL_BLOCK", - "60": "MOVE_EARTH_POWER", - "70": "MOVE_SLASH", - "80": "MOVE_SHADOW_CLAW", - "90": "MOVE_AURA_SPHERE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -126,5 +115,6 @@ "MOVE_TWISTER", "MOVE_SWIFT" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/glaceon/data.json b/res/pokemon/glaceon/data.json index a058b2f143..b91c7b8596 100644 --- a/res/pokemon/glaceon/data.json +++ b/res/pokemon/glaceon/data.json @@ -8,10 +8,7 @@ "special_attack": 130, "special_defense": 95 }, - "types": [ - "TYPE_ICE", - "TYPE_ICE" - ], + "types": [ "TYPE_ICE", "TYPE_ICE" ], "catch_rate": 45, "base_exp_reward": 196, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SNOW_CLOAK", - "ABILITY_SNOW_CLOAK" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_ICY_WIND" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_BITE" ], + [ 36, "MOVE_ICE_SHARD" ], + [ 43, "MOVE_ICE_FANG" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_MIRROR_COAT" ], + [ 64, "MOVE_HAIL" ], + [ 71, "MOVE_BLIZZARD" ], + [ 78, "MOVE_BARRIER" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -77,25 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_ICY_WIND", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_BITE", - "36": "MOVE_ICE_SHARD", - "43": "MOVE_ICE_FANG", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_MIRROR_COAT", - "64": "MOVE_HAIL", - "71": "MOVE_BLIZZARD", - "78": "MOVE_BARRIER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", @@ -106,9 +95,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -123,7 +113,7 @@ "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émon" + "category": "Fresh Snow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/glalie/data.json b/res/pokemon/glalie/data.json index 55659b44b6..0d0e8ac9e5 100644 --- a/res/pokemon/glalie/data.json +++ b/res/pokemon/glalie/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_ICE", - "TYPE_ICE" - ], + "types": [ "TYPE_ICE", "TYPE_ICE" ], "catch_rate": 75, "base_exp_reward": 187, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_ICE_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 1, "MOVE_BITE" ], + [ 4, "MOVE_DOUBLE_TEAM" ], + [ 10, "MOVE_BITE" ], + [ 13, "MOVE_ICY_WIND" ], + [ 19, "MOVE_HEADBUTT" ], + [ 22, "MOVE_PROTECT" ], + [ 28, "MOVE_ICE_FANG" ], + [ 31, "MOVE_CRUNCH" ], + [ 37, "MOVE_ICE_BEAM" ], + [ 40, "MOVE_HAIL" ], + [ 51, "MOVE_BLIZZARD" ], + [ 59, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -81,26 +89,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POWDER_SNOW", - "MOVE_LEER", - "MOVE_DOUBLE_TEAM", - "MOVE_BITE" - ], - "4": "MOVE_DOUBLE_TEAM", - "10": "MOVE_BITE", - "13": "MOVE_ICY_WIND", - "19": "MOVE_HEADBUTT", - "22": "MOVE_PROTECT", - "28": "MOVE_ICE_FANG", - "31": "MOVE_CRUNCH", - "37": "MOVE_ICE_BEAM", - "40": "MOVE_HAIL", - "51": "MOVE_BLIZZARD", - "59": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_ROLLOUT", "MOVE_IRON_HEAD", @@ -109,9 +98,10 @@ "MOVE_SIGNAL_BEAM" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 15, @@ -126,7 +116,7 @@ "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émon" + "category": "Face Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/glameow/data.json b/res/pokemon/glameow/data.json index 0f3dabd2d1..a03304f649 100644 --- a/res/pokemon/glameow/data.json +++ b/res/pokemon/glameow/data.json @@ -8,10 +8,7 @@ "special_attack": 42, "special_defense": 37 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 190, "base_exp_reward": 71, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_LIMBER", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_LIMBER", "ABILITY_OWN_TEMPO" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FAKE_OUT" ], + [ 5, "MOVE_SCRATCH" ], + [ 8, "MOVE_GROWL" ], + [ 13, "MOVE_HYPNOSIS" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 20, "MOVE_FURY_SWIPES" ], + [ 25, "MOVE_CHARM" ], + [ 29, "MOVE_ASSIST" ], + [ 32, "MOVE_CAPTIVATE" ], + [ 37, "MOVE_SLASH" ], + [ 41, "MOVE_SUCKER_PUNCH" ], + [ 45, "MOVE_ATTRACT" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -83,21 +88,7 @@ "TM90", "HM01" ], - "level_up": { - "1": "MOVE_FAKE_OUT", - "5": "MOVE_SCRATCH", - "8": "MOVE_GROWL", - "13": "MOVE_HYPNOSIS", - "17": "MOVE_FAINT_ATTACK", - "20": "MOVE_FURY_SWIPES", - "25": "MOVE_CHARM", - "29": "MOVE_ASSIST", - "32": "MOVE_CAPTIVATE", - "37": "MOVE_SLASH", - "41": "MOVE_SUCKER_PUNCH", - "45": "MOVE_ATTRACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -115,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -130,8 +121,8 @@ "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’t fed.", - "category": "Catty Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -140,4 +131,4 @@ "rarity": 30, "unused": 4102 } -} +} \ No newline at end of file diff --git a/res/pokemon/gligar/data.json b/res/pokemon/gligar/data.json index ad14327672..25f7d7b4f0 100644 --- a/res/pokemon/gligar/data.json +++ b/res/pokemon/gligar/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 65 }, - "types": [ - "TYPE_GROUND", - "TYPE_FLYING" - ], + "types": [ "TYPE_GROUND", "TYPE_FLYING" ], "catch_rate": 60, "base_exp_reward": 108, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_SAND_VEIL" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_STING" ], + [ 5, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_HARDEN" ], + [ 12, "MOVE_KNOCK_OFF" ], + [ 16, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_FURY_CUTTER" ], + [ 23, "MOVE_FAINT_ATTACK" ], + [ 27, "MOVE_SCREECH" ], + [ 31, "MOVE_SLASH" ], + [ 34, "MOVE_SWORDS_DANCE" ], + [ 38, "MOVE_U_TURN" ], + [ 42, "MOVE_X_SCISSOR" ], + [ 45, "MOVE_GUILLOTINE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -93,22 +99,7 @@ "HM05", "HM06" ], - "level_up": { - "1": "MOVE_POISON_STING", - "5": "MOVE_SAND_ATTACK", - "9": "MOVE_HARDEN", - "12": "MOVE_KNOCK_OFF", - "16": "MOVE_QUICK_ATTACK", - "20": "MOVE_FURY_CUTTER", - "23": "MOVE_FAINT_ATTACK", - "27": "MOVE_SCREECH", - "31": "MOVE_SLASH", - "34": "MOVE_SWORDS_DANCE", - "38": "MOVE_U_TURN", - "42": "MOVE_X_SCISSOR", - "45": "MOVE_GUILLOTINE" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_AQUA_TAIL", "MOVE_SNORE", @@ -125,8 +116,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -141,7 +132,7 @@ "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émon" + "category": "FlyScorpion Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -150,4 +141,4 @@ "rarity": 30, "unused": 4360 } -} +} \ No newline at end of file diff --git a/res/pokemon/gliscor/data.json b/res/pokemon/gliscor/data.json index c6f39dcb79..bd6c55cd58 100644 --- a/res/pokemon/gliscor/data.json +++ b/res/pokemon/gliscor/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 75 }, - "types": [ - "TYPE_GROUND", - "TYPE_FLYING" - ], + "types": [ "TYPE_GROUND", "TYPE_FLYING" ], "catch_rate": 30, "base_exp_reward": 192, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_SAND_VEIL" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_POISON_JAB" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_KNOCK_OFF" ], + [ 5, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_HARDEN" ], + [ 12, "MOVE_KNOCK_OFF" ], + [ 16, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_FURY_CUTTER" ], + [ 23, "MOVE_FAINT_ATTACK" ], + [ 27, "MOVE_SCREECH" ], + [ 31, "MOVE_NIGHT_SLASH" ], + [ 34, "MOVE_SWORDS_DANCE" ], + [ 38, "MOVE_U_TURN" ], + [ 42, "MOVE_X_SCISSOR" ], + [ 45, "MOVE_GUILLOTINE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -95,30 +107,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_THUNDER_FANG", - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_POISON_JAB", - "MOVE_SAND_ATTACK", - "MOVE_HARDEN", - "MOVE_KNOCK_OFF" - ], - "5": "MOVE_SAND_ATTACK", - "9": "MOVE_HARDEN", - "12": "MOVE_KNOCK_OFF", - "16": "MOVE_QUICK_ATTACK", - "20": "MOVE_FURY_CUTTER", - "23": "MOVE_FAINT_ATTACK", - "27": "MOVE_SCREECH", - "31": "MOVE_NIGHT_SLASH", - "34": "MOVE_SWORDS_DANCE", - "38": "MOVE_U_TURN", - "42": "MOVE_X_SCISSOR", - "45": "MOVE_GUILLOTINE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_AQUA_TAIL", @@ -128,9 +117,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -145,7 +135,7 @@ "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émon" + "category": "Fang Scorp Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/gloom/data.json b/res/pokemon/gloom/data.json index ed3608e3cd..d1686152ed 100644 --- a/res/pokemon/gloom/data.json +++ b/res/pokemon/gloom/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 75 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 120, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_SWEET_SCENT" ], + [ 1, "MOVE_ACID" ], + [ 5, "MOVE_SWEET_SCENT" ], + [ 9, "MOVE_ACID" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 15, "MOVE_STUN_SPORE" ], + [ 17, "MOVE_SLEEP_POWDER" ], + [ 23, "MOVE_MEGA_DRAIN" ], + [ 29, "MOVE_LUCKY_CHANT" ], + [ 35, "MOVE_NATURAL_GIFT" ], + [ 41, "MOVE_MOONLIGHT" ], + [ 47, "MOVE_GIGA_DRAIN" ], + [ 53, "MOVE_PETAL_DANCE" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -74,25 +81,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_ABSORB", - "MOVE_SWEET_SCENT", - "MOVE_ACID" - ], - "5": "MOVE_SWEET_SCENT", - "9": "MOVE_ACID", - "13": "MOVE_POISON_POWDER", - "15": "MOVE_STUN_SPORE", - "17": "MOVE_SLEEP_POWDER", - "23": "MOVE_MEGA_DRAIN", - "29": "MOVE_LUCKY_CHANT", - "35": "MOVE_NATURAL_GIFT", - "41": "MOVE_MOONLIGHT", - "47": "MOVE_GIGA_DRAIN", - "53": "MOVE_PETAL_DANCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -112,8 +101,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -128,7 +117,7 @@ "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émon" + "category": "Weed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/golbat/data.json b/res/pokemon/golbat/data.json index 5aa00e0034..73dfd7e95c 100644 --- a/res/pokemon/golbat/data.json +++ b/res/pokemon/golbat/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 75 }, - "types": [ - "TYPE_POISON", - "TYPE_FLYING" - ], + "types": [ "TYPE_POISON", "TYPE_FLYING" ], "catch_rate": 90, "base_exp_reward": 171, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCREECH" ], + [ 1, "MOVE_LEECH_LIFE" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_ASTONISH" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_ASTONISH" ], + [ 13, "MOVE_BITE" ], + [ 17, "MOVE_WING_ATTACK" ], + [ 21, "MOVE_CONFUSE_RAY" ], + [ 27, "MOVE_AIR_CUTTER" ], + [ 33, "MOVE_MEAN_LOOK" ], + [ 39, "MOVE_POISON_FANG" ], + [ 45, "MOVE_HAZE" ], + [ 51, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -81,25 +88,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_SCREECH", - "MOVE_LEECH_LIFE", - "MOVE_SUPERSONIC", - "MOVE_ASTONISH" - ], - "5": "MOVE_SUPERSONIC", - "9": "MOVE_ASTONISH", - "13": "MOVE_BITE", - "17": "MOVE_WING_ATTACK", - "21": "MOVE_CONFUSE_RAY", - "27": "MOVE_AIR_CUTTER", - "33": "MOVE_MEAN_LOOK", - "39": "MOVE_POISON_FANG", - "45": "MOVE_HAZE", - "51": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -111,14 +100,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_CROBAT" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_CROBAT" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -133,7 +119,7 @@ "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émon" + "category": "Bat Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -142,4 +128,4 @@ "rarity": 30, "unused": 4358 } -} +} \ No newline at end of file diff --git a/res/pokemon/goldeen/data.json b/res/pokemon/goldeen/data.json index 8e9c820681..7e3a781e6a 100644 --- a/res/pokemon/goldeen/data.json +++ b/res/pokemon/goldeen/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 225, "base_exp_reward": 111, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_WATER_VEIL" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 7, "MOVE_SUPERSONIC" ], + [ 11, "MOVE_HORN_ATTACK" ], + [ 17, "MOVE_WATER_PULSE" ], + [ 21, "MOVE_FLAIL" ], + [ 27, "MOVE_AQUA_RING" ], + [ 31, "MOVE_FURY_ATTACK" ], + [ 37, "MOVE_WATERFALL" ], + [ 41, "MOVE_HORN_DRILL" ], + [ 47, "MOVE_AGILITY" ], + [ 51, "MOVE_MEGAHORN" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -70,24 +76,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_TAIL_WHIP", - "MOVE_WATER_SPORT" - ], - "7": "MOVE_SUPERSONIC", - "11": "MOVE_HORN_ATTACK", - "17": "MOVE_WATER_PULSE", - "21": "MOVE_FLAIL", - "27": "MOVE_AQUA_RING", - "31": "MOVE_FURY_ATTACK", - "37": "MOVE_WATERFALL", - "41": "MOVE_HORN_DRILL", - "47": "MOVE_AGILITY", - "51": "MOVE_MEGAHORN" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -123,7 +112,7 @@ "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émon" + "category": "Goldfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -132,4 +121,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/golduck/data.json b/res/pokemon/golduck/data.json index 959b1b682f..d5e6c2ebd3 100644 --- a/res/pokemon/golduck/data.json +++ b/res/pokemon/golduck/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 80 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 75, "base_exp_reward": 174, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_DAMP", - "ABILITY_CLOUD_NINE" - ], - "great_marsh_flee_rate": 60, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_AQUA_JET" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_WATER_GUN" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_WATER_GUN" ], + [ 14, "MOVE_DISABLE" ], + [ 18, "MOVE_CONFUSION" ], + [ 22, "MOVE_WATER_PULSE" ], + [ 27, "MOVE_FURY_SWIPES" ], + [ 31, "MOVE_SCREECH" ], + [ 37, "MOVE_PSYCH_UP" ], + [ 44, "MOVE_ZEN_HEADBUTT" ], + [ 50, "MOVE_AMNESIA" ], + [ 56, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -87,27 +96,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_AQUA_JET", - "MOVE_WATER_SPORT", - "MOVE_SCRATCH", - "MOVE_TAIL_WHIP", - "MOVE_WATER_GUN" - ], - "5": "MOVE_TAIL_WHIP", - "9": "MOVE_WATER_GUN", - "14": "MOVE_DISABLE", - "18": "MOVE_CONFUSION", - "22": "MOVE_WATER_PULSE", - "27": "MOVE_FURY_SWIPES", - "31": "MOVE_SCREECH", - "37": "MOVE_PSYCH_UP", - "44": "MOVE_ZEN_HEADBUTT", - "50": "MOVE_AMNESIA", - "56": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -120,9 +109,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -137,7 +127,7 @@ "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émon" + "category": "Duck Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/golem/data.json b/res/pokemon/golem/data.json index 607fe15532..cfb16ff0b9 100644 --- a/res/pokemon/golem/data.json +++ b/res/pokemon/golem/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 65 }, - "types": [ - "TYPE_ROCK", - "TYPE_GROUND" - ], + "types": [ "TYPE_ROCK", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 177, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_ROCK_POLISH" ], + [ 4, "MOVE_MUD_SPORT" ], + [ 8, "MOVE_ROCK_POLISH" ], + [ 11, "MOVE_ROCK_THROW" ], + [ 15, "MOVE_MAGNITUDE" ], + [ 18, "MOVE_SELFDESTRUCT" ], + [ 22, "MOVE_ROLLOUT" ], + [ 27, "MOVE_ROCK_BLAST" ], + [ 33, "MOVE_EARTHQUAKE" ], + [ 38, "MOVE_EXPLOSION" ], + [ 44, "MOVE_DOUBLE_EDGE" ], + [ 49, "MOVE_STONE_EDGE" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -85,26 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_DEFENSE_CURL", - "MOVE_MUD_SPORT", - "MOVE_ROCK_POLISH" - ], - "4": "MOVE_MUD_SPORT", - "8": "MOVE_ROCK_POLISH", - "11": "MOVE_ROCK_THROW", - "15": "MOVE_MAGNITUDE", - "18": "MOVE_SELFDESTRUCT", - "22": "MOVE_ROLLOUT", - "27": "MOVE_ROCK_BLAST", - "33": "MOVE_EARTHQUAKE", - "38": "MOVE_EXPLOSION", - "44": "MOVE_DOUBLE_EDGE", - "49": "MOVE_STONE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -118,9 +107,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 14, @@ -134,8 +124,8 @@ "pokemon_pos_f": 7, "trainer_pos_m": 9, "pokemon_pos_m": 7, - "entry_text": "Even dynamite can’t harm its hard,\nboulderlike body. It sheds its hide\njust once a year.", - "category": "Megaton Pokémon" + "entry_text": "Even dynamite can\u2019t harm its hard,\nboulderlike body. It sheds its hide\njust once a year.", + "category": "Megaton Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/gorebyss/data.json b/res/pokemon/gorebyss/data.json index 68d783e44c..e748c6ac24 100644 --- a/res/pokemon/gorebyss/data.json +++ b/res/pokemon/gorebyss/data.json @@ -8,10 +8,7 @@ "special_attack": 114, "special_defense": 75 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 60, "base_exp_reward": 178, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WHIRLPOOL" ], + [ 6, "MOVE_CONFUSION" ], + [ 10, "MOVE_AGILITY" ], + [ 15, "MOVE_WATER_PULSE" ], + [ 19, "MOVE_AMNESIA" ], + [ 24, "MOVE_AQUA_RING" ], + [ 28, "MOVE_CAPTIVATE" ], + [ 33, "MOVE_BATON_PASS" ], + [ 37, "MOVE_DIVE" ], + [ 42, "MOVE_PSYCHIC" ], + [ 46, "MOVE_AQUA_TAIL" ], + [ 51, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,21 +81,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_WHIRLPOOL", - "6": "MOVE_CONFUSION", - "10": "MOVE_AGILITY", - "15": "MOVE_WATER_PULSE", - "19": "MOVE_AMNESIA", - "24": "MOVE_AQUA_RING", - "28": "MOVE_CAPTIVATE", - "33": "MOVE_BATON_PASS", - "37": "MOVE_DIVE", - "42": "MOVE_PSYCHIC", - "46": "MOVE_AQUA_TAIL", - "51": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -101,9 +92,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -118,7 +110,7 @@ "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émon" + "category": "South Sea Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/granbull/data.json b/res/pokemon/granbull/data.json index 4374c9bdc7..88c52ce6d8 100644 --- a/res/pokemon/granbull/data.json +++ b/res/pokemon/granbull/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 75, "base_exp_reward": 178, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_QUICK_FEET" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_QUICK_FEET" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_CHARM" ], + [ 7, "MOVE_BITE" ], + [ 13, "MOVE_LICK" ], + [ 19, "MOVE_HEADBUTT" ], + [ 27, "MOVE_ROAR" ], + [ 35, "MOVE_RAGE" ], + [ 43, "MOVE_TAKE_DOWN" ], + [ 51, "MOVE_PAYBACK" ], + [ 59, "MOVE_CRUNCH" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -96,26 +104,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_TACKLE", - "MOVE_SCARY_FACE", - "MOVE_TAIL_WHIP", - "MOVE_CHARM" - ], - "7": "MOVE_BITE", - "13": "MOVE_LICK", - "19": "MOVE_HEADBUTT", - "27": "MOVE_ROAR", - "35": "MOVE_RAGE", - "43": "MOVE_TAKE_DOWN", - "51": "MOVE_PAYBACK", - "59": "MOVE_CRUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -125,9 +114,10 @@ "MOVE_LAST_RESORT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -142,7 +132,7 @@ "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émon" + "category": "Fairy Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/graveler/data.json b/res/pokemon/graveler/data.json index 23e7f4c613..4ec8b6d48d 100644 --- a/res/pokemon/graveler/data.json +++ b/res/pokemon/graveler/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 45 }, - "types": [ - "TYPE_ROCK", - "TYPE_GROUND" - ], + "types": [ "TYPE_ROCK", "TYPE_GROUND" ], "catch_rate": 120, "base_exp_reward": 134, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_ROCK_POLISH" ], + [ 4, "MOVE_MUD_SPORT" ], + [ 8, "MOVE_ROCK_POLISH" ], + [ 11, "MOVE_ROCK_THROW" ], + [ 15, "MOVE_MAGNITUDE" ], + [ 18, "MOVE_SELFDESTRUCT" ], + [ 22, "MOVE_ROLLOUT" ], + [ 27, "MOVE_ROCK_BLAST" ], + [ 33, "MOVE_EARTHQUAKE" ], + [ 38, "MOVE_EXPLOSION" ], + [ 44, "MOVE_DOUBLE_EDGE" ], + [ 49, "MOVE_STONE_EDGE" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -81,26 +89,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_DEFENSE_CURL", - "MOVE_MUD_SPORT", - "MOVE_ROCK_POLISH" - ], - "4": "MOVE_MUD_SPORT", - "8": "MOVE_ROCK_POLISH", - "11": "MOVE_ROCK_THROW", - "15": "MOVE_MAGNITUDE", - "18": "MOVE_SELFDESTRUCT", - "22": "MOVE_ROLLOUT", - "27": "MOVE_ROCK_BLAST", - "33": "MOVE_EARTHQUAKE", - "38": "MOVE_EXPLOSION", - "44": "MOVE_DOUBLE_EDGE", - "49": "MOVE_STONE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -113,14 +102,11 @@ ] }, "evolutions": [ - [ - "EVO_TRADE", - "SPECIES_GOLEM" - ] + [ "EVO_TRADE", "SPECIES_GOLEM" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -134,8 +120,8 @@ "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émon\ncan stop it without difficulty.", - "category": "Rock Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/grimer/data.json b/res/pokemon/grimer/data.json index bc79dddbaf..b8ddc879cf 100644 --- a/res/pokemon/grimer/data.json +++ b/res/pokemon/grimer/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 50 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 190, "base_exp_reward": 90, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_STENCH", - "ABILITY_STICKY_HOLD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_STENCH", "ABILITY_STICKY_HOLD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_GAS" ], + [ 1, "MOVE_POUND" ], + [ 4, "MOVE_HARDEN" ], + [ 7, "MOVE_MUD_SLAP" ], + [ 12, "MOVE_DISABLE" ], + [ 17, "MOVE_MINIMIZE" ], + [ 20, "MOVE_SLUDGE" ], + [ 23, "MOVE_MUD_BOMB" ], + [ 28, "MOVE_FLING" ], + [ 33, "MOVE_SCREECH" ], + [ 36, "MOVE_SLUDGE_BOMB" ], + [ 39, "MOVE_ACID_ARMOR" ], + [ 44, "MOVE_GUNK_SHOT" ], + [ 49, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -83,25 +90,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_POISON_GAS", - "MOVE_POUND" - ], - "4": "MOVE_HARDEN", - "7": "MOVE_MUD_SLAP", - "12": "MOVE_DISABLE", - "17": "MOVE_MINIMIZE", - "20": "MOVE_SLUDGE", - "23": "MOVE_MUD_BOMB", - "28": "MOVE_FLING", - "33": "MOVE_SCREECH", - "36": "MOVE_SLUDGE_BOMB", - "39": "MOVE_ACID_ARMOR", - "44": "MOVE_GUNK_SHOT", - "49": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 9, @@ -133,8 +122,8 @@ "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’s\nX-rays. It appears among filth.", - "category": "Sludge Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -143,4 +132,4 @@ "rarity": 30, "unused": 1542 } -} +} \ No newline at end of file diff --git a/res/pokemon/grotle/data.json b/res/pokemon/grotle/data.json index 8f20a7e3e6..8565e208a9 100644 --- a/res/pokemon/grotle/data.json +++ b/res/pokemon/grotle/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 141, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_WITHDRAW" ], + [ 5, "MOVE_WITHDRAW" ], + [ 9, "MOVE_ABSORB" ], + [ 13, "MOVE_RAZOR_LEAF" ], + [ 17, "MOVE_CURSE" ], + [ 22, "MOVE_BITE" ], + [ 27, "MOVE_MEGA_DRAIN" ], + [ 32, "MOVE_LEECH_SEED" ], + [ 37, "MOVE_SYNTHESIS" ], + [ 42, "MOVE_CRUNCH" ], + [ 47, "MOVE_GIGA_DRAIN" ], + [ 52, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -79,24 +85,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_WITHDRAW" - ], - "5": "MOVE_WITHDRAW", - "9": "MOVE_ABSORB", - "13": "MOVE_RAZOR_LEAF", - "17": "MOVE_CURSE", - "22": "MOVE_BITE", - "27": "MOVE_MEGA_DRAIN", - "32": "MOVE_LEECH_SEED", - "37": "MOVE_SYNTHESIS", - "42": "MOVE_CRUNCH", - "47": "MOVE_GIGA_DRAIN", - "52": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -128,8 +117,8 @@ "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émon there\non its back.", - "category": "Grove Pokémon" + "entry_text": "It knows where pure water wells\nup. It carries fellow Pok\u00e9mon there\non its back.", + "category": "Grove Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -138,4 +127,4 @@ "rarity": 10, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/groudon/data.json b/res/pokemon/groudon/data.json index 941e2c613d..0efe9f3a67 100644 --- a/res/pokemon/groudon/data.json +++ b/res/pokemon/groudon/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 90 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 5, "base_exp_reward": 218, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_DROUGHT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_DROUGHT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SHOT" ], + [ 5, "MOVE_SCARY_FACE" ], + [ 15, "MOVE_ANCIENT_POWER" ], + [ 20, "MOVE_SLASH" ], + [ 30, "MOVE_BULK_UP" ], + [ 35, "MOVE_EARTHQUAKE" ], + [ 45, "MOVE_FIRE_BLAST" ], + [ 50, "MOVE_REST" ], + [ 60, "MOVE_FISSURE" ], + [ 65, "MOVE_SOLAR_BEAM" ], + [ 75, "MOVE_EARTH_POWER" ], + [ 80, "MOVE_ERUPTION" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -96,21 +101,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_MUD_SHOT", - "5": "MOVE_SCARY_FACE", - "15": "MOVE_ANCIENT_POWER", - "20": "MOVE_SLASH", - "30": "MOVE_BULK_UP", - "35": "MOVE_EARTHQUAKE", - "45": "MOVE_FIRE_BLAST", - "50": "MOVE_REST", - "60": "MOVE_FISSURE", - "65": "MOVE_SOLAR_BEAM", - "75": "MOVE_EARTH_POWER", - "80": "MOVE_ERUPTION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -124,9 +115,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 35, @@ -141,7 +133,7 @@ "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émon" + "category": "Continent Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/grovyle/data.json b/res/pokemon/grovyle/data.json index 6c37b4be8a..7f2680998b 100644 --- a/res/pokemon/grovyle/data.json +++ b/res/pokemon/grovyle/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 141, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 6, "MOVE_ABSORB" ], + [ 11, "MOVE_QUICK_ATTACK" ], + [ 16, "MOVE_FURY_CUTTER" ], + [ 17, "MOVE_PURSUIT" ], + [ 23, "MOVE_SCREECH" ], + [ 29, "MOVE_LEAF_BLADE" ], + [ 35, "MOVE_AGILITY" ], + [ 41, "MOVE_SLAM" ], + [ 47, "MOVE_DETECT" ], + [ 53, "MOVE_FALSE_SWIPE" ], + [ 59, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM01", "TM06", "TM09", @@ -85,26 +93,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_LEER", - "MOVE_ABSORB", - "MOVE_QUICK_ATTACK" - ], - "6": "MOVE_ABSORB", - "11": "MOVE_QUICK_ATTACK", - "16": "MOVE_FURY_CUTTER", - "17": "MOVE_PURSUIT", - "23": "MOVE_SCREECH", - "29": "MOVE_LEAF_BLADE", - "35": "MOVE_AGILITY", - "41": "MOVE_SLAM", - "47": "MOVE_DETECT", - "53": "MOVE_FALSE_SWIPE", - "59": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -123,8 +112,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -139,7 +128,7 @@ "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émon" + "category": "Wood Gecko Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -148,4 +137,4 @@ "rarity": 10, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/growlithe/data.json b/res/pokemon/growlithe/data.json index 0444153f91..b0cb1c0670 100644 --- a/res/pokemon/growlithe/data.json +++ b/res/pokemon/growlithe/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 50 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 190, "base_exp_reward": 91, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_FLASH_FIRE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_ROAR" ], + [ 6, "MOVE_EMBER" ], + [ 9, "MOVE_LEER" ], + [ 14, "MOVE_ODOR_SLEUTH" ], + [ 17, "MOVE_HELPING_HAND" ], + [ 20, "MOVE_FLAME_WHEEL" ], + [ 25, "MOVE_REVERSAL" ], + [ 28, "MOVE_FIRE_FANG" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 34, "MOVE_FLAMETHROWER" ], + [ 39, "MOVE_AGILITY" ], + [ 42, "MOVE_CRUNCH" ], + [ 45, "MOVE_HEAT_WAVE" ], + [ 48, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -74,26 +82,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_ROAR" - ], - "6": "MOVE_EMBER", - "9": "MOVE_LEER", - "14": "MOVE_ODOR_SLEUTH", - "17": "MOVE_HELPING_HAND", - "20": "MOVE_FLAME_WHEEL", - "25": "MOVE_REVERSAL", - "28": "MOVE_FIRE_FANG", - "31": "MOVE_TAKE_DOWN", - "34": "MOVE_FLAMETHROWER", - "39": "MOVE_AGILITY", - "42": "MOVE_CRUNCH", - "45": "MOVE_HEAT_WAVE", - "48": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -109,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -124,8 +113,8 @@ "pokemon_pos_f": 20, "trainer_pos_m": 9, "pokemon_pos_m": 20, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/grumpig/data.json b/res/pokemon/grumpig/data.json index 9245668fb4..6a393bc561 100644 --- a/res/pokemon/grumpig/data.json +++ b/res/pokemon/grumpig/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 110 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 60, "base_exp_reward": 164, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_PSYWAVE" ], + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 1, "MOVE_PSYBEAM" ], + [ 7, "MOVE_PSYWAVE" ], + [ 10, "MOVE_ODOR_SLEUTH" ], + [ 14, "MOVE_PSYBEAM" ], + [ 15, "MOVE_PSYCH_UP" ], + [ 18, "MOVE_CONFUSE_RAY" ], + [ 21, "MOVE_MAGIC_COAT" ], + [ 26, "MOVE_ZEN_HEADBUTT" ], + [ 29, "MOVE_REST" ], + [ 29, "MOVE_SNORE" ], + [ 37, "MOVE_PAYBACK" ], + [ 47, "MOVE_PSYCHIC" ], + [ 55, "MOVE_POWER_GEM" ], + [ 60, "MOVE_BOUNCE" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -93,30 +103,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_SPLASH", - "MOVE_PSYWAVE", - "MOVE_ODOR_SLEUTH", - "MOVE_PSYBEAM" - ], - "7": "MOVE_PSYWAVE", - "10": "MOVE_ODOR_SLEUTH", - "14": "MOVE_PSYBEAM", - "15": "MOVE_PSYCH_UP", - "18": "MOVE_CONFUSE_RAY", - "21": "MOVE_MAGIC_COAT", - "26": "MOVE_ZEN_HEADBUTT", - "29": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "37": "MOVE_PAYBACK", - "47": "MOVE_PSYCHIC", - "55": "MOVE_POWER_GEM", - "60": "MOVE_BOUNCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -130,9 +117,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -147,7 +135,7 @@ "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émon" + "category": "Manipulate Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/gulpin/data.json b/res/pokemon/gulpin/data.json index a3d58cf48c..253dab534c 100644 --- a/res/pokemon/gulpin/data.json +++ b/res/pokemon/gulpin/data.json @@ -8,10 +8,7 @@ "special_attack": 43, "special_defense": 53 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 225, "base_exp_reward": 75, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LIQUID_OOZE", - "ABILITY_STICKY_HOLD" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 6, "MOVE_YAWN" ], + [ 9, "MOVE_POISON_GAS" ], + [ 14, "MOVE_SLUDGE" ], + [ 17, "MOVE_AMNESIA" ], + [ 23, "MOVE_ENCORE" ], + [ 28, "MOVE_TOXIC" ], + [ 34, "MOVE_STOCKPILE" ], + [ 34, "MOVE_SPIT_UP" ], + [ 34, "MOVE_SWALLOW" ], + [ 39, "MOVE_SLUDGE_BOMB" ], + [ 44, "MOVE_GASTRO_ACID" ], + [ 49, "MOVE_WRING_OUT" ], + [ 54, "MOVE_GUNK_SHOT" ] + ], + "by_tm": [ "TM03", "TM06", "TM09", @@ -77,25 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_POUND", - "6": "MOVE_YAWN", - "9": "MOVE_POISON_GAS", - "14": "MOVE_SLUDGE", - "17": "MOVE_AMNESIA", - "23": "MOVE_ENCORE", - "28": "MOVE_TOXIC", - "34": [ - "MOVE_STOCKPILE", - "MOVE_SPIT_UP", - "MOVE_SWALLOW" - ], - "39": "MOVE_SLUDGE_BOMB", - "44": "MOVE_GASTRO_ACID", - "49": "MOVE_WRING_OUT", - "54": "MOVE_GUNK_SHOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -115,8 +104,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -131,7 +120,7 @@ "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émon" + "category": "Stomach Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -140,4 +129,4 @@ "rarity": 30, "unused": 1542 } -} +} \ No newline at end of file diff --git a/res/pokemon/gyarados/data.json b/res/pokemon/gyarados/data.json index 87ac9b0c67..23540b9bd0 100644 --- a/res/pokemon/gyarados/data.json +++ b/res/pokemon/gyarados/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 100 }, - "types": [ - "TYPE_WATER", - "TYPE_FLYING" - ], + "types": [ "TYPE_WATER", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 214, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 5, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_WATER_2", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THRASH" ], + [ 20, "MOVE_BITE" ], + [ 23, "MOVE_DRAGON_RAGE" ], + [ 26, "MOVE_LEER" ], + [ 29, "MOVE_TWISTER" ], + [ 32, "MOVE_ICE_FANG" ], + [ 35, "MOVE_AQUA_TAIL" ], + [ 38, "MOVE_RAIN_DANCE" ], + [ 41, "MOVE_HYDRO_PUMP" ], + [ 44, "MOVE_DRAGON_DANCE" ], + [ 47, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -89,20 +93,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_THRASH", - "20": "MOVE_BITE", - "23": "MOVE_DRAGON_RAGE", - "26": "MOVE_LEER", - "29": "MOVE_TWISTER", - "32": "MOVE_ICE_FANG", - "35": "MOVE_AQUA_TAIL", - "38": "MOVE_RAIN_DANCE", - "41": "MOVE_HYDRO_PUMP", - "44": "MOVE_DRAGON_DANCE", - "47": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_IRON_HEAD", @@ -115,9 +106,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 65, @@ -132,7 +124,7 @@ "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émon" + "category": "Atrocious Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/happiny/data.json b/res/pokemon/happiny/data.json index fc871694af..e86676fbeb 100644 --- a/res/pokemon/happiny/data.json +++ b/res/pokemon/happiny/data.json @@ -8,10 +8,7 @@ "special_attack": 15, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 130, "base_exp_reward": 255, "ev_yields": { @@ -30,21 +27,22 @@ "hatch_cycles": 40, "base_friendship": 140, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_SERENE_GRACE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_CHARM" ], + [ 5, "MOVE_COPYCAT" ], + [ 9, "MOVE_REFRESH" ], + [ 12, "MOVE_SWEET_KISS" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -82,16 +80,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_CHARM" - ], - "5": "MOVE_COPYCAT", - "9": "MOVE_REFRESH", - "12": "MOVE_SWEET_KISS" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -126,8 +115,8 @@ "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’\nfeet and cause them to stumble.", - "category": "Playhouse Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -136,4 +125,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/hariyama/data.json b/res/pokemon/hariyama/data.json index b9f0a52f66..5438c05988 100644 --- a/res/pokemon/hariyama/data.json +++ b/res/pokemon/hariyama/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 60 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 200, "base_exp_reward": 184, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_GUTS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BRINE" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_ARM_THRUST" ], + [ 4, "MOVE_SAND_ATTACK" ], + [ 7, "MOVE_ARM_THRUST" ], + [ 10, "MOVE_VITAL_THROW" ], + [ 13, "MOVE_FAKE_OUT" ], + [ 16, "MOVE_WHIRLWIND" ], + [ 19, "MOVE_KNOCK_OFF" ], + [ 22, "MOVE_SMELLING_SALT" ], + [ 27, "MOVE_BELLY_DRUM" ], + [ 32, "MOVE_FORCE_PALM" ], + [ 37, "MOVE_SEISMIC_TOSS" ], + [ 42, "MOVE_WAKE_UP_SLAP" ], + [ 47, "MOVE_ENDURE" ], + [ 52, "MOVE_CLOSE_COMBAT" ], + [ 57, "MOVE_REVERSAL" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -83,30 +95,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_BRINE", - "MOVE_TACKLE", - "MOVE_FOCUS_ENERGY", - "MOVE_SAND_ATTACK", - "MOVE_ARM_THRUST" - ], - "4": "MOVE_SAND_ATTACK", - "7": "MOVE_ARM_THRUST", - "10": "MOVE_VITAL_THROW", - "13": "MOVE_FAKE_OUT", - "16": "MOVE_WHIRLWIND", - "19": "MOVE_KNOCK_OFF", - "22": "MOVE_SMELLING_SALT", - "27": "MOVE_BELLY_DRUM", - "32": "MOVE_FORCE_PALM", - "37": "MOVE_SEISMIC_TOSS", - "42": "MOVE_WAKE_UP_SLAP", - "47": "MOVE_ENDURE", - "52": "MOVE_CLOSE_COMBAT", - "57": "MOVE_REVERSAL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -119,9 +108,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 23, @@ -135,8 +125,8 @@ "pokemon_pos_f": 4, "trainer_pos_m": 12, "pokemon_pos_m": 4, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/haunter/data.json b/res/pokemon/haunter/data.json index e99e862787..215f643856 100644 --- a/res/pokemon/haunter/data.json +++ b/res/pokemon/haunter/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 55 }, - "types": [ - "TYPE_GHOST", - "TYPE_POISON" - ], + "types": [ "TYPE_GHOST", "TYPE_POISON" ], "catch_rate": 90, "base_exp_reward": 126, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_LICK" ], + [ 1, "MOVE_SPITE" ], + [ 5, "MOVE_SPITE" ], + [ 8, "MOVE_MEAN_LOOK" ], + [ 12, "MOVE_CURSE" ], + [ 15, "MOVE_NIGHT_SHADE" ], + [ 19, "MOVE_CONFUSE_RAY" ], + [ 22, "MOVE_SUCKER_PUNCH" ], + [ 25, "MOVE_SHADOW_PUNCH" ], + [ 28, "MOVE_PAYBACK" ], + [ 33, "MOVE_SHADOW_BALL" ], + [ 39, "MOVE_DREAM_EATER" ], + [ 44, "MOVE_DARK_PULSE" ], + [ 50, "MOVE_DESTINY_BOND" ], + [ 55, "MOVE_NIGHTMARE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -86,27 +95,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_HYPNOSIS", - "MOVE_LICK", - "MOVE_SPITE" - ], - "5": "MOVE_SPITE", - "8": "MOVE_MEAN_LOOK", - "12": "MOVE_CURSE", - "15": "MOVE_NIGHT_SHADE", - "19": "MOVE_CONFUSE_RAY", - "22": "MOVE_SUCKER_PUNCH", - "25": "MOVE_SHADOW_PUNCH", - "28": "MOVE_PAYBACK", - "33": "MOVE_SHADOW_BALL", - "39": "MOVE_DREAM_EATER", - "44": "MOVE_DARK_PULSE", - "50": "MOVE_DESTINY_BOND", - "55": "MOVE_NIGHTMARE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -121,14 +110,11 @@ ] }, "evolutions": [ - [ - "EVO_TRADE", - "SPECIES_GENGAR" - ] + [ "EVO_TRADE", "SPECIES_GENGAR" ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 16, @@ -143,7 +129,7 @@ "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émon" + "category": "Gas Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/heatran/data.json b/res/pokemon/heatran/data.json index dfebf76086..c78125258f 100644 --- a/res/pokemon/heatran/data.json +++ b/res/pokemon/heatran/data.json @@ -8,10 +8,7 @@ "special_attack": 130, "special_defense": 106 }, - "types": [ - "TYPE_FIRE", - "TYPE_STEEL" - ], + "types": [ "TYPE_FIRE", "TYPE_STEEL" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 10, "base_friendship": 100, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_FLASH_FIRE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ANCIENT_POWER" ], + [ 9, "MOVE_LEER" ], + [ 17, "MOVE_FIRE_FANG" ], + [ 25, "MOVE_METAL_SOUND" ], + [ 33, "MOVE_CRUNCH" ], + [ 41, "MOVE_SCARY_FACE" ], + [ 49, "MOVE_LAVA_PLUME" ], + [ 57, "MOVE_FIRE_SPIN" ], + [ 65, "MOVE_IRON_HEAD" ], + [ 73, "MOVE_EARTH_POWER" ], + [ 81, "MOVE_HEAT_WAVE" ], + [ 88, "MOVE_STONE_EDGE" ], + [ 96, "MOVE_MAGMA_STORM" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -87,22 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_ANCIENT_POWER", - "9": "MOVE_LEER", - "17": "MOVE_FIRE_FANG", - "25": "MOVE_METAL_SOUND", - "33": "MOVE_CRUNCH", - "41": "MOVE_SCARY_FACE", - "49": "MOVE_LAVA_PLUME", - "57": "MOVE_FIRE_SPIN", - "65": "MOVE_IRON_HEAD", - "73": "MOVE_EARTH_POWER", - "81": "MOVE_HEAT_WAVE", - "88": "MOVE_STONE_EDGE", - "96": "MOVE_MAGMA_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -113,9 +104,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -130,7 +122,7 @@ "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émon" + "category": "Lava Dome Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/heracross/data.json b/res/pokemon/heracross/data.json index 36b2358537..8f84207083 100644 --- a/res/pokemon/heracross/data.json +++ b/res/pokemon/heracross/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 95 }, - "types": [ - "TYPE_BUG", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_BUG", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 200, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_GUTS" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_GUTS" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_NIGHT_SLASH" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_HORN_ATTACK" ], + [ 1, "MOVE_ENDURE" ], + [ 7, "MOVE_FURY_ATTACK" ], + [ 13, "MOVE_AERIAL_ACE" ], + [ 19, "MOVE_BRICK_BREAK" ], + [ 25, "MOVE_COUNTER" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_CLOSE_COMBAT" ], + [ 43, "MOVE_REVERSAL" ], + [ 49, "MOVE_FEINT" ], + [ 55, "MOVE_MEGAHORN" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -83,25 +90,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_NIGHT_SLASH", - "MOVE_TACKLE", - "MOVE_LEER", - "MOVE_HORN_ATTACK", - "MOVE_ENDURE" - ], - "7": "MOVE_FURY_ATTACK", - "13": "MOVE_AERIAL_ACE", - "19": "MOVE_BRICK_BREAK", - "25": "MOVE_COUNTER", - "31": "MOVE_TAKE_DOWN", - "37": "MOVE_CLOSE_COMBAT", - "43": "MOVE_REVERSAL", - "49": "MOVE_FEINT", - "55": "MOVE_MEGAHORN" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -110,9 +99,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -127,7 +117,7 @@ "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émon" + "category": "Single Horn Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/hippopotas/data.json b/res/pokemon/hippopotas/data.json index 5c32a43d3c..fc12d8c019 100644 --- a/res/pokemon/hippopotas/data.json +++ b/res/pokemon/hippopotas/data.json @@ -8,10 +8,7 @@ "special_attack": 38, "special_defense": 42 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 140, "base_exp_reward": 95, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SAND_STREAM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SAND_STREAM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 7, "MOVE_BITE" ], + [ 13, "MOVE_YAWN" ], + [ 19, "MOVE_TAKE_DOWN" ], + [ 25, "MOVE_SAND_TOMB" ], + [ 31, "MOVE_CRUNCH" ], + [ 37, "MOVE_EARTHQUAKE" ], + [ 44, "MOVE_DOUBLE_EDGE" ], + [ 50, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -73,21 +76,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_SAND_ATTACK" - ], - "7": "MOVE_BITE", - "13": "MOVE_YAWN", - "19": "MOVE_TAKE_DOWN", - "25": "MOVE_SAND_TOMB", - "31": "MOVE_CRUNCH", - "37": "MOVE_EARTHQUAKE", - "44": "MOVE_DOUBLE_EDGE", - "50": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -102,8 +91,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -118,7 +107,7 @@ "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émon" + "category": "Hippo Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -127,4 +116,4 @@ "rarity": 20, "unused": 2056 } -} +} \ No newline at end of file diff --git a/res/pokemon/hippowdon/data.json b/res/pokemon/hippowdon/data.json index 7e4fa397ac..d4fa984202 100644 --- a/res/pokemon/hippowdon/data.json +++ b/res/pokemon/hippowdon/data.json @@ -8,10 +8,7 @@ "special_attack": 68, "special_defense": 72 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 60, "base_exp_reward": 198, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SAND_STREAM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SAND_STREAM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_YAWN" ], + [ 7, "MOVE_BITE" ], + [ 13, "MOVE_YAWN" ], + [ 19, "MOVE_TAKE_DOWN" ], + [ 25, "MOVE_SAND_TOMB" ], + [ 31, "MOVE_CRUNCH" ], + [ 40, "MOVE_EARTHQUAKE" ], + [ 50, "MOVE_DOUBLE_EDGE" ], + [ 60, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -76,26 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_TACKLE", - "MOVE_SAND_ATTACK", - "MOVE_BITE", - "MOVE_YAWN" - ], - "7": "MOVE_BITE", - "13": "MOVE_YAWN", - "19": "MOVE_TAKE_DOWN", - "25": "MOVE_SAND_TOMB", - "31": "MOVE_CRUNCH", - "40": "MOVE_EARTHQUAKE", - "50": "MOVE_DOUBLE_EDGE", - "60": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_IRON_HEAD", @@ -103,9 +92,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -120,7 +110,7 @@ "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émon" + "category": "Heavyweight Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/hitmonchan/data.json b/res/pokemon/hitmonchan/data.json index fb66f3b8b4..c2ed97b401 100644 --- a/res/pokemon/hitmonchan/data.json +++ b/res/pokemon/hitmonchan/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 110 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 140, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_IRON_FIST" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REVENGE" ], + [ 1, "MOVE_COMET_PUNCH" ], + [ 6, "MOVE_AGILITY" ], + [ 11, "MOVE_PURSUIT" ], + [ 16, "MOVE_MACH_PUNCH" ], + [ 16, "MOVE_BULLET_PUNCH" ], + [ 21, "MOVE_FEINT" ], + [ 26, "MOVE_VACUUM_WAVE" ], + [ 31, "MOVE_THUNDER_PUNCH" ], + [ 31, "MOVE_ICE_PUNCH" ], + [ 31, "MOVE_FIRE_PUNCH" ], + [ 36, "MOVE_SKY_UPPERCUT" ], + [ 41, "MOVE_MEGA_PUNCH" ], + [ 46, "MOVE_DETECT" ], + [ 51, "MOVE_COUNTER" ], + [ 56, "MOVE_CLOSE_COMBAT" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -78,31 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_REVENGE", - "MOVE_COMET_PUNCH" - ], - "6": "MOVE_AGILITY", - "11": "MOVE_PURSUIT", - "16": [ - "MOVE_MACH_PUNCH", - "MOVE_BULLET_PUNCH" - ], - "21": "MOVE_FEINT", - "26": "MOVE_VACUUM_WAVE", - "31": [ - "MOVE_THUNDER_PUNCH", - "MOVE_ICE_PUNCH", - "MOVE_FIRE_PUNCH" - ], - "36": "MOVE_SKY_UPPERCUT", - "41": "MOVE_MEGA_PUNCH", - "46": "MOVE_DETECT", - "51": "MOVE_COUNTER", - "56": "MOVE_CLOSE_COMBAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -113,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -130,7 +116,7 @@ "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émon" + "category": "Punching Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/hitmonlee/data.json b/res/pokemon/hitmonlee/data.json index bebcf30c5f..a41584fcd4 100644 --- a/res/pokemon/hitmonlee/data.json +++ b/res/pokemon/hitmonlee/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 110 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 139, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_LIMBER", - "ABILITY_RECKLESS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REVENGE" ], + [ 1, "MOVE_DOUBLE_KICK" ], + [ 5, "MOVE_MEDITATE" ], + [ 9, "MOVE_ROLLING_KICK" ], + [ 13, "MOVE_JUMP_KICK" ], + [ 17, "MOVE_BRICK_BREAK" ], + [ 21, "MOVE_FOCUS_ENERGY" ], + [ 25, "MOVE_FEINT" ], + [ 29, "MOVE_HI_JUMP_KICK" ], + [ 33, "MOVE_MIND_READER" ], + [ 37, "MOVE_FORESIGHT" ], + [ 41, "MOVE_BLAZE_KICK" ], + [ 45, "MOVE_ENDURE" ], + [ 49, "MOVE_MEGA_KICK" ], + [ 53, "MOVE_CLOSE_COMBAT" ], + [ 57, "MOVE_REVERSAL" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -78,27 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_REVENGE", - "MOVE_DOUBLE_KICK" - ], - "5": "MOVE_MEDITATE", - "9": "MOVE_ROLLING_KICK", - "13": "MOVE_JUMP_KICK", - "17": "MOVE_BRICK_BREAK", - "21": "MOVE_FOCUS_ENERGY", - "25": "MOVE_FEINT", - "29": "MOVE_HI_JUMP_KICK", - "33": "MOVE_MIND_READER", - "37": "MOVE_FORESIGHT", - "41": "MOVE_BLAZE_KICK", - "45": "MOVE_ENDURE", - "49": "MOVE_MEGA_KICK", - "53": "MOVE_CLOSE_COMBAT", - "57": "MOVE_REVERSAL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -127,7 +117,7 @@ "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émon" + "category": "Kicking Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/hitmontop/data.json b/res/pokemon/hitmontop/data.json index a1fb7bdf06..40707e4d9a 100644 --- a/res/pokemon/hitmontop/data.json +++ b/res/pokemon/hitmontop/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 110 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 138, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_TECHNICIAN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REVENGE" ], + [ 1, "MOVE_ROLLING_KICK" ], + [ 6, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_PURSUIT" ], + [ 15, "MOVE_QUICK_ATTACK" ], + [ 19, "MOVE_TRIPLE_KICK" ], + [ 24, "MOVE_RAPID_SPIN" ], + [ 28, "MOVE_COUNTER" ], + [ 33, "MOVE_FEINT" ], + [ 37, "MOVE_AGILITY" ], + [ 42, "MOVE_GYRO_BALL" ], + [ 46, "MOVE_DETECT" ], + [ 51, "MOVE_CLOSE_COMBAT" ], + [ 55, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM06", "TM08", "TM10", @@ -76,25 +83,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_REVENGE", - "MOVE_ROLLING_KICK" - ], - "6": "MOVE_FOCUS_ENERGY", - "10": "MOVE_PURSUIT", - "15": "MOVE_QUICK_ATTACK", - "19": "MOVE_TRIPLE_KICK", - "24": "MOVE_RAPID_SPIN", - "28": "MOVE_COUNTER", - "33": "MOVE_FEINT", - "37": "MOVE_AGILITY", - "42": "MOVE_GYRO_BALL", - "46": "MOVE_DETECT", - "51": "MOVE_CLOSE_COMBAT", - "55": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -106,9 +95,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -123,7 +113,7 @@ "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émon" + "category": "Handstand Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/ho_oh/data.json b/res/pokemon/ho_oh/data.json index 85c731c6f2..e0fa22bf42 100644 --- a/res/pokemon/ho_oh/data.json +++ b/res/pokemon/ho_oh/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 154 }, - "types": [ - "TYPE_FIRE", - "TYPE_FLYING" - ], + "types": [ "TYPE_FIRE", "TYPE_FLYING" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WHIRLWIND" ], + [ 9, "MOVE_SAFEGUARD" ], + [ 15, "MOVE_GUST" ], + [ 23, "MOVE_RECOVER" ], + [ 29, "MOVE_FIRE_BLAST" ], + [ 37, "MOVE_SUNNY_DAY" ], + [ 43, "MOVE_SWIFT" ], + [ 51, "MOVE_NATURAL_GIFT" ], + [ 57, "MOVE_ANCIENT_POWER" ], + [ 65, "MOVE_EXTRASENSORY" ], + [ 71, "MOVE_PUNISHMENT" ], + [ 79, "MOVE_FUTURE_SIGHT" ], + [ 85, "MOVE_SACRED_FIRE" ], + [ 93, "MOVE_CALM_MIND" ], + [ 99, "MOVE_SKY_ATTACK" ] + ], + "by_tm": [ "TM04", "TM05", "TM06", @@ -95,24 +103,7 @@ "HM05", "HM06" ], - "level_up": { - "1": "MOVE_WHIRLWIND", - "9": "MOVE_SAFEGUARD", - "15": "MOVE_GUST", - "23": "MOVE_RECOVER", - "29": "MOVE_FIRE_BLAST", - "37": "MOVE_SUNNY_DAY", - "43": "MOVE_SWIFT", - "51": "MOVE_NATURAL_GIFT", - "57": "MOVE_ANCIENT_POWER", - "65": "MOVE_EXTRASENSORY", - "71": "MOVE_PUNISHMENT", - "79": "MOVE_FUTURE_SIGHT", - "85": "MOVE_SACRED_FIRE", - "93": "MOVE_CALM_MIND", - "99": "MOVE_SKY_ATTACK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_OMINOUS_WIND", @@ -127,9 +118,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 38, @@ -144,7 +136,7 @@ "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émon" + "category": "Rainbow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/honchkrow/data.json b/res/pokemon/honchkrow/data.json index 5f6f64d702..69dda2c535 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 52 }, - "types": [ - "TYPE_DARK", - "TYPE_FLYING" - ], + "types": [ "TYPE_DARK", "TYPE_FLYING" ], "catch_rate": 30, "base_exp_reward": 187, "ev_yields": { @@ -30,21 +27,25 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_SUPER_LUCK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INSOMNIA", "ABILITY_SUPER_LUCK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_PURSUIT" ], + [ 1, "MOVE_HAZE" ], + [ 1, "MOVE_WING_ATTACK" ], + [ 25, "MOVE_SWAGGER" ], + [ 35, "MOVE_NASTY_PLOT" ], + [ 45, "MOVE_NIGHT_SLASH" ], + [ 55, "MOVE_DARK_PULSE" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -85,19 +86,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_ASTONISH", - "MOVE_PURSUIT", - "MOVE_HAZE", - "MOVE_WING_ATTACK" - ], - "25": "MOVE_SWAGGER", - "35": "MOVE_NASTY_PLOT", - "45": "MOVE_NIGHT_SLASH", - "55": "MOVE_DARK_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_OMINOUS_WIND", @@ -110,9 +99,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -126,8 +116,8 @@ "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 “Summoner of Night.”", - "category": "Big Boss Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/hoothoot/data.json b/res/pokemon/hoothoot/data.json index 7bcd6ccab4..68782a6064 100644 --- a/res/pokemon/hoothoot/data.json +++ b/res/pokemon/hoothoot/data.json @@ -8,10 +8,7 @@ "special_attack": 36, "special_defense": 56 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 58, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_KEEN_EYE" - ], - "great_marsh_flee_rate": 90, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INSOMNIA", "ABILITY_KEEN_EYE" ], + "safari_flee_rate": 90, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_FORESIGHT" ], + [ 5, "MOVE_HYPNOSIS" ], + [ 9, "MOVE_PECK" ], + [ 13, "MOVE_UPROAR" ], + [ 17, "MOVE_REFLECT" ], + [ 21, "MOVE_CONFUSION" ], + [ 25, "MOVE_TAKE_DOWN" ], + [ 29, "MOVE_AIR_SLASH" ], + [ 33, "MOVE_ZEN_HEADBUTT" ], + [ 37, "MOVE_EXTRASENSORY" ], + [ 41, "MOVE_PSYCHO_SHIFT" ], + [ 45, "MOVE_ROOST" ], + [ 49, "MOVE_DREAM_EATER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,26 +86,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_FORESIGHT" - ], - "5": "MOVE_HYPNOSIS", - "9": "MOVE_PECK", - "13": "MOVE_UPROAR", - "17": "MOVE_REFLECT", - "21": "MOVE_CONFUSION", - "25": "MOVE_TAKE_DOWN", - "29": "MOVE_AIR_SLASH", - "33": "MOVE_ZEN_HEADBUTT", - "37": "MOVE_EXTRASENSORY", - "41": "MOVE_PSYCHO_SHIFT", - "45": "MOVE_ROOST", - "49": "MOVE_DREAM_EATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_AIR_CUTTER", @@ -116,8 +105,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -131,8 +120,8 @@ "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’s ways.", - "category": "Owl Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -141,4 +130,4 @@ "rarity": 50, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/hoppip/data.json b/res/pokemon/hoppip/data.json index e5ce8bbb8d..b3c17f1ae6 100644 --- a/res/pokemon/hoppip/data.json +++ b/res/pokemon/hoppip/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 55 }, - "types": [ - "TYPE_GRASS", - "TYPE_FLYING" - ], + "types": [ "TYPE_GRASS", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_LEAF_GUARD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 4, "MOVE_SYNTHESIS" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_TACKLE" ], + [ 12, "MOVE_POISON_POWDER" ], + [ 14, "MOVE_STUN_SPORE" ], + [ 16, "MOVE_SLEEP_POWDER" ], + [ 19, "MOVE_BULLET_SEED" ], + [ 22, "MOVE_LEECH_SEED" ], + [ 25, "MOVE_MEGA_DRAIN" ], + [ 28, "MOVE_COTTON_SPORE" ], + [ 31, "MOVE_U_TURN" ], + [ 34, "MOVE_WORRY_SEED" ], + [ 37, "MOVE_GIGA_DRAIN" ], + [ 40, "MOVE_BOUNCE" ], + [ 43, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,25 +82,7 @@ "TM89", "TM90" ], - "level_up": { - "1": "MOVE_SPLASH", - "4": "MOVE_SYNTHESIS", - "7": "MOVE_TAIL_WHIP", - "10": "MOVE_TACKLE", - "12": "MOVE_POISON_POWDER", - "14": "MOVE_STUN_SPORE", - "16": "MOVE_SLEEP_POWDER", - "19": "MOVE_BULLET_SEED", - "22": "MOVE_LEECH_SEED", - "25": "MOVE_MEGA_DRAIN", - "28": "MOVE_COTTON_SPORE", - "31": "MOVE_U_TURN", - "34": "MOVE_WORRY_SEED", - "37": "MOVE_GIGA_DRAIN", - "40": "MOVE_BOUNCE", - "43": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_HELPING_HAND", "MOVE_SYNTHESIS", @@ -107,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -123,7 +114,7 @@ "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émon" + "category": "Cottonweed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -132,4 +123,4 @@ "rarity": 30, "unused": 4353 } -} +} \ No newline at end of file diff --git a/res/pokemon/horsea/data.json b/res/pokemon/horsea/data.json index 744542a046..0d4d405895 100644 --- a/res/pokemon/horsea/data.json +++ b/res/pokemon/horsea/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 25 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 225, "base_exp_reward": 83, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 4, "MOVE_SMOKE_SCREEN" ], + [ 8, "MOVE_LEER" ], + [ 11, "MOVE_WATER_GUN" ], + [ 14, "MOVE_FOCUS_ENERGY" ], + [ 18, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_AGILITY" ], + [ 26, "MOVE_TWISTER" ], + [ 30, "MOVE_BRINE" ], + [ 35, "MOVE_HYDRO_PUMP" ], + [ 38, "MOVE_DRAGON_DANCE" ], + [ 42, "MOVE_DRAGON_PULSE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -72,21 +77,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_BUBBLE", - "4": "MOVE_SMOKE_SCREEN", - "8": "MOVE_LEER", - "11": "MOVE_WATER_GUN", - "14": "MOVE_FOCUS_ENERGY", - "18": "MOVE_BUBBLE_BEAM", - "23": "MOVE_AGILITY", - "26": "MOVE_TWISTER", - "30": "MOVE_BRINE", - "35": "MOVE_HYDRO_PUMP", - "38": "MOVE_DRAGON_DANCE", - "42": "MOVE_DRAGON_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -105,8 +96,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -121,7 +112,7 @@ "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émon" + "category": "Dragon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -130,4 +121,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/houndoom/data.json b/res/pokemon/houndoom/data.json index 7994d8204b..4297a921f3 100644 --- a/res/pokemon/houndoom/data.json +++ b/res/pokemon/houndoom/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 80 }, - "types": [ - "TYPE_DARK", - "TYPE_FIRE" - ], + "types": [ "TYPE_DARK", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_EARLY_BIRD", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_HOWL" ], + [ 1, "MOVE_SMOG" ], + [ 4, "MOVE_HOWL" ], + [ 9, "MOVE_SMOG" ], + [ 14, "MOVE_ROAR" ], + [ 17, "MOVE_BITE" ], + [ 22, "MOVE_ODOR_SLEUTH" ], + [ 28, "MOVE_BEAT_UP" ], + [ 32, "MOVE_FIRE_FANG" ], + [ 38, "MOVE_FAINT_ATTACK" ], + [ 44, "MOVE_EMBARGO" ], + [ 48, "MOVE_FLAMETHROWER" ], + [ 54, "MOVE_CRUNCH" ], + [ 60, "MOVE_NASTY_PLOT" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -84,28 +94,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_THUNDER_FANG", - "MOVE_LEER", - "MOVE_EMBER", - "MOVE_HOWL", - "MOVE_SMOG" - ], - "4": "MOVE_HOWL", - "9": "MOVE_SMOG", - "14": "MOVE_ROAR", - "17": "MOVE_BITE", - "22": "MOVE_ODOR_SLEUTH", - "28": "MOVE_BEAT_UP", - "32": "MOVE_FIRE_FANG", - "38": "MOVE_FAINT_ATTACK", - "44": "MOVE_EMBARGO", - "48": "MOVE_FLAMETHROWER", - "54": "MOVE_CRUNCH", - "60": "MOVE_NASTY_PLOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SPITE", @@ -115,9 +104,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -132,7 +122,7 @@ "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émon" + "category": "Dark Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/houndour/data.json b/res/pokemon/houndour/data.json index 2345b98a62..92d1da12af 100644 --- a/res/pokemon/houndour/data.json +++ b/res/pokemon/houndour/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 50 }, - "types": [ - "TYPE_DARK", - "TYPE_FIRE" - ], + "types": [ "TYPE_DARK", "TYPE_FIRE" ], "catch_rate": 120, "base_exp_reward": 114, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_EARLY_BIRD", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_EMBER" ], + [ 4, "MOVE_HOWL" ], + [ 9, "MOVE_SMOG" ], + [ 14, "MOVE_ROAR" ], + [ 17, "MOVE_BITE" ], + [ 22, "MOVE_ODOR_SLEUTH" ], + [ 27, "MOVE_BEAT_UP" ], + [ 30, "MOVE_FIRE_FANG" ], + [ 35, "MOVE_FAINT_ATTACK" ], + [ 40, "MOVE_EMBARGO" ], + [ 43, "MOVE_FLAMETHROWER" ], + [ 48, "MOVE_CRUNCH" ], + [ 53, "MOVE_NASTY_PLOT" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -81,25 +88,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_EMBER" - ], - "4": "MOVE_HOWL", - "9": "MOVE_SMOG", - "14": "MOVE_ROAR", - "17": "MOVE_BITE", - "22": "MOVE_ODOR_SLEUTH", - "27": "MOVE_BEAT_UP", - "30": "MOVE_FIRE_FANG", - "35": "MOVE_FAINT_ATTACK", - "40": "MOVE_EMBARGO", - "43": "MOVE_FLAMETHROWER", - "48": "MOVE_CRUNCH", - "53": "MOVE_NASTY_PLOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SPITE", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -133,7 +122,7 @@ "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émon" + "category": "Dark Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -142,4 +131,4 @@ "rarity": 30, "unused": 528 } -} +} \ No newline at end of file diff --git a/res/pokemon/huntail/data.json b/res/pokemon/huntail/data.json index 2646807fce..7442f9f8d7 100644 --- a/res/pokemon/huntail/data.json +++ b/res/pokemon/huntail/data.json @@ -8,10 +8,7 @@ "special_attack": 94, "special_defense": 75 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 60, "base_exp_reward": 178, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WHIRLPOOL" ], + [ 6, "MOVE_BITE" ], + [ 10, "MOVE_SCREECH" ], + [ 15, "MOVE_WATER_PULSE" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 24, "MOVE_ICE_FANG" ], + [ 28, "MOVE_BRINE" ], + [ 33, "MOVE_BATON_PASS" ], + [ 37, "MOVE_DIVE" ], + [ 42, "MOVE_CRUNCH" ], + [ 46, "MOVE_AQUA_TAIL" ], + [ 51, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -74,21 +79,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_WHIRLPOOL", - "6": "MOVE_BITE", - "10": "MOVE_SCREECH", - "15": "MOVE_WATER_PULSE", - "19": "MOVE_SCARY_FACE", - "24": "MOVE_ICE_FANG", - "28": "MOVE_BRINE", - "33": "MOVE_BATON_PASS", - "37": "MOVE_DIVE", - "42": "MOVE_CRUNCH", - "46": "MOVE_AQUA_TAIL", - "51": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -99,9 +90,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -116,7 +108,7 @@ "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émon" + "category": "Deep Sea Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/hypno/data.json b/res/pokemon/hypno/data.json index 51864d20d3..277818a9f3 100644 --- a/res/pokemon/hypno/data.json +++ b/res/pokemon/hypno/data.json @@ -8,10 +8,7 @@ "special_attack": 73, "special_defense": 115 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 75, "base_exp_reward": 165, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_FOREWARN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_NIGHTMARE" ], + [ 1, "MOVE_SWITCHEROO" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_DISABLE" ], + [ 1, "MOVE_CONFUSION" ], + [ 7, "MOVE_DISABLE" ], + [ 9, "MOVE_CONFUSION" ], + [ 15, "MOVE_HEADBUTT" ], + [ 18, "MOVE_POISON_GAS" ], + [ 21, "MOVE_MEDITATE" ], + [ 28, "MOVE_PSYBEAM" ], + [ 33, "MOVE_PSYCH_UP" ], + [ 38, "MOVE_HEADBUTT" ], + [ 45, "MOVE_SWAGGER" ], + [ 50, "MOVE_PSYCHIC" ], + [ 55, "MOVE_NASTY_PLOT" ], + [ 64, "MOVE_ZEN_HEADBUTT" ], + [ 69, "MOVE_FUTURE_SIGHT" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -89,30 +101,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_NIGHTMARE", - "MOVE_SWITCHEROO", - "MOVE_POUND", - "MOVE_HYPNOSIS", - "MOVE_DISABLE", - "MOVE_CONFUSION" - ], - "7": "MOVE_DISABLE", - "9": "MOVE_CONFUSION", - "15": "MOVE_HEADBUTT", - "18": "MOVE_POISON_GAS", - "21": "MOVE_MEDITATE", - "28": "MOVE_PSYBEAM", - "33": "MOVE_PSYCH_UP", - "38": "MOVE_HEADBUTT", - "45": "MOVE_SWAGGER", - "50": "MOVE_PSYCHIC", - "55": "MOVE_NASTY_PLOT", - "64": "MOVE_ZEN_HEADBUTT", - "69": "MOVE_FUTURE_SIGHT" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_ICE_PUNCH", @@ -121,9 +110,10 @@ "MOVE_TRICK" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -138,7 +128,7 @@ "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émon" + "category": "Hypnosis Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/igglybuff/data.json b/res/pokemon/igglybuff/data.json index fa73263aea..be94be55e5 100644 --- a/res/pokemon/igglybuff/data.json +++ b/res/pokemon/igglybuff/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 20 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 170, "base_exp_reward": 39, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SING" ], + [ 1, "MOVE_CHARM" ], + [ 5, "MOVE_DEFENSE_CURL" ], + [ 9, "MOVE_POUND" ], + [ 13, "MOVE_SWEET_KISS" ], + [ 17, "MOVE_COPYCAT" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -82,17 +81,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_SING", - "MOVE_CHARM" - ], - "5": "MOVE_DEFENSE_CURL", - "9": "MOVE_POUND", - "13": "MOVE_SWEET_KISS", - "17": "MOVE_COPYCAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -105,14 +94,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_JIGGLYPUFF" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_JIGGLYPUFF" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -127,7 +113,7 @@ "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émon" + "category": "Balloon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -136,4 +122,4 @@ "rarity": 10, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/illumise/data.json b/res/pokemon/illumise/data.json index 1b1b3fa780..86c7bf7699 100644 --- a/res/pokemon/illumise/data.json +++ b/res/pokemon/illumise/data.json @@ -8,10 +8,7 @@ "special_attack": 73, "special_defense": 75 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 150, "base_exp_reward": 146, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_TINTED_LENS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_SWEET_SCENT" ], + [ 9, "MOVE_CHARM" ], + [ 13, "MOVE_MOONLIGHT" ], + [ 17, "MOVE_QUICK_ATTACK" ], + [ 21, "MOVE_WISH" ], + [ 25, "MOVE_ENCORE" ], + [ 29, "MOVE_FLATTER" ], + [ 33, "MOVE_HELPING_HAND" ], + [ 37, "MOVE_ZEN_HEADBUTT" ], + [ 41, "MOVE_BUG_BUZZ" ], + [ 45, "MOVE_COVET" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -84,21 +89,7 @@ "TM89", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_SWEET_SCENT", - "9": "MOVE_CHARM", - "13": "MOVE_MOONLIGHT", - "17": "MOVE_QUICK_ATTACK", - "21": "MOVE_WISH", - "25": "MOVE_ENCORE", - "29": "MOVE_FLATTER", - "33": "MOVE_HELPING_HAND", - "37": "MOVE_ZEN_HEADBUTT", - "41": "MOVE_BUG_BUZZ", - "45": "MOVE_COVET" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_ICE_PUNCH", @@ -110,9 +101,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -127,7 +119,7 @@ "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émon" + "category": "Firefly Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/infernape/data.json b/res/pokemon/infernape/data.json index adbe311d59..18d956c1be 100644 --- a/res/pokemon/infernape/data.json +++ b/res/pokemon/infernape/data.json @@ -8,10 +8,7 @@ "special_attack": 104, "special_defense": 71 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIRE", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 209, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_TAUNT" ], + [ 7, "MOVE_EMBER" ], + [ 9, "MOVE_TAUNT" ], + [ 14, "MOVE_MACH_PUNCH" ], + [ 17, "MOVE_FURY_SWIPES" ], + [ 21, "MOVE_FLAME_WHEEL" ], + [ 29, "MOVE_FEINT" ], + [ 33, "MOVE_PUNISHMENT" ], + [ 41, "MOVE_CLOSE_COMBAT" ], + [ 45, "MOVE_FIRE_SPIN" ], + [ 53, "MOVE_CALM_MIND" ], + [ 57, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM01", "TM04", "TM05", @@ -96,26 +104,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_EMBER", - "MOVE_TAUNT" - ], - "7": "MOVE_EMBER", - "9": "MOVE_TAUNT", - "14": "MOVE_MACH_PUNCH", - "17": "MOVE_FURY_SWIPES", - "21": "MOVE_FLAME_WHEEL", - "29": "MOVE_FEINT", - "33": "MOVE_PUNISHMENT", - "41": "MOVE_CLOSE_COMBAT", - "45": "MOVE_FIRE_SPIN", - "53": "MOVE_CALM_MIND", - "57": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -129,9 +118,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -146,7 +136,7 @@ "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émon" + "category": "Flame Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/ivysaur/data.json b/res/pokemon/ivysaur/data.json index 1bb4be44bf..6f881f8b29 100644 --- a/res/pokemon/ivysaur/data.json +++ b/res/pokemon/ivysaur/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 141, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_LEECH_SEED" ], + [ 3, "MOVE_GROWL" ], + [ 7, "MOVE_LEECH_SEED" ], + [ 9, "MOVE_VINE_WHIP" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 13, "MOVE_SLEEP_POWDER" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 20, "MOVE_RAZOR_LEAF" ], + [ 23, "MOVE_SWEET_SCENT" ], + [ 28, "MOVE_GROWTH" ], + [ 31, "MOVE_DOUBLE_EDGE" ], + [ 36, "MOVE_WORRY_SEED" ], + [ 39, "MOVE_SYNTHESIS" ], + [ 44, "MOVE_SOLAR_BEAM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -74,29 +83,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_LEECH_SEED" - ], - "3": "MOVE_GROWL", - "7": "MOVE_LEECH_SEED", - "9": "MOVE_VINE_WHIP", - "13": [ - "MOVE_POISON_POWDER", - "MOVE_SLEEP_POWDER" - ], - "15": "MOVE_TAKE_DOWN", - "20": "MOVE_RAZOR_LEAF", - "23": "MOVE_SWEET_SCENT", - "28": "MOVE_GROWTH", - "31": "MOVE_DOUBLE_EDGE", - "36": "MOVE_WORRY_SEED", - "39": "MOVE_SYNTHESIS", - "44": "MOVE_SOLAR_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -113,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -128,8 +115,8 @@ "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’s coming bloom.", - "category": "Seed Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -138,4 +125,4 @@ "rarity": 10, "unused": 1537 } -} +} \ No newline at end of file diff --git a/res/pokemon/jigglypuff/data.json b/res/pokemon/jigglypuff/data.json index b5edaf1b36..9981f07954 100644 --- a/res/pokemon/jigglypuff/data.json +++ b/res/pokemon/jigglypuff/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 25 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 170, "base_exp_reward": 76, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SING" ], + [ 5, "MOVE_DEFENSE_CURL" ], + [ 9, "MOVE_POUND" ], + [ 13, "MOVE_DISABLE" ], + [ 17, "MOVE_ROLLOUT" ], + [ 21, "MOVE_DOUBLE_SLAP" ], + [ 25, "MOVE_REST" ], + [ 29, "MOVE_BODY_SLAM" ], + [ 33, "MOVE_GYRO_BALL" ], + [ 37, "MOVE_WAKE_UP_SLAP" ], + [ 41, "MOVE_MIMIC" ], + [ 45, "MOVE_HYPER_VOICE" ], + [ 49, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -94,22 +100,7 @@ "TM90", "HM04" ], - "level_up": { - "1": "MOVE_SING", - "5": "MOVE_DEFENSE_CURL", - "9": "MOVE_POUND", - "13": "MOVE_DISABLE", - "17": "MOVE_ROLLOUT", - "21": "MOVE_DOUBLE_SLAP", - "25": "MOVE_REST", - "29": "MOVE_BODY_SLAM", - "33": "MOVE_GYRO_BALL", - "37": "MOVE_WAKE_UP_SLAP", - "41": "MOVE_MIMIC", - "45": "MOVE_HYPER_VOICE", - "49": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -132,8 +123,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -148,7 +139,7 @@ "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émon" + "category": "Balloon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/jirachi/data.json b/res/pokemon/jirachi/data.json index d0d5dc7588..993a54ffa4 100644 --- a/res/pokemon/jirachi/data.json +++ b/res/pokemon/jirachi/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_STEEL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_STEEL", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 120, "base_friendship": 100, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SERENE_GRACE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_SERENE_GRACE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WISH" ], + [ 1, "MOVE_CONFUSION" ], + [ 5, "MOVE_REST" ], + [ 10, "MOVE_SWIFT" ], + [ 15, "MOVE_HELPING_HAND" ], + [ 20, "MOVE_PSYCHIC" ], + [ 25, "MOVE_REFRESH" ], + [ 30, "MOVE_REST" ], + [ 35, "MOVE_ZEN_HEADBUTT" ], + [ 40, "MOVE_DOUBLE_EDGE" ], + [ 45, "MOVE_GRAVITY" ], + [ 50, "MOVE_HEALING_WISH" ], + [ 55, "MOVE_FUTURE_SIGHT" ], + [ 60, "MOVE_COSMIC_POWER" ], + [ 65, "MOVE_LAST_RESORT" ], + [ 70, "MOVE_DOOM_DESIRE" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -91,27 +100,7 @@ "TM91", "TM92" ], - "level_up": { - "1": [ - "MOVE_WISH", - "MOVE_CONFUSION" - ], - "5": "MOVE_REST", - "10": "MOVE_SWIFT", - "15": "MOVE_HELPING_HAND", - "20": "MOVE_PSYCHIC", - "25": "MOVE_REFRESH", - "30": "MOVE_REST", - "35": "MOVE_ZEN_HEADBUTT", - "40": "MOVE_DOUBLE_EDGE", - "45": "MOVE_GRAVITY", - "50": "MOVE_HEALING_WISH", - "55": "MOVE_FUTURE_SIGHT", - "60": "MOVE_COSMIC_POWER", - "65": "MOVE_LAST_RESORT", - "70": "MOVE_DOOM_DESIRE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -130,9 +119,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -147,7 +137,7 @@ "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émon" + "category": "Wish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/jolteon/data.json b/res/pokemon/jolteon/data.json index aeb1dd6e99..55b2145794 100644 --- a/res/pokemon/jolteon/data.json +++ b/res/pokemon/jolteon/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 95 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 45, "base_exp_reward": 197, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_VOLT_ABSORB", - "ABILITY_VOLT_ABSORB" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_THUNDER_SHOCK" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_DOUBLE_KICK" ], + [ 36, "MOVE_PIN_MISSILE" ], + [ 43, "MOVE_THUNDER_FANG" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_THUNDER_WAVE" ], + [ 64, "MOVE_AGILITY" ], + [ 71, "MOVE_THUNDER" ], + [ 78, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -79,25 +86,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_THUNDER_SHOCK", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_DOUBLE_KICK", - "36": "MOVE_PIN_MISSILE", - "43": "MOVE_THUNDER_FANG", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_THUNDER_WAVE", - "64": "MOVE_AGILITY", - "71": "MOVE_THUNDER", - "78": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -107,9 +96,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -124,7 +114,7 @@ "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émon" + "category": "Lightning Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/jumpluff/data.json b/res/pokemon/jumpluff/data.json index ad9e1855f8..f6cb166af9 100644 --- a/res/pokemon/jumpluff/data.json +++ b/res/pokemon/jumpluff/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 85 }, - "types": [ - "TYPE_GRASS", - "TYPE_FLYING" - ], + "types": [ "TYPE_GRASS", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 176, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_LEAF_GUARD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_SYNTHESIS" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_SYNTHESIS" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_TACKLE" ], + [ 12, "MOVE_POISON_POWDER" ], + [ 14, "MOVE_STUN_SPORE" ], + [ 16, "MOVE_SLEEP_POWDER" ], + [ 20, "MOVE_BULLET_SEED" ], + [ 24, "MOVE_LEECH_SEED" ], + [ 28, "MOVE_MEGA_DRAIN" ], + [ 32, "MOVE_COTTON_SPORE" ], + [ 36, "MOVE_U_TURN" ], + [ 40, "MOVE_WORRY_SEED" ], + [ 44, "MOVE_GIGA_DRAIN" ], + [ 48, "MOVE_BOUNCE" ], + [ 52, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -75,30 +87,7 @@ "TM89", "TM90" ], - "level_up": { - "1": [ - "MOVE_SPLASH", - "MOVE_SYNTHESIS", - "MOVE_TAIL_WHIP", - "MOVE_TACKLE" - ], - "4": "MOVE_SYNTHESIS", - "7": "MOVE_TAIL_WHIP", - "10": "MOVE_TACKLE", - "12": "MOVE_POISON_POWDER", - "14": "MOVE_STUN_SPORE", - "16": "MOVE_SLEEP_POWDER", - "20": "MOVE_BULLET_SEED", - "24": "MOVE_LEECH_SEED", - "28": "MOVE_MEGA_DRAIN", - "32": "MOVE_COTTON_SPORE", - "36": "MOVE_U_TURN", - "40": "MOVE_WORRY_SEED", - "44": "MOVE_GIGA_DRAIN", - "48": "MOVE_BOUNCE", - "52": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_HELPING_HAND", "MOVE_SYNTHESIS", @@ -106,9 +95,10 @@ "MOVE_BOUNCE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -123,7 +113,7 @@ "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émon" + "category": "Cottonweed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/jynx/data.json b/res/pokemon/jynx/data.json index ccdb349477..69029a353a 100644 --- a/res/pokemon/jynx/data.json +++ b/res/pokemon/jynx/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 95 }, - "types": [ - "TYPE_ICE", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_ICE", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 137, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_FOREWARN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_LICK" ], + [ 1, "MOVE_LOVELY_KISS" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 5, "MOVE_LICK" ], + [ 8, "MOVE_LOVELY_KISS" ], + [ 11, "MOVE_POWDER_SNOW" ], + [ 15, "MOVE_DOUBLE_SLAP" ], + [ 18, "MOVE_ICE_PUNCH" ], + [ 21, "MOVE_MEAN_LOOK" ], + [ 25, "MOVE_FAKE_TEARS" ], + [ 28, "MOVE_WAKE_UP_SLAP" ], + [ 33, "MOVE_AVALANCHE" ], + [ 39, "MOVE_BODY_SLAM" ], + [ 44, "MOVE_WRING_OUT" ], + [ 49, "MOVE_PERISH_SONG" ], + [ 55, "MOVE_BLIZZARD" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -92,28 +102,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_LICK", - "MOVE_LOVELY_KISS", - "MOVE_POWDER_SNOW" - ], - "5": "MOVE_LICK", - "8": "MOVE_LOVELY_KISS", - "11": "MOVE_POWDER_SNOW", - "15": "MOVE_DOUBLE_SLAP", - "18": "MOVE_ICE_PUNCH", - "21": "MOVE_MEAN_LOOK", - "25": "MOVE_FAKE_TEARS", - "28": "MOVE_WAKE_UP_SLAP", - "33": "MOVE_AVALANCHE", - "39": "MOVE_BODY_SLAM", - "44": "MOVE_WRING_OUT", - "49": "MOVE_PERISH_SONG", - "55": "MOVE_BLIZZARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ICE_PUNCH", @@ -124,9 +113,10 @@ "MOVE_TRICK" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 14, @@ -141,7 +131,7 @@ "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émon" + "category": "Human Shape Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/kabuto/data.json b/res/pokemon/kabuto/data.json index 3fe6b0a0a4..a9d6aa321d 100644 --- a/res/pokemon/kabuto/data.json +++ b/res/pokemon/kabuto/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 45 }, - "types": [ - "TYPE_ROCK", - "TYPE_WATER" - ], + "types": [ "TYPE_ROCK", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_BATTLE_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 6, "MOVE_ABSORB" ], + [ 11, "MOVE_LEER" ], + [ 16, "MOVE_MUD_SHOT" ], + [ 21, "MOVE_SAND_ATTACK" ], + [ 26, "MOVE_ENDURE" ], + [ 31, "MOVE_AQUA_JET" ], + [ 36, "MOVE_MEGA_DRAIN" ], + [ 41, "MOVE_METAL_SOUND" ], + [ 46, "MOVE_ANCIENT_POWER" ], + [ 51, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,23 +84,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_HARDEN" - ], - "6": "MOVE_ABSORB", - "11": "MOVE_LEER", - "16": "MOVE_MUD_SHOT", - "21": "MOVE_SAND_ATTACK", - "26": "MOVE_ENDURE", - "31": "MOVE_AQUA_JET", - "36": "MOVE_MEGA_DRAIN", - "41": "MOVE_METAL_SOUND", - "46": "MOVE_ANCIENT_POWER", - "51": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -130,7 +119,7 @@ "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émon" + "category": "Shellfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -139,4 +128,4 @@ "rarity": 30, "unused": 779 } -} +} \ No newline at end of file diff --git a/res/pokemon/kabutops/data.json b/res/pokemon/kabutops/data.json index 8787d028a6..d0dacb7548 100644 --- a/res/pokemon/kabutops/data.json +++ b/res/pokemon/kabutops/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 70 }, - "types": [ - "TYPE_ROCK", - "TYPE_WATER" - ], + "types": [ "TYPE_ROCK", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_BATTLE_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FEINT" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_ABSORB" ], + [ 11, "MOVE_LEER" ], + [ 16, "MOVE_MUD_SHOT" ], + [ 21, "MOVE_SAND_ATTACK" ], + [ 26, "MOVE_ENDURE" ], + [ 31, "MOVE_AQUA_JET" ], + [ 36, "MOVE_MEGA_DRAIN" ], + [ 40, "MOVE_SLASH" ], + [ 45, "MOVE_METAL_SOUND" ], + [ 54, "MOVE_ANCIENT_POWER" ], + [ 63, "MOVE_WRING_OUT" ], + [ 72, "MOVE_NIGHT_SLASH" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -88,28 +98,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_FEINT", - "MOVE_SCRATCH", - "MOVE_HARDEN", - "MOVE_ABSORB", - "MOVE_LEER" - ], - "6": "MOVE_ABSORB", - "11": "MOVE_LEER", - "16": "MOVE_MUD_SHOT", - "21": "MOVE_SAND_ATTACK", - "26": "MOVE_ENDURE", - "31": "MOVE_AQUA_JET", - "36": "MOVE_MEGA_DRAIN", - "40": "MOVE_SLASH", - "45": "MOVE_METAL_SOUND", - "54": "MOVE_ANCIENT_POWER", - "63": "MOVE_WRING_OUT", - "72": "MOVE_NIGHT_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -124,9 +113,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -140,8 +130,8 @@ "pokemon_pos_f": 9, "trainer_pos_m": 9, "pokemon_pos_m": 9, - "entry_text": "It is thought that this Pokémon\ncame onto land because its\nprey adapted to life on land.", - "category": "Shellfish Pokémon" + "entry_text": "It is thought that this Pok\u00e9mon\ncame onto land because its\nprey adapted to life on land.", + "category": "Shellfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/kadabra/data.json b/res/pokemon/kadabra/data.json index 51abd86992..efbf2a633b 100644 --- a/res/pokemon/kadabra/data.json +++ b/res/pokemon/kadabra/data.json @@ -8,10 +8,7 @@ "special_attack": 120, "special_defense": 70 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 100, "base_exp_reward": 145, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_INNER_FOCUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TELEPORT" ], + [ 1, "MOVE_KINESIS" ], + [ 1, "MOVE_CONFUSION" ], + [ 16, "MOVE_CONFUSION" ], + [ 18, "MOVE_DISABLE" ], + [ 22, "MOVE_MIRACLE_EYE" ], + [ 24, "MOVE_PSYBEAM" ], + [ 28, "MOVE_REFLECT" ], + [ 30, "MOVE_RECOVER" ], + [ 34, "MOVE_PSYCHO_CUT" ], + [ 36, "MOVE_ROLE_PLAY" ], + [ 40, "MOVE_PSYCHIC" ], + [ 42, "MOVE_FUTURE_SIGHT" ], + [ 46, "MOVE_TRICK" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -90,25 +97,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_TELEPORT", - "MOVE_KINESIS", - "MOVE_CONFUSION" - ], - "16": "MOVE_CONFUSION", - "18": "MOVE_DISABLE", - "22": "MOVE_MIRACLE_EYE", - "24": "MOVE_PSYBEAM", - "28": "MOVE_REFLECT", - "30": "MOVE_RECOVER", - "34": "MOVE_PSYCHO_CUT", - "36": "MOVE_ROLE_PLAY", - "40": "MOVE_PSYCHIC", - "42": "MOVE_FUTURE_SIGHT", - "46": "MOVE_TRICK" - }, - "tutor": [ + "by_tutor": [ "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", "MOVE_ICE_PUNCH", @@ -120,14 +109,11 @@ ] }, "evolutions": [ - [ - "EVO_TRADE", - "SPECIES_ALAKAZAM" - ] + [ "EVO_TRADE", "SPECIES_ALAKAZAM" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -142,7 +128,7 @@ "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émon" + "category": "Psi Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/kakuna/data.json b/res/pokemon/kakuna/data.json index a00bc4b9a4..abc12a43e2 100644 --- a/res/pokemon/kakuna/data.json +++ b/res/pokemon/kakuna/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 25 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 120, "base_exp_reward": 71, "ev_yields": { @@ -30,28 +27,20 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_HARDEN", - "7": "MOVE_HARDEN" - }, - "tutor": [ - "MOVE_IRON_DEFENSE" - ] + "by_level": [ + [ 1, "MOVE_HARDEN" ], + [ 7, "MOVE_HARDEN" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_IRON_DEFENSE" ] }, "evolutions": [ [ @@ -61,8 +50,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -77,7 +66,7 @@ "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émon" + "category": "Cocoon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -86,4 +75,4 @@ "rarity": 30, "unused": 1540 } -} +} \ No newline at end of file diff --git a/res/pokemon/kangaskhan/data.json b/res/pokemon/kangaskhan/data.json index fed21d0de2..b072fb4818 100644 --- a/res/pokemon/kangaskhan/data.json +++ b/res/pokemon/kangaskhan/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 80 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 175, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_EARLY_BIRD", - "ABILITY_SCRAPPY" - ], - "great_marsh_flee_rate": 150, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_EARLY_BIRD", "ABILITY_SCRAPPY" ], + "safari_flee_rate": 150, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_COMET_PUNCH" ], + [ 1, "MOVE_LEER" ], + [ 7, "MOVE_FAKE_OUT" ], + [ 10, "MOVE_TAIL_WHIP" ], + [ 13, "MOVE_BITE" ], + [ 19, "MOVE_MEGA_PUNCH" ], + [ 22, "MOVE_RAGE" ], + [ 25, "MOVE_DIZZY_PUNCH" ], + [ 31, "MOVE_CRUNCH" ], + [ 34, "MOVE_ENDURE" ], + [ 37, "MOVE_OUTRAGE" ], + [ 43, "MOVE_DOUBLE_HIT" ], + [ 46, "MOVE_SUCKER_PUNCH" ], + [ 49, "MOVE_REVERSAL" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -98,25 +105,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_COMET_PUNCH", - "MOVE_LEER" - ], - "7": "MOVE_FAKE_OUT", - "10": "MOVE_TAIL_WHIP", - "13": "MOVE_BITE", - "19": "MOVE_MEGA_PUNCH", - "22": "MOVE_RAGE", - "25": "MOVE_DIZZY_PUNCH", - "31": "MOVE_CRUNCH", - "34": "MOVE_ENDURE", - "37": "MOVE_OUTRAGE", - "43": "MOVE_DOUBLE_HIT", - "46": "MOVE_SUCKER_PUNCH", - "49": "MOVE_REVERSAL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -133,9 +122,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 22, @@ -150,7 +140,7 @@ "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émon" + "category": "Parent Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/kecleon/data.json b/res/pokemon/kecleon/data.json index 1c7f4ca08f..2ddd06ca74 100644 --- a/res/pokemon/kecleon/data.json +++ b/res/pokemon/kecleon/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 120 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 200, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_COLOR_CHANGE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 120, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_COLOR_CHANGE", "ABILITY_NONE" ], + "safari_flee_rate": 120, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THIEF" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_LICK" ], + [ 1, "MOVE_SCRATCH" ], + [ 4, "MOVE_BIND" ], + [ 7, "MOVE_FAINT_ATTACK" ], + [ 10, "MOVE_FURY_SWIPES" ], + [ 14, "MOVE_FEINT" ], + [ 18, "MOVE_PSYBEAM" ], + [ 22, "MOVE_SHADOW_SNEAK" ], + [ 27, "MOVE_SLASH" ], + [ 32, "MOVE_SCREECH" ], + [ 37, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_SUCKER_PUNCH" ], + [ 49, "MOVE_SHADOW_CLAW" ], + [ 55, "MOVE_ANCIENT_POWER" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -98,28 +108,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_THIEF", - "MOVE_TAIL_WHIP", - "MOVE_ASTONISH", - "MOVE_LICK", - "MOVE_SCRATCH" - ], - "4": "MOVE_BIND", - "7": "MOVE_FAINT_ATTACK", - "10": "MOVE_FURY_SWIPES", - "14": "MOVE_FEINT", - "18": "MOVE_PSYBEAM", - "22": "MOVE_SHADOW_SNEAK", - "27": "MOVE_SLASH", - "32": "MOVE_SCREECH", - "37": "MOVE_SUBSTITUTE", - "43": "MOVE_SUCKER_PUNCH", - "49": "MOVE_SHADOW_CLAW", - "55": "MOVE_ANCIENT_POWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -137,9 +126,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -153,8 +143,8 @@ "pokemon_pos_f": 15, "trainer_pos_m": 9, "pokemon_pos_m": 15, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/kingdra/data.json b/res/pokemon/kingdra/data.json index 4dcdf35a39..0bb8387bc7 100644 --- a/res/pokemon/kingdra/data.json +++ b/res/pokemon/kingdra/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 95 }, - "types": [ - "TYPE_WATER", - "TYPE_DRAGON" - ], + "types": [ "TYPE_WATER", "TYPE_DRAGON" ], "catch_rate": 45, "base_exp_reward": 207, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WATER_GUN" ], + [ 4, "MOVE_SMOKE_SCREEN" ], + [ 8, "MOVE_LEER" ], + [ 11, "MOVE_WATER_GUN" ], + [ 14, "MOVE_FOCUS_ENERGY" ], + [ 18, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_AGILITY" ], + [ 26, "MOVE_TWISTER" ], + [ 30, "MOVE_BRINE" ], + [ 40, "MOVE_HYDRO_PUMP" ], + [ 48, "MOVE_DRAGON_DANCE" ], + [ 57, "MOVE_DRAGON_PULSE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -74,27 +83,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_YAWN", - "MOVE_BUBBLE", - "MOVE_SMOKE_SCREEN", - "MOVE_LEER", - "MOVE_WATER_GUN" - ], - "4": "MOVE_SMOKE_SCREEN", - "8": "MOVE_LEER", - "11": "MOVE_WATER_GUN", - "14": "MOVE_FOCUS_ENERGY", - "18": "MOVE_BUBBLE_BEAM", - "23": "MOVE_AGILITY", - "26": "MOVE_TWISTER", - "30": "MOVE_BRINE", - "40": "MOVE_HYDRO_PUMP", - "48": "MOVE_DRAGON_DANCE", - "57": "MOVE_DRAGON_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_IRON_HEAD", @@ -106,9 +95,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -123,7 +113,7 @@ "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émon" + "category": "Dragon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/kingler/data.json b/res/pokemon/kingler/data.json index 27b02930e8..781395f792 100644 --- a/res/pokemon/kingler/data.json +++ b/res/pokemon/kingler/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 60, "base_exp_reward": 206, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_VICE_GRIP" ], + [ 5, "MOVE_VICE_GRIP" ], + [ 9, "MOVE_LEER" ], + [ 11, "MOVE_HARDEN" ], + [ 15, "MOVE_BUBBLE_BEAM" ], + [ 19, "MOVE_MUD_SHOT" ], + [ 21, "MOVE_METAL_CLAW" ], + [ 25, "MOVE_STOMP" ], + [ 32, "MOVE_PROTECT" ], + [ 37, "MOVE_GUILLOTINE" ], + [ 44, "MOVE_SLAM" ], + [ 51, "MOVE_BRINE" ], + [ 56, "MOVE_CRABHAMMER" ], + [ 63, "MOVE_FLAIL" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -83,27 +92,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_MUD_SPORT", - "MOVE_BUBBLE", - "MOVE_VICE_GRIP" - ], - "5": "MOVE_VICE_GRIP", - "9": "MOVE_LEER", - "11": "MOVE_HARDEN", - "15": "MOVE_BUBBLE_BEAM", - "19": "MOVE_MUD_SHOT", - "21": "MOVE_METAL_CLAW", - "25": "MOVE_STOMP", - "32": "MOVE_PROTECT", - "37": "MOVE_GUILLOTINE", - "44": "MOVE_SLAM", - "51": "MOVE_BRINE", - "56": "MOVE_CRABHAMMER", - "63": "MOVE_FLAIL" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -115,9 +104,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -132,7 +122,7 @@ "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émon" + "category": "Pincer Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/kirlia/data.json b/res/pokemon/kirlia/data.json index 2d943dfa18..b310402891 100644 --- a/res/pokemon/kirlia/data.json +++ b/res/pokemon/kirlia/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 55 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 120, "base_exp_reward": 140, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_TRACE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_TRACE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 1, "MOVE_TELEPORT" ], + [ 6, "MOVE_CONFUSION" ], + [ 10, "MOVE_DOUBLE_TEAM" ], + [ 12, "MOVE_TELEPORT" ], + [ 17, "MOVE_LUCKY_CHANT" ], + [ 22, "MOVE_MAGICAL_LEAF" ], + [ 25, "MOVE_CALM_MIND" ], + [ 31, "MOVE_PSYCHIC" ], + [ 36, "MOVE_IMPRISON" ], + [ 39, "MOVE_FUTURE_SIGHT" ], + [ 45, "MOVE_CHARM" ], + [ 50, "MOVE_HYPNOSIS" ], + [ 53, "MOVE_DREAM_EATER" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -86,27 +95,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_CONFUSION", - "MOVE_DOUBLE_TEAM", - "MOVE_TELEPORT" - ], - "6": "MOVE_CONFUSION", - "10": "MOVE_DOUBLE_TEAM", - "12": "MOVE_TELEPORT", - "17": "MOVE_LUCKY_CHANT", - "22": "MOVE_MAGICAL_LEAF", - "25": "MOVE_CALM_MIND", - "31": "MOVE_PSYCHIC", - "36": "MOVE_IMPRISON", - "39": "MOVE_FUTURE_SIGHT", - "45": "MOVE_CHARM", - "50": "MOVE_HYPNOSIS", - "53": "MOVE_DREAM_EATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -133,8 +122,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 8, @@ -149,7 +138,7 @@ "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émon" + "category": "Emotion Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -158,4 +147,4 @@ "rarity": 20, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/koffing/data.json b/res/pokemon/koffing/data.json index f2917d1706..fbb4b4b756 100644 --- a/res/pokemon/koffing/data.json +++ b/res/pokemon/koffing/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 45 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 190, "base_exp_reward": 114, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_GAS" ], + [ 1, "MOVE_TACKLE" ], + [ 6, "MOVE_SMOG" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 15, "MOVE_ASSURANCE" ], + [ 19, "MOVE_SELFDESTRUCT" ], + [ 24, "MOVE_SLUDGE" ], + [ 28, "MOVE_HAZE" ], + [ 33, "MOVE_GYRO_BALL" ], + [ 37, "MOVE_EXPLOSION" ], + [ 42, "MOVE_SLUDGE_BOMB" ], + [ 46, "MOVE_DESTINY_BOND" ], + [ 51, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -80,24 +86,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POISON_GAS", - "MOVE_TACKLE" - ], - "6": "MOVE_SMOG", - "10": "MOVE_SMOKE_SCREEN", - "15": "MOVE_ASSURANCE", - "19": "MOVE_SELFDESTRUCT", - "24": "MOVE_SLUDGE", - "28": "MOVE_HAZE", - "33": "MOVE_GYRO_BALL", - "37": "MOVE_EXPLOSION", - "42": "MOVE_SLUDGE_BOMB", - "46": "MOVE_DESTINY_BOND", - "51": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SPITE", @@ -112,8 +101,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -128,7 +117,7 @@ "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émon" + "category": "Poison Gas Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -137,4 +126,4 @@ "rarity": 30, "unused": 1542 } -} +} \ No newline at end of file diff --git a/res/pokemon/krabby/data.json b/res/pokemon/krabby/data.json index cd3cf4de6c..03ef7fd2f7 100644 --- a/res/pokemon/krabby/data.json +++ b/res/pokemon/krabby/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 25 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 225, "base_exp_reward": 115, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_BUBBLE" ], + [ 5, "MOVE_VICE_GRIP" ], + [ 9, "MOVE_LEER" ], + [ 11, "MOVE_HARDEN" ], + [ 15, "MOVE_BUBBLE_BEAM" ], + [ 19, "MOVE_MUD_SHOT" ], + [ 21, "MOVE_METAL_CLAW" ], + [ 25, "MOVE_STOMP" ], + [ 29, "MOVE_PROTECT" ], + [ 31, "MOVE_GUILLOTINE" ], + [ 35, "MOVE_SLAM" ], + [ 39, "MOVE_BRINE" ], + [ 41, "MOVE_CRABHAMMER" ], + [ 45, "MOVE_FLAIL" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -81,26 +89,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_MUD_SPORT", - "MOVE_BUBBLE" - ], - "5": "MOVE_VICE_GRIP", - "9": "MOVE_LEER", - "11": "MOVE_HARDEN", - "15": "MOVE_BUBBLE_BEAM", - "19": "MOVE_MUD_SHOT", - "21": "MOVE_METAL_CLAW", - "25": "MOVE_STOMP", - "29": "MOVE_PROTECT", - "31": "MOVE_GUILLOTINE", - "35": "MOVE_SLAM", - "39": "MOVE_BRINE", - "41": "MOVE_CRABHAMMER", - "45": "MOVE_FLAIL" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -120,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -136,7 +125,7 @@ "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émon" + "category": "River Crab Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -145,4 +134,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/kricketot/data.json b/res/pokemon/kricketot/data.json index 9b564a1605..befea05579 100644 --- a/res/pokemon/kricketot/data.json +++ b/res/pokemon/kricketot/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 41 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 255, "base_exp_reward": 54, "ev_yields": { @@ -30,29 +27,21 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_BIDE" - ], - "16": "MOVE_BUG_BITE" - }, - "tutor": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_BIDE" ], + [ 16, "MOVE_BUG_BITE" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_ENDEAVOR", @@ -67,8 +56,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -83,7 +72,7 @@ "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émon" + "category": "Cricket Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -92,4 +81,4 @@ "rarity": 30, "unused": 1028 } -} +} \ No newline at end of file diff --git a/res/pokemon/kricketune/data.json b/res/pokemon/kricketune/data.json index 4474925be2..aa638ccd9d 100644 --- a/res/pokemon/kricketune/data.json +++ b/res/pokemon/kricketune/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 51 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 45, "base_exp_reward": 159, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_BIDE" ], + [ 10, "MOVE_FURY_CUTTER" ], + [ 14, "MOVE_LEECH_LIFE" ], + [ 18, "MOVE_SING" ], + [ 22, "MOVE_FOCUS_ENERGY" ], + [ 26, "MOVE_SLASH" ], + [ 30, "MOVE_X_SCISSOR" ], + [ 34, "MOVE_SCREECH" ], + [ 38, "MOVE_TAUNT" ], + [ 42, "MOVE_NIGHT_SLASH" ], + [ 46, "MOVE_BUG_BUZZ" ], + [ 50, "MOVE_PERISH_SONG" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -76,24 +82,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_BIDE" - ], - "10": "MOVE_FURY_CUTTER", - "14": "MOVE_LEECH_LIFE", - "18": "MOVE_SING", - "22": "MOVE_FOCUS_ENERGY", - "26": "MOVE_SLASH", - "30": "MOVE_X_SCISSOR", - "34": "MOVE_SCREECH", - "38": "MOVE_TAUNT", - "42": "MOVE_NIGHT_SLASH", - "46": "MOVE_BUG_BUZZ", - "50": "MOVE_PERISH_SONG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -102,9 +91,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 10, @@ -118,8 +108,8 @@ "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émon.", - "category": "Cricket Pokémon" + "entry_text": "There is a village that hosts a\ncontest based on the amazingly\nvariable cries of this Pok\u00e9mon.", + "category": "Cricket Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/kyogre/data.json b/res/pokemon/kyogre/data.json index ec02d1ce47..840b8a74d9 100644 --- a/res/pokemon/kyogre/data.json +++ b/res/pokemon/kyogre/data.json @@ -8,10 +8,7 @@ "special_attack": 150, "special_defense": 140 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 5, "base_exp_reward": 218, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_DRIZZLE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_DRIZZLE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_PULSE" ], + [ 5, "MOVE_SCARY_FACE" ], + [ 15, "MOVE_ANCIENT_POWER" ], + [ 20, "MOVE_BODY_SLAM" ], + [ 30, "MOVE_CALM_MIND" ], + [ 35, "MOVE_ICE_BEAM" ], + [ 45, "MOVE_HYDRO_PUMP" ], + [ 50, "MOVE_REST" ], + [ 60, "MOVE_SHEER_COLD" ], + [ 65, "MOVE_DOUBLE_EDGE" ], + [ 75, "MOVE_AQUA_TAIL" ], + [ 80, "MOVE_WATER_SPOUT" ] + ], + "by_tm": [ "TM03", "TM04", "TM05", @@ -85,21 +90,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_WATER_PULSE", - "5": "MOVE_SCARY_FACE", - "15": "MOVE_ANCIENT_POWER", - "20": "MOVE_BODY_SLAM", - "30": "MOVE_CALM_MIND", - "35": "MOVE_ICE_BEAM", - "45": "MOVE_HYDRO_PUMP", - "50": "MOVE_REST", - "60": "MOVE_SHEER_COLD", - "65": "MOVE_DOUBLE_EDGE", - "75": "MOVE_AQUA_TAIL", - "80": "MOVE_WATER_SPOUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -112,9 +103,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 45, @@ -129,7 +121,7 @@ "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émon" + "category": "Sea Basin Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/lairon/data.json b/res/pokemon/lairon/data.json index cbfa5a0fbe..d1ef487dc6 100644 --- a/res/pokemon/lairon/data.json +++ b/res/pokemon/lairon/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_STEEL", - "TYPE_ROCK" - ], + "types": [ "TYPE_STEEL", "TYPE_ROCK" ], "catch_rate": 90, "base_exp_reward": 152, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 35, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_HEADBUTT" ], + [ 4, "MOVE_HARDEN" ], + [ 8, "MOVE_MUD_SLAP" ], + [ 11, "MOVE_HEADBUTT" ], + [ 15, "MOVE_METAL_CLAW" ], + [ 18, "MOVE_IRON_DEFENSE" ], + [ 22, "MOVE_ROAR" ], + [ 25, "MOVE_TAKE_DOWN" ], + [ 29, "MOVE_IRON_HEAD" ], + [ 34, "MOVE_PROTECT" ], + [ 40, "MOVE_METAL_SOUND" ], + [ 45, "MOVE_IRON_TAIL" ], + [ 51, "MOVE_DOUBLE_EDGE" ], + [ 56, "MOVE_METAL_BURST" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -81,28 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HARDEN", - "MOVE_MUD_SLAP", - "MOVE_HEADBUTT" - ], - "4": "MOVE_HARDEN", - "8": "MOVE_MUD_SLAP", - "11": "MOVE_HEADBUTT", - "15": "MOVE_METAL_CLAW", - "18": "MOVE_IRON_DEFENSE", - "22": "MOVE_ROAR", - "25": "MOVE_TAKE_DOWN", - "29": "MOVE_IRON_HEAD", - "34": "MOVE_PROTECT", - "40": "MOVE_METAL_SOUND", - "45": "MOVE_IRON_TAIL", - "51": "MOVE_DOUBLE_EDGE", - "56": "MOVE_METAL_BURST" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -126,8 +115,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -142,7 +131,7 @@ "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émon" + "category": "Iron Armor Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -151,4 +140,4 @@ "rarity": 20, "unused": 2830 } -} +} \ No newline at end of file diff --git a/res/pokemon/lanturn/data.json b/res/pokemon/lanturn/data.json index 00ed779f8d..97b34571a5 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -8,10 +8,7 @@ "special_attack": 76, "special_defense": 76 }, - "types": [ - "TYPE_WATER", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_WATER", "TYPE_ELECTRIC" ], "catch_rate": 75, "base_exp_reward": 156, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_VOLT_ABSORB", - "ABILITY_ILLUMINATE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 6, "MOVE_THUNDER_WAVE" ], + [ 9, "MOVE_FLAIL" ], + [ 12, "MOVE_WATER_GUN" ], + [ 17, "MOVE_CONFUSE_RAY" ], + [ 20, "MOVE_SPARK" ], + [ 23, "MOVE_TAKE_DOWN" ], + [ 27, "MOVE_STOCKPILE" ], + [ 27, "MOVE_SWALLOW" ], + [ 27, "MOVE_SPIT_UP" ], + [ 30, "MOVE_BUBBLE_BEAM" ], + [ 35, "MOVE_SIGNAL_BEAM" ], + [ 40, "MOVE_DISCHARGE" ], + [ 47, "MOVE_AQUA_RING" ], + [ 52, "MOVE_HYDRO_PUMP" ], + [ 57, "MOVE_CHARGE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -78,31 +89,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_BUBBLE", - "MOVE_SUPERSONIC", - "MOVE_THUNDER_WAVE" - ], - "6": "MOVE_THUNDER_WAVE", - "9": "MOVE_FLAIL", - "12": "MOVE_WATER_GUN", - "17": "MOVE_CONFUSE_RAY", - "20": "MOVE_SPARK", - "23": "MOVE_TAKE_DOWN", - "27": [ - "MOVE_STOCKPILE", - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "30": "MOVE_BUBBLE_BEAM", - "35": "MOVE_SIGNAL_BEAM", - "40": "MOVE_DISCHARGE", - "47": "MOVE_AQUA_RING", - "52": "MOVE_HYDRO_PUMP", - "57": "MOVE_CHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", @@ -112,9 +99,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -128,8 +116,8 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "entry_text": "LANTURN’s light can shine up from\ngreat depths. It is nicknamed\n“The Deep-Sea Star.”", - "category": "Light Pokémon" + "entry_text": "LANTURN\u2019s light can shine up from\ngreat depths. It is nicknamed\n\u201cThe Deep-Sea Star.\u201d", + "category": "Light Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/lapras/data.json b/res/pokemon/lapras/data.json index 2d18e0e762..89284b4df5 100644 --- a/res/pokemon/lapras/data.json +++ b/res/pokemon/lapras/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 95 }, - "types": [ - "TYPE_WATER", - "TYPE_ICE" - ], + "types": [ "TYPE_WATER", "TYPE_ICE" ], "catch_rate": 45, "base_exp_reward": 219, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_WATER_ABSORB", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SING" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 4, "MOVE_MIST" ], + [ 7, "MOVE_CONFUSE_RAY" ], + [ 10, "MOVE_ICE_SHARD" ], + [ 14, "MOVE_WATER_PULSE" ], + [ 18, "MOVE_BODY_SLAM" ], + [ 22, "MOVE_RAIN_DANCE" ], + [ 27, "MOVE_PERISH_SONG" ], + [ 32, "MOVE_ICE_BEAM" ], + [ 37, "MOVE_BRINE" ], + [ 43, "MOVE_SAFEGUARD" ], + [ 49, "MOVE_HYDRO_PUMP" ], + [ 55, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -84,26 +92,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_SING", - "MOVE_GROWL", - "MOVE_WATER_GUN" - ], - "4": "MOVE_MIST", - "7": "MOVE_CONFUSE_RAY", - "10": "MOVE_ICE_SHARD", - "14": "MOVE_WATER_PULSE", - "18": "MOVE_BODY_SLAM", - "22": "MOVE_RAIN_DANCE", - "27": "MOVE_PERISH_SONG", - "32": "MOVE_ICE_BEAM", - "37": "MOVE_BRINE", - "43": "MOVE_SAFEGUARD", - "49": "MOVE_HYDRO_PUMP", - "55": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_IRON_HEAD", @@ -115,9 +104,10 @@ "MOVE_ZEN_HEADBUTT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 25, @@ -131,8 +121,8 @@ "pokemon_pos_f": 7, "trainer_pos_m": 16, "pokemon_pos_m": 7, - "entry_text": "It loves crossing the sea with\npeople and Pokémon on its back.\nIt understands human speech.", - "category": "Transport Pokémon" + "entry_text": "It loves crossing the sea with\npeople and Pok\u00e9mon on its back.\nIt understands human speech.", + "category": "Transport Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/larvitar/data.json b/res/pokemon/larvitar/data.json index 7120f977c9..971509205e 100644 --- a/res/pokemon/larvitar/data.json +++ b/res/pokemon/larvitar/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 50 }, - "types": [ - "TYPE_ROCK", - "TYPE_GROUND" - ], + "types": [ "TYPE_ROCK", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 67, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_GUTS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_SANDSTORM" ], + [ 10, "MOVE_SCREECH" ], + [ 14, "MOVE_ROCK_SLIDE" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 23, "MOVE_THRASH" ], + [ 28, "MOVE_DARK_PULSE" ], + [ 32, "MOVE_PAYBACK" ], + [ 37, "MOVE_CRUNCH" ], + [ 41, "MOVE_EARTHQUAKE" ], + [ 46, "MOVE_STONE_EDGE" ], + [ 50, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,24 +85,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_LEER" - ], - "5": "MOVE_SANDSTORM", - "10": "MOVE_SCREECH", - "14": "MOVE_ROCK_SLIDE", - "19": "MOVE_SCARY_FACE", - "23": "MOVE_THRASH", - "28": "MOVE_DARK_PULSE", - "32": "MOVE_PAYBACK", - "37": "MOVE_CRUNCH", - "41": "MOVE_EARTHQUAKE", - "46": "MOVE_STONE_EDGE", - "50": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_IRON_HEAD", @@ -115,8 +104,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -130,8 +119,8 @@ "pokemon_pos_f": 21, "trainer_pos_m": 9, "pokemon_pos_m": 21, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -140,4 +129,4 @@ "rarity": 20, "unused": 2059 } -} +} \ No newline at end of file diff --git a/res/pokemon/latias/data.json b/res/pokemon/latias/data.json index ddb1172d40..043d82938c 100644 --- a/res/pokemon/latias/data.json +++ b/res/pokemon/latias/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 130 }, - "types": [ - "TYPE_DRAGON", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_DRAGON", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 211, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 120, "base_friendship": 90, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PSYWAVE" ], + [ 5, "MOVE_WISH" ], + [ 10, "MOVE_HELPING_HAND" ], + [ 15, "MOVE_SAFEGUARD" ], + [ 20, "MOVE_DRAGON_BREATH" ], + [ 25, "MOVE_WATER_SPORT" ], + [ 30, "MOVE_REFRESH" ], + [ 35, "MOVE_MIST_BALL" ], + [ 40, "MOVE_ZEN_HEADBUTT" ], + [ 45, "MOVE_RECOVER" ], + [ 50, "MOVE_PSYCHO_SHIFT" ], + [ 55, "MOVE_CHARM" ], + [ 60, "MOVE_HEALING_WISH" ], + [ 65, "MOVE_PSYCHIC" ], + [ 70, "MOVE_DRAGON_PULSE" ] + ], + "by_tm": [ "TM02", "TM03", "TM04", @@ -99,24 +107,7 @@ "HM05", "HM07" ], - "level_up": { - "1": "MOVE_PSYWAVE", - "5": "MOVE_WISH", - "10": "MOVE_HELPING_HAND", - "15": "MOVE_SAFEGUARD", - "20": "MOVE_DRAGON_BREATH", - "25": "MOVE_WATER_SPORT", - "30": "MOVE_REFRESH", - "35": "MOVE_MIST_BALL", - "40": "MOVE_ZEN_HEADBUTT", - "45": "MOVE_RECOVER", - "50": "MOVE_PSYCHO_SHIFT", - "55": "MOVE_CHARM", - "60": "MOVE_HEALING_WISH", - "65": "MOVE_PSYCHIC", - "70": "MOVE_DRAGON_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -132,9 +123,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -149,7 +141,7 @@ "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émon" + "category": "Eon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/latios/data.json b/res/pokemon/latios/data.json index ecb51d8eea..68a1883430 100644 --- a/res/pokemon/latios/data.json +++ b/res/pokemon/latios/data.json @@ -8,10 +8,7 @@ "special_attack": 130, "special_defense": 110 }, - "types": [ - "TYPE_DRAGON", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_DRAGON", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 211, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 120, "base_friendship": 90, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PSYWAVE" ], + [ 5, "MOVE_HEAL_BLOCK" ], + [ 10, "MOVE_HELPING_HAND" ], + [ 15, "MOVE_SAFEGUARD" ], + [ 20, "MOVE_DRAGON_BREATH" ], + [ 25, "MOVE_PROTECT" ], + [ 30, "MOVE_REFRESH" ], + [ 35, "MOVE_LUSTER_PURGE" ], + [ 40, "MOVE_ZEN_HEADBUTT" ], + [ 45, "MOVE_RECOVER" ], + [ 50, "MOVE_PSYCHO_SHIFT" ], + [ 55, "MOVE_DRAGON_DANCE" ], + [ 60, "MOVE_MEMENTO" ], + [ 65, "MOVE_PSYCHIC" ], + [ 70, "MOVE_DRAGON_PULSE" ] + ], + "by_tm": [ "TM02", "TM03", "TM04", @@ -99,24 +107,7 @@ "HM05", "HM07" ], - "level_up": { - "1": "MOVE_PSYWAVE", - "5": "MOVE_HEAL_BLOCK", - "10": "MOVE_HELPING_HAND", - "15": "MOVE_SAFEGUARD", - "20": "MOVE_DRAGON_BREATH", - "25": "MOVE_PROTECT", - "30": "MOVE_REFRESH", - "35": "MOVE_LUSTER_PURGE", - "40": "MOVE_ZEN_HEADBUTT", - "45": "MOVE_RECOVER", - "50": "MOVE_PSYCHO_SHIFT", - "55": "MOVE_DRAGON_DANCE", - "60": "MOVE_MEMENTO", - "65": "MOVE_PSYCHIC", - "70": "MOVE_DRAGON_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -131,9 +122,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -147,8 +139,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "A highly intelligent Pokémon.\nBy folding back its wings in flight,\nit can overtake jet planes.", - "category": "Eon Pokémon" + "entry_text": "A highly intelligent Pok\u00e9mon.\nBy folding back its wings in flight,\nit can overtake jet planes.", + "category": "Eon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/leafeon/data.json b/res/pokemon/leafeon/data.json index e235619b87..dabe716470 100644 --- a/res/pokemon/leafeon/data.json +++ b/res/pokemon/leafeon/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 196, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_LEAF_GUARD", - "ABILITY_LEAF_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_RAZOR_LEAF" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_SYNTHESIS" ], + [ 36, "MOVE_MAGICAL_LEAF" ], + [ 43, "MOVE_GIGA_DRAIN" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_GRASS_WHISTLE" ], + [ 64, "MOVE_SUNNY_DAY" ], + [ 71, "MOVE_LEAF_BLADE" ], + [ 78, "MOVE_SWORDS_DANCE" ] + ], + "by_tm": [ "TM05", "TM06", "TM09", @@ -81,25 +88,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_RAZOR_LEAF", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_SYNTHESIS", - "36": "MOVE_MAGICAL_LEAF", - "43": "MOVE_GIGA_DRAIN", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_GRASS_WHISTLE", - "64": "MOVE_SUNNY_DAY", - "71": "MOVE_LEAF_BLADE", - "78": "MOVE_SWORDS_DANCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -111,9 +100,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -128,7 +118,7 @@ "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émon" + "category": "Verdant Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/ledian/data.json b/res/pokemon/ledian/data.json index c28e212284..2dbe7100b4 100644 --- a/res/pokemon/ledian/data.json +++ b/res/pokemon/ledian/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 110 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 90, "base_exp_reward": 134, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_COMET_PUNCH" ], + [ 6, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_COMET_PUNCH" ], + [ 14, "MOVE_LIGHT_SCREEN" ], + [ 14, "MOVE_REFLECT" ], + [ 14, "MOVE_SAFEGUARD" ], + [ 17, "MOVE_MACH_PUNCH" ], + [ 24, "MOVE_BATON_PASS" ], + [ 29, "MOVE_SILVER_WIND" ], + [ 36, "MOVE_AGILITY" ], + [ 41, "MOVE_SWIFT" ], + [ 48, "MOVE_DOUBLE_EDGE" ], + [ 53, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -85,28 +93,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_SUPERSONIC", - "MOVE_COMET_PUNCH" - ], - "6": "MOVE_SUPERSONIC", - "9": "MOVE_COMET_PUNCH", - "14": [ - "MOVE_LIGHT_SCREEN", - "MOVE_REFLECT", - "MOVE_SAFEGUARD" - ], - "17": "MOVE_MACH_PUNCH", - "24": "MOVE_BATON_PASS", - "29": "MOVE_SILVER_WIND", - "36": "MOVE_AGILITY", - "41": "MOVE_SWIFT", - "48": "MOVE_DOUBLE_EDGE", - "53": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", "MOVE_ICE_PUNCH", @@ -118,9 +105,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -135,7 +123,7 @@ "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émon" + "category": "Five Star Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/ledyba/data.json b/res/pokemon/ledyba/data.json index e221c40186..2b17744720 100644 --- a/res/pokemon/ledyba/data.json +++ b/res/pokemon/ledyba/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 80 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 54, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 6, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_COMET_PUNCH" ], + [ 14, "MOVE_LIGHT_SCREEN" ], + [ 14, "MOVE_REFLECT" ], + [ 14, "MOVE_SAFEGUARD" ], + [ 17, "MOVE_MACH_PUNCH" ], + [ 22, "MOVE_BATON_PASS" ], + [ 25, "MOVE_SILVER_WIND" ], + [ 30, "MOVE_AGILITY" ], + [ 33, "MOVE_SWIFT" ], + [ 38, "MOVE_DOUBLE_EDGE" ], + [ 41, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -80,24 +86,7 @@ "TM89", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "6": "MOVE_SUPERSONIC", - "9": "MOVE_COMET_PUNCH", - "14": [ - "MOVE_LIGHT_SCREEN", - "MOVE_REFLECT", - "MOVE_SAFEGUARD" - ], - "17": "MOVE_MACH_PUNCH", - "22": "MOVE_BATON_PASS", - "25": "MOVE_SILVER_WIND", - "30": "MOVE_AGILITY", - "33": "MOVE_SWIFT", - "38": "MOVE_DOUBLE_EDGE", - "41": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", "MOVE_ICE_PUNCH", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -132,8 +121,8 @@ "pokemon_pos_f": 65531, "trainer_pos_m": 9, "pokemon_pos_m": 65531, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -142,4 +131,4 @@ "rarity": 50, "unused": 4356 } -} +} \ No newline at end of file diff --git a/res/pokemon/lickilicky/data.json b/res/pokemon/lickilicky/data.json index 10ca67dc9f..415103f602 100644 --- a/res/pokemon/lickilicky/data.json +++ b/res/pokemon/lickilicky/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 95 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 30, "base_exp_reward": 193, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_OWN_TEMPO", - "ABILITY_OBLIVIOUS" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_OBLIVIOUS" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LICK" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_DEFENSE_CURL" ], + [ 13, "MOVE_KNOCK_OFF" ], + [ 17, "MOVE_WRAP" ], + [ 21, "MOVE_STOMP" ], + [ 25, "MOVE_DISABLE" ], + [ 29, "MOVE_SLAM" ], + [ 33, "MOVE_ROLLOUT" ], + [ 37, "MOVE_ME_FIRST" ], + [ 41, "MOVE_REFRESH" ], + [ 45, "MOVE_SCREECH" ], + [ 49, "MOVE_POWER_WHIP" ], + [ 53, "MOVE_WRING_OUT" ], + [ 57, "MOVE_GYRO_BALL" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -97,24 +105,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_LICK", - "5": "MOVE_SUPERSONIC", - "9": "MOVE_DEFENSE_CURL", - "13": "MOVE_KNOCK_OFF", - "17": "MOVE_WRAP", - "21": "MOVE_STOMP", - "25": "MOVE_DISABLE", - "29": "MOVE_SLAM", - "33": "MOVE_ROLLOUT", - "37": "MOVE_ME_FIRST", - "41": "MOVE_REFRESH", - "45": "MOVE_SCREECH", - "49": "MOVE_POWER_WHIP", - "53": "MOVE_WRING_OUT", - "57": "MOVE_GYRO_BALL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -127,9 +118,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -144,7 +136,7 @@ "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émon" + "category": "Licking Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/lickitung/data.json b/res/pokemon/lickitung/data.json index afc836c718..76c82cdcee 100644 --- a/res/pokemon/lickitung/data.json +++ b/res/pokemon/lickitung/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 75 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 127, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_OWN_TEMPO", - "ABILITY_OBLIVIOUS" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_OBLIVIOUS" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LICK" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_DEFENSE_CURL" ], + [ 13, "MOVE_KNOCK_OFF" ], + [ 17, "MOVE_WRAP" ], + [ 21, "MOVE_STOMP" ], + [ 25, "MOVE_DISABLE" ], + [ 29, "MOVE_SLAM" ], + [ 33, "MOVE_ROLLOUT" ], + [ 37, "MOVE_ME_FIRST" ], + [ 41, "MOVE_REFRESH" ], + [ 45, "MOVE_SCREECH" ], + [ 49, "MOVE_POWER_WHIP" ], + [ 53, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -94,23 +101,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_LICK", - "5": "MOVE_SUPERSONIC", - "9": "MOVE_DEFENSE_CURL", - "13": "MOVE_KNOCK_OFF", - "17": "MOVE_WRAP", - "21": "MOVE_STOMP", - "25": "MOVE_DISABLE", - "29": "MOVE_SLAM", - "33": "MOVE_ROLLOUT", - "37": "MOVE_ME_FIRST", - "41": "MOVE_REFRESH", - "45": "MOVE_SCREECH", - "49": "MOVE_POWER_WHIP", - "53": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -131,8 +122,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -147,7 +138,7 @@ "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émon" + "category": "Licking Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -156,4 +147,4 @@ "rarity": 20, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/lileep/data.json b/res/pokemon/lileep/data.json index c54e82fca5..4a92c02822 100644 --- a/res/pokemon/lileep/data.json +++ b/res/pokemon/lileep/data.json @@ -8,10 +8,7 @@ "special_attack": 61, "special_defense": 87 }, - "types": [ - "TYPE_ROCK", - "TYPE_GRASS" - ], + "types": [ "TYPE_ROCK", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SUCTION_CUPS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_CONSTRICT" ], + [ 8, "MOVE_ACID" ], + [ 15, "MOVE_INGRAIN" ], + [ 22, "MOVE_CONFUSE_RAY" ], + [ 29, "MOVE_AMNESIA" ], + [ 36, "MOVE_GASTRO_ACID" ], + [ 43, "MOVE_ANCIENT_POWER" ], + [ 50, "MOVE_ENERGY_BALL" ], + [ 57, "MOVE_STOCKPILE" ], + [ 57, "MOVE_SPIT_UP" ], + [ 57, "MOVE_SWALLOW" ], + [ 64, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -76,26 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_ASTONISH", - "MOVE_CONSTRICT" - ], - "8": "MOVE_ACID", - "15": "MOVE_INGRAIN", - "22": "MOVE_CONFUSE_RAY", - "29": "MOVE_AMNESIA", - "36": "MOVE_GASTRO_ACID", - "43": "MOVE_ANCIENT_POWER", - "50": "MOVE_ENERGY_BALL", - "57": [ - "MOVE_STOCKPILE", - "MOVE_SPIT_UP", - "MOVE_SWALLOW" - ], - "64": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_GASTRO_ACID", "MOVE_SNORE", @@ -113,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -129,7 +116,7 @@ "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émon" + "category": "Sea Lily Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -138,4 +125,4 @@ "rarity": 20, "unused": 267 } -} +} \ No newline at end of file diff --git a/res/pokemon/linoone/data.json b/res/pokemon/linoone/data.json index ad587e81c5..3b42e32027 100644 --- a/res/pokemon/linoone/data.json +++ b/res/pokemon/linoone/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 61 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 90, "base_exp_reward": 128, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PICKUP", - "ABILITY_GLUTTONY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PICKUP", "ABILITY_GLUTTONY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SWITCHEROO" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_HEADBUTT" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_HEADBUTT" ], + [ 13, "MOVE_SAND_ATTACK" ], + [ 17, "MOVE_ODOR_SLEUTH" ], + [ 23, "MOVE_MUD_SPORT" ], + [ 29, "MOVE_FURY_SWIPES" ], + [ 35, "MOVE_COVET" ], + [ 41, "MOVE_SLASH" ], + [ 47, "MOVE_REST" ], + [ 53, "MOVE_BELLY_DRUM" ], + [ 59, "MOVE_FLING" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -86,27 +95,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SWITCHEROO", - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_TAIL_WHIP", - "MOVE_HEADBUTT" - ], - "5": "MOVE_TAIL_WHIP", - "9": "MOVE_HEADBUTT", - "13": "MOVE_SAND_ATTACK", - "17": "MOVE_ODOR_SLEUTH", - "23": "MOVE_MUD_SPORT", - "29": "MOVE_FURY_SWIPES", - "35": "MOVE_COVET", - "41": "MOVE_SLASH", - "47": "MOVE_REST", - "53": "MOVE_BELLY_DRUM", - "59": "MOVE_FLING" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -120,9 +109,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -137,7 +127,7 @@ "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émon" + "category": "Rushing Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/lombre/data.json b/res/pokemon/lombre/data.json index 3ed9d3d119..f180c5e705 100644 --- a/res/pokemon/lombre/data.json +++ b/res/pokemon/lombre/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 70 }, - "types": [ - "TYPE_WATER", - "TYPE_GRASS" - ], + "types": [ "TYPE_WATER", "TYPE_GRASS" ], "catch_rate": 120, "base_exp_reward": 141, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_RAIN_DISH" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 3, "MOVE_GROWL" ], + [ 5, "MOVE_ABSORB" ], + [ 7, "MOVE_NATURE_POWER" ], + [ 11, "MOVE_FAKE_OUT" ], + [ 15, "MOVE_FURY_SWIPES" ], + [ 19, "MOVE_WATER_SPORT" ], + [ 25, "MOVE_BUBBLE_BEAM" ], + [ 31, "MOVE_ZEN_HEADBUTT" ], + [ 37, "MOVE_UPROAR" ], + [ 45, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -83,20 +87,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_ASTONISH", - "3": "MOVE_GROWL", - "5": "MOVE_ABSORB", - "7": "MOVE_NATURE_POWER", - "11": "MOVE_FAKE_OUT", - "15": "MOVE_FURY_SWIPES", - "19": "MOVE_WATER_SPORT", - "25": "MOVE_BUBBLE_BEAM", - "31": "MOVE_ZEN_HEADBUTT", - "37": "MOVE_UPROAR", - "45": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -118,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -134,7 +125,7 @@ "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émon" + "category": "Jolly Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/lopunny/data.json b/res/pokemon/lopunny/data.json index 6cded08771..55e957c722 100644 --- a/res/pokemon/lopunny/data.json +++ b/res/pokemon/lopunny/data.json @@ -8,10 +8,7 @@ "special_attack": 54, "special_defense": 96 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 60, "base_exp_reward": 178, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 140, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_KLUTZ" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MIRROR_COAT" ], + [ 1, "MOVE_MAGIC_COAT" ], + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_FORESIGHT" ], + [ 6, "MOVE_ENDURE" ], + [ 13, "MOVE_RETURN" ], + [ 16, "MOVE_QUICK_ATTACK" ], + [ 23, "MOVE_JUMP_KICK" ], + [ 26, "MOVE_BATON_PASS" ], + [ 33, "MOVE_AGILITY" ], + [ 36, "MOVE_DIZZY_PUNCH" ], + [ 43, "MOVE_CHARM" ], + [ 46, "MOVE_BOUNCE" ], + [ 53, "MOVE_HEALING_WISH" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -86,27 +95,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_MIRROR_COAT", - "MOVE_MAGIC_COAT", - "MOVE_SPLASH", - "MOVE_POUND", - "MOVE_DEFENSE_CURL", - "MOVE_FORESIGHT" - ], - "6": "MOVE_ENDURE", - "13": "MOVE_RETURN", - "16": "MOVE_QUICK_ATTACK", - "23": "MOVE_JUMP_KICK", - "26": "MOVE_BATON_PASS", - "33": "MOVE_AGILITY", - "36": "MOVE_DIZZY_PUNCH", - "43": "MOVE_CHARM", - "46": "MOVE_BOUNCE", - "53": "MOVE_HEALING_WISH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -121,9 +110,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -138,7 +128,7 @@ "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émon" + "category": "Rabbit Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/lotad/data.json b/res/pokemon/lotad/data.json index be7c094787..73959abcbc 100644 --- a/res/pokemon/lotad/data.json +++ b/res/pokemon/lotad/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_GRASS" - ], + "types": [ "TYPE_WATER", "TYPE_GRASS" ], "catch_rate": 255, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_RAIN_DISH" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 3, "MOVE_GROWL" ], + [ 5, "MOVE_ABSORB" ], + [ 7, "MOVE_NATURE_POWER" ], + [ 11, "MOVE_MIST" ], + [ 15, "MOVE_NATURAL_GIFT" ], + [ 19, "MOVE_MEGA_DRAIN" ], + [ 25, "MOVE_BUBBLE_BEAM" ], + [ 31, "MOVE_ZEN_HEADBUTT" ], + [ 37, "MOVE_RAIN_DANCE" ], + [ 45, "MOVE_ENERGY_BALL" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -77,20 +81,7 @@ "TM90", "HM03" ], - "level_up": { - "1": "MOVE_ASTONISH", - "3": "MOVE_GROWL", - "5": "MOVE_ABSORB", - "7": "MOVE_NATURE_POWER", - "11": "MOVE_MIST", - "15": "MOVE_NATURAL_GIFT", - "19": "MOVE_MEGA_DRAIN", - "25": "MOVE_BUBBLE_BEAM", - "31": "MOVE_ZEN_HEADBUTT", - "37": "MOVE_RAIN_DANCE", - "45": "MOVE_ENERGY_BALL" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -107,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -122,8 +113,8 @@ "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émon\nthat can’t swim.", - "category": "Water Weed Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -132,4 +123,4 @@ "rarity": 50, "unused": 259 } -} +} \ No newline at end of file diff --git a/res/pokemon/loudred/data.json b/res/pokemon/loudred/data.json index 8a7c731201..b0c6c186e4 100644 --- a/res/pokemon/loudred/data.json +++ b/res/pokemon/loudred/data.json @@ -8,10 +8,7 @@ "special_attack": 71, "special_defense": 43 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 120, "base_exp_reward": 126, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_UPROAR" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_HOWL" ], + [ 5, "MOVE_UPROAR" ], + [ 11, "MOVE_ASTONISH" ], + [ 15, "MOVE_HOWL" ], + [ 20, "MOVE_BITE" ], + [ 23, "MOVE_SUPERSONIC" ], + [ 29, "MOVE_STOMP" ], + [ 37, "MOVE_SCREECH" ], + [ 43, "MOVE_ROAR" ], + [ 51, "MOVE_REST" ], + [ 51, "MOVE_SLEEP_TALK" ], + [ 57, "MOVE_HYPER_VOICE" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -83,28 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_UPROAR", - "MOVE_ASTONISH", - "MOVE_HOWL" - ], - "5": "MOVE_UPROAR", - "11": "MOVE_ASTONISH", - "15": "MOVE_HOWL", - "20": "MOVE_BITE", - "23": "MOVE_SUPERSONIC", - "29": "MOVE_STOMP", - "37": "MOVE_SCREECH", - "43": "MOVE_ROAR", - "51": [ - "MOVE_REST", - "MOVE_SLEEP_TALK" - ], - "57": "MOVE_HYPER_VOICE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -124,8 +111,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -140,7 +127,7 @@ "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émon" + "category": "Big Voice Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -149,4 +136,4 @@ "rarity": 20, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/lucario/data.json b/res/pokemon/lucario/data.json index c63e711b03..eb0d9cf8ef 100644 --- a/res/pokemon/lucario/data.json +++ b/res/pokemon/lucario/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 70 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_STEEL" - ], + "types": [ "TYPE_FIGHTING", "TYPE_STEEL" ], "catch_rate": 45, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_STEADFAST", - "ABILITY_INNER_FOCUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DARK_PULSE" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_FORESIGHT" ], + [ 1, "MOVE_DETECT" ], + [ 1, "MOVE_METAL_CLAW" ], + [ 6, "MOVE_COUNTER" ], + [ 11, "MOVE_FORCE_PALM" ], + [ 15, "MOVE_FEINT" ], + [ 19, "MOVE_BONE_RUSH" ], + [ 24, "MOVE_METAL_SOUND" ], + [ 29, "MOVE_ME_FIRST" ], + [ 33, "MOVE_SWORDS_DANCE" ], + [ 37, "MOVE_AURA_SPHERE" ], + [ 42, "MOVE_CLOSE_COMBAT" ], + [ 47, "MOVE_DRAGON_PULSE" ], + [ 51, "MOVE_EXTREME_SPEED" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -93,27 +102,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_DARK_PULSE", - "MOVE_QUICK_ATTACK", - "MOVE_FORESIGHT", - "MOVE_DETECT", - "MOVE_METAL_CLAW" - ], - "6": "MOVE_COUNTER", - "11": "MOVE_FORCE_PALM", - "15": "MOVE_FEINT", - "19": "MOVE_BONE_RUSH", - "24": "MOVE_METAL_SOUND", - "29": "MOVE_ME_FIRST", - "33": "MOVE_SWORDS_DANCE", - "37": "MOVE_AURA_SPHERE", - "42": "MOVE_CLOSE_COMBAT", - "47": "MOVE_DRAGON_PULSE", - "51": "MOVE_EXTREME_SPEED" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -127,9 +116,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -144,7 +134,7 @@ "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émon" + "category": "Aura Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/ludicolo/data.json b/res/pokemon/ludicolo/data.json index 482b670b0f..d52d9a8021 100644 --- a/res/pokemon/ludicolo/data.json +++ b/res/pokemon/ludicolo/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 100 }, - "types": [ - "TYPE_WATER", - "TYPE_GRASS" - ], + "types": [ "TYPE_WATER", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 181, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_RAIN_DISH" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_MEGA_DRAIN" ], + [ 1, "MOVE_NATURE_POWER" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -88,15 +85,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_ASTONISH", - "MOVE_GROWL", - "MOVE_MEGA_DRAIN", - "MOVE_NATURE_POWER" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -110,9 +99,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -126,8 +116,8 @@ "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’t\nhelp breaking out into a dance.", - "category": "Carefree Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/lugia/data.json b/res/pokemon/lugia/data.json index 538ff9b977..4166df96cf 100644 --- a/res/pokemon/lugia/data.json +++ b/res/pokemon/lugia/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 154 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_FLYING" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_FLYING" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WHIRLWIND" ], + [ 9, "MOVE_SAFEGUARD" ], + [ 15, "MOVE_GUST" ], + [ 23, "MOVE_RECOVER" ], + [ 29, "MOVE_HYDRO_PUMP" ], + [ 37, "MOVE_RAIN_DANCE" ], + [ 43, "MOVE_SWIFT" ], + [ 51, "MOVE_NATURAL_GIFT" ], + [ 57, "MOVE_ANCIENT_POWER" ], + [ 65, "MOVE_EXTRASENSORY" ], + [ 71, "MOVE_PUNISHMENT" ], + [ 79, "MOVE_FUTURE_SIGHT" ], + [ 85, "MOVE_AEROBLAST" ], + [ 93, "MOVE_CALM_MIND" ], + [ 99, "MOVE_SKY_ATTACK" ] + ], + "by_tm": [ "TM03", "TM04", "TM05", @@ -100,24 +108,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_WHIRLWIND", - "9": "MOVE_SAFEGUARD", - "15": "MOVE_GUST", - "23": "MOVE_RECOVER", - "29": "MOVE_HYDRO_PUMP", - "37": "MOVE_RAIN_DANCE", - "43": "MOVE_SWIFT", - "51": "MOVE_NATURAL_GIFT", - "57": "MOVE_ANCIENT_POWER", - "65": "MOVE_EXTRASENSORY", - "71": "MOVE_PUNISHMENT", - "79": "MOVE_FUTURE_SIGHT", - "85": "MOVE_AEROBLAST", - "93": "MOVE_CALM_MIND", - "99": "MOVE_SKY_ATTACK" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -135,9 +126,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 52, @@ -152,7 +144,7 @@ "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émon" + "category": "Diving Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/lumineon/data.json b/res/pokemon/lumineon/data.json index bb5e060cb4..890c30dc79 100644 --- a/res/pokemon/lumineon/data.json +++ b/res/pokemon/lumineon/data.json @@ -8,10 +8,7 @@ "special_attack": 69, "special_defense": 86 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 75, "base_exp_reward": 156, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_STORM_DRAIN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_ATTRACT" ], + [ 6, "MOVE_WATER_GUN" ], + [ 10, "MOVE_ATTRACT" ], + [ 13, "MOVE_RAIN_DANCE" ], + [ 17, "MOVE_GUST" ], + [ 22, "MOVE_WATER_PULSE" ], + [ 26, "MOVE_CAPTIVATE" ], + [ 29, "MOVE_SAFEGUARD" ], + [ 35, "MOVE_AQUA_RING" ], + [ 42, "MOVE_WHIRLPOOL" ], + [ 48, "MOVE_U_TURN" ], + [ 53, "MOVE_BOUNCE" ], + [ 59, "MOVE_SILVER_WIND" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,26 +87,7 @@ "HM05", "HM07" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_WATER_GUN", - "MOVE_ATTRACT" - ], - "6": "MOVE_WATER_GUN", - "10": "MOVE_ATTRACT", - "13": "MOVE_RAIN_DANCE", - "17": "MOVE_GUST", - "22": "MOVE_WATER_PULSE", - "26": "MOVE_CAPTIVATE", - "29": "MOVE_SAFEGUARD", - "35": "MOVE_AQUA_RING", - "42": "MOVE_WHIRLPOOL", - "48": "MOVE_U_TURN", - "53": "MOVE_BOUNCE", - "59": "MOVE_SILVER_WIND" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -127,7 +117,7 @@ "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émon" + "category": "Neon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/lunatone/data.json b/res/pokemon/lunatone/data.json index 1a6777fa29..8fe39ff751 100644 --- a/res/pokemon/lunatone/data.json +++ b/res/pokemon/lunatone/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 85 }, - "types": [ - "TYPE_ROCK", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_ROCK", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 150, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_CONFUSION" ], + [ 9, "MOVE_ROCK_THROW" ], + [ 12, "MOVE_HYPNOSIS" ], + [ 20, "MOVE_ROCK_POLISH" ], + [ 23, "MOVE_PSYWAVE" ], + [ 31, "MOVE_EMBARGO" ], + [ 34, "MOVE_COSMIC_POWER" ], + [ 42, "MOVE_HEAL_BLOCK" ], + [ 45, "MOVE_PSYCHIC" ], + [ 53, "MOVE_FUTURE_SIGHT" ], + [ 56, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -89,24 +95,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HARDEN", - "MOVE_CONFUSION" - ], - "9": "MOVE_ROCK_THROW", - "12": "MOVE_HYPNOSIS", - "20": "MOVE_ROCK_POLISH", - "23": "MOVE_PSYWAVE", - "31": "MOVE_EMBARGO", - "34": "MOVE_COSMIC_POWER", - "42": "MOVE_HEAL_BLOCK", - "45": "MOVE_PSYCHIC", - "53": "MOVE_FUTURE_SIGHT", - "56": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -118,9 +107,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 10, @@ -135,7 +125,7 @@ "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émon" + "category": "Meteorite Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/luvdisc/data.json b/res/pokemon/luvdisc/data.json index efdb5d6568..027ae33856 100644 --- a/res/pokemon/luvdisc/data.json +++ b/res/pokemon/luvdisc/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 65 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 225, "base_exp_reward": 110, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_CHARM" ], + [ 7, "MOVE_WATER_GUN" ], + [ 9, "MOVE_AGILITY" ], + [ 14, "MOVE_TAKE_DOWN" ], + [ 17, "MOVE_LUCKY_CHANT" ], + [ 22, "MOVE_ATTRACT" ], + [ 27, "MOVE_SWEET_KISS" ], + [ 31, "MOVE_WATER_PULSE" ], + [ 37, "MOVE_AQUA_RING" ], + [ 40, "MOVE_CAPTIVATE" ], + [ 46, "MOVE_FLAIL" ], + [ 51, "MOVE_SAFEGUARD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -72,22 +78,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_CHARM", - "7": "MOVE_WATER_GUN", - "9": "MOVE_AGILITY", - "14": "MOVE_TAKE_DOWN", - "17": "MOVE_LUCKY_CHANT", - "22": "MOVE_ATTRACT", - "27": "MOVE_SWEET_KISS", - "31": "MOVE_WATER_PULSE", - "37": "MOVE_AQUA_RING", - "40": "MOVE_CAPTIVATE", - "46": "MOVE_FLAIL", - "51": "MOVE_SAFEGUARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -95,9 +86,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -111,8 +103,8 @@ "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émon\nwill be blessed with eternal love.", - "category": "Rendezvous Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/luxio/data.json b/res/pokemon/luxio/data.json index 58a1bc6c9d..541500ca03 100644 --- a/res/pokemon/luxio/data.json +++ b/res/pokemon/luxio/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 49 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 120, "base_exp_reward": 117, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RIVALRY", - "ABILITY_INTIMIDATE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RIVALRY", "ABILITY_INTIMIDATE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_LEER" ], + [ 9, "MOVE_CHARGE" ], + [ 13, "MOVE_SPARK" ], + [ 18, "MOVE_BITE" ], + [ 23, "MOVE_ROAR" ], + [ 28, "MOVE_SWAGGER" ], + [ 33, "MOVE_THUNDER_FANG" ], + [ 38, "MOVE_CRUNCH" ], + [ 43, "MOVE_SCARY_FACE" ], + [ 48, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -74,23 +79,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_LEER" - ], - "5": "MOVE_LEER", - "9": "MOVE_CHARGE", - "13": "MOVE_SPARK", - "18": "MOVE_BITE", - "23": "MOVE_ROAR", - "28": "MOVE_SWAGGER", - "33": "MOVE_THUNDER_FANG", - "38": "MOVE_CRUNCH", - "43": "MOVE_SCARY_FACE", - "48": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -123,7 +112,7 @@ "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émon" + "category": "Spark Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -132,4 +121,4 @@ "rarity": 20, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/luxray/data.json b/res/pokemon/luxray/data.json index 596e0f2b48..ca23c9dbdc 100644 --- a/res/pokemon/luxray/data.json +++ b/res/pokemon/luxray/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 79 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 45, "base_exp_reward": 194, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RIVALRY", - "ABILITY_INTIMIDATE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RIVALRY", "ABILITY_INTIMIDATE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_CHARGE" ], + [ 5, "MOVE_LEER" ], + [ 9, "MOVE_CHARGE" ], + [ 13, "MOVE_SPARK" ], + [ 18, "MOVE_BITE" ], + [ 23, "MOVE_ROAR" ], + [ 28, "MOVE_SWAGGER" ], + [ 35, "MOVE_THUNDER_FANG" ], + [ 42, "MOVE_CRUNCH" ], + [ 49, "MOVE_SCARY_FACE" ], + [ 56, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -76,24 +82,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_LEER", - "MOVE_CHARGE" - ], - "5": "MOVE_LEER", - "9": "MOVE_CHARGE", - "13": "MOVE_SPARK", - "18": "MOVE_BITE", - "23": "MOVE_ROAR", - "28": "MOVE_SWAGGER", - "35": "MOVE_THUNDER_FANG", - "42": "MOVE_CRUNCH", - "49": "MOVE_SCARY_FACE", - "56": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SUPERPOWER", @@ -103,9 +92,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -120,7 +110,7 @@ "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émon" + "category": "Gleam Eyes Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/machamp/data.json b/res/pokemon/machamp/data.json index 332b87ac0a..3ce0426b07 100644 --- a/res/pokemon/machamp/data.json +++ b/res/pokemon/machamp/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 85 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 193, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_NO_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LOW_KICK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_KARATE_CHOP" ], + [ 13, "MOVE_FORESIGHT" ], + [ 19, "MOVE_SEISMIC_TOSS" ], + [ 22, "MOVE_REVENGE" ], + [ 25, "MOVE_VITAL_THROW" ], + [ 32, "MOVE_SUBMISSION" ], + [ 36, "MOVE_WAKE_UP_SLAP" ], + [ 40, "MOVE_CROSS_CHOP" ], + [ 44, "MOVE_SCARY_FACE" ], + [ 51, "MOVE_DYNAMIC_PUNCH" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -84,25 +91,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_LOW_KICK", - "MOVE_LEER", - "MOVE_FOCUS_ENERGY" - ], - "7": "MOVE_FOCUS_ENERGY", - "10": "MOVE_KARATE_CHOP", - "13": "MOVE_FORESIGHT", - "19": "MOVE_SEISMIC_TOSS", - "22": "MOVE_REVENGE", - "25": "MOVE_VITAL_THROW", - "32": "MOVE_SUBMISSION", - "36": "MOVE_WAKE_UP_SLAP", - "40": "MOVE_CROSS_CHOP", - "44": "MOVE_SCARY_FACE", - "51": "MOVE_DYNAMIC_PUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -113,9 +102,10 @@ "MOVE_VACUUM_WAVE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 16, @@ -130,7 +120,7 @@ "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émon" + "category": "Superpower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/machoke/data.json b/res/pokemon/machoke/data.json index 6482cc18b0..e96cc94903 100644 --- a/res/pokemon/machoke/data.json +++ b/res/pokemon/machoke/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 60 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 90, "base_exp_reward": 146, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_NO_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LOW_KICK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_KARATE_CHOP" ], + [ 13, "MOVE_FORESIGHT" ], + [ 19, "MOVE_SEISMIC_TOSS" ], + [ 22, "MOVE_REVENGE" ], + [ 25, "MOVE_VITAL_THROW" ], + [ 32, "MOVE_SUBMISSION" ], + [ 36, "MOVE_WAKE_UP_SLAP" ], + [ 40, "MOVE_CROSS_CHOP" ], + [ 44, "MOVE_SCARY_FACE" ], + [ 51, "MOVE_DYNAMIC_PUNCH" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -81,25 +88,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_LOW_KICK", - "MOVE_LEER", - "MOVE_FOCUS_ENERGY" - ], - "7": "MOVE_FOCUS_ENERGY", - "10": "MOVE_KARATE_CHOP", - "13": "MOVE_FORESIGHT", - "19": "MOVE_SEISMIC_TOSS", - "22": "MOVE_REVENGE", - "25": "MOVE_VITAL_THROW", - "32": "MOVE_SUBMISSION", - "36": "MOVE_WAKE_UP_SLAP", - "40": "MOVE_CROSS_CHOP", - "44": "MOVE_SCARY_FACE", - "51": "MOVE_DYNAMIC_PUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -111,14 +100,11 @@ ] }, "evolutions": [ - [ - "EVO_TRADE", - "SPECIES_MACHAMP" - ] + [ "EVO_TRADE", "SPECIES_MACHAMP" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -133,7 +119,7 @@ "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émon" + "category": "Superpower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/machop/data.json b/res/pokemon/machop/data.json index aadc4e03dc..fcf488136b 100644 --- a/res/pokemon/machop/data.json +++ b/res/pokemon/machop/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 180, "base_exp_reward": 75, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_NO_GUARD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LOW_KICK" ], + [ 1, "MOVE_LEER" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_KARATE_CHOP" ], + [ 13, "MOVE_FORESIGHT" ], + [ 19, "MOVE_SEISMIC_TOSS" ], + [ 22, "MOVE_REVENGE" ], + [ 25, "MOVE_VITAL_THROW" ], + [ 31, "MOVE_SUBMISSION" ], + [ 34, "MOVE_WAKE_UP_SLAP" ], + [ 37, "MOVE_CROSS_CHOP" ], + [ 43, "MOVE_SCARY_FACE" ], + [ 46, "MOVE_DYNAMIC_PUNCH" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -81,24 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_LOW_KICK", - "MOVE_LEER" - ], - "7": "MOVE_FOCUS_ENERGY", - "10": "MOVE_KARATE_CHOP", - "13": "MOVE_FORESIGHT", - "19": "MOVE_SEISMIC_TOSS", - "22": "MOVE_REVENGE", - "25": "MOVE_VITAL_THROW", - "31": "MOVE_SUBMISSION", - "34": "MOVE_WAKE_UP_SLAP", - "37": "MOVE_CROSS_CHOP", - "43": "MOVE_SCARY_FACE", - "46": "MOVE_DYNAMIC_PUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -133,7 +122,7 @@ "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émon" + "category": "Superpower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -142,4 +131,4 @@ "rarity": 30, "unused": 2313 } -} +} \ No newline at end of file diff --git a/res/pokemon/magby/data.json b/res/pokemon/magby/data.json index 3b51eecd82..58c5175e57 100644 --- a/res/pokemon/magby/data.json +++ b/res/pokemon/magby/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 55 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 117, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_FLAME_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_FLAME_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SMOG" ], + [ 1, "MOVE_LEER" ], + [ 7, "MOVE_EMBER" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 16, "MOVE_FAINT_ATTACK" ], + [ 19, "MOVE_FIRE_SPIN" ], + [ 25, "MOVE_CONFUSE_RAY" ], + [ 28, "MOVE_FIRE_PUNCH" ], + [ 34, "MOVE_LAVA_PLUME" ], + [ 37, "MOVE_FLAMETHROWER" ], + [ 43, "MOVE_SUNNY_DAY" ], + [ 46, "MOVE_FIRE_BLAST" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -74,23 +79,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_SMOG", - "MOVE_LEER" - ], - "7": "MOVE_EMBER", - "10": "MOVE_SMOKE_SCREEN", - "16": "MOVE_FAINT_ATTACK", - "19": "MOVE_FIRE_SPIN", - "25": "MOVE_CONFUSE_RAY", - "28": "MOVE_FIRE_PUNCH", - "34": "MOVE_LAVA_PLUME", - "37": "MOVE_FLAMETHROWER", - "43": "MOVE_SUNNY_DAY", - "46": "MOVE_FIRE_BLAST" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -108,8 +97,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -123,8 +112,8 @@ "pokemon_pos_f": 20, "trainer_pos_m": 9, "pokemon_pos_m": 20, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -133,4 +122,4 @@ "rarity": 10, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/magcargo/data.json b/res/pokemon/magcargo/data.json index 23d27d161a..f4e53698ca 100644 --- a/res/pokemon/magcargo/data.json +++ b/res/pokemon/magcargo/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_FIRE", - "TYPE_ROCK" - ], + "types": [ "TYPE_FIRE", "TYPE_ROCK" ], "catch_rate": 75, "base_exp_reward": 154, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_MAGMA_ARMOR", - "ABILITY_FLAME_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_SMOG" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_ROCK_THROW" ], + [ 8, "MOVE_EMBER" ], + [ 11, "MOVE_ROCK_THROW" ], + [ 16, "MOVE_HARDEN" ], + [ 23, "MOVE_RECOVER" ], + [ 26, "MOVE_ANCIENT_POWER" ], + [ 31, "MOVE_AMNESIA" ], + [ 40, "MOVE_LAVA_PLUME" ], + [ 45, "MOVE_ROCK_SLIDE" ], + [ 52, "MOVE_BODY_SLAM" ], + [ 61, "MOVE_FLAMETHROWER" ], + [ 66, "MOVE_EARTH_POWER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -83,26 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_YAWN", - "MOVE_SMOG", - "MOVE_EMBER", - "MOVE_ROCK_THROW" - ], - "8": "MOVE_EMBER", - "11": "MOVE_ROCK_THROW", - "16": "MOVE_HARDEN", - "23": "MOVE_RECOVER", - "26": "MOVE_ANCIENT_POWER", - "31": "MOVE_AMNESIA", - "40": "MOVE_LAVA_PLUME", - "45": "MOVE_ROCK_SLIDE", - "52": "MOVE_BODY_SLAM", - "61": "MOVE_FLAMETHROWER", - "66": "MOVE_EARTH_POWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -112,9 +101,10 @@ "MOVE_HEAT_WAVE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 8, @@ -129,7 +119,7 @@ "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émon" + "category": "Lava Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/magikarp/data.json b/res/pokemon/magikarp/data.json index 964e762420..913bf50d63 100644 --- a/res/pokemon/magikarp/data.json +++ b/res/pokemon/magikarp/data.json @@ -8,10 +8,7 @@ "special_attack": 15, "special_defense": 20 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 255, "base_exp_reward": 20, "ev_yields": { @@ -30,29 +27,21 @@ "hatch_cycles": 5, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 90, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_SPLASH", - "15": "MOVE_TACKLE", - "30": "MOVE_FLAIL" - }, - "tutor": [ - "MOVE_BOUNCE" - ] + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 15, "MOVE_TACKLE" ], + [ 30, "MOVE_FLAIL" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_BOUNCE" ] }, "evolutions": [ [ @@ -62,8 +51,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 9, @@ -78,7 +67,7 @@ "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émon" + "category": "Fish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -87,4 +76,4 @@ "rarity": 50, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/magmar/data.json b/res/pokemon/magmar/data.json index fb67b0667d..76102d9d18 100644 --- a/res/pokemon/magmar/data.json +++ b/res/pokemon/magmar/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 85 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 167, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_FLAME_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SMOG" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_EMBER" ], + [ 7, "MOVE_EMBER" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 16, "MOVE_FAINT_ATTACK" ], + [ 19, "MOVE_FIRE_SPIN" ], + [ 25, "MOVE_CONFUSE_RAY" ], + [ 28, "MOVE_FIRE_PUNCH" ], + [ 36, "MOVE_LAVA_PLUME" ], + [ 41, "MOVE_FLAMETHROWER" ], + [ 49, "MOVE_SUNNY_DAY" ], + [ 54, "MOVE_FIRE_BLAST" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -79,24 +85,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SMOG", - "MOVE_LEER", - "MOVE_EMBER" - ], - "7": "MOVE_EMBER", - "10": "MOVE_SMOKE_SCREEN", - "16": "MOVE_FAINT_ATTACK", - "19": "MOVE_FIRE_SPIN", - "25": "MOVE_CONFUSE_RAY", - "28": "MOVE_FIRE_PUNCH", - "36": "MOVE_LAVA_PLUME", - "41": "MOVE_FLAMETHROWER", - "49": "MOVE_SUNNY_DAY", - "54": "MOVE_FIRE_BLAST" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -129,7 +118,7 @@ "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émon" + "category": "Spitfire Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -138,4 +127,4 @@ "rarity": 20, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/magmortar/data.json b/res/pokemon/magmortar/data.json index 46d61d3e51..f39c42d4dd 100644 --- a/res/pokemon/magmortar/data.json +++ b/res/pokemon/magmortar/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 95 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 30, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_FLAME_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_PUNCH" ], + [ 1, "MOVE_SMOG" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 7, "MOVE_EMBER" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 16, "MOVE_FAINT_ATTACK" ], + [ 19, "MOVE_FIRE_SPIN" ], + [ 25, "MOVE_CONFUSE_RAY" ], + [ 28, "MOVE_FIRE_PUNCH" ], + [ 37, "MOVE_LAVA_PLUME" ], + [ 43, "MOVE_FLAMETHROWER" ], + [ 52, "MOVE_SUNNY_DAY" ], + [ 58, "MOVE_FIRE_BLAST" ], + [ 67, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -86,27 +95,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_THUNDER_PUNCH", - "MOVE_SMOG", - "MOVE_LEER", - "MOVE_EMBER", - "MOVE_SMOKE_SCREEN" - ], - "7": "MOVE_EMBER", - "10": "MOVE_SMOKE_SCREEN", - "16": "MOVE_FAINT_ATTACK", - "19": "MOVE_FIRE_SPIN", - "25": "MOVE_CONFUSE_RAY", - "28": "MOVE_FIRE_PUNCH", - "37": "MOVE_LAVA_PLUME", - "43": "MOVE_FLAMETHROWER", - "52": "MOVE_SUNNY_DAY", - "58": "MOVE_FIRE_BLAST", - "67": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -115,9 +104,10 @@ "MOVE_HEAT_WAVE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -132,7 +122,7 @@ "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émon" + "category": "Blast Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/magnemite/data.json b/res/pokemon/magnemite/data.json index 4b5b32355c..451c7f2a1d 100644 --- a/res/pokemon/magnemite/data.json +++ b/res/pokemon/magnemite/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 55 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_STEEL" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_STEEL" ], "catch_rate": 190, "base_exp_reward": 89, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_MAGNET_PULL", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_MAGNET_PULL", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_METAL_SOUND" ], + [ 1, "MOVE_TACKLE" ], + [ 6, "MOVE_THUNDER_SHOCK" ], + [ 11, "MOVE_SUPERSONIC" ], + [ 14, "MOVE_SONIC_BOOM" ], + [ 17, "MOVE_THUNDER_WAVE" ], + [ 22, "MOVE_SPARK" ], + [ 27, "MOVE_LOCK_ON" ], + [ 30, "MOVE_MAGNET_BOMB" ], + [ 33, "MOVE_SCREECH" ], + [ 38, "MOVE_DISCHARGE" ], + [ 43, "MOVE_MIRROR_SHOT" ], + [ 46, "MOVE_MAGNET_RISE" ], + [ 49, "MOVE_GYRO_BALL" ], + [ 54, "MOVE_ZAP_CANNON" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -75,26 +83,7 @@ "TM90", "TM91" ], - "level_up": { - "1": [ - "MOVE_METAL_SOUND", - "MOVE_TACKLE" - ], - "6": "MOVE_THUNDER_SHOCK", - "11": "MOVE_SUPERSONIC", - "14": "MOVE_SONIC_BOOM", - "17": "MOVE_THUNDER_WAVE", - "22": "MOVE_SPARK", - "27": "MOVE_LOCK_ON", - "30": "MOVE_MAGNET_BOMB", - "33": "MOVE_SCREECH", - "38": "MOVE_DISCHARGE", - "43": "MOVE_MIRROR_SHOT", - "46": "MOVE_MAGNET_RISE", - "49": "MOVE_GYRO_BALL", - "54": "MOVE_ZAP_CANNON" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -127,7 +116,7 @@ "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émon" + "category": "Magnet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -136,4 +125,4 @@ "rarity": 30, "unused": 3591 } -} +} \ No newline at end of file diff --git a/res/pokemon/magneton/data.json b/res/pokemon/magneton/data.json index 9e53f541ca..34f7bb06c4 100644 --- a/res/pokemon/magneton/data.json +++ b/res/pokemon/magneton/data.json @@ -8,10 +8,7 @@ "special_attack": 120, "special_defense": 70 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_STEEL" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_STEEL" ], "catch_rate": 60, "base_exp_reward": 161, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_MAGNET_PULL", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_MAGNET_PULL", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRI_ATTACK" ], + [ 1, "MOVE_METAL_SOUND" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 6, "MOVE_THUNDER_SHOCK" ], + [ 11, "MOVE_SUPERSONIC" ], + [ 14, "MOVE_SONIC_BOOM" ], + [ 17, "MOVE_THUNDER_WAVE" ], + [ 22, "MOVE_SPARK" ], + [ 27, "MOVE_LOCK_ON" ], + [ 30, "MOVE_MAGNET_BOMB" ], + [ 34, "MOVE_SCREECH" ], + [ 40, "MOVE_DISCHARGE" ], + [ 46, "MOVE_MIRROR_SHOT" ], + [ 50, "MOVE_MAGNET_RISE" ], + [ 54, "MOVE_GYRO_BALL" ], + [ 60, "MOVE_ZAP_CANNON" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,29 +88,7 @@ "TM90", "TM91" ], - "level_up": { - "1": [ - "MOVE_TRI_ATTACK", - "MOVE_METAL_SOUND", - "MOVE_TACKLE", - "MOVE_THUNDER_SHOCK", - "MOVE_SUPERSONIC" - ], - "6": "MOVE_THUNDER_SHOCK", - "11": "MOVE_SUPERSONIC", - "14": "MOVE_SONIC_BOOM", - "17": "MOVE_THUNDER_WAVE", - "22": "MOVE_SPARK", - "27": "MOVE_LOCK_ON", - "30": "MOVE_MAGNET_BOMB", - "34": "MOVE_SCREECH", - "40": "MOVE_DISCHARGE", - "46": "MOVE_MIRROR_SHOT", - "50": "MOVE_MAGNET_RISE", - "54": "MOVE_GYRO_BALL", - "60": "MOVE_ZAP_CANNON" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -109,14 +98,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_MAGNETIC_FIELD", - "SPECIES_MAGNEZONE" - ] + [ "EVO_LEVEL_MAGNETIC_FIELD", "SPECIES_MAGNEZONE" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -131,7 +117,7 @@ "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émon" + "category": "Magnet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -140,4 +126,4 @@ "rarity": 20, "unused": 3591 } -} +} \ No newline at end of file diff --git a/res/pokemon/magnezone/data.json b/res/pokemon/magnezone/data.json index 701d17100d..3bdf45adb9 100644 --- a/res/pokemon/magnezone/data.json +++ b/res/pokemon/magnezone/data.json @@ -8,10 +8,7 @@ "special_attack": 130, "special_defense": 90 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_STEEL" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_STEEL" ], "catch_rate": 30, "base_exp_reward": 211, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_MAGNET_PULL", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_MAGNET_PULL", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MIRROR_COAT" ], + [ 1, "MOVE_BARRIER" ], + [ 1, "MOVE_METAL_SOUND" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 6, "MOVE_THUNDER_SHOCK" ], + [ 11, "MOVE_SUPERSONIC" ], + [ 14, "MOVE_SONIC_BOOM" ], + [ 17, "MOVE_THUNDER_WAVE" ], + [ 22, "MOVE_SPARK" ], + [ 27, "MOVE_LOCK_ON" ], + [ 30, "MOVE_MAGNET_BOMB" ], + [ 34, "MOVE_SCREECH" ], + [ 40, "MOVE_DISCHARGE" ], + [ 46, "MOVE_MIRROR_SHOT" ], + [ 50, "MOVE_MAGNET_RISE" ], + [ 54, "MOVE_GYRO_BALL" ], + [ 60, "MOVE_ZAP_CANNON" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,30 +89,7 @@ "TM90", "TM91" ], - "level_up": { - "1": [ - "MOVE_MIRROR_COAT", - "MOVE_BARRIER", - "MOVE_METAL_SOUND", - "MOVE_TACKLE", - "MOVE_THUNDER_SHOCK", - "MOVE_SUPERSONIC" - ], - "6": "MOVE_THUNDER_SHOCK", - "11": "MOVE_SUPERSONIC", - "14": "MOVE_SONIC_BOOM", - "17": "MOVE_THUNDER_WAVE", - "22": "MOVE_SPARK", - "27": "MOVE_LOCK_ON", - "30": "MOVE_MAGNET_BOMB", - "34": "MOVE_SCREECH", - "40": "MOVE_DISCHARGE", - "46": "MOVE_MIRROR_SHOT", - "50": "MOVE_MAGNET_RISE", - "54": "MOVE_GYRO_BALL", - "60": "MOVE_ZAP_CANNON" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -127,7 +117,7 @@ "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émon" + "category": "Magnet Area Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/makuhita/data.json b/res/pokemon/makuhita/data.json index af57ce72cf..14555d3e05 100644 --- a/res/pokemon/makuhita/data.json +++ b/res/pokemon/makuhita/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 30 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 180, "base_exp_reward": 87, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_GUTS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 4, "MOVE_SAND_ATTACK" ], + [ 7, "MOVE_ARM_THRUST" ], + [ 10, "MOVE_VITAL_THROW" ], + [ 13, "MOVE_FAKE_OUT" ], + [ 16, "MOVE_WHIRLWIND" ], + [ 19, "MOVE_KNOCK_OFF" ], + [ 22, "MOVE_SMELLING_SALT" ], + [ 25, "MOVE_BELLY_DRUM" ], + [ 28, "MOVE_FORCE_PALM" ], + [ 31, "MOVE_SEISMIC_TOSS" ], + [ 34, "MOVE_WAKE_UP_SLAP" ], + [ 37, "MOVE_ENDURE" ], + [ 40, "MOVE_CLOSE_COMBAT" ], + [ 43, "MOVE_REVERSAL" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -78,27 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_FOCUS_ENERGY" - ], - "4": "MOVE_SAND_ATTACK", - "7": "MOVE_ARM_THRUST", - "10": "MOVE_VITAL_THROW", - "13": "MOVE_FAKE_OUT", - "16": "MOVE_WHIRLWIND", - "19": "MOVE_KNOCK_OFF", - "22": "MOVE_SMELLING_SALT", - "25": "MOVE_BELLY_DRUM", - "28": "MOVE_FORCE_PALM", - "31": "MOVE_SEISMIC_TOSS", - "34": "MOVE_WAKE_UP_SLAP", - "37": "MOVE_ENDURE", - "40": "MOVE_CLOSE_COMBAT", - "43": "MOVE_REVERSAL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -134,7 +123,7 @@ "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émon" + "category": "Guts Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -143,4 +132,4 @@ "rarity": 30, "unused": 2313 } -} +} \ No newline at end of file diff --git a/res/pokemon/mamoswine/data.json b/res/pokemon/mamoswine/data.json index 515f59c55e..72190f764c 100644 --- a/res/pokemon/mamoswine/data.json +++ b/res/pokemon/mamoswine/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 60 }, - "types": [ - "TYPE_ICE", - "TYPE_GROUND" - ], + "types": [ "TYPE_ICE", "TYPE_GROUND" ], "catch_rate": 50, "base_exp_reward": 207, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_SNOW_CLOAK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SNOW_CLOAK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ANCIENT_POWER" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 4, "MOVE_MUD_SPORT" ], + [ 8, "MOVE_POWDER_SNOW" ], + [ 13, "MOVE_MUD_SLAP" ], + [ 16, "MOVE_ENDURE" ], + [ 20, "MOVE_MUD_BOMB" ], + [ 25, "MOVE_HAIL" ], + [ 28, "MOVE_ICE_FANG" ], + [ 32, "MOVE_TAKE_DOWN" ], + [ 33, "MOVE_DOUBLE_HIT" ], + [ 40, "MOVE_EARTHQUAKE" ], + [ 48, "MOVE_MIST" ], + [ 56, "MOVE_BLIZZARD" ], + [ 65, "MOVE_SCARY_FACE" ] + ], + "by_tm": [ "TM05", "TM06", "TM07", @@ -82,29 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_ANCIENT_POWER", - "MOVE_PECK", - "MOVE_ODOR_SLEUTH", - "MOVE_MUD_SPORT", - "MOVE_POWDER_SNOW" - ], - "4": "MOVE_MUD_SPORT", - "8": "MOVE_POWDER_SNOW", - "13": "MOVE_MUD_SLAP", - "16": "MOVE_ENDURE", - "20": "MOVE_MUD_BOMB", - "25": "MOVE_HAIL", - "28": "MOVE_ICE_FANG", - "32": "MOVE_TAKE_DOWN", - "33": "MOVE_DOUBLE_HIT", - "40": "MOVE_EARTHQUAKE", - "48": "MOVE_MIST", - "56": "MOVE_BLIZZARD", - "65": "MOVE_SCARY_FACE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -117,9 +106,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 25, @@ -134,7 +124,7 @@ "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émon" + "category": "Twin Tusk Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/manaphy/data.json b/res/pokemon/manaphy/data.json index b503307a0d..c00d2d1f00 100644 --- a/res/pokemon/manaphy/data.json +++ b/res/pokemon/manaphy/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_HYDRATION", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_HYDRATION", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_GLOW" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 9, "MOVE_CHARM" ], + [ 16, "MOVE_SUPERSONIC" ], + [ 24, "MOVE_BUBBLE_BEAM" ], + [ 31, "MOVE_ACID_ARMOR" ], + [ 39, "MOVE_WHIRLPOOL" ], + [ 46, "MOVE_WATER_PULSE" ], + [ 54, "MOVE_AQUA_RING" ], + [ 61, "MOVE_DIVE" ], + [ 69, "MOVE_RAIN_DANCE" ], + [ 76, "MOVE_HEART_SWAP" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -83,24 +89,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_TAIL_GLOW", - "MOVE_BUBBLE", - "MOVE_WATER_SPORT" - ], - "9": "MOVE_CHARM", - "16": "MOVE_SUPERSONIC", - "24": "MOVE_BUBBLE_BEAM", - "31": "MOVE_ACID_ARMOR", - "39": "MOVE_WHIRLPOOL", - "46": "MOVE_WATER_PULSE", - "54": "MOVE_AQUA_RING", - "61": "MOVE_DIVE", - "69": "MOVE_RAIN_DANCE", - "76": "MOVE_HEART_SWAP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -115,9 +104,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -131,8 +121,8 @@ "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émon.", - "category": "Seafaring Pokémon" + "entry_text": "It is born with a wondrous power\nthat lets it bond with any kind of\nPok\u00e9mon.", + "category": "Seafaring Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/manectric/data.json b/res/pokemon/manectric/data.json index 1c7af8a62c..7ac640099e 100644 --- a/res/pokemon/manectric/data.json +++ b/res/pokemon/manectric/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 60 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 45, "base_exp_reward": 168, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_LIGHTNING_ROD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_LIGHTNING_ROD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_HOWL" ], + [ 4, "MOVE_THUNDER_WAVE" ], + [ 9, "MOVE_LEER" ], + [ 12, "MOVE_HOWL" ], + [ 17, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_SPARK" ], + [ 25, "MOVE_ODOR_SLEUTH" ], + [ 30, "MOVE_BITE" ], + [ 37, "MOVE_THUNDER_FANG" ], + [ 42, "MOVE_ROAR" ], + [ 49, "MOVE_DISCHARGE" ], + [ 54, "MOVE_CHARGE" ], + [ 61, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -78,28 +88,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_FIRE_FANG", - "MOVE_TACKLE", - "MOVE_THUNDER_WAVE", - "MOVE_LEER", - "MOVE_HOWL" - ], - "4": "MOVE_THUNDER_WAVE", - "9": "MOVE_LEER", - "12": "MOVE_HOWL", - "17": "MOVE_QUICK_ATTACK", - "20": "MOVE_SPARK", - "25": "MOVE_ODOR_SLEUTH", - "30": "MOVE_BITE", - "37": "MOVE_THUNDER_FANG", - "42": "MOVE_ROAR", - "49": "MOVE_DISCHARGE", - "54": "MOVE_CHARGE", - "61": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -107,9 +96,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -124,7 +114,7 @@ "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émon" + "category": "Discharge Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/mankey/data.json b/res/pokemon/mankey/data.json index f64f6dec24..d28b2ccc99 100644 --- a/res/pokemon/mankey/data.json +++ b/res/pokemon/mankey/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 45 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 190, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_VITAL_SPIRIT", - "ABILITY_ANGER_POINT" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_COVET" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LOW_KICK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 9, "MOVE_FURY_SWIPES" ], + [ 13, "MOVE_KARATE_CHOP" ], + [ 17, "MOVE_SEISMIC_TOSS" ], + [ 21, "MOVE_SCREECH" ], + [ 25, "MOVE_ASSURANCE" ], + [ 33, "MOVE_SWAGGER" ], + [ 37, "MOVE_CROSS_CHOP" ], + [ 41, "MOVE_THRASH" ], + [ 45, "MOVE_PUNISHMENT" ], + [ 49, "MOVE_CLOSE_COMBAT" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -86,26 +94,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_COVET", - "MOVE_SCRATCH", - "MOVE_LOW_KICK", - "MOVE_LEER", - "MOVE_FOCUS_ENERGY" - ], - "9": "MOVE_FURY_SWIPES", - "13": "MOVE_KARATE_CHOP", - "17": "MOVE_SEISMIC_TOSS", - "21": "MOVE_SCREECH", - "25": "MOVE_ASSURANCE", - "33": "MOVE_SWAGGER", - "37": "MOVE_CROSS_CHOP", - "41": "MOVE_THRASH", - "45": "MOVE_PUNISHMENT", - "49": "MOVE_CLOSE_COMBAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -129,8 +118,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -145,7 +134,7 @@ "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émon" + "category": "Pig Monkey Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -154,4 +143,4 @@ "rarity": 30, "unused": 2313 } -} +} \ No newline at end of file diff --git a/res/pokemon/mantine/data.json b/res/pokemon/mantine/data.json index c5bbe02a9a..93858ca8e1 100644 --- a/res/pokemon/mantine/data.json +++ b/res/pokemon/mantine/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 140 }, - "types": [ - "TYPE_WATER", - "TYPE_FLYING" - ], + "types": [ "TYPE_WATER", "TYPE_FLYING" ], "catch_rate": 25, "base_exp_reward": 168, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_WATER_ABSORB" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PSYBEAM" ], + [ 1, "MOVE_BULLET_SEED" ], + [ 1, "MOVE_SIGNAL_BEAM" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_BUBBLE_BEAM" ], + [ 4, "MOVE_SUPERSONIC" ], + [ 10, "MOVE_BUBBLE_BEAM" ], + [ 13, "MOVE_HEADBUTT" ], + [ 19, "MOVE_AGILITY" ], + [ 22, "MOVE_WING_ATTACK" ], + [ 28, "MOVE_WATER_PULSE" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_CONFUSE_RAY" ], + [ 40, "MOVE_BOUNCE" ], + [ 46, "MOVE_AQUA_RING" ], + [ 49, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -78,29 +89,7 @@ "HM05", "HM07" ], - "level_up": { - "1": [ - "MOVE_PSYBEAM", - "MOVE_BULLET_SEED", - "MOVE_SIGNAL_BEAM", - "MOVE_TACKLE", - "MOVE_BUBBLE", - "MOVE_SUPERSONIC", - "MOVE_BUBBLE_BEAM" - ], - "4": "MOVE_SUPERSONIC", - "10": "MOVE_BUBBLE_BEAM", - "13": "MOVE_HEADBUTT", - "19": "MOVE_AGILITY", - "22": "MOVE_WING_ATTACK", - "28": "MOVE_WATER_PULSE", - "31": "MOVE_TAKE_DOWN", - "37": "MOVE_CONFUSE_RAY", - "40": "MOVE_BOUNCE", - "46": "MOVE_AQUA_RING", - "49": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -116,9 +105,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 21, @@ -133,7 +123,7 @@ "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émon" + "category": "Kite Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/mantyke/data.json b/res/pokemon/mantyke/data.json index b590d64eb0..6050e50341 100644 --- a/res/pokemon/mantyke/data.json +++ b/res/pokemon/mantyke/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 120 }, - "types": [ - "TYPE_WATER", - "TYPE_FLYING" - ], + "types": [ "TYPE_WATER", "TYPE_FLYING" ], "catch_rate": 25, "base_exp_reward": 108, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_WATER_ABSORB" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_BUBBLE" ], + [ 4, "MOVE_SUPERSONIC" ], + [ 10, "MOVE_BUBBLE_BEAM" ], + [ 13, "MOVE_HEADBUTT" ], + [ 19, "MOVE_AGILITY" ], + [ 22, "MOVE_WING_ATTACK" ], + [ 28, "MOVE_WATER_PULSE" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_CONFUSE_RAY" ], + [ 40, "MOVE_BOUNCE" ], + [ 46, "MOVE_AQUA_RING" ], + [ 49, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -71,24 +77,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_BUBBLE" - ], - "4": "MOVE_SUPERSONIC", - "10": "MOVE_BUBBLE_BEAM", - "13": "MOVE_HEADBUTT", - "19": "MOVE_AGILITY", - "22": "MOVE_WING_ATTACK", - "28": "MOVE_WATER_PULSE", - "31": "MOVE_TAKE_DOWN", - "37": "MOVE_CONFUSE_RAY", - "40": "MOVE_BOUNCE", - "46": "MOVE_AQUA_RING", - "49": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 10, @@ -122,8 +111,8 @@ "pokemon_pos_f": 65529, "trainer_pos_m": 9, "pokemon_pos_m": 65529, - "entry_text": "People organize tours to see this\nPokémon frolic and skim the tops\nof waves with REMORAID.", - "category": "Kite Pokémon" + "entry_text": "People organize tours to see this\nPok\u00e9mon frolic and skim the tops\nof waves with REMORAID.", + "category": "Kite Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -132,4 +121,4 @@ "rarity": 3, "unused": 3593 } -} +} \ No newline at end of file diff --git a/res/pokemon/mareep/data.json b/res/pokemon/mareep/data.json index 007d679f0c..b772d32a7b 100644 --- a/res/pokemon/mareep/data.json +++ b/res/pokemon/mareep/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 45 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 235, "base_exp_reward": 59, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_GROWL" ], + [ 10, "MOVE_THUNDER_SHOCK" ], + [ 14, "MOVE_THUNDER_WAVE" ], + [ 19, "MOVE_COTTON_SPORE" ], + [ 23, "MOVE_CHARGE" ], + [ 28, "MOVE_DISCHARGE" ], + [ 32, "MOVE_SIGNAL_BEAM" ], + [ 37, "MOVE_LIGHT_SCREEN" ], + [ 41, "MOVE_POWER_GEM" ], + [ 46, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM06", "TM10", "TM16", @@ -71,20 +75,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_GROWL", - "10": "MOVE_THUNDER_SHOCK", - "14": "MOVE_THUNDER_WAVE", - "19": "MOVE_COTTON_SPORE", - "23": "MOVE_CHARGE", - "28": "MOVE_DISCHARGE", - "32": "MOVE_SIGNAL_BEAM", - "37": "MOVE_LIGHT_SCREEN", - "41": "MOVE_POWER_GEM", - "46": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_SIGNAL_BEAM", "MOVE_MAGNET_RISE", @@ -99,8 +90,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -115,7 +106,7 @@ "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émon" + "category": "Wool Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -124,4 +115,4 @@ "rarity": 30, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/marill/data.json b/res/pokemon/marill/data.json index 57067ae3e3..219f18b1ec 100644 --- a/res/pokemon/marill/data.json +++ b/res/pokemon/marill/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 58, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_HUGE_POWER" - ], - "great_marsh_flee_rate": 60, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 2, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_WATER_GUN" ], + [ 15, "MOVE_ROLLOUT" ], + [ 18, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_AQUA_RING" ], + [ 27, "MOVE_DOUBLE_EDGE" ], + [ 32, "MOVE_RAIN_DANCE" ], + [ 37, "MOVE_AQUA_TAIL" ], + [ 42, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -77,20 +81,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_TACKLE", - "2": "MOVE_DEFENSE_CURL", - "7": "MOVE_TAIL_WHIP", - "10": "MOVE_WATER_GUN", - "15": "MOVE_ROLLOUT", - "18": "MOVE_BUBBLE_BEAM", - "23": "MOVE_AQUA_RING", - "27": "MOVE_DOUBLE_EDGE", - "32": "MOVE_RAIN_DANCE", - "37": "MOVE_AQUA_TAIL", - "42": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -112,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -128,7 +119,7 @@ "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émon" + "category": "Aqua Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -137,4 +128,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/marowak/data.json b/res/pokemon/marowak/data.json index 9f9f20ec3c..0a03c3f3db 100644 --- a/res/pokemon/marowak/data.json +++ b/res/pokemon/marowak/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 80 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 75, "base_exp_reward": 124, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_LIGHTNING_ROD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_BONE_CLUB" ], + [ 1, "MOVE_HEADBUTT" ], + [ 3, "MOVE_TAIL_WHIP" ], + [ 7, "MOVE_BONE_CLUB" ], + [ 11, "MOVE_HEADBUTT" ], + [ 13, "MOVE_LEER" ], + [ 17, "MOVE_FOCUS_ENERGY" ], + [ 21, "MOVE_BONEMERANG" ], + [ 23, "MOVE_RAGE" ], + [ 27, "MOVE_FALSE_SWIPE" ], + [ 33, "MOVE_THRASH" ], + [ 37, "MOVE_FLING" ], + [ 43, "MOVE_BONE_RUSH" ], + [ 49, "MOVE_ENDEAVOR" ], + [ 53, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -88,28 +98,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_TAIL_WHIP", - "MOVE_BONE_CLUB", - "MOVE_HEADBUTT" - ], - "3": "MOVE_TAIL_WHIP", - "7": "MOVE_BONE_CLUB", - "11": "MOVE_HEADBUTT", - "13": "MOVE_LEER", - "17": "MOVE_FOCUS_ENERGY", - "21": "MOVE_BONEMERANG", - "23": "MOVE_RAGE", - "27": "MOVE_FALSE_SWIPE", - "33": "MOVE_THRASH", - "37": "MOVE_FLING", - "43": "MOVE_BONE_RUSH", - "49": "MOVE_ENDEAVOR", - "53": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -124,9 +113,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -140,8 +130,8 @@ "pokemon_pos_f": 19, "trainer_pos_m": 9, "pokemon_pos_m": 19, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/marshtomp/data.json b/res/pokemon/marshtomp/data.json index 31b530b5ff..83d7a65f96 100644 --- a/res/pokemon/marshtomp/data.json +++ b/res/pokemon/marshtomp/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 70 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 143, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_WATER_GUN" ], + [ 6, "MOVE_MUD_SLAP" ], + [ 10, "MOVE_WATER_GUN" ], + [ 15, "MOVE_BIDE" ], + [ 16, "MOVE_MUD_SHOT" ], + [ 20, "MOVE_FORESIGHT" ], + [ 25, "MOVE_MUD_BOMB" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_MUDDY_WATER" ], + [ 42, "MOVE_PROTECT" ], + [ 46, "MOVE_EARTHQUAKE" ], + [ 53, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,26 +87,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_MUD_SLAP", - "MOVE_WATER_GUN" - ], - "6": "MOVE_MUD_SLAP", - "10": "MOVE_WATER_GUN", - "15": "MOVE_BIDE", - "16": "MOVE_MUD_SHOT", - "20": "MOVE_FORESIGHT", - "25": "MOVE_MUD_BOMB", - "31": "MOVE_TAKE_DOWN", - "37": "MOVE_MUDDY_WATER", - "42": "MOVE_PROTECT", - "46": "MOVE_EARTHQUAKE", - "53": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -120,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -136,7 +125,7 @@ "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émon" + "category": "Mud Fish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -145,4 +134,4 @@ "rarity": 10, "unused": 2051 } -} +} \ No newline at end of file diff --git a/res/pokemon/masquerain/data.json b/res/pokemon/masquerain/data.json index 96dee11ba6..a98a105949 100644 --- a/res/pokemon/masquerain/data.json +++ b/res/pokemon/masquerain/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 82 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 75, "base_exp_reward": 128, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_OMINOUS_WIND" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_SWEET_SCENT" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 7, "MOVE_QUICK_ATTACK" ], + [ 13, "MOVE_SWEET_SCENT" ], + [ 19, "MOVE_WATER_SPORT" ], + [ 22, "MOVE_GUST" ], + [ 26, "MOVE_SCARY_FACE" ], + [ 33, "MOVE_STUN_SPORE" ], + [ 40, "MOVE_SILVER_WIND" ], + [ 47, "MOVE_AIR_SLASH" ], + [ 54, "MOVE_WHIRLWIND" ], + [ 61, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -81,26 +89,7 @@ "TM90", "HM05" ], - "level_up": { - "1": [ - "MOVE_OMINOUS_WIND", - "MOVE_BUBBLE", - "MOVE_QUICK_ATTACK", - "MOVE_SWEET_SCENT", - "MOVE_WATER_SPORT" - ], - "7": "MOVE_QUICK_ATTACK", - "13": "MOVE_SWEET_SCENT", - "19": "MOVE_WATER_SPORT", - "22": "MOVE_GUST", - "26": "MOVE_SCARY_FACE", - "33": "MOVE_STUN_SPORE", - "40": "MOVE_SILVER_WIND", - "47": "MOVE_AIR_SLASH", - "54": "MOVE_WHIRLWIND", - "61": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -111,9 +100,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 8, @@ -128,7 +118,7 @@ "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émon" + "category": "Eyeball Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/mawile/data.json b/res/pokemon/mawile/data.json index 28f907e8bd..f8e7d87a85 100644 --- a/res/pokemon/mawile/data.json +++ b/res/pokemon/mawile/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_STEEL", - "TYPE_STEEL" - ], + "types": [ "TYPE_STEEL", "TYPE_STEEL" ], "catch_rate": 45, "base_exp_reward": 98, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_INTIMIDATE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_HYPER_CUTTER", "ABILITY_INTIMIDATE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 6, "MOVE_FAKE_TEARS" ], + [ 11, "MOVE_BITE" ], + [ 16, "MOVE_SWEET_SCENT" ], + [ 21, "MOVE_VICE_GRIP" ], + [ 26, "MOVE_FAINT_ATTACK" ], + [ 31, "MOVE_BATON_PASS" ], + [ 36, "MOVE_CRUNCH" ], + [ 41, "MOVE_IRON_DEFENSE" ], + [ 46, "MOVE_SUCKER_PUNCH" ], + [ 51, "MOVE_STOCKPILE" ], + [ 51, "MOVE_SWALLOW" ], + [ 51, "MOVE_SPIT_UP" ], + [ 56, "MOVE_IRON_HEAD" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -90,25 +97,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_ASTONISH", - "6": "MOVE_FAKE_TEARS", - "11": "MOVE_BITE", - "16": "MOVE_SWEET_SCENT", - "21": "MOVE_VICE_GRIP", - "26": "MOVE_FAINT_ATTACK", - "31": "MOVE_BATON_PASS", - "36": "MOVE_CRUNCH", - "41": "MOVE_IRON_DEFENSE", - "46": "MOVE_SUCKER_PUNCH", - "51": [ - "MOVE_STOCKPILE", - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "56": "MOVE_IRON_HEAD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -122,9 +111,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -139,7 +129,7 @@ "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émon" + "category": "Deceiver Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/medicham/data.json b/res/pokemon/medicham/data.json index 6d2552aae8..e84e786c60 100644 --- a/res/pokemon/medicham/data.json +++ b/res/pokemon/medicham/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 75 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_FIGHTING", "TYPE_PSYCHIC" ], "catch_rate": 90, "base_exp_reward": 153, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_PURE_POWER", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_THUNDER_PUNCH" ], + [ 1, "MOVE_ICE_PUNCH" ], + [ 1, "MOVE_BIDE" ], + [ 1, "MOVE_MEDITATE" ], + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_DETECT" ], + [ 4, "MOVE_MEDITATE" ], + [ 8, "MOVE_CONFUSION" ], + [ 11, "MOVE_DETECT" ], + [ 15, "MOVE_HIDDEN_POWER" ], + [ 18, "MOVE_MIND_READER" ], + [ 22, "MOVE_FEINT" ], + [ 25, "MOVE_CALM_MIND" ], + [ 29, "MOVE_FORCE_PALM" ], + [ 32, "MOVE_HI_JUMP_KICK" ], + [ 36, "MOVE_PSYCH_UP" ], + [ 42, "MOVE_POWER_TRICK" ], + [ 49, "MOVE_REVERSAL" ], + [ 55, "MOVE_RECOVER" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -88,31 +101,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_THUNDER_PUNCH", - "MOVE_ICE_PUNCH", - "MOVE_BIDE", - "MOVE_MEDITATE", - "MOVE_CONFUSION", - "MOVE_DETECT" - ], - "4": "MOVE_MEDITATE", - "8": "MOVE_CONFUSION", - "11": "MOVE_DETECT", - "15": "MOVE_HIDDEN_POWER", - "18": "MOVE_MIND_READER", - "22": "MOVE_FEINT", - "25": "MOVE_CALM_MIND", - "29": "MOVE_FORCE_PALM", - "32": "MOVE_HI_JUMP_KICK", - "36": "MOVE_PSYCH_UP", - "42": "MOVE_POWER_TRICK", - "49": "MOVE_REVERSAL", - "55": "MOVE_RECOVER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -126,9 +115,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -143,7 +133,7 @@ "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émon" + "category": "Meditate Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/meditite/data.json b/res/pokemon/meditite/data.json index 7a584423ce..c9ac72dbdb 100644 --- a/res/pokemon/meditite/data.json +++ b/res/pokemon/meditite/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 55 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_FIGHTING", "TYPE_PSYCHIC" ], "catch_rate": 180, "base_exp_reward": 91, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_PURE_POWER", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BIDE" ], + [ 4, "MOVE_MEDITATE" ], + [ 8, "MOVE_CONFUSION" ], + [ 11, "MOVE_DETECT" ], + [ 15, "MOVE_HIDDEN_POWER" ], + [ 18, "MOVE_MIND_READER" ], + [ 22, "MOVE_FEINT" ], + [ 25, "MOVE_CALM_MIND" ], + [ 29, "MOVE_FORCE_PALM" ], + [ 32, "MOVE_HI_JUMP_KICK" ], + [ 36, "MOVE_PSYCH_UP" ], + [ 39, "MOVE_POWER_TRICK" ], + [ 43, "MOVE_REVERSAL" ], + [ 46, "MOVE_RECOVER" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -85,23 +92,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_BIDE", - "4": "MOVE_MEDITATE", - "8": "MOVE_CONFUSION", - "11": "MOVE_DETECT", - "15": "MOVE_HIDDEN_POWER", - "18": "MOVE_MIND_READER", - "22": "MOVE_FEINT", - "25": "MOVE_CALM_MIND", - "29": "MOVE_FORCE_PALM", - "32": "MOVE_HI_JUMP_KICK", - "36": "MOVE_PSYCH_UP", - "39": "MOVE_POWER_TRICK", - "43": "MOVE_REVERSAL", - "46": "MOVE_RECOVER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -123,8 +114,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -139,7 +130,7 @@ "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émon" + "category": "Meditate Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -148,4 +139,4 @@ "rarity": 30, "unused": 2569 } -} +} \ No newline at end of file diff --git a/res/pokemon/meganium/data.json b/res/pokemon/meganium/data.json index cfe9f5048d..201bbbdbec 100644 --- a/res/pokemon/meganium/data.json +++ b/res/pokemon/meganium/data.json @@ -8,10 +8,7 @@ "special_attack": 83, "special_defense": 100 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 208, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_RAZOR_LEAF" ], + [ 1, "MOVE_POISON_POWDER" ], + [ 6, "MOVE_RAZOR_LEAF" ], + [ 9, "MOVE_POISON_POWDER" ], + [ 12, "MOVE_SYNTHESIS" ], + [ 18, "MOVE_REFLECT" ], + [ 22, "MOVE_MAGICAL_LEAF" ], + [ 26, "MOVE_NATURAL_GIFT" ], + [ 32, "MOVE_PETAL_DANCE" ], + [ 34, "MOVE_SWEET_SCENT" ], + [ 40, "MOVE_LIGHT_SCREEN" ], + [ 46, "MOVE_BODY_SLAM" ], + [ 54, "MOVE_SAFEGUARD" ], + [ 60, "MOVE_AROMATHERAPY" ], + [ 66, "MOVE_SOLAR_BEAM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -81,28 +91,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_RAZOR_LEAF", - "MOVE_POISON_POWDER" - ], - "6": "MOVE_RAZOR_LEAF", - "9": "MOVE_POISON_POWDER", - "12": "MOVE_SYNTHESIS", - "18": "MOVE_REFLECT", - "22": "MOVE_MAGICAL_LEAF", - "26": "MOVE_NATURAL_GIFT", - "32": "MOVE_PETAL_DANCE", - "34": "MOVE_SWEET_SCENT", - "40": "MOVE_LIGHT_SCREEN", - "46": "MOVE_BODY_SLAM", - "54": "MOVE_SAFEGUARD", - "60": "MOVE_AROMATHERAPY", - "66": "MOVE_SOLAR_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -112,9 +101,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -129,7 +119,7 @@ "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émon" + "category": "Herb Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/meowth/data.json b/res/pokemon/meowth/data.json index 42de2f9293..70f536310a 100644 --- a/res/pokemon/meowth/data.json +++ b/res/pokemon/meowth/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 69, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PICKUP", - "ABILITY_TECHNICIAN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PICKUP", "ABILITY_TECHNICIAN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 6, "MOVE_BITE" ], + [ 9, "MOVE_FAKE_OUT" ], + [ 14, "MOVE_FURY_SWIPES" ], + [ 17, "MOVE_SCREECH" ], + [ 22, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_TAUNT" ], + [ 30, "MOVE_PAY_DAY" ], + [ 33, "MOVE_SLASH" ], + [ 38, "MOVE_NASTY_PLOT" ], + [ 41, "MOVE_ASSURANCE" ], + [ 46, "MOVE_CAPTIVATE" ], + [ 49, "MOVE_NIGHT_SLASH" ], + [ 54, "MOVE_FEINT" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -84,26 +92,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_GROWL" - ], - "6": "MOVE_BITE", - "9": "MOVE_FAKE_OUT", - "14": "MOVE_FURY_SWIPES", - "17": "MOVE_SCREECH", - "22": "MOVE_FAINT_ATTACK", - "25": "MOVE_TAUNT", - "30": "MOVE_PAY_DAY", - "33": "MOVE_SLASH", - "38": "MOVE_NASTY_PLOT", - "41": "MOVE_ASSURANCE", - "46": "MOVE_CAPTIVATE", - "49": "MOVE_NIGHT_SLASH", - "54": "MOVE_FEINT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -124,8 +113,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -140,7 +129,7 @@ "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émon" + "category": "Scratch Cat Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -149,4 +138,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/mesprit/data.json b/res/pokemon/mesprit/data.json index b37405b766..fe8c177edc 100644 --- a/res/pokemon/mesprit/data.json +++ b/res/pokemon/mesprit/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 105 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 80, "base_friendship": 140, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REST" ], + [ 1, "MOVE_CONFUSION" ], + [ 6, "MOVE_IMPRISON" ], + [ 16, "MOVE_PROTECT" ], + [ 21, "MOVE_SWIFT" ], + [ 31, "MOVE_LUCKY_CHANT" ], + [ 36, "MOVE_FUTURE_SIGHT" ], + [ 46, "MOVE_CHARM" ], + [ 51, "MOVE_EXTRASENSORY" ], + [ 61, "MOVE_COPYCAT" ], + [ 66, "MOVE_NATURAL_GIFT" ], + [ 76, "MOVE_HEALING_WISH" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -91,23 +96,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_REST", - "MOVE_CONFUSION" - ], - "6": "MOVE_IMPRISON", - "16": "MOVE_PROTECT", - "21": "MOVE_SWIFT", - "31": "MOVE_LUCKY_CHANT", - "36": "MOVE_FUTURE_SIGHT", - "46": "MOVE_CHARM", - "51": "MOVE_EXTRASENSORY", - "61": "MOVE_COPYCAT", - "66": "MOVE_NATURAL_GIFT", - "76": "MOVE_HEALING_WISH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -121,9 +110,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -138,7 +128,7 @@ "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émon" + "category": "Emotion Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/metagross/data.json b/res/pokemon/metagross/data.json index 646fd544ce..3b9425fcf1 100644 --- a/res/pokemon/metagross/data.json +++ b/res/pokemon/metagross/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 90 }, - "types": [ - "TYPE_STEEL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_STEEL", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MAGNET_RISE" ], + [ 1, "MOVE_TAKE_DOWN" ], + [ 1, "MOVE_METAL_CLAW" ], + [ 1, "MOVE_CONFUSION" ], + [ 20, "MOVE_METAL_CLAW" ], + [ 20, "MOVE_CONFUSION" ], + [ 24, "MOVE_SCARY_FACE" ], + [ 28, "MOVE_PURSUIT" ], + [ 32, "MOVE_BULLET_PUNCH" ], + [ 36, "MOVE_PSYCHIC" ], + [ 40, "MOVE_IRON_DEFENSE" ], + [ 44, "MOVE_AGILITY" ], + [ 45, "MOVE_HAMMER_ARM" ], + [ 53, "MOVE_METEOR_MASH" ], + [ 62, "MOVE_ZEN_HEADBUTT" ], + [ 71, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -86,29 +95,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_MAGNET_RISE", - "MOVE_TAKE_DOWN", - "MOVE_METAL_CLAW", - "MOVE_CONFUSION" - ], - "20": [ - "MOVE_METAL_CLAW", - "MOVE_CONFUSION" - ], - "24": "MOVE_SCARY_FACE", - "28": "MOVE_PURSUIT", - "32": "MOVE_BULLET_PUNCH", - "36": "MOVE_PSYCHIC", - "40": "MOVE_IRON_DEFENSE", - "44": "MOVE_AGILITY", - "45": "MOVE_HAMMER_ARM", - "53": "MOVE_METEOR_MASH", - "62": "MOVE_ZEN_HEADBUTT", - "71": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -125,9 +112,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -142,7 +130,7 @@ "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émon" + "category": "Iron Leg Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/metang/data.json b/res/pokemon/metang/data.json index ea3e1e2ac4..29b120e2f1 100644 --- a/res/pokemon/metang/data.json +++ b/res/pokemon/metang/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 80 }, - "types": [ - "TYPE_STEEL", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_STEEL", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 153, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MAGNET_RISE" ], + [ 1, "MOVE_TAKE_DOWN" ], + [ 1, "MOVE_METAL_CLAW" ], + [ 1, "MOVE_CONFUSION" ], + [ 20, "MOVE_METAL_CLAW" ], + [ 20, "MOVE_CONFUSION" ], + [ 24, "MOVE_SCARY_FACE" ], + [ 28, "MOVE_PURSUIT" ], + [ 32, "MOVE_BULLET_PUNCH" ], + [ 36, "MOVE_PSYCHIC" ], + [ 40, "MOVE_IRON_DEFENSE" ], + [ 44, "MOVE_AGILITY" ], + [ 48, "MOVE_METEOR_MASH" ], + [ 52, "MOVE_ZEN_HEADBUTT" ], + [ 56, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -85,28 +93,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_MAGNET_RISE", - "MOVE_TAKE_DOWN", - "MOVE_METAL_CLAW", - "MOVE_CONFUSION" - ], - "20": [ - "MOVE_METAL_CLAW", - "MOVE_CONFUSION" - ], - "24": "MOVE_SCARY_FACE", - "28": "MOVE_PURSUIT", - "32": "MOVE_BULLET_PUNCH", - "36": "MOVE_PSYCHIC", - "40": "MOVE_IRON_DEFENSE", - "44": "MOVE_AGILITY", - "48": "MOVE_METEOR_MASH", - "52": "MOVE_ZEN_HEADBUTT", - "56": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -131,8 +118,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -146,8 +133,8 @@ "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’t be\nscratched if it collides with a jet.", - "category": "Iron Claw Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -156,4 +143,4 @@ "rarity": 10, "unused": 2574 } -} +} \ No newline at end of file diff --git a/res/pokemon/metapod/data.json b/res/pokemon/metapod/data.json index a2a3c601f8..639ec22973 100644 --- a/res/pokemon/metapod/data.json +++ b/res/pokemon/metapod/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 25 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 120, "base_exp_reward": 72, "ev_yields": { @@ -30,28 +27,20 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_HARDEN", - "7": "MOVE_HARDEN" - }, - "tutor": [ - "MOVE_IRON_DEFENSE" - ] + "by_level": [ + [ 1, "MOVE_HARDEN" ], + [ 7, "MOVE_HARDEN" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_IRON_DEFENSE" ] }, "evolutions": [ [ @@ -61,8 +50,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -77,7 +66,7 @@ "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émon" + "category": "Cocoon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -86,4 +75,4 @@ "rarity": 30, "unused": 1028 } -} +} \ No newline at end of file diff --git a/res/pokemon/mew/data.json b/res/pokemon/mew/data.json index 37280f7367..2c515c1342 100644 --- a/res/pokemon/mew/data.json +++ b/res/pokemon/mew/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_TRANSFORM" ], + [ 10, "MOVE_MEGA_PUNCH" ], + [ 20, "MOVE_METRONOME" ], + [ 30, "MOVE_PSYCHIC" ], + [ 40, "MOVE_BARRIER" ], + [ 50, "MOVE_ANCIENT_POWER" ], + [ 60, "MOVE_AMNESIA" ], + [ 70, "MOVE_ME_FIRST" ], + [ 80, "MOVE_BATON_PASS" ], + [ 90, "MOVE_NASTY_PLOT" ], + [ 100, "MOVE_AURA_SPHERE" ] + ], + "by_tm": [ "TM01", "TM02", "TM03", @@ -146,23 +151,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_TRANSFORM" - ], - "10": "MOVE_MEGA_PUNCH", - "20": "MOVE_METRONOME", - "30": "MOVE_PSYCHIC", - "40": "MOVE_BARRIER", - "50": "MOVE_ANCIENT_POWER", - "60": "MOVE_AMNESIA", - "70": "MOVE_ME_FIRST", - "80": "MOVE_BATON_PASS", - "90": "MOVE_NASTY_PLOT", - "100": "MOVE_AURA_SPHERE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -203,9 +192,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -219,8 +209,8 @@ "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émon.", - "category": "New Species Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/mewtwo/data.json b/res/pokemon/mewtwo/data.json index 684b48cd1a..688a11117b 100644 --- a/res/pokemon/mewtwo/data.json +++ b/res/pokemon/mewtwo/data.json @@ -8,10 +8,7 @@ "special_attack": 154, "special_defense": 90 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONFUSION" ], + [ 1, "MOVE_DISABLE" ], + [ 8, "MOVE_BARRIER" ], + [ 15, "MOVE_SWIFT" ], + [ 22, "MOVE_FUTURE_SIGHT" ], + [ 29, "MOVE_PSYCH_UP" ], + [ 36, "MOVE_MIRACLE_EYE" ], + [ 43, "MOVE_MIST" ], + [ 50, "MOVE_PSYCHO_CUT" ], + [ 57, "MOVE_AMNESIA" ], + [ 64, "MOVE_POWER_SWAP" ], + [ 64, "MOVE_GUARD_SWAP" ], + [ 71, "MOVE_PSYCHIC" ], + [ 79, "MOVE_ME_FIRST" ], + [ 86, "MOVE_RECOVER" ], + [ 93, "MOVE_SAFEGUARD" ], + [ 100, "MOVE_AURA_SPHERE" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -113,30 +123,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_CONFUSION", - "MOVE_DISABLE" - ], - "8": "MOVE_BARRIER", - "15": "MOVE_SWIFT", - "22": "MOVE_FUTURE_SIGHT", - "29": "MOVE_PSYCH_UP", - "36": "MOVE_MIRACLE_EYE", - "43": "MOVE_MIST", - "50": "MOVE_PSYCHO_CUT", - "57": "MOVE_AMNESIA", - "64": [ - "MOVE_POWER_SWAP", - "MOVE_GUARD_SWAP" - ], - "71": "MOVE_PSYCHIC", - "79": "MOVE_ME_FIRST", - "86": "MOVE_RECOVER", - "93": "MOVE_SAFEGUARD", - "100": "MOVE_AURA_SPHERE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -150,9 +137,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -166,8 +154,8 @@ "pokemon_pos_f": 6, "trainer_pos_m": 16, "pokemon_pos_m": 6, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/mightyena/data.json b/res/pokemon/mightyena/data.json index 76daf930e6..b6a1d39e8f 100644 --- a/res/pokemon/mightyena/data.json +++ b/res/pokemon/mightyena/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_DARK", - "TYPE_DARK" - ], + "types": [ "TYPE_DARK", "TYPE_DARK" ], "catch_rate": 127, "base_exp_reward": 128, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_QUICK_FEET" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_QUICK_FEET" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HOWL" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_BITE" ], + [ 5, "MOVE_HOWL" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 13, "MOVE_BITE" ], + [ 17, "MOVE_ODOR_SLEUTH" ], + [ 22, "MOVE_ROAR" ], + [ 27, "MOVE_SWAGGER" ], + [ 32, "MOVE_ASSURANCE" ], + [ 37, "MOVE_SCARY_FACE" ], + [ 42, "MOVE_TAUNT" ], + [ 47, "MOVE_EMBARGO" ], + [ 52, "MOVE_TAKE_DOWN" ], + [ 57, "MOVE_THIEF" ], + [ 62, "MOVE_SUCKER_PUNCH" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -79,28 +89,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HOWL", - "MOVE_SAND_ATTACK", - "MOVE_BITE" - ], - "5": "MOVE_HOWL", - "9": "MOVE_SAND_ATTACK", - "13": "MOVE_BITE", - "17": "MOVE_ODOR_SLEUTH", - "22": "MOVE_ROAR", - "27": "MOVE_SWAGGER", - "32": "MOVE_ASSURANCE", - "37": "MOVE_SCARY_FACE", - "42": "MOVE_TAUNT", - "47": "MOVE_EMBARGO", - "52": "MOVE_TAKE_DOWN", - "57": "MOVE_THIEF", - "62": "MOVE_SUCKER_PUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SPITE", @@ -108,9 +97,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -125,7 +115,7 @@ "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émon" + "category": "Bite Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/milotic/data.json b/res/pokemon/milotic/data.json index 2528acfeae..3852ebc6fd 100644 --- a/res/pokemon/milotic/data.json +++ b/res/pokemon/milotic/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 125 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 60, "base_exp_reward": 213, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_MARVEL_SCALE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_WRAP" ], + [ 5, "MOVE_WATER_SPORT" ], + [ 9, "MOVE_REFRESH" ], + [ 13, "MOVE_WATER_PULSE" ], + [ 17, "MOVE_TWISTER" ], + [ 21, "MOVE_RECOVER" ], + [ 25, "MOVE_CAPTIVATE" ], + [ 29, "MOVE_AQUA_TAIL" ], + [ 33, "MOVE_RAIN_DANCE" ], + [ 37, "MOVE_HYDRO_PUMP" ], + [ 41, "MOVE_ATTRACT" ], + [ 45, "MOVE_SAFEGUARD" ], + [ 49, "MOVE_AQUA_RING" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,25 +83,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_WATER_GUN", - "MOVE_WRAP" - ], - "5": "MOVE_WATER_SPORT", - "9": "MOVE_REFRESH", - "13": "MOVE_WATER_PULSE", - "17": "MOVE_TWISTER", - "21": "MOVE_RECOVER", - "25": "MOVE_CAPTIVATE", - "29": "MOVE_AQUA_TAIL", - "33": "MOVE_RAIN_DANCE", - "37": "MOVE_HYDRO_PUMP", - "41": "MOVE_ATTRACT", - "45": "MOVE_SAFEGUARD", - "49": "MOVE_AQUA_RING" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -105,9 +94,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 62, @@ -122,7 +112,7 @@ "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émon" + "category": "Tender Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/miltank/data.json b/res/pokemon/miltank/data.json index 0d52a11cdb..f65e2fd017 100644 --- a/res/pokemon/miltank/data.json +++ b/res/pokemon/miltank/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 70 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 200, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_SCRAPPY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_THICK_FAT", "ABILITY_SCRAPPY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 3, "MOVE_GROWL" ], + [ 5, "MOVE_DEFENSE_CURL" ], + [ 8, "MOVE_STOMP" ], + [ 11, "MOVE_MILK_DRINK" ], + [ 15, "MOVE_BIDE" ], + [ 19, "MOVE_ROLLOUT" ], + [ 24, "MOVE_BODY_SLAM" ], + [ 29, "MOVE_ZEN_HEADBUTT" ], + [ 35, "MOVE_CAPTIVATE" ], + [ 41, "MOVE_GYRO_BALL" ], + [ 48, "MOVE_HEAL_BELL" ], + [ 55, "MOVE_WAKE_UP_SLAP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -90,22 +96,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "3": "MOVE_GROWL", - "5": "MOVE_DEFENSE_CURL", - "8": "MOVE_STOMP", - "11": "MOVE_MILK_DRINK", - "15": "MOVE_BIDE", - "19": "MOVE_ROLLOUT", - "24": "MOVE_BODY_SLAM", - "29": "MOVE_ZEN_HEADBUTT", - "35": "MOVE_CAPTIVATE", - "41": "MOVE_GYRO_BALL", - "48": "MOVE_HEAL_BELL", - "55": "MOVE_WAKE_UP_SLAP" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -118,9 +109,10 @@ "MOVE_ZEN_HEADBUTT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 12, @@ -134,8 +126,8 @@ "pokemon_pos_f": 11, "trainer_pos_m": 9, "pokemon_pos_m": 11, - "entry_text": "It is said that kids who drink\nMILTANK’s milk grow up to become\nhearty, healthy adults.", - "category": "Milk Cow Pokémon" + "entry_text": "It is said that kids who drink\nMILTANK\u2019s milk grow up to become\nhearty, healthy adults.", + "category": "Milk Cow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/mime_jr/data.json b/res/pokemon/mime_jr/data.json index 6498cc93c4..011a59adf3 100644 --- a/res/pokemon/mime_jr/data.json +++ b/res/pokemon/mime_jr/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 90 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 145, "base_exp_reward": 78, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_FILTER" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_FILTER" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TICKLE" ], + [ 1, "MOVE_BARRIER" ], + [ 1, "MOVE_CONFUSION" ], + [ 4, "MOVE_COPYCAT" ], + [ 8, "MOVE_MEDITATE" ], + [ 11, "MOVE_ENCORE" ], + [ 15, "MOVE_DOUBLE_SLAP" ], + [ 18, "MOVE_MIMIC" ], + [ 22, "MOVE_LIGHT_SCREEN" ], + [ 22, "MOVE_REFLECT" ], + [ 25, "MOVE_PSYBEAM" ], + [ 29, "MOVE_SUBSTITUTE" ], + [ 32, "MOVE_RECYCLE" ], + [ 36, "MOVE_TRICK" ], + [ 39, "MOVE_PSYCHIC" ], + [ 43, "MOVE_ROLE_PLAY" ], + [ 46, "MOVE_BATON_PASS" ], + [ 50, "MOVE_SAFEGUARD" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -91,31 +102,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_TICKLE", - "MOVE_BARRIER", - "MOVE_CONFUSION" - ], - "4": "MOVE_COPYCAT", - "8": "MOVE_MEDITATE", - "11": "MOVE_ENCORE", - "15": "MOVE_DOUBLE_SLAP", - "18": "MOVE_MIMIC", - "22": [ - "MOVE_LIGHT_SCREEN", - "MOVE_REFLECT" - ], - "25": "MOVE_PSYBEAM", - "29": "MOVE_SUBSTITUTE", - "32": "MOVE_RECYCLE", - "36": "MOVE_TRICK", - "39": "MOVE_PSYCHIC", - "43": "MOVE_ROLE_PLAY", - "46": "MOVE_BATON_PASS", - "50": "MOVE_SAFEGUARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -132,8 +119,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -148,7 +135,7 @@ "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émon" + "category": "Mime Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -157,4 +144,4 @@ "rarity": 3, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/minun/data.json b/res/pokemon/minun/data.json index 722a3dd3a9..79678fb605 100644 --- a/res/pokemon/minun/data.json +++ b/res/pokemon/minun/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 85 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 200, "base_exp_reward": 120, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_MINUS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_MINUS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 3, "MOVE_THUNDER_WAVE" ], + [ 7, "MOVE_QUICK_ATTACK" ], + [ 10, "MOVE_HELPING_HAND" ], + [ 15, "MOVE_SPARK" ], + [ 17, "MOVE_ENCORE" ], + [ 21, "MOVE_CHARM" ], + [ 24, "MOVE_COPYCAT" ], + [ 29, "MOVE_SWIFT" ], + [ 31, "MOVE_FAKE_TEARS" ], + [ 35, "MOVE_CHARGE" ], + [ 38, "MOVE_THUNDER" ], + [ 42, "MOVE_BATON_PASS" ], + [ 44, "MOVE_AGILITY" ], + [ 48, "MOVE_TRUMP_CARD" ], + [ 51, "MOVE_NASTY_PLOT" ] + ], + "by_tm": [ "TM06", "TM10", "TM16", @@ -73,25 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_GROWL", - "3": "MOVE_THUNDER_WAVE", - "7": "MOVE_QUICK_ATTACK", - "10": "MOVE_HELPING_HAND", - "15": "MOVE_SPARK", - "17": "MOVE_ENCORE", - "21": "MOVE_CHARM", - "24": "MOVE_COPYCAT", - "29": "MOVE_SWIFT", - "31": "MOVE_FAKE_TEARS", - "35": "MOVE_CHARGE", - "38": "MOVE_THUNDER", - "42": "MOVE_BATON_PASS", - "44": "MOVE_AGILITY", - "48": "MOVE_TRUMP_CARD", - "51": "MOVE_NASTY_PLOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -104,9 +95,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -121,7 +113,7 @@ "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émon" + "category": "Cheering Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/misdreavus/data.json b/res/pokemon/misdreavus/data.json index 3399bd4ffa..9a5440e447 100644 --- a/res/pokemon/misdreavus/data.json +++ b/res/pokemon/misdreavus/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 85 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 147, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_PSYWAVE" ], + [ 5, "MOVE_SPITE" ], + [ 10, "MOVE_ASTONISH" ], + [ 14, "MOVE_CONFUSE_RAY" ], + [ 19, "MOVE_MEAN_LOOK" ], + [ 23, "MOVE_PSYBEAM" ], + [ 28, "MOVE_PAIN_SPLIT" ], + [ 32, "MOVE_PAYBACK" ], + [ 37, "MOVE_SHADOW_BALL" ], + [ 41, "MOVE_PERISH_SONG" ], + [ 46, "MOVE_GRUDGE" ], + [ 50, "MOVE_POWER_GEM" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -86,24 +92,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_PSYWAVE" - ], - "5": "MOVE_SPITE", - "10": "MOVE_ASTONISH", - "14": "MOVE_CONFUSE_RAY", - "19": "MOVE_MEAN_LOOK", - "23": "MOVE_PSYBEAM", - "28": "MOVE_PAIN_SPLIT", - "32": "MOVE_PAYBACK", - "37": "MOVE_SHADOW_BALL", - "41": "MOVE_PERISH_SONG", - "46": "MOVE_GRUDGE", - "50": "MOVE_POWER_GEM" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -122,8 +111,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -137,8 +126,8 @@ "pokemon_pos_f": 65527, "trainer_pos_m": 9, "pokemon_pos_m": 65527, - "entry_text": "A Pokémon that startles people in\nthe middle of the night. It gathers\nfear as its energy.", - "category": "Screech Pokémon" + "entry_text": "A Pok\u00e9mon that startles people in\nthe middle of the night. It gathers\nfear as its energy.", + "category": "Screech Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/mismagius/data.json b/res/pokemon/mismagius/data.json index ea2f1e59c2..25b563352e 100644 --- a/res/pokemon/mismagius/data.json +++ b/res/pokemon/mismagius/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 105 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 187, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LUCKY_CHANT" ], + [ 1, "MOVE_MAGICAL_LEAF" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_PSYWAVE" ], + [ 1, "MOVE_SPITE" ], + [ 1, "MOVE_ASTONISH" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -89,17 +88,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_LUCKY_CHANT", - "MOVE_MAGICAL_LEAF", - "MOVE_GROWL", - "MOVE_PSYWAVE", - "MOVE_SPITE", - "MOVE_ASTONISH" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -110,9 +99,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 9, @@ -127,7 +117,7 @@ "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émon" + "category": "Magical Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/moltres/data.json b/res/pokemon/moltres/data.json index 922c656ee8..33be496e0e 100644 --- a/res/pokemon/moltres/data.json +++ b/res/pokemon/moltres/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 85 }, - "types": [ - "TYPE_FIRE", - "TYPE_FLYING" - ], + "types": [ "TYPE_FIRE", "TYPE_FLYING" ], "catch_rate": 3, "base_exp_reward": 217, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WING_ATTACK" ], + [ 1, "MOVE_EMBER" ], + [ 8, "MOVE_FIRE_SPIN" ], + [ 15, "MOVE_AGILITY" ], + [ 22, "MOVE_ENDURE" ], + [ 29, "MOVE_ANCIENT_POWER" ], + [ 36, "MOVE_FLAMETHROWER" ], + [ 43, "MOVE_SAFEGUARD" ], + [ 50, "MOVE_AIR_SLASH" ], + [ 57, "MOVE_ROOST" ], + [ 64, "MOVE_HEAT_WAVE" ], + [ 71, "MOVE_SOLAR_BEAM" ], + [ 78, "MOVE_SKY_ATTACK" ], + [ 85, "MOVE_SUNNY_DAY" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -80,25 +87,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_WING_ATTACK", - "MOVE_EMBER" - ], - "8": "MOVE_FIRE_SPIN", - "15": "MOVE_AGILITY", - "22": "MOVE_ENDURE", - "29": "MOVE_ANCIENT_POWER", - "36": "MOVE_FLAMETHROWER", - "43": "MOVE_SAFEGUARD", - "50": "MOVE_AIR_SLASH", - "57": "MOVE_ROOST", - "64": "MOVE_HEAT_WAVE", - "71": "MOVE_SOLAR_BEAM", - "78": "MOVE_SKY_ATTACK", - "85": "MOVE_SUNNY_DAY" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -109,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -125,8 +115,8 @@ "pokemon_pos_f": 1, "trainer_pos_m": 15, "pokemon_pos_m": 1, - "entry_text": "One of the legendary bird Pokémon.\nIt is said that its appearance\nindicates the coming of spring.", - "category": "Flame Pokémon" + "entry_text": "One of the legendary bird Pok\u00e9mon.\nIt is said that its appearance\nindicates the coming of spring.", + "category": "Flame Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/monferno/data.json b/res/pokemon/monferno/data.json index eddcd80a95..1f6393b8e8 100644 --- a/res/pokemon/monferno/data.json +++ b/res/pokemon/monferno/data.json @@ -8,10 +8,7 @@ "special_attack": 78, "special_defense": 52 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIRE", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 142, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_HUMAN_LIKE" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_EMBER" ], + [ 7, "MOVE_EMBER" ], + [ 9, "MOVE_TAUNT" ], + [ 14, "MOVE_MACH_PUNCH" ], + [ 16, "MOVE_FURY_SWIPES" ], + [ 19, "MOVE_FLAME_WHEEL" ], + [ 26, "MOVE_FEINT" ], + [ 29, "MOVE_TORMENT" ], + [ 36, "MOVE_CLOSE_COMBAT" ], + [ 39, "MOVE_FIRE_SPIN" ], + [ 46, "MOVE_SLACK_OFF" ], + [ 49, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -89,25 +96,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_EMBER" - ], - "7": "MOVE_EMBER", - "9": "MOVE_TAUNT", - "14": "MOVE_MACH_PUNCH", - "16": "MOVE_FURY_SWIPES", - "19": "MOVE_FLAME_WHEEL", - "26": "MOVE_FEINT", - "29": "MOVE_TORMENT", - "36": "MOVE_CLOSE_COMBAT", - "39": "MOVE_FIRE_SPIN", - "46": "MOVE_SLACK_OFF", - "49": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -129,8 +118,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -145,7 +134,7 @@ "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émon" + "category": "Playful Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -154,4 +143,4 @@ "rarity": 10, "unused": 2306 } -} +} \ No newline at end of file diff --git a/res/pokemon/mothim/data.json b/res/pokemon/mothim/data.json index cd1cca54f6..2c196b7f56 100644 --- a/res/pokemon/mothim/data.json +++ b/res/pokemon/mothim/data.json @@ -8,10 +8,7 @@ "special_attack": 94, "special_defense": 50 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 159, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 10, "MOVE_PROTECT" ], + [ 15, "MOVE_BUG_BITE" ], + [ 20, "MOVE_HIDDEN_POWER" ], + [ 23, "MOVE_CONFUSION" ], + [ 26, "MOVE_GUST" ], + [ 29, "MOVE_POISON_POWDER" ], + [ 32, "MOVE_PSYBEAM" ], + [ 35, "MOVE_CAMOUFLAGE" ], + [ 38, "MOVE_SILVER_WIND" ], + [ 41, "MOVE_AIR_SLASH" ], + [ 44, "MOVE_PSYCHIC" ], + [ 47, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,22 +88,7 @@ "TM90", "HM05" ], - "level_up": { - "1": "MOVE_TACKLE", - "10": "MOVE_PROTECT", - "15": "MOVE_BUG_BITE", - "20": "MOVE_HIDDEN_POWER", - "23": "MOVE_CONFUSION", - "26": "MOVE_GUST", - "29": "MOVE_POISON_POWDER", - "32": "MOVE_PSYBEAM", - "35": "MOVE_CAMOUFLAGE", - "38": "MOVE_SILVER_WIND", - "41": "MOVE_AIR_SLASH", - "44": "MOVE_PSYCHIC", - "47": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -107,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 9, @@ -123,8 +115,8 @@ "pokemon_pos_f": 65525, "trainer_pos_m": 9, "pokemon_pos_m": 65525, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/mr_mime/data.json b/res/pokemon/mr_mime/data.json index 6a762c3707..ffce3c5357 100644 --- a/res/pokemon/mr_mime/data.json +++ b/res/pokemon/mr_mime/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 120 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 136, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_FILTER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MAGICAL_LEAF" ], + [ 1, "MOVE_POWER_SWAP" ], + [ 1, "MOVE_GUARD_SWAP" ], + [ 1, "MOVE_BARRIER" ], + [ 1, "MOVE_CONFUSION" ], + [ 4, "MOVE_COPYCAT" ], + [ 8, "MOVE_MEDITATE" ], + [ 11, "MOVE_ENCORE" ], + [ 15, "MOVE_DOUBLE_SLAP" ], + [ 18, "MOVE_MIMIC" ], + [ 22, "MOVE_LIGHT_SCREEN" ], + [ 22, "MOVE_REFLECT" ], + [ 25, "MOVE_PSYBEAM" ], + [ 29, "MOVE_SUBSTITUTE" ], + [ 32, "MOVE_RECYCLE" ], + [ 36, "MOVE_TRICK" ], + [ 39, "MOVE_PSYCHIC" ], + [ 43, "MOVE_ROLE_PLAY" ], + [ 46, "MOVE_BATON_PASS" ], + [ 50, "MOVE_SAFEGUARD" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -97,33 +110,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_MAGICAL_LEAF", - "MOVE_POWER_SWAP", - "MOVE_GUARD_SWAP", - "MOVE_BARRIER", - "MOVE_CONFUSION" - ], - "4": "MOVE_COPYCAT", - "8": "MOVE_MEDITATE", - "11": "MOVE_ENCORE", - "15": "MOVE_DOUBLE_SLAP", - "18": "MOVE_MIMIC", - "22": [ - "MOVE_LIGHT_SCREEN", - "MOVE_REFLECT" - ], - "25": "MOVE_PSYBEAM", - "29": "MOVE_SUBSTITUTE", - "32": "MOVE_RECYCLE", - "36": "MOVE_TRICK", - "39": "MOVE_PSYCHIC", - "43": "MOVE_ROLE_PLAY", - "46": "MOVE_BATON_PASS", - "50": "MOVE_SAFEGUARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -136,9 +123,10 @@ "MOVE_TRICK" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -153,7 +141,7 @@ "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émon" + "category": "Barrier Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/mudkip/data.json b/res/pokemon/mudkip/data.json index 38f85c5c6a..86f4e24646 100644 --- a/res/pokemon/mudkip/data.json +++ b/res/pokemon/mudkip/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 6, "MOVE_MUD_SLAP" ], + [ 10, "MOVE_WATER_GUN" ], + [ 15, "MOVE_BIDE" ], + [ 19, "MOVE_FORESIGHT" ], + [ 24, "MOVE_MUD_SPORT" ], + [ 28, "MOVE_TAKE_DOWN" ], + [ 33, "MOVE_WHIRLPOOL" ], + [ 37, "MOVE_PROTECT" ], + [ 42, "MOVE_HYDRO_PUMP" ], + [ 46, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -75,23 +80,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "6": "MOVE_MUD_SLAP", - "10": "MOVE_WATER_GUN", - "15": "MOVE_BIDE", - "19": "MOVE_FORESIGHT", - "24": "MOVE_MUD_SPORT", - "28": "MOVE_TAKE_DOWN", - "33": "MOVE_WHIRLPOOL", - "37": "MOVE_PROTECT", - "42": "MOVE_HYDRO_PUMP", - "46": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -112,8 +101,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -128,7 +117,7 @@ "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émon" + "category": "Mud Fish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -137,4 +126,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/muk/data.json b/res/pokemon/muk/data.json index d2a5b4805d..c67e17c597 100644 --- a/res/pokemon/muk/data.json +++ b/res/pokemon/muk/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 100 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 75, "base_exp_reward": 157, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_STENCH", - "ABILITY_STICKY_HOLD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_STENCH", "ABILITY_STICKY_HOLD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_GAS" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 4, "MOVE_HARDEN" ], + [ 7, "MOVE_MUD_SLAP" ], + [ 12, "MOVE_DISABLE" ], + [ 17, "MOVE_MINIMIZE" ], + [ 20, "MOVE_SLUDGE" ], + [ 23, "MOVE_MUD_BOMB" ], + [ 28, "MOVE_FLING" ], + [ 33, "MOVE_SCREECH" ], + [ 36, "MOVE_SLUDGE_BOMB" ], + [ 44, "MOVE_ACID_ARMOR" ], + [ 54, "MOVE_GUNK_SHOT" ], + [ 65, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -90,27 +99,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POISON_GAS", - "MOVE_POUND", - "MOVE_HARDEN", - "MOVE_MUD_SLAP" - ], - "4": "MOVE_HARDEN", - "7": "MOVE_MUD_SLAP", - "12": "MOVE_DISABLE", - "17": "MOVE_MINIMIZE", - "20": "MOVE_SLUDGE", - "23": "MOVE_MUD_BOMB", - "28": "MOVE_FLING", - "33": "MOVE_SCREECH", - "36": "MOVE_SLUDGE_BOMB", - "44": "MOVE_ACID_ARMOR", - "54": "MOVE_GUNK_SHOT", - "65": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -119,9 +108,10 @@ "MOVE_GUNK_SHOT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -136,7 +126,7 @@ "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émon" + "category": "Sludge Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/munchlax/data.json b/res/pokemon/munchlax/data.json index ba1f97ce87..c95c806c84 100644 --- a/res/pokemon/munchlax/data.json +++ b/res/pokemon/munchlax/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 85 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 50, "base_exp_reward": 94, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PICKUP", - "ABILITY_THICK_FAT" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PICKUP", "ABILITY_THICK_FAT" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_METRONOME" ], + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_DEFENSE_CURL" ], + [ 9, "MOVE_AMNESIA" ], + [ 12, "MOVE_LICK" ], + [ 17, "MOVE_RECYCLE" ], + [ 20, "MOVE_SCREECH" ], + [ 25, "MOVE_STOCKPILE" ], + [ 28, "MOVE_SWALLOW" ], + [ 33, "MOVE_BODY_SLAM" ], + [ 36, "MOVE_FLING" ], + [ 41, "MOVE_ROLLOUT" ], + [ 44, "MOVE_NATURAL_GIFT" ], + [ 49, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -87,26 +95,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_METRONOME", - "MOVE_ODOR_SLEUTH", - "MOVE_TACKLE" - ], - "4": "MOVE_DEFENSE_CURL", - "9": "MOVE_AMNESIA", - "12": "MOVE_LICK", - "17": "MOVE_RECYCLE", - "20": "MOVE_SCREECH", - "25": "MOVE_STOCKPILE", - "28": "MOVE_SWALLOW", - "33": "MOVE_BODY_SLAM", - "36": "MOVE_FLING", - "41": "MOVE_ROLLOUT", - "44": "MOVE_NATURAL_GIFT", - "49": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -123,14 +112,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_SNORLAX" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_SNORLAX" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -145,7 +131,7 @@ "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émon" + "category": "Big Eater Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -154,4 +140,4 @@ "rarity": 20, "unused": 2310 } -} +} \ No newline at end of file diff --git a/res/pokemon/murkrow/data.json b/res/pokemon/murkrow/data.json index 2d69809ef9..0ed49fb979 100644 --- a/res/pokemon/murkrow/data.json +++ b/res/pokemon/murkrow/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 42 }, - "types": [ - "TYPE_DARK", - "TYPE_FLYING" - ], + "types": [ "TYPE_DARK", "TYPE_FLYING" ], "catch_rate": 30, "base_exp_reward": 107, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_SUPER_LUCK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INSOMNIA", "ABILITY_SUPER_LUCK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_ASTONISH" ], + [ 5, "MOVE_PURSUIT" ], + [ 11, "MOVE_HAZE" ], + [ 15, "MOVE_WING_ATTACK" ], + [ 21, "MOVE_NIGHT_SHADE" ], + [ 25, "MOVE_ASSURANCE" ], + [ 31, "MOVE_TAUNT" ], + [ 35, "MOVE_FAINT_ATTACK" ], + [ 41, "MOVE_MEAN_LOOK" ], + [ 45, "MOVE_SUCKER_PUNCH" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -83,22 +87,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_ASTONISH" - ], - "5": "MOVE_PURSUIT", - "11": "MOVE_HAZE", - "15": "MOVE_WING_ATTACK", - "21": "MOVE_NIGHT_SHADE", - "25": "MOVE_ASSURANCE", - "31": "MOVE_TAUNT", - "35": "MOVE_FAINT_ATTACK", - "41": "MOVE_MEAN_LOOK", - "45": "MOVE_SUCKER_PUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -135,7 +124,7 @@ "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émon" + "category": "Darkness Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/natu/data.json b/res/pokemon/natu/data.json index add71f223e..8813b5980f 100644 --- a/res/pokemon/natu/data.json +++ b/res/pokemon/natu/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 45 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_FLYING" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_FLYING" ], "catch_rate": 190, "base_exp_reward": 73, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_NIGHT_SHADE" ], + [ 9, "MOVE_TELEPORT" ], + [ 12, "MOVE_LUCKY_CHANT" ], + [ 17, "MOVE_MIRACLE_EYE" ], + [ 20, "MOVE_ME_FIRST" ], + [ 23, "MOVE_CONFUSE_RAY" ], + [ 28, "MOVE_WISH" ], + [ 33, "MOVE_PSYCHO_SHIFT" ], + [ 36, "MOVE_FUTURE_SIGHT" ], + [ 39, "MOVE_OMINOUS_WIND" ], + [ 44, "MOVE_POWER_SWAP" ], + [ 44, "MOVE_GUARD_SWAP" ], + [ 47, "MOVE_PSYCHIC" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -85,28 +93,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_LEER" - ], - "6": "MOVE_NIGHT_SHADE", - "9": "MOVE_TELEPORT", - "12": "MOVE_LUCKY_CHANT", - "17": "MOVE_MIRACLE_EYE", - "20": "MOVE_ME_FIRST", - "23": "MOVE_CONFUSE_RAY", - "28": "MOVE_WISH", - "33": "MOVE_PSYCHO_SHIFT", - "36": "MOVE_FUTURE_SIGHT", - "39": "MOVE_OMINOUS_WIND", - "44": [ - "MOVE_POWER_SWAP", - "MOVE_GUARD_SWAP" - ], - "47": "MOVE_PSYCHIC" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -127,8 +114,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 2, @@ -143,7 +130,7 @@ "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émon" + "category": "Tiny Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -152,4 +139,4 @@ "rarity": 30, "unused": 4362 } -} +} \ No newline at end of file diff --git a/res/pokemon/nidoking/data.json b/res/pokemon/nidoking/data.json index 5a7881fd42..b90235d7f1 100644 --- a/res/pokemon/nidoking/data.json +++ b/res/pokemon/nidoking/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 75 }, - "types": [ - "TYPE_POISON", - "TYPE_GROUND" - ], + "types": [ "TYPE_POISON", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 195, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_RIVALRY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_DOUBLE_KICK" ], + [ 1, "MOVE_POISON_STING" ], + [ 23, "MOVE_THRASH" ], + [ 43, "MOVE_EARTH_POWER" ], + [ 58, "MOVE_MEGAHORN" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -101,18 +101,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_FOCUS_ENERGY", - "MOVE_DOUBLE_KICK", - "MOVE_POISON_STING" - ], - "23": "MOVE_THRASH", - "43": "MOVE_EARTH_POWER", - "58": "MOVE_MEGAHORN" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -129,9 +118,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 14, @@ -146,7 +136,7 @@ "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émon" + "category": "Drill Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/nidoqueen/data.json b/res/pokemon/nidoqueen/data.json index 77c7b23c16..fcbff8b5d6 100644 --- a/res/pokemon/nidoqueen/data.json +++ b/res/pokemon/nidoqueen/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 85 }, - "types": [ - "TYPE_POISON", - "TYPE_GROUND" - ], + "types": [ "TYPE_POISON", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 194, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_RIVALRY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_DOUBLE_KICK" ], + [ 1, "MOVE_POISON_STING" ], + [ 23, "MOVE_BODY_SLAM" ], + [ 43, "MOVE_EARTH_POWER" ], + [ 58, "MOVE_SUPERPOWER" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -102,18 +102,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_TAIL_WHIP", - "MOVE_DOUBLE_KICK", - "MOVE_POISON_STING" - ], - "23": "MOVE_BODY_SLAM", - "43": "MOVE_EARTH_POWER", - "58": "MOVE_SUPERPOWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -129,9 +118,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 13, @@ -146,7 +136,7 @@ "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émon" + "category": "Drill Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/nidoran_f/data.json b/res/pokemon/nidoran_f/data.json index d0216a03da..b05900926a 100644 --- a/res/pokemon/nidoran_f/data.json +++ b/res/pokemon/nidoran_f/data.json @@ -1,5 +1,5 @@ { - "name": "Nidoran♀", + "name": "Nidoran\u2640", "base_stats": { "hp": 55, "attack": 47, @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 235, "base_exp_reward": 59, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_RIVALRY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_SCRATCH" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_DOUBLE_KICK" ], + [ 13, "MOVE_POISON_STING" ], + [ 19, "MOVE_FURY_SWIPES" ], + [ 21, "MOVE_BITE" ], + [ 25, "MOVE_HELPING_HAND" ], + [ 31, "MOVE_TOXIC_SPIKES" ], + [ 33, "MOVE_FLATTER" ], + [ 37, "MOVE_CRUNCH" ], + [ 43, "MOVE_CAPTIVATE" ], + [ 45, "MOVE_POISON_FANG" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -80,24 +86,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_SCRATCH" - ], - "7": "MOVE_TAIL_WHIP", - "9": "MOVE_DOUBLE_KICK", - "13": "MOVE_POISON_STING", - "19": "MOVE_FURY_SWIPES", - "21": "MOVE_BITE", - "25": "MOVE_HELPING_HAND", - "31": "MOVE_TOXIC_SPIKES", - "33": "MOVE_FLATTER", - "37": "MOVE_CRUNCH", - "43": "MOVE_CAPTIVATE", - "45": "MOVE_POISON_FANG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND" @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -127,7 +116,7 @@ "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émon" + "category": "Poison Pin Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -136,4 +125,4 @@ "rarity": 50, "unused": 1542 } -} +} \ No newline at end of file diff --git a/res/pokemon/nidoran_m/data.json b/res/pokemon/nidoran_m/data.json index 97fefd40c7..c99b45839b 100644 --- a/res/pokemon/nidoran_m/data.json +++ b/res/pokemon/nidoran_m/data.json @@ -1,5 +1,5 @@ { - "name": "Nidoran♂", + "name": "Nidoran\u2642", "base_stats": { "hp": 46, "attack": 57, @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 235, "base_exp_reward": 60, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_RIVALRY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_PECK" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 9, "MOVE_DOUBLE_KICK" ], + [ 13, "MOVE_POISON_STING" ], + [ 19, "MOVE_FURY_ATTACK" ], + [ 21, "MOVE_HORN_ATTACK" ], + [ 25, "MOVE_HELPING_HAND" ], + [ 31, "MOVE_TOXIC_SPIKES" ], + [ 33, "MOVE_FLATTER" ], + [ 37, "MOVE_POISON_JAB" ], + [ 43, "MOVE_CAPTIVATE" ], + [ 45, "MOVE_HORN_DRILL" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -79,24 +85,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_PECK" - ], - "7": "MOVE_FOCUS_ENERGY", - "9": "MOVE_DOUBLE_KICK", - "13": "MOVE_POISON_STING", - "19": "MOVE_FURY_ATTACK", - "21": "MOVE_HORN_ATTACK", - "25": "MOVE_HELPING_HAND", - "31": "MOVE_TOXIC_SPIKES", - "33": "MOVE_FLATTER", - "37": "MOVE_POISON_JAB", - "43": "MOVE_CAPTIVATE", - "45": "MOVE_HORN_DRILL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -127,7 +116,7 @@ "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émon" + "category": "Poison Pin Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -136,4 +125,4 @@ "rarity": 50, "unused": 1542 } -} +} \ No newline at end of file diff --git a/res/pokemon/nidorina/data.json b/res/pokemon/nidorina/data.json index 7b7e3b6765..4fe94cb44c 100644 --- a/res/pokemon/nidorina/data.json +++ b/res/pokemon/nidorina/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 120, "base_exp_reward": 117, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_RIVALRY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_SCRATCH" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_DOUBLE_KICK" ], + [ 13, "MOVE_POISON_STING" ], + [ 20, "MOVE_FURY_SWIPES" ], + [ 23, "MOVE_BITE" ], + [ 28, "MOVE_HELPING_HAND" ], + [ 35, "MOVE_TOXIC_SPIKES" ], + [ 38, "MOVE_FLATTER" ], + [ 43, "MOVE_CRUNCH" ], + [ 50, "MOVE_CAPTIVATE" ], + [ 58, "MOVE_POISON_FANG" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -80,24 +86,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_SCRATCH" - ], - "7": "MOVE_TAIL_WHIP", - "9": "MOVE_DOUBLE_KICK", - "13": "MOVE_POISON_STING", - "20": "MOVE_FURY_SWIPES", - "23": "MOVE_BITE", - "28": "MOVE_HELPING_HAND", - "35": "MOVE_TOXIC_SPIKES", - "38": "MOVE_FLATTER", - "43": "MOVE_CRUNCH", - "50": "MOVE_CAPTIVATE", - "58": "MOVE_POISON_FANG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND" @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -126,8 +115,8 @@ "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’s.", - "category": "Poison Pin Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/nidorino/data.json b/res/pokemon/nidorino/data.json index d555d8f4bd..fe98dac6d9 100644 --- a/res/pokemon/nidorino/data.json +++ b/res/pokemon/nidorino/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 120, "base_exp_reward": 118, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_RIVALRY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_POISON_POINT", "ABILITY_RIVALRY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_PECK" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 9, "MOVE_DOUBLE_KICK" ], + [ 13, "MOVE_POISON_STING" ], + [ 20, "MOVE_FURY_ATTACK" ], + [ 23, "MOVE_HORN_ATTACK" ], + [ 28, "MOVE_HELPING_HAND" ], + [ 35, "MOVE_TOXIC_SPIKES" ], + [ 38, "MOVE_FLATTER" ], + [ 43, "MOVE_POISON_JAB" ], + [ 50, "MOVE_CAPTIVATE" ], + [ 58, "MOVE_HORN_DRILL" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -79,24 +85,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_PECK" - ], - "7": "MOVE_FOCUS_ENERGY", - "9": "MOVE_DOUBLE_KICK", - "13": "MOVE_POISON_STING", - "20": "MOVE_FURY_ATTACK", - "23": "MOVE_HORN_ATTACK", - "28": "MOVE_HELPING_HAND", - "35": "MOVE_TOXIC_SPIKES", - "38": "MOVE_FLATTER", - "43": "MOVE_POISON_JAB", - "50": "MOVE_CAPTIVATE", - "58": "MOVE_HORN_DRILL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -111,8 +100,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -127,7 +116,7 @@ "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émon" + "category": "Poison Pin Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/nincada/data.json b/res/pokemon/nincada/data.json index fd7fa9a330..0d6156873f 100644 --- a/res/pokemon/nincada/data.json +++ b/res/pokemon/nincada/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_BUG", - "TYPE_GROUND" - ], + "types": [ "TYPE_BUG", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_COMPOUND_EYES", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_COMPOUND_EYES", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 5, "MOVE_LEECH_LIFE" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 14, "MOVE_FURY_SWIPES" ], + [ 19, "MOVE_MIND_READER" ], + [ 25, "MOVE_FALSE_SWIPE" ], + [ 31, "MOVE_MUD_SLAP" ], + [ 38, "MOVE_METAL_CLAW" ], + [ 45, "MOVE_DIG" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -71,21 +74,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_HARDEN" - ], - "5": "MOVE_LEECH_LIFE", - "9": "MOVE_SAND_ATTACK", - "14": "MOVE_FURY_SWIPES", - "19": "MOVE_MIND_READER", - "25": "MOVE_FALSE_SWIPE", - "31": "MOVE_MUD_SLAP", - "38": "MOVE_METAL_CLAW", - "45": "MOVE_DIG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -105,8 +94,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -121,7 +110,7 @@ "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émon" + "category": "Trainee Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/ninetales/data.json b/res/pokemon/ninetales/data.json index 1143f1f89c..2b93665561 100644 --- a/res/pokemon/ninetales/data.json +++ b/res/pokemon/ninetales/data.json @@ -8,10 +8,7 @@ "special_attack": 81, "special_defense": 100 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 75, "base_exp_reward": 178, "ev_yields": { @@ -30,21 +27,22 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_FLASH_FIRE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_NASTY_PLOT" ], + [ 1, "MOVE_EMBER" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 1, "MOVE_SAFEGUARD" ] + ], + "by_tm": [ "TM04", "TM05", "TM06", @@ -79,16 +77,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_NASTY_PLOT", - "MOVE_EMBER", - "MOVE_QUICK_ATTACK", - "MOVE_CONFUSE_RAY", - "MOVE_SAFEGUARD" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_SPITE", @@ -97,9 +86,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -114,7 +104,7 @@ "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émon" + "category": "Fox Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/ninjask/data.json b/res/pokemon/ninjask/data.json index a4d633ec79..65537e861c 100644 --- a/res/pokemon/ninjask/data.json +++ b/res/pokemon/ninjask/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 120, "base_exp_reward": 155, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SPEED_BOOST", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SPEED_BOOST", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUG_BITE" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_LEECH_LIFE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 5, "MOVE_LEECH_LIFE" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 14, "MOVE_FURY_SWIPES" ], + [ 19, "MOVE_MIND_READER" ], + [ 20, "MOVE_DOUBLE_TEAM" ], + [ 20, "MOVE_FURY_CUTTER" ], + [ 20, "MOVE_SCREECH" ], + [ 25, "MOVE_SWORDS_DANCE" ], + [ 31, "MOVE_SLASH" ], + [ 38, "MOVE_AGILITY" ], + [ 45, "MOVE_BATON_PASS" ], + [ 52, "MOVE_X_SCISSOR" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -81,30 +91,7 @@ "HM01", "HM05" ], - "level_up": { - "1": [ - "MOVE_BUG_BITE", - "MOVE_SCRATCH", - "MOVE_HARDEN", - "MOVE_LEECH_LIFE", - "MOVE_SAND_ATTACK" - ], - "5": "MOVE_LEECH_LIFE", - "9": "MOVE_SAND_ATTACK", - "14": "MOVE_FURY_SWIPES", - "19": "MOVE_MIND_READER", - "20": [ - "MOVE_DOUBLE_TEAM", - "MOVE_FURY_CUTTER", - "MOVE_SCREECH" - ], - "25": "MOVE_SWORDS_DANCE", - "31": "MOVE_SLASH", - "38": "MOVE_AGILITY", - "45": "MOVE_BATON_PASS", - "52": "MOVE_X_SCISSOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", @@ -115,9 +102,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -132,7 +120,7 @@ "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émon" + "category": "Ninja Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/noctowl/data.json b/res/pokemon/noctowl/data.json index 943ed85ef0..4bbae37855 100644 --- a/res/pokemon/noctowl/data.json +++ b/res/pokemon/noctowl/data.json @@ -8,10 +8,7 @@ "special_attack": 76, "special_defense": 96 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 90, "base_exp_reward": 162, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_KEEN_EYE" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INSOMNIA", "ABILITY_KEEN_EYE" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SKY_ATTACK" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_FORESIGHT" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 5, "MOVE_HYPNOSIS" ], + [ 9, "MOVE_PECK" ], + [ 13, "MOVE_UPROAR" ], + [ 17, "MOVE_REFLECT" ], + [ 22, "MOVE_CONFUSION" ], + [ 27, "MOVE_TAKE_DOWN" ], + [ 32, "MOVE_AIR_SLASH" ], + [ 37, "MOVE_ZEN_HEADBUTT" ], + [ 42, "MOVE_EXTRASENSORY" ], + [ 47, "MOVE_PSYCHO_SHIFT" ], + [ 52, "MOVE_ROOST" ], + [ 57, "MOVE_DREAM_EATER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -80,28 +90,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_SKY_ATTACK", - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_FORESIGHT", - "MOVE_HYPNOSIS" - ], - "5": "MOVE_HYPNOSIS", - "9": "MOVE_PECK", - "13": "MOVE_UPROAR", - "17": "MOVE_REFLECT", - "22": "MOVE_CONFUSION", - "27": "MOVE_TAKE_DOWN", - "32": "MOVE_AIR_SLASH", - "37": "MOVE_ZEN_HEADBUTT", - "42": "MOVE_EXTRASENSORY", - "47": "MOVE_PSYCHO_SHIFT", - "52": "MOVE_ROOST", - "57": "MOVE_DREAM_EATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_AIR_CUTTER", @@ -112,9 +101,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -129,7 +119,7 @@ "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émon" + "category": "Owl Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/nosepass/data.json b/res/pokemon/nosepass/data.json index 4dc70c6351..384f778ff6 100644 --- a/res/pokemon/nosepass/data.json +++ b/res/pokemon/nosepass/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 90 }, - "types": [ - "TYPE_ROCK", - "TYPE_ROCK" - ], + "types": [ "TYPE_ROCK", "TYPE_ROCK" ], "catch_rate": 255, "base_exp_reward": 108, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_MAGNET_PULL" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_MAGNET_PULL" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 7, "MOVE_HARDEN" ], + [ 13, "MOVE_ROCK_THROW" ], + [ 19, "MOVE_BLOCK" ], + [ 25, "MOVE_THUNDER_WAVE" ], + [ 31, "MOVE_ROCK_SLIDE" ], + [ 37, "MOVE_SANDSTORM" ], + [ 43, "MOVE_REST" ], + [ 49, "MOVE_POWER_GEM" ], + [ 55, "MOVE_DISCHARGE" ], + [ 61, "MOVE_STONE_EDGE" ], + [ 67, "MOVE_ZAP_CANNON" ], + [ 73, "MOVE_LOCK_ON" ], + [ 79, "MOVE_EARTH_POWER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,23 +86,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "7": "MOVE_HARDEN", - "13": "MOVE_ROCK_THROW", - "19": "MOVE_BLOCK", - "25": "MOVE_THUNDER_WAVE", - "31": "MOVE_ROCK_SLIDE", - "37": "MOVE_SANDSTORM", - "43": "MOVE_REST", - "49": "MOVE_POWER_GEM", - "55": "MOVE_DISCHARGE", - "61": "MOVE_STONE_EDGE", - "67": "MOVE_ZAP_CANNON", - "73": "MOVE_LOCK_ON", - "79": "MOVE_EARTH_POWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -109,14 +100,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_MAGNETIC_FIELD", - "SPECIES_PROBOPASS" - ] + [ "EVO_LEVEL_MAGNETIC_FIELD", "SPECIES_PROBOPASS" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -131,7 +119,7 @@ "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émon" + "category": "Compass Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -140,4 +128,4 @@ "rarity": 20, "unused": 2827 } -} +} \ No newline at end of file diff --git a/res/pokemon/numel/data.json b/res/pokemon/numel/data.json index 12c90b5f09..d48ae11c80 100644 --- a/res/pokemon/numel/data.json +++ b/res/pokemon/numel/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 45 }, - "types": [ - "TYPE_FIRE", - "TYPE_GROUND" - ], + "types": [ "TYPE_FIRE", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 88, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_SIMPLE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SIMPLE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_EMBER" ], + [ 11, "MOVE_MAGNITUDE" ], + [ 15, "MOVE_FOCUS_ENERGY" ], + [ 21, "MOVE_TAKE_DOWN" ], + [ 25, "MOVE_AMNESIA" ], + [ 31, "MOVE_LAVA_PLUME" ], + [ 35, "MOVE_EARTH_POWER" ], + [ 41, "MOVE_EARTHQUAKE" ], + [ 45, "MOVE_FLAMETHROWER" ], + [ 51, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -75,23 +80,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_TACKLE" - ], - "5": "MOVE_EMBER", - "11": "MOVE_MAGNITUDE", - "15": "MOVE_FOCUS_ENERGY", - "21": "MOVE_TAKE_DOWN", - "25": "MOVE_AMNESIA", - "31": "MOVE_LAVA_PLUME", - "35": "MOVE_EARTH_POWER", - "41": "MOVE_EARTHQUAKE", - "45": "MOVE_FLAMETHROWER", - "51": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -123,7 +112,7 @@ "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émon" + "category": "Numb Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -132,4 +121,4 @@ "rarity": 30, "unused": 2050 } -} +} \ No newline at end of file diff --git a/res/pokemon/nuzleaf/data.json b/res/pokemon/nuzleaf/data.json index 4eb047ca2a..43c78ce206 100644 --- a/res/pokemon/nuzleaf/data.json +++ b/res/pokemon/nuzleaf/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 40 }, - "types": [ - "TYPE_GRASS", - "TYPE_DARK" - ], + "types": [ "TYPE_GRASS", "TYPE_DARK" ], "catch_rate": 120, "base_exp_reward": 141, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_RAZOR_LEAF" ], + [ 1, "MOVE_POUND" ], + [ 3, "MOVE_HARDEN" ], + [ 7, "MOVE_GROWTH" ], + [ 13, "MOVE_NATURE_POWER" ], + [ 19, "MOVE_FAKE_OUT" ], + [ 25, "MOVE_TORMENT" ], + [ 31, "MOVE_FAINT_ATTACK" ], + [ 37, "MOVE_RAZOR_WIND" ], + [ 43, "MOVE_SWAGGER" ], + [ 49, "MOVE_EXTRASENSORY" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -87,22 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_RAZOR_LEAF", - "MOVE_POUND" - ], - "3": "MOVE_HARDEN", - "7": "MOVE_GROWTH", - "13": "MOVE_NATURE_POWER", - "19": "MOVE_FAKE_OUT", - "25": "MOVE_TORMENT", - "31": "MOVE_FAINT_ATTACK", - "37": "MOVE_RAZOR_WIND", - "43": "MOVE_SWAGGER", - "49": "MOVE_EXTRASENSORY" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -121,8 +110,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -137,7 +126,7 @@ "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émon" + "category": "Wily Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/octillery/data.json b/res/pokemon/octillery/data.json index 4c69147f6a..558913c1ba 100644 --- a/res/pokemon/octillery/data.json +++ b/res/pokemon/octillery/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 75 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 75, "base_exp_reward": 164, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SUCTION_CUPS", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GUNK_SHOT" ], + [ 1, "MOVE_ROCK_BLAST" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_PSYBEAM" ], + [ 1, "MOVE_AURORA_BEAM" ], + [ 6, "MOVE_CONSTRICT" ], + [ 10, "MOVE_PSYBEAM" ], + [ 14, "MOVE_AURORA_BEAM" ], + [ 19, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_FOCUS_ENERGY" ], + [ 25, "MOVE_OCTAZOOKA" ], + [ 29, "MOVE_BULLET_SEED" ], + [ 36, "MOVE_WRING_OUT" ], + [ 42, "MOVE_SIGNAL_BEAM" ], + [ 48, "MOVE_ICE_BEAM" ], + [ 55, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM03", "TM06", "TM09", @@ -83,28 +93,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_GUNK_SHOT", - "MOVE_ROCK_BLAST", - "MOVE_WATER_GUN", - "MOVE_CONSTRICT", - "MOVE_PSYBEAM", - "MOVE_AURORA_BEAM" - ], - "6": "MOVE_CONSTRICT", - "10": "MOVE_PSYBEAM", - "14": "MOVE_AURORA_BEAM", - "19": "MOVE_BUBBLE_BEAM", - "23": "MOVE_FOCUS_ENERGY", - "25": "MOVE_OCTAZOOKA", - "29": "MOVE_BULLET_SEED", - "36": "MOVE_WRING_OUT", - "42": "MOVE_SIGNAL_BEAM", - "48": "MOVE_ICE_BEAM", - "55": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -116,9 +105,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -133,7 +123,7 @@ "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émon" + "category": "Jet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/oddish/data.json b/res/pokemon/oddish/data.json index 6b61cea76a..ee91ca67cd 100644 --- a/res/pokemon/oddish/data.json +++ b/res/pokemon/oddish/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 255, "base_exp_reward": 78, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 5, "MOVE_SWEET_SCENT" ], + [ 9, "MOVE_ACID" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 15, "MOVE_STUN_SPORE" ], + [ 17, "MOVE_SLEEP_POWDER" ], + [ 21, "MOVE_MEGA_DRAIN" ], + [ 25, "MOVE_LUCKY_CHANT" ], + [ 29, "MOVE_NATURAL_GIFT" ], + [ 33, "MOVE_MOONLIGHT" ], + [ 37, "MOVE_GIGA_DRAIN" ], + [ 41, "MOVE_PETAL_DANCE" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -72,21 +77,7 @@ "TM90", "HM01" ], - "level_up": { - "1": "MOVE_ABSORB", - "5": "MOVE_SWEET_SCENT", - "9": "MOVE_ACID", - "13": "MOVE_POISON_POWDER", - "15": "MOVE_STUN_SPORE", - "17": "MOVE_SLEEP_POWDER", - "21": "MOVE_MEGA_DRAIN", - "25": "MOVE_LUCKY_CHANT", - "29": "MOVE_NATURAL_GIFT", - "33": "MOVE_MOONLIGHT", - "37": "MOVE_GIGA_DRAIN", - "41": "MOVE_PETAL_DANCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -101,8 +92,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -117,7 +108,7 @@ "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émon" + "category": "Weed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -126,4 +117,4 @@ "rarity": 50, "unused": 1537 } -} +} \ No newline at end of file diff --git a/res/pokemon/omanyte/data.json b/res/pokemon/omanyte/data.json index 64bcf16549..1da1a132f6 100644 --- a/res/pokemon/omanyte/data.json +++ b/res/pokemon/omanyte/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 55 }, - "types": [ - "TYPE_ROCK", - "TYPE_WATER" - ], + "types": [ "TYPE_ROCK", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_WITHDRAW" ], + [ 7, "MOVE_BITE" ], + [ 10, "MOVE_WATER_GUN" ], + [ 16, "MOVE_ROLLOUT" ], + [ 19, "MOVE_LEER" ], + [ 25, "MOVE_MUD_SHOT" ], + [ 28, "MOVE_BRINE" ], + [ 34, "MOVE_PROTECT" ], + [ 37, "MOVE_ANCIENT_POWER" ], + [ 43, "MOVE_TICKLE" ], + [ 46, "MOVE_ROCK_BLAST" ], + [ 52, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -78,24 +84,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_CONSTRICT", - "MOVE_WITHDRAW" - ], - "7": "MOVE_BITE", - "10": "MOVE_WATER_GUN", - "16": "MOVE_ROLLOUT", - "19": "MOVE_LEER", - "25": "MOVE_MUD_SHOT", - "28": "MOVE_BRINE", - "34": "MOVE_PROTECT", - "37": "MOVE_ANCIENT_POWER", - "43": "MOVE_TICKLE", - "46": "MOVE_ROCK_BLAST", - "52": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -129,8 +118,8 @@ "pokemon_pos_f": 28, "trainer_pos_m": 9, "pokemon_pos_m": 28, - "entry_text": "A Pokémon that was resurrected\nfrom a fossil using modern science.\nIt swam in ancient seas.", - "category": "Spiral Pokémon" + "entry_text": "A Pok\u00e9mon that was resurrected\nfrom a fossil using modern science.\nIt swam in ancient seas.", + "category": "Spiral Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -139,4 +128,4 @@ "rarity": 30, "unused": 779 } -} +} \ No newline at end of file diff --git a/res/pokemon/omastar/data.json b/res/pokemon/omastar/data.json index b22584f72c..721ae21929 100644 --- a/res/pokemon/omastar/data.json +++ b/res/pokemon/omastar/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 70 }, - "types": [ - "TYPE_ROCK", - "TYPE_WATER" - ], + "types": [ "TYPE_ROCK", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_SHELL_ARMOR" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_WITHDRAW" ], + [ 1, "MOVE_BITE" ], + [ 7, "MOVE_BITE" ], + [ 10, "MOVE_WATER_GUN" ], + [ 16, "MOVE_ROLLOUT" ], + [ 19, "MOVE_LEER" ], + [ 25, "MOVE_MUD_SHOT" ], + [ 28, "MOVE_BRINE" ], + [ 34, "MOVE_PROTECT" ], + [ 37, "MOVE_ANCIENT_POWER" ], + [ 40, "MOVE_SPIKE_CANNON" ], + [ 48, "MOVE_TICKLE" ], + [ 56, "MOVE_ROCK_BLAST" ], + [ 67, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -82,26 +90,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_CONSTRICT", - "MOVE_WITHDRAW", - "MOVE_BITE" - ], - "7": "MOVE_BITE", - "10": "MOVE_WATER_GUN", - "16": "MOVE_ROLLOUT", - "19": "MOVE_LEER", - "25": "MOVE_MUD_SHOT", - "28": "MOVE_BRINE", - "34": "MOVE_PROTECT", - "37": "MOVE_ANCIENT_POWER", - "40": "MOVE_SPIKE_CANNON", - "48": "MOVE_TICKLE", - "56": "MOVE_ROCK_BLAST", - "67": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -112,9 +101,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -128,8 +118,8 @@ "pokemon_pos_f": 14, "trainer_pos_m": 9, "pokemon_pos_m": 14, - "entry_text": "It is thought that this Pokémon\nbecame extinct because its spiral\nshell grew too large.", - "category": "Spiral Pokémon" + "entry_text": "It is thought that this Pok\u00e9mon\nbecame extinct because its spiral\nshell grew too large.", + "category": "Spiral Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/onix/data.json b/res/pokemon/onix/data.json index 73a2c2b291..5f7bf1c823 100644 --- a/res/pokemon/onix/data.json +++ b/res/pokemon/onix/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 45 }, - "types": [ - "TYPE_ROCK", - "TYPE_GROUND" - ], + "types": [ "TYPE_ROCK", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 108, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_BIND" ], + [ 6, "MOVE_SCREECH" ], + [ 9, "MOVE_ROCK_THROW" ], + [ 14, "MOVE_RAGE" ], + [ 17, "MOVE_ROCK_TOMB" ], + [ 22, "MOVE_SANDSTORM" ], + [ 25, "MOVE_SLAM" ], + [ 30, "MOVE_ROCK_POLISH" ], + [ 33, "MOVE_DRAGON_BREATH" ], + [ 38, "MOVE_CURSE" ], + [ 41, "MOVE_IRON_TAIL" ], + [ 46, "MOVE_SAND_TOMB" ], + [ 49, "MOVE_DOUBLE_EDGE" ], + [ 54, "MOVE_STONE_EDGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -84,28 +94,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_MUD_SPORT", - "MOVE_TACKLE", - "MOVE_HARDEN", - "MOVE_BIND" - ], - "6": "MOVE_SCREECH", - "9": "MOVE_ROCK_THROW", - "14": "MOVE_RAGE", - "17": "MOVE_ROCK_TOMB", - "22": "MOVE_SANDSTORM", - "25": "MOVE_SLAM", - "30": "MOVE_ROCK_POLISH", - "33": "MOVE_DRAGON_BREATH", - "38": "MOVE_CURSE", - "41": "MOVE_IRON_TAIL", - "46": "MOVE_SAND_TOMB", - "49": "MOVE_DOUBLE_EDGE", - "54": "MOVE_STONE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_IRON_HEAD", @@ -123,8 +112,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 88, @@ -139,7 +128,7 @@ "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émon" + "category": "Rock Snake Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -148,4 +137,4 @@ "rarity": 10, "unused": 2059 } -} +} \ No newline at end of file diff --git a/res/pokemon/pachirisu/data.json b/res/pokemon/pachirisu/data.json index b411d3e4b8..1f61a87f97 100644 --- a/res/pokemon/pachirisu/data.json +++ b/res/pokemon/pachirisu/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 90 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 200, "base_exp_reward": 120, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 10, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_PICKUP" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_PICKUP" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_BIDE" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 9, "MOVE_CHARM" ], + [ 13, "MOVE_SPARK" ], + [ 17, "MOVE_ENDURE" ], + [ 21, "MOVE_SWIFT" ], + [ 25, "MOVE_SWEET_KISS" ], + [ 29, "MOVE_DISCHARGE" ], + [ 33, "MOVE_SUPER_FANG" ], + [ 37, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM06", "TM10", "TM16", @@ -76,22 +80,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_BIDE" - ], - "5": "MOVE_QUICK_ATTACK", - "9": "MOVE_CHARM", - "13": "MOVE_SPARK", - "17": "MOVE_ENDURE", - "21": "MOVE_SWIFT", - "25": "MOVE_SWEET_KISS", - "29": "MOVE_DISCHARGE", - "33": "MOVE_SUPER_FANG", - "37": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -105,9 +94,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -122,7 +112,7 @@ "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émon" + "category": "EleSquirrel Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/palkia/data.json b/res/pokemon/palkia/data.json index ef29817639..01528abfb0 100644 --- a/res/pokemon/palkia/data.json +++ b/res/pokemon/palkia/data.json @@ -8,10 +8,7 @@ "special_attack": 150, "special_defense": 120 }, - "types": [ - "TYPE_WATER", - "TYPE_DRAGON" - ], + "types": [ "TYPE_WATER", "TYPE_DRAGON" ], "catch_rate": 30, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DRAGON_BREATH" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 10, "MOVE_WATER_PULSE" ], + [ 20, "MOVE_ANCIENT_POWER" ], + [ 30, "MOVE_DRAGON_CLAW" ], + [ 40, "MOVE_SPACIAL_REND" ], + [ 50, "MOVE_HEAL_BLOCK" ], + [ 60, "MOVE_EARTH_POWER" ], + [ 70, "MOVE_SLASH" ], + [ 80, "MOVE_AQUA_TAIL" ], + [ 90, "MOVE_AURA_SPHERE" ] + ], + "by_tm": [ "TM01", "TM02", "TM03", @@ -98,22 +102,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_DRAGON_BREATH", - "MOVE_SCARY_FACE" - ], - "10": "MOVE_WATER_PULSE", - "20": "MOVE_ANCIENT_POWER", - "30": "MOVE_DRAGON_CLAW", - "40": "MOVE_SPACIAL_REND", - "50": "MOVE_HEAL_BLOCK", - "60": "MOVE_EARTH_POWER", - "70": "MOVE_SLASH", - "80": "MOVE_AQUA_TAIL", - "90": "MOVE_AURA_SPHERE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -126,9 +115,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 42, @@ -142,8 +132,8 @@ "pokemon_pos_f": 2, "trainer_pos_m": 26, "pokemon_pos_m": 2, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/paras/data.json b/res/pokemon/paras/data.json index a9f54ad00a..b0764bbe9c 100644 --- a/res/pokemon/paras/data.json +++ b/res/pokemon/paras/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 55 }, - "types": [ - "TYPE_BUG", - "TYPE_GRASS" - ], + "types": [ "TYPE_BUG", "TYPE_GRASS" ], "catch_rate": 190, "base_exp_reward": 70, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_EFFECT_SPORE", - "ABILITY_DRY_SKIN" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 6, "MOVE_STUN_SPORE" ], + [ 6, "MOVE_POISON_POWDER" ], + [ 11, "MOVE_LEECH_LIFE" ], + [ 17, "MOVE_SPORE" ], + [ 22, "MOVE_SLASH" ], + [ 27, "MOVE_GROWTH" ], + [ 33, "MOVE_GIGA_DRAIN" ], + [ 38, "MOVE_AROMATHERAPY" ], + [ 43, "MOVE_X_SCISSOR" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -79,21 +82,7 @@ "HM01", "HM06" ], - "level_up": { - "1": "MOVE_SCRATCH", - "6": [ - "MOVE_STUN_SPORE", - "MOVE_POISON_POWDER" - ], - "11": "MOVE_LEECH_LIFE", - "17": "MOVE_SPORE", - "22": "MOVE_SLASH", - "27": "MOVE_GROWTH", - "33": "MOVE_GIGA_DRAIN", - "38": "MOVE_AROMATHERAPY", - "43": "MOVE_X_SCISSOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -109,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -125,7 +114,7 @@ "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émon" + "category": "Mushroom Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -134,4 +123,4 @@ "rarity": 50, "unused": 260 } -} +} \ No newline at end of file diff --git a/res/pokemon/parasect/data.json b/res/pokemon/parasect/data.json index 04bfdb5079..7037e490c4 100644 --- a/res/pokemon/parasect/data.json +++ b/res/pokemon/parasect/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 80 }, - "types": [ - "TYPE_BUG", - "TYPE_GRASS" - ], + "types": [ "TYPE_BUG", "TYPE_GRASS" ], "catch_rate": 75, "base_exp_reward": 128, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_EFFECT_SPORE", - "ABILITY_DRY_SKIN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CROSS_POISON" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_STUN_SPORE" ], + [ 1, "MOVE_POISON_POWDER" ], + [ 1, "MOVE_LEECH_LIFE" ], + [ 6, "MOVE_STUN_SPORE" ], + [ 6, "MOVE_POISON_POWDER" ], + [ 11, "MOVE_LEECH_LIFE" ], + [ 17, "MOVE_SPORE" ], + [ 22, "MOVE_SLASH" ], + [ 30, "MOVE_GROWTH" ], + [ 39, "MOVE_GIGA_DRAIN" ], + [ 47, "MOVE_AROMATHERAPY" ], + [ 55, "MOVE_X_SCISSOR" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -81,27 +88,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_CROSS_POISON", - "MOVE_SCRATCH", - "MOVE_STUN_SPORE", - "MOVE_POISON_POWDER", - "MOVE_LEECH_LIFE" - ], - "6": [ - "MOVE_STUN_SPORE", - "MOVE_POISON_POWDER" - ], - "11": "MOVE_LEECH_LIFE", - "17": "MOVE_SPORE", - "22": "MOVE_SLASH", - "30": "MOVE_GROWTH", - "39": "MOVE_GIGA_DRAIN", - "47": "MOVE_AROMATHERAPY", - "55": "MOVE_X_SCISSOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -109,9 +96,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 10, @@ -125,8 +113,8 @@ "pokemon_pos_f": 18, "trainer_pos_m": 9, "pokemon_pos_m": 18, - "entry_text": "A mushroom grown larger than the\nhost’s body controls PARASECT.\nIt scatters poisonous spores.", - "category": "Mushroom Pokémon" + "entry_text": "A mushroom grown larger than the\nhost\u2019s body controls PARASECT.\nIt scatters poisonous spores.", + "category": "Mushroom Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/pelipper/data.json b/res/pokemon/pelipper/data.json index 682e8beb7f..47e149f326 100644 --- a/res/pokemon/pelipper/data.json +++ b/res/pokemon/pelipper/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 70 }, - "types": [ - "TYPE_WATER", - "TYPE_FLYING" - ], + "types": [ "TYPE_WATER", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 164, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 1, "MOVE_WING_ATTACK" ], + [ 6, "MOVE_SUPERSONIC" ], + [ 11, "MOVE_WING_ATTACK" ], + [ 16, "MOVE_MIST" ], + [ 19, "MOVE_WATER_PULSE" ], + [ 24, "MOVE_PAYBACK" ], + [ 25, "MOVE_PROTECT" ], + [ 31, "MOVE_ROOST" ], + [ 38, "MOVE_STOCKPILE" ], + [ 38, "MOVE_SWALLOW" ], + [ 38, "MOVE_SPIT_UP" ], + [ 43, "MOVE_FLING" ], + [ 50, "MOVE_TAILWIND" ], + [ 57, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -82,30 +92,7 @@ "HM03", "HM05" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_WATER_GUN", - "MOVE_WATER_SPORT", - "MOVE_WING_ATTACK" - ], - "6": "MOVE_SUPERSONIC", - "11": "MOVE_WING_ATTACK", - "16": "MOVE_MIST", - "19": "MOVE_WATER_PULSE", - "24": "MOVE_PAYBACK", - "25": "MOVE_PROTECT", - "31": "MOVE_ROOST", - "38": [ - "MOVE_STOCKPILE", - "MOVE_SWALLOW", - "MOVE_SPIT_UP" - ], - "43": "MOVE_FLING", - "50": "MOVE_TAILWIND", - "57": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -119,9 +106,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -135,8 +123,8 @@ "pokemon_pos_f": 65531, "trainer_pos_m": 9, "pokemon_pos_m": 65531, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/persian/data.json b/res/pokemon/persian/data.json index 1f98c0fbb5..f656041b1e 100644 --- a/res/pokemon/persian/data.json +++ b/res/pokemon/persian/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 90, "base_exp_reward": 148, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_LIMBER", - "ABILITY_TECHNICIAN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_LIMBER", "ABILITY_TECHNICIAN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SWITCHEROO" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_FAKE_OUT" ], + [ 6, "MOVE_BITE" ], + [ 9, "MOVE_FAKE_OUT" ], + [ 14, "MOVE_FURY_SWIPES" ], + [ 17, "MOVE_SCREECH" ], + [ 22, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_TAUNT" ], + [ 32, "MOVE_POWER_GEM" ], + [ 37, "MOVE_SLASH" ], + [ 44, "MOVE_NASTY_PLOT" ], + [ 49, "MOVE_ASSURANCE" ], + [ 56, "MOVE_CAPTIVATE" ], + [ 61, "MOVE_NIGHT_SLASH" ], + [ 68, "MOVE_FEINT" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -88,29 +99,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_SWITCHEROO", - "MOVE_SCRATCH", - "MOVE_GROWL", - "MOVE_BITE", - "MOVE_FAKE_OUT" - ], - "6": "MOVE_BITE", - "9": "MOVE_FAKE_OUT", - "14": "MOVE_FURY_SWIPES", - "17": "MOVE_SCREECH", - "22": "MOVE_FAINT_ATTACK", - "25": "MOVE_TAUNT", - "32": "MOVE_POWER_GEM", - "37": "MOVE_SLASH", - "44": "MOVE_NASTY_PLOT", - "49": "MOVE_ASSURANCE", - "56": "MOVE_CAPTIVATE", - "61": "MOVE_NIGHT_SLASH", - "68": "MOVE_FEINT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -123,9 +112,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -139,8 +129,8 @@ "pokemon_pos_f": 16, "trainer_pos_m": 9, "pokemon_pos_m": 16, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/phanpy/data.json b/res/pokemon/phanpy/data.json index 7f737b1a36..bf0c59f5f6 100644 --- a/res/pokemon/phanpy/data.json +++ b/res/pokemon/phanpy/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 120, "base_exp_reward": 124, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PICKUP", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PICKUP", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 6, "MOVE_FLAIL" ], + [ 10, "MOVE_TAKE_DOWN" ], + [ 15, "MOVE_ROLLOUT" ], + [ 19, "MOVE_NATURAL_GIFT" ], + [ 24, "MOVE_SLAM" ], + [ 28, "MOVE_ENDURE" ], + [ 33, "MOVE_CHARM" ], + [ 37, "MOVE_LAST_RESORT" ], + [ 42, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -72,24 +78,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_ODOR_SLEUTH", - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_DEFENSE_CURL" - ], - "6": "MOVE_FLAIL", - "10": "MOVE_TAKE_DOWN", - "15": "MOVE_ROLLOUT", - "19": "MOVE_NATURAL_GIFT", - "24": "MOVE_SLAM", - "28": "MOVE_ENDURE", - "33": "MOVE_CHARM", - "37": "MOVE_LAST_RESORT", - "42": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SUPERPOWER", @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -126,7 +115,7 @@ "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émon" + "category": "Long Nose Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -135,4 +124,4 @@ "rarity": 30, "unused": 2056 } -} +} \ No newline at end of file diff --git a/res/pokemon/phione/data.json b/res/pokemon/phione/data.json index 952955fa9b..d3beb228b7 100644 --- a/res/pokemon/phione/data.json +++ b/res/pokemon/phione/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 30, "base_exp_reward": 165, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_HYDRATION", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_HYDRATION", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 9, "MOVE_CHARM" ], + [ 16, "MOVE_SUPERSONIC" ], + [ 24, "MOVE_BUBBLE_BEAM" ], + [ 31, "MOVE_ACID_ARMOR" ], + [ 39, "MOVE_WHIRLPOOL" ], + [ 46, "MOVE_WATER_PULSE" ], + [ 54, "MOVE_AQUA_RING" ], + [ 61, "MOVE_DIVE" ], + [ 69, "MOVE_RAIN_DANCE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -73,22 +77,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_BUBBLE", - "MOVE_WATER_SPORT" - ], - "9": "MOVE_CHARM", - "16": "MOVE_SUPERSONIC", - "24": "MOVE_BUBBLE_BEAM", - "31": "MOVE_ACID_ARMOR", - "39": "MOVE_WHIRLPOOL", - "46": "MOVE_WATER_PULSE", - "54": "MOVE_AQUA_RING", - "61": "MOVE_DIVE", - "69": "MOVE_RAIN_DANCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -103,9 +92,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 4, @@ -120,7 +110,7 @@ "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émon" + "category": "Sea Drifter Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/pichu/data.json b/res/pokemon/pichu/data.json index 4c078f414d..7524e0f169 100644 --- a/res/pokemon/pichu/data.json +++ b/res/pokemon/pichu/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 190, "base_exp_reward": 42, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CHARM" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_THUNDER_WAVE" ], + [ 13, "MOVE_SWEET_KISS" ], + [ 18, "MOVE_NASTY_PLOT" ] + ], + "by_tm": [ "TM06", "TM10", "TM16", @@ -73,17 +72,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_THUNDER_SHOCK", - "MOVE_CHARM" - ], - "5": "MOVE_TAIL_WHIP", - "10": "MOVE_THUNDER_WAVE", - "13": "MOVE_SWEET_KISS", - "18": "MOVE_NASTY_PLOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -95,14 +84,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_PIKACHU" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_PIKACHU" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -117,7 +103,7 @@ "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émon" + "category": "Tiny Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -126,4 +112,4 @@ "rarity": 10, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/pidgeot/data.json b/res/pokemon/pidgeot/data.json index 3de3394b58..a9132568e0 100644 --- a/res/pokemon/pidgeot/data.json +++ b/res/pokemon/pidgeot/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 70 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 172, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_TANGLED_FEET" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_GUST" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 5, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_GUST" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 17, "MOVE_WHIRLWIND" ], + [ 22, "MOVE_TWISTER" ], + [ 27, "MOVE_FEATHER_DANCE" ], + [ 32, "MOVE_AGILITY" ], + [ 38, "MOVE_WING_ATTACK" ], + [ 44, "MOVE_ROOST" ], + [ 50, "MOVE_TAILWIND" ], + [ 56, "MOVE_MIRROR_MOVE" ], + [ 62, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -74,27 +83,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_SAND_ATTACK", - "MOVE_GUST", - "MOVE_QUICK_ATTACK" - ], - "5": "MOVE_SAND_ATTACK", - "9": "MOVE_GUST", - "13": "MOVE_QUICK_ATTACK", - "17": "MOVE_WHIRLWIND", - "22": "MOVE_TWISTER", - "27": "MOVE_FEATHER_DANCE", - "32": "MOVE_AGILITY", - "38": "MOVE_WING_ATTACK", - "44": "MOVE_ROOST", - "50": "MOVE_TAILWIND", - "56": "MOVE_MIRROR_MOVE", - "62": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -105,9 +94,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 15, @@ -122,7 +112,7 @@ "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émon" + "category": "Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/pidgeotto/data.json b/res/pokemon/pidgeotto/data.json index 83468739cb..5a089d3af8 100644 --- a/res/pokemon/pidgeotto/data.json +++ b/res/pokemon/pidgeotto/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 120, "base_exp_reward": 113, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_TANGLED_FEET" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_GUST" ], + [ 5, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_GUST" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 17, "MOVE_WHIRLWIND" ], + [ 22, "MOVE_TWISTER" ], + [ 27, "MOVE_FEATHER_DANCE" ], + [ 32, "MOVE_AGILITY" ], + [ 37, "MOVE_WING_ATTACK" ], + [ 42, "MOVE_ROOST" ], + [ 47, "MOVE_TAILWIND" ], + [ 52, "MOVE_MIRROR_MOVE" ], + [ 57, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,26 +80,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_SAND_ATTACK", - "MOVE_GUST" - ], - "5": "MOVE_SAND_ATTACK", - "9": "MOVE_GUST", - "13": "MOVE_QUICK_ATTACK", - "17": "MOVE_WHIRLWIND", - "22": "MOVE_TWISTER", - "27": "MOVE_FEATHER_DANCE", - "32": "MOVE_AGILITY", - "37": "MOVE_WING_ATTACK", - "42": "MOVE_ROOST", - "47": "MOVE_TAILWIND", - "52": "MOVE_MIRROR_MOVE", - "57": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -126,7 +115,7 @@ "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émon" + "category": "Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -135,4 +124,4 @@ "rarity": 30, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/pidgey/data.json b/res/pokemon/pidgey/data.json index f7d703f695..2300141056 100644 --- a/res/pokemon/pidgey/data.json +++ b/res/pokemon/pidgey/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 55, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_TANGLED_FEET" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_GUST" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 17, "MOVE_WHIRLWIND" ], + [ 21, "MOVE_TWISTER" ], + [ 25, "MOVE_FEATHER_DANCE" ], + [ 29, "MOVE_AGILITY" ], + [ 33, "MOVE_WING_ATTACK" ], + [ 37, "MOVE_ROOST" ], + [ 41, "MOVE_TAILWIND" ], + [ 45, "MOVE_MIRROR_MOVE" ], + [ 49, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,22 +78,7 @@ "HM02", "HM05" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_SAND_ATTACK", - "9": "MOVE_GUST", - "13": "MOVE_QUICK_ATTACK", - "17": "MOVE_WHIRLWIND", - "21": "MOVE_TWISTER", - "25": "MOVE_FEATHER_DANCE", - "29": "MOVE_AGILITY", - "33": "MOVE_WING_ATTACK", - "37": "MOVE_ROOST", - "41": "MOVE_TAILWIND", - "45": "MOVE_MIRROR_MOVE", - "49": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -106,8 +97,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -122,7 +113,7 @@ "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émon" + "category": "Tiny Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -131,4 +122,4 @@ "rarity": 50, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/pikachu/data.json b/res/pokemon/pikachu/data.json index 2adb6d4ee9..750cddfde1 100644 --- a/res/pokemon/pikachu/data.json +++ b/res/pokemon/pikachu/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 40 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 190, "base_exp_reward": 82, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_THUNDER_WAVE" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 18, "MOVE_DOUBLE_TEAM" ], + [ 21, "MOVE_SLAM" ], + [ 26, "MOVE_THUNDERBOLT" ], + [ 29, "MOVE_FEINT" ], + [ 34, "MOVE_AGILITY" ], + [ 37, "MOVE_DISCHARGE" ], + [ 42, "MOVE_LIGHT_SCREEN" ], + [ 45, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -78,24 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_THUNDER_SHOCK", - "MOVE_GROWL" - ], - "5": "MOVE_TAIL_WHIP", - "10": "MOVE_THUNDER_WAVE", - "13": "MOVE_QUICK_ATTACK", - "18": "MOVE_DOUBLE_TEAM", - "21": "MOVE_SLAM", - "26": "MOVE_THUNDERBOLT", - "29": "MOVE_FEINT", - "34": "MOVE_AGILITY", - "37": "MOVE_DISCHARGE", - "42": "MOVE_LIGHT_SCREEN", - "45": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -115,8 +104,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -131,7 +120,7 @@ "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émon" + "category": "Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/piloswine/data.json b/res/pokemon/piloswine/data.json index e2ff0c03d3..301299df23 100644 --- a/res/pokemon/piloswine/data.json +++ b/res/pokemon/piloswine/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_ICE", - "TYPE_GROUND" - ], + "types": [ "TYPE_ICE", "TYPE_GROUND" ], "catch_rate": 75, "base_exp_reward": 160, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_SNOW_CLOAK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SNOW_CLOAK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ANCIENT_POWER" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 4, "MOVE_MUD_SPORT" ], + [ 8, "MOVE_POWDER_SNOW" ], + [ 13, "MOVE_MUD_SLAP" ], + [ 16, "MOVE_ENDURE" ], + [ 20, "MOVE_MUD_BOMB" ], + [ 25, "MOVE_ICY_WIND" ], + [ 28, "MOVE_ICE_FANG" ], + [ 32, "MOVE_TAKE_DOWN" ], + [ 33, "MOVE_FURY_ATTACK" ], + [ 40, "MOVE_EARTHQUAKE" ], + [ 48, "MOVE_MIST" ], + [ 56, "MOVE_BLIZZARD" ], + [ 65, "MOVE_AMNESIA" ] + ], + "by_tm": [ "TM05", "TM06", "TM07", @@ -81,29 +92,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_ANCIENT_POWER", - "MOVE_PECK", - "MOVE_ODOR_SLEUTH", - "MOVE_MUD_SPORT", - "MOVE_POWDER_SNOW" - ], - "4": "MOVE_MUD_SPORT", - "8": "MOVE_POWDER_SNOW", - "13": "MOVE_MUD_SLAP", - "16": "MOVE_ENDURE", - "20": "MOVE_MUD_BOMB", - "25": "MOVE_ICY_WIND", - "28": "MOVE_ICE_FANG", - "32": "MOVE_TAKE_DOWN", - "33": "MOVE_FURY_ATTACK", - "40": "MOVE_EARTHQUAKE", - "48": "MOVE_MIST", - "56": "MOVE_BLIZZARD", - "65": "MOVE_AMNESIA" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SUPERPOWER", @@ -121,8 +110,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -137,7 +126,7 @@ "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émon" + "category": "Swine Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -146,4 +135,4 @@ "rarity": 20, "unused": 2061 } -} +} \ No newline at end of file diff --git a/res/pokemon/pineco/data.json b/res/pokemon/pineco/data.json index 286c6a2e78..00b6ccdbfe 100644 --- a/res/pokemon/pineco/data.json +++ b/res/pokemon/pineco/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 190, "base_exp_reward": 60, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_PROTECT" ], + [ 6, "MOVE_SELFDESTRUCT" ], + [ 9, "MOVE_BUG_BITE" ], + [ 12, "MOVE_TAKE_DOWN" ], + [ 17, "MOVE_RAPID_SPIN" ], + [ 20, "MOVE_BIDE" ], + [ 23, "MOVE_NATURAL_GIFT" ], + [ 28, "MOVE_SPIKES" ], + [ 31, "MOVE_PAYBACK" ], + [ 34, "MOVE_EXPLOSION" ], + [ 39, "MOVE_IRON_DEFENSE" ], + [ 42, "MOVE_GYRO_BALL" ], + [ 45, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,25 +85,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_PROTECT" - ], - "6": "MOVE_SELFDESTRUCT", - "9": "MOVE_BUG_BITE", - "12": "MOVE_TAKE_DOWN", - "17": "MOVE_RAPID_SPIN", - "20": "MOVE_BIDE", - "23": "MOVE_NATURAL_GIFT", - "28": "MOVE_SPIKES", - "31": "MOVE_PAYBACK", - "34": "MOVE_EXPLOSION", - "39": "MOVE_IRON_DEFENSE", - "42": "MOVE_GYRO_BALL", - "45": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_IRON_DEFENSE" @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -125,8 +114,8 @@ "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émon that peck it by mistake.", - "category": "Bagworm Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -135,4 +124,4 @@ "rarity": 30, "unused": 1028 } -} +} \ No newline at end of file diff --git a/res/pokemon/pinsir/data.json b/res/pokemon/pinsir/data.json index d4408cb478..29045e3316 100644 --- a/res/pokemon/pinsir/data.json +++ b/res/pokemon/pinsir/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 70 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 45, "base_exp_reward": 200, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_MOLD_BREAKER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_VICE_GRIP" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 4, "MOVE_BIND" ], + [ 8, "MOVE_SEISMIC_TOSS" ], + [ 13, "MOVE_HARDEN" ], + [ 18, "MOVE_REVENGE" ], + [ 21, "MOVE_BRICK_BREAK" ], + [ 25, "MOVE_VITAL_THROW" ], + [ 30, "MOVE_X_SCISSOR" ], + [ 35, "MOVE_THRASH" ], + [ 38, "MOVE_SWORDS_DANCE" ], + [ 42, "MOVE_SUBMISSION" ], + [ 47, "MOVE_GUILLOTINE" ], + [ 52, "MOVE_SUPERPOWER" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -85,25 +92,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_VICE_GRIP", - "MOVE_FOCUS_ENERGY" - ], - "4": "MOVE_BIND", - "8": "MOVE_SEISMIC_TOSS", - "13": "MOVE_HARDEN", - "18": "MOVE_REVENGE", - "21": "MOVE_BRICK_BREAK", - "25": "MOVE_VITAL_THROW", - "30": "MOVE_X_SCISSOR", - "35": "MOVE_THRASH", - "38": "MOVE_SWORDS_DANCE", - "42": "MOVE_SUBMISSION", - "47": "MOVE_GUILLOTINE", - "52": "MOVE_SUPERPOWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -111,9 +100,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -127,8 +117,8 @@ "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’t tear, it tosses far.", - "category": "Stag Beetle Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/piplup/data.json b/res/pokemon/piplup/data.json index d7da9e8fa0..d53d5760c6 100644 --- a/res/pokemon/piplup/data.json +++ b/res/pokemon/piplup/data.json @@ -8,10 +8,7 @@ "special_attack": 61, "special_defense": 56 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 66, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 4, "MOVE_GROWL" ], + [ 8, "MOVE_BUBBLE" ], + [ 11, "MOVE_WATER_SPORT" ], + [ 15, "MOVE_PECK" ], + [ 18, "MOVE_BUBBLE_BEAM" ], + [ 22, "MOVE_BIDE" ], + [ 25, "MOVE_FURY_ATTACK" ], + [ 29, "MOVE_BRINE" ], + [ 32, "MOVE_WHIRLPOOL" ], + [ 36, "MOVE_MIST" ], + [ 39, "MOVE_DRILL_PECK" ], + [ 43, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -80,22 +86,7 @@ "HM05", "HM07" ], - "level_up": { - "1": "MOVE_POUND", - "4": "MOVE_GROWL", - "8": "MOVE_BUBBLE", - "11": "MOVE_WATER_SPORT", - "15": "MOVE_PECK", - "18": "MOVE_BUBBLE_BEAM", - "22": "MOVE_BIDE", - "25": "MOVE_FURY_ATTACK", - "29": "MOVE_BRINE", - "32": "MOVE_WHIRLPOOL", - "36": "MOVE_MIST", - "39": "MOVE_DRILL_PECK", - "43": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -111,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -127,7 +118,7 @@ "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émon" + "category": "Penguin Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -136,4 +127,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/plusle/data.json b/res/pokemon/plusle/data.json index 3f72d24141..7ec05e0108 100644 --- a/res/pokemon/plusle/data.json +++ b/res/pokemon/plusle/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 75 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 200, "base_exp_reward": 120, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_PLUS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_PLUS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 3, "MOVE_THUNDER_WAVE" ], + [ 7, "MOVE_QUICK_ATTACK" ], + [ 10, "MOVE_HELPING_HAND" ], + [ 15, "MOVE_SPARK" ], + [ 17, "MOVE_ENCORE" ], + [ 21, "MOVE_FAKE_TEARS" ], + [ 24, "MOVE_COPYCAT" ], + [ 29, "MOVE_SWIFT" ], + [ 31, "MOVE_FAKE_TEARS" ], + [ 35, "MOVE_CHARGE" ], + [ 38, "MOVE_THUNDER" ], + [ 42, "MOVE_BATON_PASS" ], + [ 44, "MOVE_AGILITY" ], + [ 48, "MOVE_LAST_RESORT" ], + [ 51, "MOVE_NASTY_PLOT" ] + ], + "by_tm": [ "TM06", "TM10", "TM16", @@ -73,25 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_GROWL", - "3": "MOVE_THUNDER_WAVE", - "7": "MOVE_QUICK_ATTACK", - "10": "MOVE_HELPING_HAND", - "15": "MOVE_SPARK", - "17": "MOVE_ENCORE", - "21": "MOVE_FAKE_TEARS", - "24": "MOVE_COPYCAT", - "29": "MOVE_SWIFT", - "31": "MOVE_FAKE_TEARS", - "35": "MOVE_CHARGE", - "38": "MOVE_THUNDER", - "42": "MOVE_BATON_PASS", - "44": "MOVE_AGILITY", - "48": "MOVE_LAST_RESORT", - "51": "MOVE_NASTY_PLOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -104,9 +95,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -121,7 +113,7 @@ "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émon" + "category": "Cheering Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/politoed/data.json b/res/pokemon/politoed/data.json index 315f7b228a..35e3dcecf4 100644 --- a/res/pokemon/politoed/data.json +++ b/res/pokemon/politoed/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 100 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 185, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_WATER_ABSORB", - "ABILITY_DAMP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE_BEAM" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_DOUBLE_SLAP" ], + [ 1, "MOVE_PERISH_SONG" ], + [ 27, "MOVE_SWAGGER" ], + [ 37, "MOVE_BOUNCE" ], + [ 48, "MOVE_HYPER_VOICE" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -82,18 +82,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_BUBBLE_BEAM", - "MOVE_HYPNOSIS", - "MOVE_DOUBLE_SLAP", - "MOVE_PERISH_SONG" - ], - "27": "MOVE_SWAGGER", - "37": "MOVE_BOUNCE", - "48": "MOVE_HYPER_VOICE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -102,9 +91,10 @@ "MOVE_BOUNCE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -119,7 +109,7 @@ "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émon" + "category": "Frog Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/poliwag/data.json b/res/pokemon/poliwag/data.json index a07e19de12..7ddb513eff 100644 --- a/res/pokemon/poliwag/data.json +++ b/res/pokemon/poliwag/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 255, "base_exp_reward": 77, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_WATER_ABSORB", - "ABILITY_DAMP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_SPORT" ], + [ 5, "MOVE_BUBBLE" ], + [ 8, "MOVE_HYPNOSIS" ], + [ 11, "MOVE_WATER_GUN" ], + [ 15, "MOVE_DOUBLE_SLAP" ], + [ 18, "MOVE_RAIN_DANCE" ], + [ 21, "MOVE_BODY_SLAM" ], + [ 25, "MOVE_BUBBLE_BEAM" ], + [ 28, "MOVE_MUD_SHOT" ], + [ 31, "MOVE_BELLY_DRUM" ], + [ 35, "MOVE_WAKE_UP_SLAP" ], + [ 38, "MOVE_HYDRO_PUMP" ], + [ 41, "MOVE_MUD_BOMB" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -72,22 +78,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_WATER_SPORT", - "5": "MOVE_BUBBLE", - "8": "MOVE_HYPNOSIS", - "11": "MOVE_WATER_GUN", - "15": "MOVE_DOUBLE_SLAP", - "18": "MOVE_RAIN_DANCE", - "21": "MOVE_BODY_SLAM", - "25": "MOVE_BUBBLE_BEAM", - "28": "MOVE_MUD_SHOT", - "31": "MOVE_BELLY_DRUM", - "35": "MOVE_WAKE_UP_SLAP", - "38": "MOVE_HYDRO_PUMP", - "41": "MOVE_MUD_BOMB" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -102,8 +93,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 6, @@ -118,7 +109,7 @@ "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émon" + "category": "Tadpole Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -127,4 +118,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/poliwhirl/data.json b/res/pokemon/poliwhirl/data.json index ab801891b6..540bae9e9b 100644 --- a/res/pokemon/poliwhirl/data.json +++ b/res/pokemon/poliwhirl/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 120, "base_exp_reward": 131, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_WATER_ABSORB", - "ABILITY_DAMP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_SPORT" ], + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 5, "MOVE_BUBBLE" ], + [ 8, "MOVE_HYPNOSIS" ], + [ 11, "MOVE_WATER_GUN" ], + [ 15, "MOVE_DOUBLE_SLAP" ], + [ 18, "MOVE_RAIN_DANCE" ], + [ 21, "MOVE_BODY_SLAM" ], + [ 27, "MOVE_BUBBLE_BEAM" ], + [ 32, "MOVE_MUD_SHOT" ], + [ 37, "MOVE_BELLY_DRUM" ], + [ 43, "MOVE_WAKE_UP_SLAP" ], + [ 48, "MOVE_HYDRO_PUMP" ], + [ 53, "MOVE_MUD_BOMB" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -78,26 +86,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_WATER_SPORT", - "MOVE_BUBBLE", - "MOVE_HYPNOSIS" - ], - "5": "MOVE_BUBBLE", - "8": "MOVE_HYPNOSIS", - "11": "MOVE_WATER_GUN", - "15": "MOVE_DOUBLE_SLAP", - "18": "MOVE_RAIN_DANCE", - "21": "MOVE_BODY_SLAM", - "27": "MOVE_BUBBLE_BEAM", - "32": "MOVE_MUD_SHOT", - "37": "MOVE_BELLY_DRUM", - "43": "MOVE_WAKE_UP_SLAP", - "48": "MOVE_HYDRO_PUMP", - "53": "MOVE_MUD_BOMB" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -135,7 +124,7 @@ "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émon" + "category": "Tadpole Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -144,4 +133,4 @@ "rarity": 10, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/poliwrath/data.json b/res/pokemon/poliwrath/data.json index 3cae001ca3..c4071c8396 100644 --- a/res/pokemon/poliwrath/data.json +++ b/res/pokemon/poliwrath/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 90 }, - "types": [ - "TYPE_WATER", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_WATER", "TYPE_FIGHTING" ], "catch_rate": 45, "base_exp_reward": 185, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_WATER_ABSORB", - "ABILITY_DAMP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE_BEAM" ], + [ 1, "MOVE_HYPNOSIS" ], + [ 1, "MOVE_DOUBLE_SLAP" ], + [ 1, "MOVE_SUBMISSION" ], + [ 43, "MOVE_DYNAMIC_PUNCH" ], + [ 53, "MOVE_MIND_READER" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -87,17 +86,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_BUBBLE_BEAM", - "MOVE_HYPNOSIS", - "MOVE_DOUBLE_SLAP", - "MOVE_SUBMISSION" - ], - "43": "MOVE_DYNAMIC_PUNCH", - "53": "MOVE_MIND_READER" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -107,9 +96,10 @@ "MOVE_VACUUM_WAVE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -124,7 +114,7 @@ "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émon" + "category": "Tadpole Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/ponyta/data.json b/res/pokemon/ponyta/data.json index 2a1eb48fb0..5fdb275e8b 100644 --- a/res/pokemon/ponyta/data.json +++ b/res/pokemon/ponyta/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 65 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 190, "base_exp_reward": 152, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_TACKLE" ], + [ 6, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_EMBER" ], + [ 15, "MOVE_FLAME_WHEEL" ], + [ 19, "MOVE_STOMP" ], + [ 24, "MOVE_FIRE_SPIN" ], + [ 28, "MOVE_TAKE_DOWN" ], + [ 33, "MOVE_AGILITY" ], + [ 37, "MOVE_FIRE_BLAST" ], + [ 42, "MOVE_BOUNCE" ], + [ 46, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -70,23 +75,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_TACKLE" - ], - "6": "MOVE_TAIL_WHIP", - "10": "MOVE_EMBER", - "15": "MOVE_FLAME_WHEEL", - "19": "MOVE_STOMP", - "24": "MOVE_FIRE_SPIN", - "28": "MOVE_TAKE_DOWN", - "33": "MOVE_AGILITY", - "37": "MOVE_FIRE_BLAST", - "42": "MOVE_BOUNCE", - "46": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_BOUNCE", "MOVE_HEAT_WAVE", @@ -101,8 +90,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -117,7 +106,7 @@ "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émon" + "category": "Fire Horse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -126,4 +115,4 @@ "rarity": 30, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/poochyena/data.json b/res/pokemon/poochyena/data.json index 97a1911a02..1c5213b4bd 100644 --- a/res/pokemon/poochyena/data.json +++ b/res/pokemon/poochyena/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_DARK", - "TYPE_DARK" - ], + "types": [ "TYPE_DARK", "TYPE_DARK" ], "catch_rate": 255, "base_exp_reward": 55, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_QUICK_FEET" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_HOWL" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 13, "MOVE_BITE" ], + [ 17, "MOVE_ODOR_SLEUTH" ], + [ 21, "MOVE_ROAR" ], + [ 25, "MOVE_SWAGGER" ], + [ 29, "MOVE_ASSURANCE" ], + [ 33, "MOVE_SCARY_FACE" ], + [ 37, "MOVE_TAUNT" ], + [ 41, "MOVE_EMBARGO" ], + [ 45, "MOVE_TAKE_DOWN" ], + [ 49, "MOVE_SUCKER_PUNCH" ], + [ 53, "MOVE_CRUNCH" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -76,23 +83,7 @@ "TM90", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_HOWL", - "9": "MOVE_SAND_ATTACK", - "13": "MOVE_BITE", - "17": "MOVE_ODOR_SLEUTH", - "21": "MOVE_ROAR", - "25": "MOVE_SWAGGER", - "29": "MOVE_ASSURANCE", - "33": "MOVE_SCARY_FACE", - "37": "MOVE_TAUNT", - "41": "MOVE_EMBARGO", - "45": "MOVE_TAKE_DOWN", - "49": "MOVE_SUCKER_PUNCH", - "53": "MOVE_CRUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SPITE", @@ -108,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -123,8 +114,8 @@ "pokemon_pos_f": 26, "trainer_pos_m": 9, "pokemon_pos_m": 26, - "entry_text": "A Pokémon with a persistent\nnature, it chases its chosen prey\nuntil the prey becomes exhausted.", - "category": "Bite Pokémon" + "entry_text": "A Pok\u00e9mon with a persistent\nnature, it chases its chosen prey\nuntil the prey becomes exhausted.", + "category": "Bite Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -133,4 +124,4 @@ "rarity": 50, "unused": 4112 } -} +} \ No newline at end of file diff --git a/res/pokemon/porygon/data.json b/res/pokemon/porygon/data.json index e7013004ab..0268be1f41 100644 --- a/res/pokemon/porygon/data.json +++ b/res/pokemon/porygon/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 75 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 130, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_TRACE", - "ABILITY_DOWNLOAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_TRACE", "ABILITY_DOWNLOAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONVERSION_2" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_CONVERSION" ], + [ 1, "MOVE_SHARPEN" ], + [ 7, "MOVE_PSYBEAM" ], + [ 12, "MOVE_AGILITY" ], + [ 18, "MOVE_RECOVER" ], + [ 23, "MOVE_MAGNET_RISE" ], + [ 29, "MOVE_SIGNAL_BEAM" ], + [ 34, "MOVE_RECYCLE" ], + [ 40, "MOVE_DISCHARGE" ], + [ 45, "MOVE_LOCK_ON" ], + [ 51, "MOVE_TRI_ATTACK" ], + [ 56, "MOVE_MAGIC_COAT" ], + [ 62, "MOVE_ZAP_CANNON" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,26 +90,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_CONVERSION_2", - "MOVE_TACKLE", - "MOVE_CONVERSION", - "MOVE_SHARPEN" - ], - "7": "MOVE_PSYBEAM", - "12": "MOVE_AGILITY", - "18": "MOVE_RECOVER", - "23": "MOVE_MAGNET_RISE", - "29": "MOVE_SIGNAL_BEAM", - "34": "MOVE_RECYCLE", - "40": "MOVE_DISCHARGE", - "45": "MOVE_LOCK_ON", - "51": "MOVE_TRI_ATTACK", - "56": "MOVE_MAGIC_COAT", - "62": "MOVE_ZAP_CANNON" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -134,8 +123,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 9, "pokemon_pos_m": 0, - "entry_text": "A man-made Pokémon created using\nadvanced scientific means. It can\nmove freely in cyberspace.", - "category": "Virtual Pokémon" + "entry_text": "A man-made Pok\u00e9mon created using\nadvanced scientific means. It can\nmove freely in cyberspace.", + "category": "Virtual Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -144,4 +133,4 @@ "rarity": 10, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/porygon2/data.json b/res/pokemon/porygon2/data.json index 5c46a3f2ad..837c24fafd 100644 --- a/res/pokemon/porygon2/data.json +++ b/res/pokemon/porygon2/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 95 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 180, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_TRACE", - "ABILITY_DOWNLOAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_TRACE", "ABILITY_DOWNLOAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CONVERSION_2" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_CONVERSION" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_PSYBEAM" ], + [ 12, "MOVE_AGILITY" ], + [ 18, "MOVE_RECOVER" ], + [ 23, "MOVE_MAGNET_RISE" ], + [ 29, "MOVE_SIGNAL_BEAM" ], + [ 34, "MOVE_RECYCLE" ], + [ 40, "MOVE_DISCHARGE" ], + [ 45, "MOVE_LOCK_ON" ], + [ 51, "MOVE_TRI_ATTACK" ], + [ 56, "MOVE_MAGIC_COAT" ], + [ 62, "MOVE_ZAP_CANNON" ], + [ 67, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,27 +91,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_CONVERSION_2", - "MOVE_TACKLE", - "MOVE_CONVERSION", - "MOVE_DEFENSE_CURL" - ], - "7": "MOVE_PSYBEAM", - "12": "MOVE_AGILITY", - "18": "MOVE_RECOVER", - "23": "MOVE_MAGNET_RISE", - "29": "MOVE_SIGNAL_BEAM", - "34": "MOVE_RECYCLE", - "40": "MOVE_DISCHARGE", - "45": "MOVE_LOCK_ON", - "51": "MOVE_TRI_ATTACK", - "56": "MOVE_MAGIC_COAT", - "62": "MOVE_ZAP_CANNON", - "67": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -120,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -136,7 +125,7 @@ "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émon" + "category": "Virtual Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -145,4 +134,4 @@ "rarity": 10, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/porygon_z/data.json b/res/pokemon/porygon_z/data.json index e182878217..5339e05723 100644 --- a/res/pokemon/porygon_z/data.json +++ b/res/pokemon/porygon_z/data.json @@ -8,10 +8,7 @@ "special_attack": 135, "special_defense": 75 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 30, "base_exp_reward": 185, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_ADAPTABILITY", - "ABILITY_DOWNLOAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_ADAPTABILITY", "ABILITY_DOWNLOAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK_ROOM" ], + [ 1, "MOVE_CONVERSION_2" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_CONVERSION" ], + [ 1, "MOVE_NASTY_PLOT" ], + [ 7, "MOVE_PSYBEAM" ], + [ 12, "MOVE_AGILITY" ], + [ 18, "MOVE_RECOVER" ], + [ 23, "MOVE_MAGNET_RISE" ], + [ 29, "MOVE_SIGNAL_BEAM" ], + [ 34, "MOVE_EMBARGO" ], + [ 40, "MOVE_DISCHARGE" ], + [ 45, "MOVE_LOCK_ON" ], + [ 51, "MOVE_TRI_ATTACK" ], + [ 56, "MOVE_MAGIC_COAT" ], + [ 62, "MOVE_ZAP_CANNON" ], + [ 67, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -84,28 +94,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_TRICK_ROOM", - "MOVE_CONVERSION_2", - "MOVE_TACKLE", - "MOVE_CONVERSION", - "MOVE_NASTY_PLOT" - ], - "7": "MOVE_PSYBEAM", - "12": "MOVE_AGILITY", - "18": "MOVE_RECOVER", - "23": "MOVE_MAGNET_RISE", - "29": "MOVE_SIGNAL_BEAM", - "34": "MOVE_EMBARGO", - "40": "MOVE_DISCHARGE", - "45": "MOVE_LOCK_ON", - "51": "MOVE_TRI_ATTACK", - "56": "MOVE_MAGIC_COAT", - "62": "MOVE_ZAP_CANNON", - "67": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -116,9 +105,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 9, @@ -133,7 +123,7 @@ "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émon" + "category": "Virtual Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/primeape/data.json b/res/pokemon/primeape/data.json index 40e7477400..a9c2488b4d 100644 --- a/res/pokemon/primeape/data.json +++ b/res/pokemon/primeape/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 70 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 75, "base_exp_reward": 149, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_VITAL_SPIRIT", - "ABILITY_ANGER_POINT" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FLING" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LOW_KICK" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 9, "MOVE_FURY_SWIPES" ], + [ 13, "MOVE_KARATE_CHOP" ], + [ 17, "MOVE_SEISMIC_TOSS" ], + [ 21, "MOVE_SCREECH" ], + [ 25, "MOVE_ASSURANCE" ], + [ 28, "MOVE_RAGE" ], + [ 35, "MOVE_SWAGGER" ], + [ 41, "MOVE_CROSS_CHOP" ], + [ 47, "MOVE_THRASH" ], + [ 53, "MOVE_PUNISHMENT" ], + [ 59, "MOVE_CLOSE_COMBAT" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -89,27 +98,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_FLING", - "MOVE_SCRATCH", - "MOVE_LOW_KICK", - "MOVE_LEER", - "MOVE_FOCUS_ENERGY" - ], - "9": "MOVE_FURY_SWIPES", - "13": "MOVE_KARATE_CHOP", - "17": "MOVE_SEISMIC_TOSS", - "21": "MOVE_SCREECH", - "25": "MOVE_ASSURANCE", - "28": "MOVE_RAGE", - "35": "MOVE_SWAGGER", - "41": "MOVE_CROSS_CHOP", - "47": "MOVE_THRASH", - "53": "MOVE_PUNISHMENT", - "59": "MOVE_CLOSE_COMBAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -125,9 +114,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -142,7 +132,7 @@ "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émon" + "category": "Pig Monkey Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/prinplup/data.json b/res/pokemon/prinplup/data.json index df0c792438..83d9514574 100644 --- a/res/pokemon/prinplup/data.json +++ b/res/pokemon/prinplup/data.json @@ -8,10 +8,7 @@ "special_attack": 81, "special_defense": 76 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 143, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_WATER_1", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 4, "MOVE_GROWL" ], + [ 8, "MOVE_BUBBLE" ], + [ 11, "MOVE_WATER_SPORT" ], + [ 15, "MOVE_PECK" ], + [ 16, "MOVE_METAL_CLAW" ], + [ 19, "MOVE_BUBBLE_BEAM" ], + [ 24, "MOVE_BIDE" ], + [ 28, "MOVE_FURY_ATTACK" ], + [ 33, "MOVE_BRINE" ], + [ 37, "MOVE_WHIRLPOOL" ], + [ 42, "MOVE_MIST" ], + [ 46, "MOVE_DRILL_PECK" ], + [ 51, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -83,26 +91,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "4": "MOVE_GROWL", - "8": "MOVE_BUBBLE", - "11": "MOVE_WATER_SPORT", - "15": "MOVE_PECK", - "16": "MOVE_METAL_CLAW", - "19": "MOVE_BUBBLE_BEAM", - "24": "MOVE_BIDE", - "28": "MOVE_FURY_ATTACK", - "33": "MOVE_BRINE", - "37": "MOVE_WHIRLPOOL", - "42": "MOVE_MIST", - "46": "MOVE_DRILL_PECK", - "51": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -134,7 +123,7 @@ "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émon" + "category": "Penguin Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -143,4 +132,4 @@ "rarity": 10, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/probopass/data.json b/res/pokemon/probopass/data.json index d6df04fa3b..e7ce804dad 100644 --- a/res/pokemon/probopass/data.json +++ b/res/pokemon/probopass/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 150 }, - "types": [ - "TYPE_ROCK", - "TYPE_STEEL" - ], + "types": [ "TYPE_ROCK", "TYPE_STEEL" ], "catch_rate": 60, "base_exp_reward": 198, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_MAGNET_PULL" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_MAGNET_PULL" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MAGNET_RISE" ], + [ 1, "MOVE_GRAVITY" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_IRON_DEFENSE" ], + [ 1, "MOVE_MAGNET_BOMB" ], + [ 1, "MOVE_BLOCK" ], + [ 7, "MOVE_IRON_DEFENSE" ], + [ 13, "MOVE_MAGNET_BOMB" ], + [ 19, "MOVE_BLOCK" ], + [ 25, "MOVE_THUNDER_WAVE" ], + [ 31, "MOVE_ROCK_SLIDE" ], + [ 37, "MOVE_SANDSTORM" ], + [ 43, "MOVE_REST" ], + [ 49, "MOVE_POWER_GEM" ], + [ 55, "MOVE_DISCHARGE" ], + [ 61, "MOVE_STONE_EDGE" ], + [ 67, "MOVE_ZAP_CANNON" ], + [ 73, "MOVE_LOCK_ON" ], + [ 79, "MOVE_EARTH_POWER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,30 +94,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_MAGNET_RISE", - "MOVE_GRAVITY", - "MOVE_TACKLE", - "MOVE_IRON_DEFENSE", - "MOVE_MAGNET_BOMB", - "MOVE_BLOCK" - ], - "7": "MOVE_IRON_DEFENSE", - "13": "MOVE_MAGNET_BOMB", - "19": "MOVE_BLOCK", - "25": "MOVE_THUNDER_WAVE", - "31": "MOVE_ROCK_SLIDE", - "37": "MOVE_SANDSTORM", - "43": "MOVE_REST", - "49": "MOVE_POWER_GEM", - "55": "MOVE_DISCHARGE", - "61": "MOVE_STONE_EDGE", - "67": "MOVE_ZAP_CANNON", - "73": "MOVE_LOCK_ON", - "79": "MOVE_EARTH_POWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -119,9 +108,10 @@ "MOVE_MAGNET_RISE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 14, @@ -136,7 +126,7 @@ "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émon" + "category": "Compass Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/psyduck/data.json b/res/pokemon/psyduck/data.json index a645c9239a..7719da9c8e 100644 --- a/res/pokemon/psyduck/data.json +++ b/res/pokemon/psyduck/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 50 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 80, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_DAMP", - "ABILITY_CLOUD_NINE" - ], - "great_marsh_flee_rate": 90, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_SPORT" ], + [ 1, "MOVE_SCRATCH" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_WATER_GUN" ], + [ 14, "MOVE_DISABLE" ], + [ 18, "MOVE_CONFUSION" ], + [ 22, "MOVE_WATER_PULSE" ], + [ 27, "MOVE_FURY_SWIPES" ], + [ 31, "MOVE_SCREECH" ], + [ 35, "MOVE_PSYCH_UP" ], + [ 40, "MOVE_ZEN_HEADBUTT" ], + [ 44, "MOVE_AMNESIA" ], + [ 48, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -83,24 +89,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_WATER_SPORT", - "MOVE_SCRATCH" - ], - "5": "MOVE_TAIL_WHIP", - "9": "MOVE_WATER_GUN", - "14": "MOVE_DISABLE", - "18": "MOVE_CONFUSION", - "22": "MOVE_WATER_PULSE", - "27": "MOVE_FURY_SWIPES", - "31": "MOVE_SCREECH", - "35": "MOVE_PSYCH_UP", - "40": "MOVE_ZEN_HEADBUTT", - "44": "MOVE_AMNESIA", - "48": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -120,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -136,7 +125,7 @@ "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émon" + "category": "Duck Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -145,4 +134,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/pupitar/data.json b/res/pokemon/pupitar/data.json index d3a8a195c6..cf89b93f53 100644 --- a/res/pokemon/pupitar/data.json +++ b/res/pokemon/pupitar/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 70 }, - "types": [ - "TYPE_ROCK", - "TYPE_GROUND" - ], + "types": [ "TYPE_ROCK", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 144, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_SANDSTORM" ], + [ 1, "MOVE_SCREECH" ], + [ 5, "MOVE_SANDSTORM" ], + [ 10, "MOVE_SCREECH" ], + [ 14, "MOVE_ROCK_SLIDE" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 23, "MOVE_THRASH" ], + [ 28, "MOVE_DARK_PULSE" ], + [ 34, "MOVE_PAYBACK" ], + [ 41, "MOVE_CRUNCH" ], + [ 47, "MOVE_EARTHQUAKE" ], + [ 54, "MOVE_STONE_EDGE" ], + [ 60, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,26 +87,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_LEER", - "MOVE_SANDSTORM", - "MOVE_SCREECH" - ], - "5": "MOVE_SANDSTORM", - "10": "MOVE_SCREECH", - "14": "MOVE_ROCK_SLIDE", - "19": "MOVE_SCARY_FACE", - "23": "MOVE_THRASH", - "28": "MOVE_DARK_PULSE", - "34": "MOVE_PAYBACK", - "41": "MOVE_CRUNCH", - "47": "MOVE_EARTHQUAKE", - "54": "MOVE_STONE_EDGE", - "60": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_IRON_HEAD", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -134,7 +123,7 @@ "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émon" + "category": "Hard Shell Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -143,4 +132,4 @@ "rarity": 10, "unused": 2059 } -} +} \ No newline at end of file diff --git a/res/pokemon/purugly/data.json b/res/pokemon/purugly/data.json index 1088b8f627..5829cf82e9 100644 --- a/res/pokemon/purugly/data.json +++ b/res/pokemon/purugly/data.json @@ -8,10 +8,7 @@ "special_attack": 64, "special_defense": 59 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 75, "base_exp_reward": 183, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FAKE_OUT" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_SCRATCH" ], + [ 8, "MOVE_GROWL" ], + [ 13, "MOVE_HYPNOSIS" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 20, "MOVE_FURY_SWIPES" ], + [ 25, "MOVE_CHARM" ], + [ 29, "MOVE_ASSIST" ], + [ 32, "MOVE_CAPTIVATE" ], + [ 37, "MOVE_SLASH" ], + [ 38, "MOVE_SWAGGER" ], + [ 45, "MOVE_BODY_SLAM" ], + [ 53, "MOVE_ATTRACT" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -86,26 +94,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_FAKE_OUT", - "MOVE_SCRATCH", - "MOVE_GROWL" - ], - "5": "MOVE_SCRATCH", - "8": "MOVE_GROWL", - "13": "MOVE_HYPNOSIS", - "17": "MOVE_FAINT_ATTACK", - "20": "MOVE_FURY_SWIPES", - "25": "MOVE_CHARM", - "29": "MOVE_ASSIST", - "32": "MOVE_CAPTIVATE", - "37": "MOVE_SLASH", - "38": "MOVE_SWAGGER", - "45": "MOVE_BODY_SLAM", - "53": "MOVE_ATTRACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -116,9 +105,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -133,7 +123,7 @@ "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émon" + "category": "Tiger Cat Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/quagsire/data.json b/res/pokemon/quagsire/data.json index 9d320d62bc..c24c49bae6 100644 --- a/res/pokemon/quagsire/data.json +++ b/res/pokemon/quagsire/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 65 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 90, "base_exp_reward": 137, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_DAMP", - "ABILITY_WATER_ABSORB" - ], - "great_marsh_flee_rate": 60, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 5, "MOVE_MUD_SPORT" ], + [ 9, "MOVE_MUD_SHOT" ], + [ 15, "MOVE_SLAM" ], + [ 19, "MOVE_MUD_BOMB" ], + [ 24, "MOVE_AMNESIA" ], + [ 31, "MOVE_YAWN" ], + [ 36, "MOVE_EARTHQUAKE" ], + [ 41, "MOVE_RAIN_DANCE" ], + [ 48, "MOVE_MIST" ], + [ 48, "MOVE_HAZE" ], + [ 53, "MOVE_MUDDY_WATER" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -86,27 +93,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_WATER_GUN", - "MOVE_TAIL_WHIP", - "MOVE_MUD_SPORT" - ], - "5": "MOVE_MUD_SPORT", - "9": "MOVE_MUD_SHOT", - "15": "MOVE_SLAM", - "19": "MOVE_MUD_BOMB", - "24": "MOVE_AMNESIA", - "31": "MOVE_YAWN", - "36": "MOVE_EARTHQUAKE", - "41": "MOVE_RAIN_DANCE", - "48": [ - "MOVE_MIST", - "MOVE_HAZE" - ], - "53": "MOVE_MUDDY_WATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -118,9 +105,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -134,8 +122,8 @@ "pokemon_pos_f": 6, "trainer_pos_m": 9, "pokemon_pos_m": 6, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/quilava/data.json b/res/pokemon/quilava/data.json index ff9360b1ff..b6b3b86686 100644 --- a/res/pokemon/quilava/data.json +++ b/res/pokemon/quilava/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 65 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 142, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 4, "MOVE_SMOKE_SCREEN" ], + [ 10, "MOVE_EMBER" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_FLAME_WHEEL" ], + [ 24, "MOVE_DEFENSE_CURL" ], + [ 31, "MOVE_SWIFT" ], + [ 35, "MOVE_LAVA_PLUME" ], + [ 42, "MOVE_FLAMETHROWER" ], + [ 46, "MOVE_ROLLOUT" ], + [ 53, "MOVE_DOUBLE_EDGE" ], + [ 57, "MOVE_ERUPTION" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -75,25 +82,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_LEER", - "MOVE_SMOKE_SCREEN" - ], - "4": "MOVE_SMOKE_SCREEN", - "10": "MOVE_EMBER", - "13": "MOVE_QUICK_ATTACK", - "20": "MOVE_FLAME_WHEEL", - "24": "MOVE_DEFENSE_CURL", - "31": "MOVE_SWIFT", - "35": "MOVE_LAVA_PLUME", - "42": "MOVE_FLAMETHROWER", - "46": "MOVE_ROLLOUT", - "53": "MOVE_DOUBLE_EDGE", - "57": "MOVE_ERUPTION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -110,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 9, @@ -126,7 +115,7 @@ "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émon" + "category": "Volcano Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -135,4 +124,4 @@ "rarity": 10, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/qwilfish/data.json b/res/pokemon/qwilfish/data.json index e719bbaa29..91236bbd69 100644 --- a/res/pokemon/qwilfish/data.json +++ b/res/pokemon/qwilfish/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_WATER", - "TYPE_POISON" - ], + "types": [ "TYPE_WATER", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 100, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_SWIFT_SWIM" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPIKES" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_POISON_STING" ], + [ 9, "MOVE_HARDEN" ], + [ 9, "MOVE_MINIMIZE" ], + [ 13, "MOVE_WATER_GUN" ], + [ 17, "MOVE_ROLLOUT" ], + [ 21, "MOVE_TOXIC_SPIKES" ], + [ 25, "MOVE_STOCKPILE" ], + [ 25, "MOVE_SPIT_UP" ], + [ 29, "MOVE_REVENGE" ], + [ 33, "MOVE_BRINE" ], + [ 37, "MOVE_PIN_MISSILE" ], + [ 41, "MOVE_TAKE_DOWN" ], + [ 45, "MOVE_AQUA_TAIL" ], + [ 49, "MOVE_POISON_JAB" ], + [ 53, "MOVE_DESTINY_BOND" ], + [ 57, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,33 +90,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_SPIKES", - "MOVE_TACKLE", - "MOVE_POISON_STING" - ], - "9": [ - "MOVE_HARDEN", - "MOVE_MINIMIZE" - ], - "13": "MOVE_WATER_GUN", - "17": "MOVE_ROLLOUT", - "21": "MOVE_TOXIC_SPIKES", - "25": [ - "MOVE_STOCKPILE", - "MOVE_SPIT_UP" - ], - "29": "MOVE_REVENGE", - "33": "MOVE_BRINE", - "37": "MOVE_PIN_MISSILE", - "41": "MOVE_TAKE_DOWN", - "45": "MOVE_AQUA_TAIL", - "49": "MOVE_POISON_JAB", - "53": "MOVE_DESTINY_BOND", - "57": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -116,9 +101,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 5, @@ -133,7 +119,7 @@ "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émon" + "category": "Balloon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/raichu/data.json b/res/pokemon/raichu/data.json index 502ef5dce1..4644fd1ad2 100644 --- a/res/pokemon/raichu/data.json +++ b/res/pokemon/raichu/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 80 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 75, "base_exp_reward": 122, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_STATIC", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_STATIC", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_THUNDERBOLT" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -82,15 +79,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_THUNDER_SHOCK", - "MOVE_TAIL_WHIP", - "MOVE_QUICK_ATTACK", - "MOVE_THUNDERBOLT" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -102,9 +91,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -119,7 +109,7 @@ "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émon" + "category": "Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/raikou/data.json b/res/pokemon/raikou/data.json index 63b6caf245..83c2bc8fba 100644 --- a/res/pokemon/raikou/data.json +++ b/res/pokemon/raikou/data.json @@ -8,10 +8,7 @@ "special_attack": 115, "special_defense": 100 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 3, "base_exp_reward": 216, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 8, "MOVE_THUNDER_SHOCK" ], + [ 15, "MOVE_ROAR" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_SPARK" ], + [ 36, "MOVE_REFLECT" ], + [ 43, "MOVE_CRUNCH" ], + [ 50, "MOVE_THUNDER_FANG" ], + [ 57, "MOVE_DISCHARGE" ], + [ 64, "MOVE_EXTRASENSORY" ], + [ 71, "MOVE_RAIN_DANCE" ], + [ 78, "MOVE_CALM_MIND" ], + [ 85, "MOVE_THUNDER" ] + ], + "by_tm": [ "TM04", "TM05", "TM06", @@ -83,25 +90,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_LEER" - ], - "8": "MOVE_THUNDER_SHOCK", - "15": "MOVE_ROAR", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_SPARK", - "36": "MOVE_REFLECT", - "43": "MOVE_CRUNCH", - "50": "MOVE_THUNDER_FANG", - "57": "MOVE_DISCHARGE", - "64": "MOVE_EXTRASENSORY", - "71": "MOVE_RAIN_DANCE", - "78": "MOVE_CALM_MIND", - "85": "MOVE_THUNDER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 19, @@ -127,7 +117,7 @@ "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émon" + "category": "Thunder Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/ralts/data.json b/res/pokemon/ralts/data.json index f8e89ee2ab..f0ea81cdbf 100644 --- a/res/pokemon/ralts/data.json +++ b/res/pokemon/ralts/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 35 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 235, "base_exp_reward": 70, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_TRACE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_TRACE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 6, "MOVE_CONFUSION" ], + [ 10, "MOVE_DOUBLE_TEAM" ], + [ 12, "MOVE_TELEPORT" ], + [ 17, "MOVE_LUCKY_CHANT" ], + [ 21, "MOVE_MAGICAL_LEAF" ], + [ 23, "MOVE_CALM_MIND" ], + [ 28, "MOVE_PSYCHIC" ], + [ 32, "MOVE_IMPRISON" ], + [ 34, "MOVE_FUTURE_SIGHT" ], + [ 39, "MOVE_CHARM" ], + [ 43, "MOVE_HYPNOSIS" ], + [ 45, "MOVE_DREAM_EATER" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -86,22 +92,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_GROWL", - "6": "MOVE_CONFUSION", - "10": "MOVE_DOUBLE_TEAM", - "12": "MOVE_TELEPORT", - "17": "MOVE_LUCKY_CHANT", - "21": "MOVE_MAGICAL_LEAF", - "23": "MOVE_CALM_MIND", - "28": "MOVE_PSYCHIC", - "32": "MOVE_IMPRISON", - "34": "MOVE_FUTURE_SIGHT", - "39": "MOVE_CHARM", - "43": "MOVE_HYPNOSIS", - "45": "MOVE_DREAM_EATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -123,8 +114,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -138,8 +129,8 @@ "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émon,\nits body warms up slightly.", - "category": "Feeling Pokémon" + "entry_text": "If its horns capture the warm\nfeelings of people or Pok\u00e9mon,\nits body warms up slightly.", + "category": "Feeling Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -148,4 +139,4 @@ "rarity": 30, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/rampardos/data.json b/res/pokemon/rampardos/data.json index 953397e88f..d6e3886631 100644 --- a/res/pokemon/rampardos/data.json +++ b/res/pokemon/rampardos/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 50 }, - "types": [ - "TYPE_ROCK", - "TYPE_ROCK" - ], + "types": [ "TYPE_ROCK", "TYPE_ROCK" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_MOLD_BREAKER", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_MOLD_BREAKER", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HEADBUTT" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_PURSUIT" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 24, "MOVE_ASSURANCE" ], + [ 28, "MOVE_ANCIENT_POWER" ], + [ 30, "MOVE_ENDEAVOR" ], + [ 36, "MOVE_ZEN_HEADBUTT" ], + [ 43, "MOVE_SCREECH" ], + [ 52, "MOVE_HEAD_SMASH" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -97,23 +102,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_HEADBUTT", - "MOVE_LEER" - ], - "6": "MOVE_FOCUS_ENERGY", - "10": "MOVE_PURSUIT", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_SCARY_FACE", - "24": "MOVE_ASSURANCE", - "28": "MOVE_ANCIENT_POWER", - "30": "MOVE_ENDEAVOR", - "36": "MOVE_ZEN_HEADBUTT", - "43": "MOVE_SCREECH", - "52": "MOVE_HEAD_SMASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -129,9 +118,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -146,7 +136,7 @@ "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émon" + "category": "Head Butt Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/rapidash/data.json b/res/pokemon/rapidash/data.json index 93df80277e..6273733012 100644 --- a/res/pokemon/rapidash/data.json +++ b/res/pokemon/rapidash/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 80 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 60, "base_exp_reward": 192, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_FLASH_FIRE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_JAB" ], + [ 1, "MOVE_MEGAHORN" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_EMBER" ], + [ 6, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_EMBER" ], + [ 15, "MOVE_FLAME_WHEEL" ], + [ 19, "MOVE_STOMP" ], + [ 24, "MOVE_FIRE_SPIN" ], + [ 28, "MOVE_TAKE_DOWN" ], + [ 33, "MOVE_AGILITY" ], + [ 37, "MOVE_FIRE_BLAST" ], + [ 40, "MOVE_FURY_ATTACK" ], + [ 47, "MOVE_BOUNCE" ], + [ 56, "MOVE_FLARE_BLITZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -73,37 +83,17 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_POISON_JAB", - "MOVE_MEGAHORN", - "MOVE_GROWL", - "MOVE_QUICK_ATTACK", - "MOVE_TAIL_WHIP", - "MOVE_EMBER" - ], - "6": "MOVE_TAIL_WHIP", - "10": "MOVE_EMBER", - "15": "MOVE_FLAME_WHEEL", - "19": "MOVE_STOMP", - "24": "MOVE_FIRE_SPIN", - "28": "MOVE_TAKE_DOWN", - "33": "MOVE_AGILITY", - "37": "MOVE_FIRE_BLAST", - "40": "MOVE_FURY_ATTACK", - "47": "MOVE_BOUNCE", - "56": "MOVE_FLARE_BLITZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_BOUNCE", "MOVE_HEAT_WAVE", "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -118,7 +108,7 @@ "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émon" + "category": "Fire Horse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/raticate/data.json b/res/pokemon/raticate/data.json index 44b1ed9579..3257e9ff8d 100644 --- a/res/pokemon/raticate/data.json +++ b/res/pokemon/raticate/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 70 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 127, "base_exp_reward": 116, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_GUTS" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_GUTS" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SWORDS_DANCE" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 4, "MOVE_QUICK_ATTACK" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_BITE" ], + [ 13, "MOVE_PURSUIT" ], + [ 16, "MOVE_HYPER_FANG" ], + [ 19, "MOVE_SUCKER_PUNCH" ], + [ 20, "MOVE_SCARY_FACE" ], + [ 24, "MOVE_CRUNCH" ], + [ 29, "MOVE_ASSURANCE" ], + [ 34, "MOVE_SUPER_FANG" ], + [ 39, "MOVE_DOUBLE_EDGE" ], + [ 44, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -86,28 +96,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SWORDS_DANCE", - "MOVE_TACKLE", - "MOVE_TAIL_WHIP", - "MOVE_QUICK_ATTACK", - "MOVE_FOCUS_ENERGY" - ], - "4": "MOVE_QUICK_ATTACK", - "7": "MOVE_FOCUS_ENERGY", - "10": "MOVE_BITE", - "13": "MOVE_PURSUIT", - "16": "MOVE_HYPER_FANG", - "19": "MOVE_SUCKER_PUNCH", - "20": "MOVE_SCARY_FACE", - "24": "MOVE_CRUNCH", - "29": "MOVE_ASSURANCE", - "34": "MOVE_SUPER_FANG", - "39": "MOVE_DOUBLE_EDGE", - "44": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -118,9 +107,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -135,7 +125,7 @@ "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émon" + "category": "Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/rattata/data.json b/res/pokemon/rattata/data.json index 89c5ad702b..335c163779 100644 --- a/res/pokemon/rattata/data.json +++ b/res/pokemon/rattata/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 35 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 57, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_GUTS" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RUN_AWAY", "ABILITY_GUTS" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 4, "MOVE_QUICK_ATTACK" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_BITE" ], + [ 13, "MOVE_PURSUIT" ], + [ 16, "MOVE_HYPER_FANG" ], + [ 19, "MOVE_SUCKER_PUNCH" ], + [ 22, "MOVE_CRUNCH" ], + [ 25, "MOVE_ASSURANCE" ], + [ 28, "MOVE_SUPER_FANG" ], + [ 31, "MOVE_DOUBLE_EDGE" ], + [ 34, "MOVE_ENDEAVOR" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -81,24 +87,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_TAIL_WHIP" - ], - "4": "MOVE_QUICK_ATTACK", - "7": "MOVE_FOCUS_ENERGY", - "10": "MOVE_BITE", - "13": "MOVE_PURSUIT", - "16": "MOVE_HYPER_FANG", - "19": "MOVE_SUCKER_PUNCH", - "22": "MOVE_CRUNCH", - "25": "MOVE_ASSURANCE", - "28": "MOVE_SUPER_FANG", - "31": "MOVE_DOUBLE_EDGE", - "34": "MOVE_ENDEAVOR" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -133,7 +122,7 @@ "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émon" + "category": "Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -142,4 +131,4 @@ "rarity": 50, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/rayquaza/data.json b/res/pokemon/rayquaza/data.json index dbdc34d069..7c9b85442d 100644 --- a/res/pokemon/rayquaza/data.json +++ b/res/pokemon/rayquaza/data.json @@ -8,10 +8,7 @@ "special_attack": 150, "special_defense": 90 }, - "types": [ - "TYPE_DRAGON", - "TYPE_FLYING" - ], + "types": [ "TYPE_DRAGON", "TYPE_FLYING" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_AIR_LOCK", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_AIR_LOCK", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TWISTER" ], + [ 5, "MOVE_SCARY_FACE" ], + [ 15, "MOVE_ANCIENT_POWER" ], + [ 20, "MOVE_DRAGON_CLAW" ], + [ 30, "MOVE_DRAGON_DANCE" ], + [ 35, "MOVE_CRUNCH" ], + [ 45, "MOVE_FLY" ], + [ 50, "MOVE_REST" ], + [ 60, "MOVE_EXTREME_SPEED" ], + [ 65, "MOVE_HYPER_BEAM" ], + [ 75, "MOVE_DRAGON_PULSE" ], + [ 80, "MOVE_OUTRAGE" ] + ], + "by_tm": [ "TM02", "TM03", "TM05", @@ -100,21 +105,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_TWISTER", - "5": "MOVE_SCARY_FACE", - "15": "MOVE_ANCIENT_POWER", - "20": "MOVE_DRAGON_CLAW", - "30": "MOVE_DRAGON_DANCE", - "35": "MOVE_CRUNCH", - "45": "MOVE_FLY", - "50": "MOVE_REST", - "60": "MOVE_EXTREME_SPEED", - "65": "MOVE_HYPER_BEAM", - "75": "MOVE_DRAGON_PULSE", - "80": "MOVE_OUTRAGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -130,9 +121,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 70, @@ -147,7 +139,7 @@ "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émon" + "category": "Sky High Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/regice/data.json b/res/pokemon/regice/data.json index 894a4af865..ad12994719 100644 --- a/res/pokemon/regice/data.json +++ b/res/pokemon/regice/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 200 }, - "types": [ - "TYPE_ICE", - "TYPE_ICE" - ], + "types": [ "TYPE_ICE", "TYPE_ICE" ], "catch_rate": 3, "base_exp_reward": 216, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_EXPLOSION" ], + [ 1, "MOVE_STOMP" ], + [ 9, "MOVE_ICY_WIND" ], + [ 17, "MOVE_CURSE" ], + [ 25, "MOVE_SUPERPOWER" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 41, "MOVE_AMNESIA" ], + [ 49, "MOVE_CHARGE_BEAM" ], + [ 57, "MOVE_LOCK_ON" ], + [ 65, "MOVE_ZAP_CANNON" ], + [ 73, "MOVE_ICE_BEAM" ], + [ 81, "MOVE_HAMMER_ARM" ], + [ 89, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM06", "TM07", @@ -87,24 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_EXPLOSION", - "MOVE_STOMP" - ], - "9": "MOVE_ICY_WIND", - "17": "MOVE_CURSE", - "25": "MOVE_SUPERPOWER", - "33": "MOVE_ANCIENT_POWER", - "41": "MOVE_AMNESIA", - "49": "MOVE_CHARGE_BEAM", - "57": "MOVE_LOCK_ON", - "65": "MOVE_ZAP_CANNON", - "73": "MOVE_ICE_BEAM", - "81": "MOVE_HAMMER_ARM", - "89": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -117,9 +106,10 @@ "MOVE_SIGNAL_BEAM" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 18, @@ -134,7 +124,7 @@ "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émon" + "category": "Iceberg Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/regigigas/data.json b/res/pokemon/regigigas/data.json index 810cffc2c6..5ae258eeb3 100644 --- a/res/pokemon/regigigas/data.json +++ b/res/pokemon/regigigas/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 110 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 3, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 120, "base_friendship": 0, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SLOW_START", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_SLOW_START", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_PUNCH" ], + [ 1, "MOVE_ICE_PUNCH" ], + [ 1, "MOVE_THUNDER_PUNCH" ], + [ 1, "MOVE_DIZZY_PUNCH" ], + [ 1, "MOVE_KNOCK_OFF" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 1, "MOVE_FORESIGHT" ], + [ 25, "MOVE_REVENGE" ], + [ 50, "MOVE_ZEN_HEADBUTT" ], + [ 75, "MOVE_CRUSH_GRIP" ], + [ 100, "MOVE_GIGA_IMPACT" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -83,22 +87,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_FIRE_PUNCH", - "MOVE_ICE_PUNCH", - "MOVE_THUNDER_PUNCH", - "MOVE_DIZZY_PUNCH", - "MOVE_KNOCK_OFF", - "MOVE_CONFUSE_RAY", - "MOVE_FORESIGHT" - ], - "25": "MOVE_REVENGE", - "50": "MOVE_ZEN_HEADBUTT", - "75": "MOVE_CRUSH_GRIP", - "100": "MOVE_GIGA_IMPACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_THUNDER_PUNCH", @@ -112,9 +101,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 37, @@ -128,8 +118,8 @@ "pokemon_pos_f": 1, "trainer_pos_m": 23, "pokemon_pos_m": 1, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/regirock/data.json b/res/pokemon/regirock/data.json index 140a59bdcb..d49f92ba3f 100644 --- a/res/pokemon/regirock/data.json +++ b/res/pokemon/regirock/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 100 }, - "types": [ - "TYPE_ROCK", - "TYPE_ROCK" - ], + "types": [ "TYPE_ROCK", "TYPE_ROCK" ], "catch_rate": 3, "base_exp_reward": 217, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_EXPLOSION" ], + [ 1, "MOVE_STOMP" ], + [ 9, "MOVE_ROCK_THROW" ], + [ 17, "MOVE_CURSE" ], + [ 25, "MOVE_SUPERPOWER" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 41, "MOVE_IRON_DEFENSE" ], + [ 49, "MOVE_CHARGE_BEAM" ], + [ 57, "MOVE_LOCK_ON" ], + [ 65, "MOVE_ZAP_CANNON" ], + [ 73, "MOVE_STONE_EDGE" ], + [ 81, "MOVE_HAMMER_ARM" ], + [ 89, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -87,24 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_EXPLOSION", - "MOVE_STOMP" - ], - "9": "MOVE_ROCK_THROW", - "17": "MOVE_CURSE", - "25": "MOVE_SUPERPOWER", - "33": "MOVE_ANCIENT_POWER", - "41": "MOVE_IRON_DEFENSE", - "49": "MOVE_CHARGE_BEAM", - "57": "MOVE_LOCK_ON", - "65": "MOVE_ZAP_CANNON", - "73": "MOVE_STONE_EDGE", - "81": "MOVE_HAMMER_ARM", - "89": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -117,9 +106,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -134,7 +124,7 @@ "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émon" + "category": "Rock Peak Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/registeel/data.json b/res/pokemon/registeel/data.json index 3be52fbb11..a75932ec28 100644 --- a/res/pokemon/registeel/data.json +++ b/res/pokemon/registeel/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 150 }, - "types": [ - "TYPE_STEEL", - "TYPE_STEEL" - ], + "types": [ "TYPE_STEEL", "TYPE_STEEL" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_CLEAR_BODY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_EXPLOSION" ], + [ 1, "MOVE_STOMP" ], + [ 9, "MOVE_METAL_CLAW" ], + [ 17, "MOVE_CURSE" ], + [ 25, "MOVE_SUPERPOWER" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 41, "MOVE_IRON_DEFENSE" ], + [ 41, "MOVE_AMNESIA" ], + [ 49, "MOVE_CHARGE_BEAM" ], + [ 57, "MOVE_LOCK_ON" ], + [ 65, "MOVE_ZAP_CANNON" ], + [ 73, "MOVE_IRON_HEAD" ], + [ 73, "MOVE_FLASH_CANNON" ], + [ 81, "MOVE_HAMMER_ARM" ], + [ 89, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -88,30 +96,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_EXPLOSION", - "MOVE_STOMP" - ], - "9": "MOVE_METAL_CLAW", - "17": "MOVE_CURSE", - "25": "MOVE_SUPERPOWER", - "33": "MOVE_ANCIENT_POWER", - "41": [ - "MOVE_IRON_DEFENSE", - "MOVE_AMNESIA" - ], - "49": "MOVE_CHARGE_BEAM", - "57": "MOVE_LOCK_ON", - "65": "MOVE_ZAP_CANNON", - "73": [ - "MOVE_IRON_HEAD", - "MOVE_FLASH_CANNON" - ], - "81": "MOVE_HAMMER_ARM", - "89": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -124,9 +109,10 @@ "MOVE_MAGNET_RISE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 19, @@ -141,7 +127,7 @@ "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émon" + "category": "Iron Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/relicanth/data.json b/res/pokemon/relicanth/data.json index 517c87c1ec..92ffee7935 100644 --- a/res/pokemon/relicanth/data.json +++ b/res/pokemon/relicanth/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 65 }, - "types": [ - "TYPE_WATER", - "TYPE_ROCK" - ], + "types": [ "TYPE_WATER", "TYPE_ROCK" ], "catch_rate": 25, "base_exp_reward": 198, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 8, "MOVE_WATER_GUN" ], + [ 15, "MOVE_ROCK_TOMB" ], + [ 22, "MOVE_YAWN" ], + [ 29, "MOVE_TAKE_DOWN" ], + [ 36, "MOVE_MUD_SPORT" ], + [ 43, "MOVE_ANCIENT_POWER" ], + [ 50, "MOVE_DOUBLE_EDGE" ], + [ 57, "MOVE_DIVE" ], + [ 64, "MOVE_REST" ], + [ 71, "MOVE_HYDRO_PUMP" ], + [ 78, "MOVE_HEAD_SMASH" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -83,24 +89,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HARDEN" - ], - "8": "MOVE_WATER_GUN", - "15": "MOVE_ROCK_TOMB", - "22": "MOVE_YAWN", - "29": "MOVE_TAKE_DOWN", - "36": "MOVE_MUD_SPORT", - "43": "MOVE_ANCIENT_POWER", - "50": "MOVE_DOUBLE_EDGE", - "57": "MOVE_DIVE", - "64": "MOVE_REST", - "71": "MOVE_HYDRO_PUMP", - "78": "MOVE_HEAD_SMASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -111,9 +100,10 @@ "MOVE_BOUNCE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 10, @@ -127,8 +117,8 @@ "pokemon_pos_f": 65529, "trainer_pos_m": 9, "pokemon_pos_m": 65529, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/remoraid/data.json b/res/pokemon/remoraid/data.json index cc68264523..7b4c3d51d3 100644 --- a/res/pokemon/remoraid/data.json +++ b/res/pokemon/remoraid/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 35 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 78, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_HUSTLE", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_GUN" ], + [ 6, "MOVE_LOCK_ON" ], + [ 10, "MOVE_PSYBEAM" ], + [ 14, "MOVE_AURORA_BEAM" ], + [ 19, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_FOCUS_ENERGY" ], + [ 27, "MOVE_BULLET_SEED" ], + [ 32, "MOVE_WATER_PULSE" ], + [ 36, "MOVE_SIGNAL_BEAM" ], + [ 40, "MOVE_ICE_BEAM" ], + [ 45, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM03", "TM06", "TM09", @@ -78,20 +82,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_WATER_GUN", - "6": "MOVE_LOCK_ON", - "10": "MOVE_PSYBEAM", - "14": "MOVE_AURORA_BEAM", - "19": "MOVE_BUBBLE_BEAM", - "23": "MOVE_FOCUS_ENERGY", - "27": "MOVE_BULLET_SEED", - "32": "MOVE_WATER_PULSE", - "36": "MOVE_SIGNAL_BEAM", - "40": "MOVE_ICE_BEAM", - "45": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -111,8 +102,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -127,7 +118,7 @@ "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émon" + "category": "Jet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -136,4 +127,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/rhydon/data.json b/res/pokemon/rhydon/data.json index e70e8b1ae3..dcd38df3c1 100644 --- a/res/pokemon/rhydon/data.json +++ b/res/pokemon/rhydon/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 45 }, - "types": [ - "TYPE_GROUND", - "TYPE_ROCK" - ], + "types": [ "TYPE_GROUND", "TYPE_ROCK" ], "catch_rate": 60, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_LIGHTNING_ROD", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HORN_ATTACK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_STOMP" ], + [ 1, "MOVE_FURY_ATTACK" ], + [ 9, "MOVE_STOMP" ], + [ 13, "MOVE_FURY_ATTACK" ], + [ 21, "MOVE_SCARY_FACE" ], + [ 25, "MOVE_ROCK_BLAST" ], + [ 33, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_HORN_DRILL" ], + [ 42, "MOVE_HAMMER_ARM" ], + [ 45, "MOVE_STONE_EDGE" ], + [ 49, "MOVE_EARTHQUAKE" ], + [ 57, "MOVE_MEGAHORN" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -99,25 +106,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_HORN_ATTACK", - "MOVE_TAIL_WHIP", - "MOVE_STOMP", - "MOVE_FURY_ATTACK" - ], - "9": "MOVE_STOMP", - "13": "MOVE_FURY_ATTACK", - "21": "MOVE_SCARY_FACE", - "25": "MOVE_ROCK_BLAST", - "33": "MOVE_TAKE_DOWN", - "37": "MOVE_HORN_DRILL", - "42": "MOVE_HAMMER_ARM", - "45": "MOVE_STONE_EDGE", - "49": "MOVE_EARTHQUAKE", - "57": "MOVE_MEGAHORN" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -144,8 +133,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 19, @@ -160,7 +149,7 @@ "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émon" + "category": "Drill Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -169,4 +158,4 @@ "rarity": 20, "unused": 2824 } -} +} \ No newline at end of file diff --git a/res/pokemon/rhyhorn/data.json b/res/pokemon/rhyhorn/data.json index 7b7fa3fb23..16dee71bf4 100644 --- a/res/pokemon/rhyhorn/data.json +++ b/res/pokemon/rhyhorn/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_GROUND", - "TYPE_ROCK" - ], + "types": [ "TYPE_GROUND", "TYPE_ROCK" ], "catch_rate": 120, "base_exp_reward": 135, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_LIGHTNING_ROD", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HORN_ATTACK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_STOMP" ], + [ 13, "MOVE_FURY_ATTACK" ], + [ 21, "MOVE_SCARY_FACE" ], + [ 25, "MOVE_ROCK_BLAST" ], + [ 33, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_HORN_DRILL" ], + [ 45, "MOVE_STONE_EDGE" ], + [ 49, "MOVE_EARTHQUAKE" ], + [ 57, "MOVE_MEGAHORN" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -89,22 +93,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_HORN_ATTACK", - "MOVE_TAIL_WHIP" - ], - "9": "MOVE_STOMP", - "13": "MOVE_FURY_ATTACK", - "21": "MOVE_SCARY_FACE", - "25": "MOVE_ROCK_BLAST", - "33": "MOVE_TAKE_DOWN", - "37": "MOVE_HORN_DRILL", - "45": "MOVE_STONE_EDGE", - "49": "MOVE_EARTHQUAKE", - "57": "MOVE_MEGAHORN" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -126,8 +115,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -142,7 +131,7 @@ "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émon" + "category": "Spikes Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -151,4 +140,4 @@ "rarity": 30, "unused": 2824 } -} +} \ No newline at end of file diff --git a/res/pokemon/rhyperior/data.json b/res/pokemon/rhyperior/data.json index b6540950ad..829c5f58cc 100644 --- a/res/pokemon/rhyperior/data.json +++ b/res/pokemon/rhyperior/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_GROUND", - "TYPE_ROCK" - ], + "types": [ "TYPE_GROUND", "TYPE_ROCK" ], "catch_rate": 30, "base_exp_reward": 217, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_LIGHTNING_ROD", - "ABILITY_SOLID_ROCK" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_JAB" ], + [ 1, "MOVE_HORN_ATTACK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_STOMP" ], + [ 1, "MOVE_FURY_ATTACK" ], + [ 9, "MOVE_STOMP" ], + [ 13, "MOVE_FURY_ATTACK" ], + [ 21, "MOVE_SCARY_FACE" ], + [ 25, "MOVE_ROCK_BLAST" ], + [ 33, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_HORN_DRILL" ], + [ 42, "MOVE_HAMMER_ARM" ], + [ 45, "MOVE_STONE_EDGE" ], + [ 49, "MOVE_EARTHQUAKE" ], + [ 57, "MOVE_MEGAHORN" ], + [ 61, "MOVE_ROCK_WRECKER" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -100,27 +109,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_POISON_JAB", - "MOVE_HORN_ATTACK", - "MOVE_TAIL_WHIP", - "MOVE_STOMP", - "MOVE_FURY_ATTACK" - ], - "9": "MOVE_STOMP", - "13": "MOVE_FURY_ATTACK", - "21": "MOVE_SCARY_FACE", - "25": "MOVE_ROCK_BLAST", - "33": "MOVE_TAKE_DOWN", - "37": "MOVE_HORN_DRILL", - "42": "MOVE_HAMMER_ARM", - "45": "MOVE_STONE_EDGE", - "49": "MOVE_EARTHQUAKE", - "57": "MOVE_MEGAHORN", - "61": "MOVE_ROCK_WRECKER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -140,9 +129,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 24, @@ -157,7 +147,7 @@ "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émon" + "category": "Drill Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/riolu/data.json b/res/pokemon/riolu/data.json index d7fd6e0338..6b5efae937 100644 --- a/res/pokemon/riolu/data.json +++ b/res/pokemon/riolu/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 40 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 75, "base_exp_reward": 72, "ev_yields": { @@ -30,21 +27,26 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_STEADFAST", - "ABILITY_INNER_FOCUS" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_STEADFAST", "ABILITY_INNER_FOCUS" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_FORESIGHT" ], + [ 1, "MOVE_ENDURE" ], + [ 6, "MOVE_COUNTER" ], + [ 11, "MOVE_FORCE_PALM" ], + [ 15, "MOVE_FEINT" ], + [ 19, "MOVE_REVERSAL" ], + [ 24, "MOVE_SCREECH" ], + [ 29, "MOVE_COPYCAT" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -82,20 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_QUICK_ATTACK", - "MOVE_FORESIGHT", - "MOVE_ENDURE" - ], - "6": "MOVE_COUNTER", - "11": "MOVE_FORCE_PALM", - "15": "MOVE_FEINT", - "19": "MOVE_REVERSAL", - "24": "MOVE_SCREECH", - "29": "MOVE_COPYCAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -110,14 +99,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS_DAY", - "SPECIES_LUCARIO" - ] + [ "EVO_LEVEL_HAPPINESS_DAY", "SPECIES_LUCARIO" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -132,7 +118,7 @@ "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émon" + "category": "Emanation Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -141,4 +127,4 @@ "rarity": 20, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/roselia/data.json b/res/pokemon/roselia/data.json index 41b84d682c..a75875092c 100644 --- a/res/pokemon/roselia/data.json +++ b/res/pokemon/roselia/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 80 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 150, "base_exp_reward": 152, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_POISON_POINT" - ], - "great_marsh_flee_rate": 60, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 4, "MOVE_GROWTH" ], + [ 7, "MOVE_POISON_STING" ], + [ 10, "MOVE_STUN_SPORE" ], + [ 13, "MOVE_MEGA_DRAIN" ], + [ 16, "MOVE_LEECH_SEED" ], + [ 19, "MOVE_MAGICAL_LEAF" ], + [ 22, "MOVE_GRASS_WHISTLE" ], + [ 25, "MOVE_GIGA_DRAIN" ], + [ 28, "MOVE_TOXIC_SPIKES" ], + [ 31, "MOVE_SWEET_SCENT" ], + [ 34, "MOVE_INGRAIN" ], + [ 37, "MOVE_TOXIC" ], + [ 40, "MOVE_PETAL_DANCE" ], + [ 43, "MOVE_AROMATHERAPY" ], + [ 46, "MOVE_SYNTHESIS" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -76,25 +85,7 @@ "TM90", "HM01" ], - "level_up": { - "1": "MOVE_ABSORB", - "4": "MOVE_GROWTH", - "7": "MOVE_POISON_STING", - "10": "MOVE_STUN_SPORE", - "13": "MOVE_MEGA_DRAIN", - "16": "MOVE_LEECH_SEED", - "19": "MOVE_MAGICAL_LEAF", - "22": "MOVE_GRASS_WHISTLE", - "25": "MOVE_GIGA_DRAIN", - "28": "MOVE_TOXIC_SPIKES", - "31": "MOVE_SWEET_SCENT", - "34": "MOVE_INGRAIN", - "37": "MOVE_TOXIC", - "40": "MOVE_PETAL_DANCE", - "43": "MOVE_AROMATHERAPY", - "46": "MOVE_SYNTHESIS" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -111,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -126,8 +117,8 @@ "pokemon_pos_f": 29, "trainer_pos_m": 9, "pokemon_pos_m": 29, - "entry_text": "The more healthy the ROSELIA, the\nmore pleasant its flowers’ aroma.\nIts scent deeply relaxes people.", - "category": "Thorn Pokémon" + "entry_text": "The more healthy the ROSELIA, the\nmore pleasant its flowers\u2019 aroma.\nIts scent deeply relaxes people.", + "category": "Thorn Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/roserade/data.json b/res/pokemon/roserade/data.json index d70e234e04..fb2c180630 100644 --- a/res/pokemon/roserade/data.json +++ b/res/pokemon/roserade/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 105 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 75, "base_exp_reward": 204, "ev_yields": { @@ -30,21 +27,22 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_POISON_POINT" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WEATHER_BALL" ], + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_MEGA_DRAIN" ], + [ 1, "MOVE_MAGICAL_LEAF" ], + [ 1, "MOVE_SWEET_SCENT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -78,16 +76,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_WEATHER_BALL", - "MOVE_POISON_STING", - "MOVE_MEGA_DRAIN", - "MOVE_MAGICAL_LEAF", - "MOVE_SWEET_SCENT" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -96,9 +85,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 9, @@ -113,7 +103,7 @@ "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émon" + "category": "Bouquet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/rotom/data.json b/res/pokemon/rotom/data.json index d632b3a557..151c13019a 100644 --- a/res/pokemon/rotom/data.json +++ b/res/pokemon/rotom/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 77 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_GHOST" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 8, "MOVE_UPROAR" ], + [ 15, "MOVE_DOUBLE_TEAM" ], + [ 22, "MOVE_SHOCK_WAVE" ], + [ 29, "MOVE_OMINOUS_WIND" ], + [ 36, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_CHARGE" ], + [ 50, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TRICK", - "MOVE_ASTONISH", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER_SHOCK", - "MOVE_CONFUSE_RAY" - ], - "8": "MOVE_UPROAR", - "15": "MOVE_DOUBLE_TEAM", - "22": "MOVE_SHOCK_WAVE", - "29": "MOVE_OMINOUS_WIND", - "36": "MOVE_SUBSTITUTE", - "43": "MOVE_CHARGE", - "50": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -105,9 +94,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -122,7 +112,7 @@ "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émon" + "category": "Plasma Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/rotom/forms/fan/data.json b/res/pokemon/rotom/forms/fan/data.json index cf5918ebcf..3b3a0a7d07 100644 --- a/res/pokemon/rotom/forms/fan/data.json +++ b/res/pokemon/rotom/forms/fan/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 107 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_GHOST" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 8, "MOVE_UPROAR" ], + [ 15, "MOVE_DOUBLE_TEAM" ], + [ 22, "MOVE_SHOCK_WAVE" ], + [ 29, "MOVE_OMINOUS_WIND" ], + [ 36, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_CHARGE" ], + [ 50, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TRICK", - "MOVE_ASTONISH", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER_SHOCK", - "MOVE_CONFUSE_RAY" - ], - "8": "MOVE_UPROAR", - "15": "MOVE_DOUBLE_TEAM", - "22": "MOVE_SHOCK_WAVE", - "29": "MOVE_OMINOUS_WIND", - "36": "MOVE_SUBSTITUTE", - "43": "MOVE_CHARGE", - "50": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -104,5 +93,6 @@ "MOVE_SWIFT", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/rotom/forms/frost/data.json b/res/pokemon/rotom/forms/frost/data.json index cf5918ebcf..3b3a0a7d07 100644 --- a/res/pokemon/rotom/forms/frost/data.json +++ b/res/pokemon/rotom/forms/frost/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 107 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_GHOST" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 8, "MOVE_UPROAR" ], + [ 15, "MOVE_DOUBLE_TEAM" ], + [ 22, "MOVE_SHOCK_WAVE" ], + [ 29, "MOVE_OMINOUS_WIND" ], + [ 36, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_CHARGE" ], + [ 50, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TRICK", - "MOVE_ASTONISH", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER_SHOCK", - "MOVE_CONFUSE_RAY" - ], - "8": "MOVE_UPROAR", - "15": "MOVE_DOUBLE_TEAM", - "22": "MOVE_SHOCK_WAVE", - "29": "MOVE_OMINOUS_WIND", - "36": "MOVE_SUBSTITUTE", - "43": "MOVE_CHARGE", - "50": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -104,5 +93,6 @@ "MOVE_SWIFT", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/rotom/forms/heat/data.json b/res/pokemon/rotom/forms/heat/data.json index cf5918ebcf..3b3a0a7d07 100644 --- a/res/pokemon/rotom/forms/heat/data.json +++ b/res/pokemon/rotom/forms/heat/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 107 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_GHOST" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 8, "MOVE_UPROAR" ], + [ 15, "MOVE_DOUBLE_TEAM" ], + [ 22, "MOVE_SHOCK_WAVE" ], + [ 29, "MOVE_OMINOUS_WIND" ], + [ 36, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_CHARGE" ], + [ 50, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TRICK", - "MOVE_ASTONISH", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER_SHOCK", - "MOVE_CONFUSE_RAY" - ], - "8": "MOVE_UPROAR", - "15": "MOVE_DOUBLE_TEAM", - "22": "MOVE_SHOCK_WAVE", - "29": "MOVE_OMINOUS_WIND", - "36": "MOVE_SUBSTITUTE", - "43": "MOVE_CHARGE", - "50": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -104,5 +93,6 @@ "MOVE_SWIFT", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/rotom/forms/mow/data.json b/res/pokemon/rotom/forms/mow/data.json index cf5918ebcf..3b3a0a7d07 100644 --- a/res/pokemon/rotom/forms/mow/data.json +++ b/res/pokemon/rotom/forms/mow/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 107 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_GHOST" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 8, "MOVE_UPROAR" ], + [ 15, "MOVE_DOUBLE_TEAM" ], + [ 22, "MOVE_SHOCK_WAVE" ], + [ 29, "MOVE_OMINOUS_WIND" ], + [ 36, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_CHARGE" ], + [ 50, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TRICK", - "MOVE_ASTONISH", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER_SHOCK", - "MOVE_CONFUSE_RAY" - ], - "8": "MOVE_UPROAR", - "15": "MOVE_DOUBLE_TEAM", - "22": "MOVE_SHOCK_WAVE", - "29": "MOVE_OMINOUS_WIND", - "36": "MOVE_SUBSTITUTE", - "43": "MOVE_CHARGE", - "50": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -104,5 +93,6 @@ "MOVE_SWIFT", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/rotom/forms/wash/data.json b/res/pokemon/rotom/forms/wash/data.json index cf5918ebcf..3b3a0a7d07 100644 --- a/res/pokemon/rotom/forms/wash/data.json +++ b/res/pokemon/rotom/forms/wash/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 107 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_GHOST" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TRICK" ], + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_THUNDER_WAVE" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 8, "MOVE_UPROAR" ], + [ 15, "MOVE_DOUBLE_TEAM" ], + [ 22, "MOVE_SHOCK_WAVE" ], + [ 29, "MOVE_OMINOUS_WIND" ], + [ 36, "MOVE_SUBSTITUTE" ], + [ 43, "MOVE_CHARGE" ], + [ 50, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TRICK", - "MOVE_ASTONISH", - "MOVE_THUNDER_WAVE", - "MOVE_THUNDER_SHOCK", - "MOVE_CONFUSE_RAY" - ], - "8": "MOVE_UPROAR", - "15": "MOVE_DOUBLE_TEAM", - "22": "MOVE_SHOCK_WAVE", - "29": "MOVE_OMINOUS_WIND", - "36": "MOVE_SUBSTITUTE", - "43": "MOVE_CHARGE", - "50": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -104,5 +93,6 @@ "MOVE_SWIFT", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/sableye/data.json b/res/pokemon/sableye/data.json index fc837af255..69602f5853 100644 --- a/res/pokemon/sableye/data.json +++ b/res/pokemon/sableye/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 65 }, - "types": [ - "TYPE_DARK", - "TYPE_GHOST" - ], + "types": [ "TYPE_DARK", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 98, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_STALL" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_SCRATCH" ], + [ 4, "MOVE_FORESIGHT" ], + [ 8, "MOVE_NIGHT_SHADE" ], + [ 11, "MOVE_ASTONISH" ], + [ 15, "MOVE_FURY_SWIPES" ], + [ 18, "MOVE_FAKE_OUT" ], + [ 22, "MOVE_DETECT" ], + [ 25, "MOVE_SHADOW_SNEAK" ], + [ 29, "MOVE_KNOCK_OFF" ], + [ 32, "MOVE_FAINT_ATTACK" ], + [ 36, "MOVE_PUNISHMENT" ], + [ 39, "MOVE_SHADOW_CLAW" ], + [ 43, "MOVE_POWER_GEM" ], + [ 46, "MOVE_CONFUSE_RAY" ], + [ 50, "MOVE_ZEN_HEADBUTT" ], + [ 53, "MOVE_SHADOW_BALL" ], + [ 57, "MOVE_MEAN_LOOK" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -90,29 +101,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_SCRATCH" - ], - "4": "MOVE_FORESIGHT", - "8": "MOVE_NIGHT_SHADE", - "11": "MOVE_ASTONISH", - "15": "MOVE_FURY_SWIPES", - "18": "MOVE_FAKE_OUT", - "22": "MOVE_DETECT", - "25": "MOVE_SHADOW_SNEAK", - "29": "MOVE_KNOCK_OFF", - "32": "MOVE_FAINT_ATTACK", - "36": "MOVE_PUNISHMENT", - "39": "MOVE_SHADOW_CLAW", - "43": "MOVE_POWER_GEM", - "46": "MOVE_CONFUSE_RAY", - "50": "MOVE_ZEN_HEADBUTT", - "53": "MOVE_SHADOW_BALL", - "57": "MOVE_MEAN_LOOK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -129,9 +118,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -146,7 +136,7 @@ "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émon" + "category": "Darkness Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/salamence/data.json b/res/pokemon/salamence/data.json index c551ee14ac..49c612eee1 100644 --- a/res/pokemon/salamence/data.json +++ b/res/pokemon/salamence/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 80 }, - "types": [ - "TYPE_DRAGON", - "TYPE_FLYING" - ], + "types": [ "TYPE_DRAGON", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 218, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_DRAGON", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_DRAGON", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_RAGE" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_HEADBUTT" ], + [ 5, "MOVE_BITE" ], + [ 10, "MOVE_LEER" ], + [ 16, "MOVE_HEADBUTT" ], + [ 20, "MOVE_FOCUS_ENERGY" ], + [ 25, "MOVE_EMBER" ], + [ 30, "MOVE_PROTECT" ], + [ 32, "MOVE_DRAGON_BREATH" ], + [ 37, "MOVE_ZEN_HEADBUTT" ], + [ 43, "MOVE_SCARY_FACE" ], + [ 50, "MOVE_FLY" ], + [ 53, "MOVE_CRUNCH" ], + [ 61, "MOVE_DRAGON_CLAW" ], + [ 70, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -86,30 +98,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_RAGE", - "MOVE_BITE", - "MOVE_LEER", - "MOVE_HEADBUTT" - ], - "5": "MOVE_BITE", - "10": "MOVE_LEER", - "16": "MOVE_HEADBUTT", - "20": "MOVE_FOCUS_ENERGY", - "25": "MOVE_EMBER", - "30": "MOVE_PROTECT", - "32": "MOVE_DRAGON_BREATH", - "37": "MOVE_ZEN_HEADBUTT", - "43": "MOVE_SCARY_FACE", - "50": "MOVE_FLY", - "53": "MOVE_CRUNCH", - "61": "MOVE_DRAGON_CLAW", - "70": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -124,9 +113,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -141,7 +131,7 @@ "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émon" + "category": "Dragon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/sandshrew/data.json b/res/pokemon/sandshrew/data.json index 317e9aa768..05372b98be 100644 --- a/res/pokemon/sandshrew/data.json +++ b/res/pokemon/sandshrew/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 30 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 93, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 3, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_POISON_STING" ], + [ 13, "MOVE_RAPID_SPIN" ], + [ 15, "MOVE_SWIFT" ], + [ 19, "MOVE_FURY_SWIPES" ], + [ 21, "MOVE_ROLLOUT" ], + [ 25, "MOVE_FURY_CUTTER" ], + [ 27, "MOVE_SAND_TOMB" ], + [ 31, "MOVE_SLASH" ], + [ 33, "MOVE_GYRO_BALL" ], + [ 37, "MOVE_SANDSTORM" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -84,22 +90,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_SCRATCH", - "3": "MOVE_DEFENSE_CURL", - "7": "MOVE_SAND_ATTACK", - "9": "MOVE_POISON_STING", - "13": "MOVE_RAPID_SPIN", - "15": "MOVE_SWIFT", - "19": "MOVE_FURY_SWIPES", - "21": "MOVE_ROLLOUT", - "25": "MOVE_FURY_CUTTER", - "27": "MOVE_SAND_TOMB", - "31": "MOVE_SLASH", - "33": "MOVE_GYRO_BALL", - "37": "MOVE_SANDSTORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -117,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -133,7 +124,7 @@ "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émon" + "category": "Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -142,4 +133,4 @@ "rarity": 30, "unused": 2056 } -} +} \ No newline at end of file diff --git a/res/pokemon/sandslash/data.json b/res/pokemon/sandslash/data.json index e9242638d4..1e96c5633e 100644 --- a/res/pokemon/sandslash/data.json +++ b/res/pokemon/sandslash/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 55 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 90, "base_exp_reward": 163, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SAND_VEIL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SAND_VEIL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 3, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_POISON_STING" ], + [ 13, "MOVE_RAPID_SPIN" ], + [ 15, "MOVE_SWIFT" ], + [ 19, "MOVE_FURY_SWIPES" ], + [ 21, "MOVE_ROLLOUT" ], + [ 22, "MOVE_CRUSH_CLAW" ], + [ 28, "MOVE_FURY_CUTTER" ], + [ 33, "MOVE_SAND_TOMB" ], + [ 40, "MOVE_SLASH" ], + [ 45, "MOVE_GYRO_BALL" ], + [ 52, "MOVE_SANDSTORM" ] + ], + "by_tm": [ "TM01", "TM06", "TM10", @@ -88,27 +97,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_DEFENSE_CURL", - "MOVE_SAND_ATTACK" - ], - "3": "MOVE_DEFENSE_CURL", - "7": "MOVE_SAND_ATTACK", - "9": "MOVE_POISON_STING", - "13": "MOVE_RAPID_SPIN", - "15": "MOVE_SWIFT", - "19": "MOVE_FURY_SWIPES", - "21": "MOVE_ROLLOUT", - "22": "MOVE_CRUSH_CLAW", - "28": "MOVE_FURY_CUTTER", - "33": "MOVE_SAND_TOMB", - "40": "MOVE_SLASH", - "45": "MOVE_GYRO_BALL", - "52": "MOVE_SANDSTORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -118,9 +107,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -135,7 +125,7 @@ "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émon" + "category": "Mouse Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/sceptile/data.json b/res/pokemon/sceptile/data.json index cff77704a5..357f0c0812 100644 --- a/res/pokemon/sceptile/data.json +++ b/res/pokemon/sceptile/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 85 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 208, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_NIGHT_SLASH" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 6, "MOVE_ABSORB" ], + [ 11, "MOVE_QUICK_ATTACK" ], + [ 16, "MOVE_X_SCISSOR" ], + [ 17, "MOVE_PURSUIT" ], + [ 23, "MOVE_SCREECH" ], + [ 29, "MOVE_LEAF_BLADE" ], + [ 35, "MOVE_AGILITY" ], + [ 43, "MOVE_SLAM" ], + [ 51, "MOVE_DETECT" ], + [ 59, "MOVE_FALSE_SWIPE" ], + [ 67, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM01", "TM02", "TM05", @@ -93,27 +102,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_NIGHT_SLASH", - "MOVE_POUND", - "MOVE_LEER", - "MOVE_ABSORB", - "MOVE_QUICK_ATTACK" - ], - "6": "MOVE_ABSORB", - "11": "MOVE_QUICK_ATTACK", - "16": "MOVE_X_SCISSOR", - "17": "MOVE_PURSUIT", - "23": "MOVE_SCREECH", - "29": "MOVE_LEAF_BLADE", - "35": "MOVE_AGILITY", - "43": "MOVE_SLAM", - "51": "MOVE_DETECT", - "59": "MOVE_FALSE_SWIPE", - "67": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -125,9 +114,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -142,7 +132,7 @@ "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émon" + "category": "Forest Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/scizor/data.json b/res/pokemon/scizor/data.json index 6c9ffae20c..9063351a2d 100644 --- a/res/pokemon/scizor/data.json +++ b/res/pokemon/scizor/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 80 }, - "types": [ - "TYPE_BUG", - "TYPE_STEEL" - ], + "types": [ "TYPE_BUG", "TYPE_STEEL" ], "catch_rate": 25, "base_exp_reward": 200, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_TECHNICIAN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_TECHNICIAN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BULLET_PUNCH" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_FOCUS_ENERGY" ], + [ 9, "MOVE_PURSUIT" ], + [ 13, "MOVE_FALSE_SWIPE" ], + [ 17, "MOVE_AGILITY" ], + [ 21, "MOVE_METAL_CLAW" ], + [ 25, "MOVE_FURY_CUTTER" ], + [ 29, "MOVE_SLASH" ], + [ 33, "MOVE_RAZOR_WIND" ], + [ 37, "MOVE_IRON_DEFENSE" ], + [ 41, "MOVE_X_SCISSOR" ], + [ 45, "MOVE_NIGHT_SLASH" ], + [ 49, "MOVE_DOUBLE_HIT" ], + [ 53, "MOVE_IRON_HEAD" ], + [ 57, "MOVE_SWORDS_DANCE" ], + [ 61, "MOVE_FEINT" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -83,29 +94,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_BULLET_PUNCH", - "MOVE_QUICK_ATTACK", - "MOVE_LEER" - ], - "5": "MOVE_FOCUS_ENERGY", - "9": "MOVE_PURSUIT", - "13": "MOVE_FALSE_SWIPE", - "17": "MOVE_AGILITY", - "21": "MOVE_METAL_CLAW", - "25": "MOVE_FURY_CUTTER", - "29": "MOVE_SLASH", - "33": "MOVE_RAZOR_WIND", - "37": "MOVE_IRON_DEFENSE", - "41": "MOVE_X_SCISSOR", - "45": "MOVE_NIGHT_SLASH", - "49": "MOVE_DOUBLE_HIT", - "53": "MOVE_IRON_HEAD", - "57": "MOVE_SWORDS_DANCE", - "61": "MOVE_FEINT" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_SUPERPOWER", "MOVE_IRON_HEAD", @@ -116,9 +105,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 18, @@ -133,7 +123,7 @@ "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émon" + "category": "Pincer Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/scyther/data.json b/res/pokemon/scyther/data.json index 253193e43e..6602506f3d 100644 --- a/res/pokemon/scyther/data.json +++ b/res/pokemon/scyther/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 80 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 187, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_TECHNICIAN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_TECHNICIAN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_VACUUM_WAVE" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_FOCUS_ENERGY" ], + [ 9, "MOVE_PURSUIT" ], + [ 13, "MOVE_FALSE_SWIPE" ], + [ 17, "MOVE_AGILITY" ], + [ 21, "MOVE_WING_ATTACK" ], + [ 25, "MOVE_FURY_CUTTER" ], + [ 29, "MOVE_SLASH" ], + [ 33, "MOVE_RAZOR_WIND" ], + [ 37, "MOVE_DOUBLE_TEAM" ], + [ 41, "MOVE_X_SCISSOR" ], + [ 45, "MOVE_NIGHT_SLASH" ], + [ 49, "MOVE_DOUBLE_HIT" ], + [ 53, "MOVE_AIR_SLASH" ], + [ 57, "MOVE_SWORDS_DANCE" ], + [ 61, "MOVE_FEINT" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,29 +90,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_VACUUM_WAVE", - "MOVE_QUICK_ATTACK", - "MOVE_LEER" - ], - "5": "MOVE_FOCUS_ENERGY", - "9": "MOVE_PURSUIT", - "13": "MOVE_FALSE_SWIPE", - "17": "MOVE_AGILITY", - "21": "MOVE_WING_ATTACK", - "25": "MOVE_FURY_CUTTER", - "29": "MOVE_SLASH", - "33": "MOVE_RAZOR_WIND", - "37": "MOVE_DOUBLE_TEAM", - "41": "MOVE_X_SCISSOR", - "45": "MOVE_NIGHT_SLASH", - "49": "MOVE_DOUBLE_HIT", - "53": "MOVE_AIR_SLASH", - "57": "MOVE_SWORDS_DANCE", - "61": "MOVE_FEINT" - }, - "tutor": [ + "by_tutor": [ "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -133,7 +122,7 @@ "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émon" + "category": "Mantis Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -142,4 +131,4 @@ "rarity": 20, "unused": 4356 } -} +} \ No newline at end of file diff --git a/res/pokemon/seadra/data.json b/res/pokemon/seadra/data.json index e975d9452a..6f662186b5 100644 --- a/res/pokemon/seadra/data.json +++ b/res/pokemon/seadra/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 45 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 75, "base_exp_reward": 155, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_POISON_POINT", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_WATER_GUN" ], + [ 4, "MOVE_SMOKE_SCREEN" ], + [ 8, "MOVE_LEER" ], + [ 11, "MOVE_WATER_GUN" ], + [ 14, "MOVE_FOCUS_ENERGY" ], + [ 18, "MOVE_BUBBLE_BEAM" ], + [ 23, "MOVE_AGILITY" ], + [ 26, "MOVE_TWISTER" ], + [ 30, "MOVE_BRINE" ], + [ 40, "MOVE_HYDRO_PUMP" ], + [ 48, "MOVE_DRAGON_DANCE" ], + [ 57, "MOVE_DRAGON_PULSE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -74,26 +82,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_BUBBLE", - "MOVE_SMOKE_SCREEN", - "MOVE_LEER", - "MOVE_WATER_GUN" - ], - "4": "MOVE_SMOKE_SCREEN", - "8": "MOVE_LEER", - "11": "MOVE_WATER_GUN", - "14": "MOVE_FOCUS_ENERGY", - "18": "MOVE_BUBBLE_BEAM", - "23": "MOVE_AGILITY", - "26": "MOVE_TWISTER", - "30": "MOVE_BRINE", - "40": "MOVE_HYDRO_PUMP", - "48": "MOVE_DRAGON_DANCE", - "57": "MOVE_DRAGON_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -112,8 +101,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -128,7 +117,7 @@ "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émon" + "category": "Dragon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -137,4 +126,4 @@ "rarity": 20, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/seaking/data.json b/res/pokemon/seaking/data.json index 9682f8b9d8..24471357d6 100644 --- a/res/pokemon/seaking/data.json +++ b/res/pokemon/seaking/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 80 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 60, "base_exp_reward": 170, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_WATER_VEIL" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_JAB" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 7, "MOVE_SUPERSONIC" ], + [ 11, "MOVE_HORN_ATTACK" ], + [ 17, "MOVE_WATER_PULSE" ], + [ 21, "MOVE_FLAIL" ], + [ 27, "MOVE_AQUA_RING" ], + [ 31, "MOVE_FURY_ATTACK" ], + [ 40, "MOVE_WATERFALL" ], + [ 47, "MOVE_HORN_DRILL" ], + [ 56, "MOVE_AGILITY" ], + [ 63, "MOVE_MEGAHORN" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -72,26 +80,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_POISON_JAB", - "MOVE_PECK", - "MOVE_TAIL_WHIP", - "MOVE_WATER_SPORT", - "MOVE_SUPERSONIC" - ], - "7": "MOVE_SUPERSONIC", - "11": "MOVE_HORN_ATTACK", - "17": "MOVE_WATER_PULSE", - "21": "MOVE_FLAIL", - "27": "MOVE_AQUA_RING", - "31": "MOVE_FURY_ATTACK", - "40": "MOVE_WATERFALL", - "47": "MOVE_HORN_DRILL", - "56": "MOVE_AGILITY", - "63": "MOVE_MEGAHORN" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -103,9 +92,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 13, @@ -120,7 +110,7 @@ "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émon" + "category": "Goldfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/sealeo/data.json b/res/pokemon/sealeo/data.json index ca62b59b1b..21c399c197 100644 --- a/res/pokemon/sealeo/data.json +++ b/res/pokemon/sealeo/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 70 }, - "types": [ - "TYPE_ICE", - "TYPE_WATER" - ], + "types": [ "TYPE_ICE", "TYPE_WATER" ], "catch_rate": 120, "base_exp_reward": 128, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_ICE_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_ENCORE" ], + [ 7, "MOVE_ENCORE" ], + [ 13, "MOVE_ICE_BALL" ], + [ 19, "MOVE_BODY_SLAM" ], + [ 25, "MOVE_AURORA_BEAM" ], + [ 31, "MOVE_HAIL" ], + [ 32, "MOVE_SWAGGER" ], + [ 39, "MOVE_REST" ], + [ 39, "MOVE_SNORE" ], + [ 47, "MOVE_BLIZZARD" ], + [ 55, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -77,27 +84,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_POWDER_SNOW", - "MOVE_GROWL", - "MOVE_WATER_GUN", - "MOVE_ENCORE" - ], - "7": "MOVE_ENCORE", - "13": "MOVE_ICE_BALL", - "19": "MOVE_BODY_SLAM", - "25": "MOVE_AURORA_BEAM", - "31": "MOVE_HAIL", - "32": "MOVE_SWAGGER", - "39": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "47": "MOVE_BLIZZARD", - "55": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -115,8 +102,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 11, @@ -131,7 +118,7 @@ "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émon" + "category": "Ball Roll Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -140,4 +127,4 @@ "rarity": 20, "unused": 781 } -} +} \ No newline at end of file diff --git a/res/pokemon/seedot/data.json b/res/pokemon/seedot/data.json index e1a7e9087e..d24f710260 100644 --- a/res/pokemon/seedot/data.json +++ b/res/pokemon/seedot/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 255, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,24 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BIDE" ], + [ 3, "MOVE_HARDEN" ], + [ 7, "MOVE_GROWTH" ], + [ 13, "MOVE_NATURE_POWER" ], + [ 21, "MOVE_SYNTHESIS" ], + [ 31, "MOVE_SUNNY_DAY" ], + [ 43, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -74,16 +74,7 @@ "TM90", "HM06" ], - "level_up": { - "1": "MOVE_BIDE", - "3": "MOVE_HARDEN", - "7": "MOVE_GROWTH", - "13": "MOVE_NATURE_POWER", - "21": "MOVE_SYNTHESIS", - "31": "MOVE_SUNNY_DAY", - "43": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SPITE", @@ -99,8 +90,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -114,8 +105,8 @@ "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émon.", - "category": "Acorn Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -124,4 +115,4 @@ "rarity": 50, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/seel/data.json b/res/pokemon/seel/data.json index 2c4518b6f5..7c6422fdfa 100644 --- a/res/pokemon/seel/data.json +++ b/res/pokemon/seel/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 70 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 100, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_HYDRATION" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_HEADBUTT" ], + [ 3, "MOVE_GROWL" ], + [ 7, "MOVE_WATER_SPORT" ], + [ 11, "MOVE_ICY_WIND" ], + [ 13, "MOVE_ENCORE" ], + [ 17, "MOVE_ICE_SHARD" ], + [ 21, "MOVE_REST" ], + [ 23, "MOVE_AQUA_RING" ], + [ 27, "MOVE_AURORA_BEAM" ], + [ 31, "MOVE_AQUA_JET" ], + [ 33, "MOVE_BRINE" ], + [ 37, "MOVE_TAKE_DOWN" ], + [ 41, "MOVE_DIVE" ], + [ 43, "MOVE_AQUA_TAIL" ], + [ 47, "MOVE_ICE_BEAM" ], + [ 51, "MOVE_SAFEGUARD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -73,25 +82,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_HEADBUTT", - "3": "MOVE_GROWL", - "7": "MOVE_WATER_SPORT", - "11": "MOVE_ICY_WIND", - "13": "MOVE_ENCORE", - "17": "MOVE_ICE_SHARD", - "21": "MOVE_REST", - "23": "MOVE_AQUA_RING", - "27": "MOVE_AURORA_BEAM", - "31": "MOVE_AQUA_JET", - "33": "MOVE_BRINE", - "37": "MOVE_TAKE_DOWN", - "41": "MOVE_DIVE", - "43": "MOVE_AQUA_TAIL", - "47": "MOVE_ICE_BEAM", - "51": "MOVE_SAFEGUARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_AQUA_TAIL", @@ -107,8 +98,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 11, @@ -122,8 +113,8 @@ "pokemon_pos_f": 13, "trainer_pos_m": 9, "pokemon_pos_m": 13, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -132,4 +123,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/sentret/data.json b/res/pokemon/sentret/data.json index b7eadb9f71..baf5e20315 100644 --- a/res/pokemon/sentret/data.json +++ b/res/pokemon/sentret/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 45 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 57, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RUN_AWAY", - "ABILITY_KEEN_EYE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_FORESIGHT" ], + [ 4, "MOVE_DEFENSE_CURL" ], + [ 7, "MOVE_QUICK_ATTACK" ], + [ 13, "MOVE_FURY_SWIPES" ], + [ 16, "MOVE_HELPING_HAND" ], + [ 19, "MOVE_FOLLOW_ME" ], + [ 25, "MOVE_SLAM" ], + [ 28, "MOVE_REST" ], + [ 31, "MOVE_SUCKER_PUNCH" ], + [ 36, "MOVE_AMNESIA" ], + [ 39, "MOVE_BATON_PASS" ], + [ 42, "MOVE_ME_FIRST" ], + [ 47, "MOVE_HYPER_VOICE" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -83,25 +90,7 @@ "HM01", "HM03" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_FORESIGHT" - ], - "4": "MOVE_DEFENSE_CURL", - "7": "MOVE_QUICK_ATTACK", - "13": "MOVE_FURY_SWIPES", - "16": "MOVE_HELPING_HAND", - "19": "MOVE_FOLLOW_ME", - "25": "MOVE_SLAM", - "28": "MOVE_REST", - "31": "MOVE_SUCKER_PUNCH", - "36": "MOVE_AMNESIA", - "39": "MOVE_BATON_PASS", - "42": "MOVE_ME_FIRST", - "47": "MOVE_HYPER_VOICE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -126,8 +115,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 8, @@ -142,7 +131,7 @@ "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émon" + "category": "Scout Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -151,4 +140,4 @@ "rarity": 50, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/seviper/data.json b/res/pokemon/seviper/data.json index ffa56daf4f..5e1f3d066f 100644 --- a/res/pokemon/seviper/data.json +++ b/res/pokemon/seviper/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 60 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 90, "base_exp_reward": 165, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WRAP" ], + [ 7, "MOVE_LICK" ], + [ 10, "MOVE_BITE" ], + [ 16, "MOVE_POISON_TAIL" ], + [ 19, "MOVE_SCREECH" ], + [ 25, "MOVE_GLARE" ], + [ 28, "MOVE_CRUNCH" ], + [ 34, "MOVE_POISON_FANG" ], + [ 37, "MOVE_SWAGGER" ], + [ 43, "MOVE_HAZE" ], + [ 46, "MOVE_NIGHT_SLASH" ], + [ 52, "MOVE_POISON_JAB" ], + [ 55, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,22 +85,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_WRAP", - "7": "MOVE_LICK", - "10": "MOVE_BITE", - "16": "MOVE_POISON_TAIL", - "19": "MOVE_SCREECH", - "25": "MOVE_GLARE", - "28": "MOVE_CRUNCH", - "34": "MOVE_POISON_FANG", - "37": "MOVE_SWAGGER", - "43": "MOVE_HAZE", - "46": "MOVE_NIGHT_SLASH", - "52": "MOVE_POISON_JAB", - "55": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_AQUA_TAIL", @@ -104,9 +95,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 27, @@ -121,7 +113,7 @@ "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émon" + "category": "Fang Snake Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/sharpedo/data.json b/res/pokemon/sharpedo/data.json index 0dd663ddfe..24f04479f9 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 40 }, - "types": [ - "TYPE_WATER", - "TYPE_DARK" - ], + "types": [ "TYPE_WATER", "TYPE_DARK" ], "catch_rate": 60, "base_exp_reward": 175, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_ROUGH_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FEINT" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_RAGE" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 6, "MOVE_RAGE" ], + [ 8, "MOVE_FOCUS_ENERGY" ], + [ 11, "MOVE_SCARY_FACE" ], + [ 16, "MOVE_ICE_FANG" ], + [ 18, "MOVE_SCREECH" ], + [ 21, "MOVE_SWAGGER" ], + [ 26, "MOVE_ASSURANCE" ], + [ 28, "MOVE_CRUNCH" ], + [ 30, "MOVE_SLASH" ], + [ 34, "MOVE_AQUA_JET" ], + [ 40, "MOVE_TAUNT" ], + [ 45, "MOVE_AGILITY" ], + [ 50, "MOVE_SKULL_BASH" ], + [ 56, "MOVE_NIGHT_SLASH" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -84,30 +96,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_FEINT", - "MOVE_LEER", - "MOVE_BITE", - "MOVE_RAGE", - "MOVE_FOCUS_ENERGY" - ], - "6": "MOVE_RAGE", - "8": "MOVE_FOCUS_ENERGY", - "11": "MOVE_SCARY_FACE", - "16": "MOVE_ICE_FANG", - "18": "MOVE_SCREECH", - "21": "MOVE_SWAGGER", - "26": "MOVE_ASSURANCE", - "28": "MOVE_CRUNCH", - "30": "MOVE_SLASH", - "34": "MOVE_AQUA_JET", - "40": "MOVE_TAUNT", - "45": "MOVE_AGILITY", - "50": "MOVE_SKULL_BASH", - "56": "MOVE_NIGHT_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -121,9 +110,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 18, @@ -137,8 +127,8 @@ "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“The Bully of the Sea.”", - "category": "Brutal Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/shaymin/data.json b/res/pokemon/shaymin/data.json index 25c4933f69..43e6047346 100644 --- a/res/pokemon/shaymin/data.json +++ b/res/pokemon/shaymin/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWTH" ], + [ 10, "MOVE_MAGICAL_LEAF" ], + [ 19, "MOVE_LEECH_SEED" ], + [ 28, "MOVE_SYNTHESIS" ], + [ 37, "MOVE_SWEET_SCENT" ], + [ 46, "MOVE_NATURAL_GIFT" ], + [ 55, "MOVE_WORRY_SEED" ], + [ 64, "MOVE_AROMATHERAPY" ], + [ 73, "MOVE_ENERGY_BALL" ], + [ 82, "MOVE_SWEET_KISS" ], + [ 91, "MOVE_HEALING_WISH" ], + [ 100, "MOVE_SEED_FLARE" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,21 +78,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_GROWTH", - "10": "MOVE_MAGICAL_LEAF", - "19": "MOVE_LEECH_SEED", - "28": "MOVE_SYNTHESIS", - "37": "MOVE_SWEET_SCENT", - "46": "MOVE_NATURAL_GIFT", - "55": "MOVE_WORRY_SEED", - "64": "MOVE_AROMATHERAPY", - "73": "MOVE_ENERGY_BALL", - "82": "MOVE_SWEET_KISS", - "91": "MOVE_HEALING_WISH", - "100": "MOVE_SEED_FLARE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_ENDEAVOR", @@ -99,9 +90,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 2, @@ -116,7 +108,7 @@ "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émon" + "category": "Gratitude Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/shaymin/forms/sky/data.json b/res/pokemon/shaymin/forms/sky/data.json index 9314ce37d6..fcba4c4bcd 100644 --- a/res/pokemon/shaymin/forms/sky/data.json +++ b/res/pokemon/shaymin/forms/sky/data.json @@ -8,10 +8,7 @@ "special_attack": 120, "special_defense": 75 }, - "types": [ - "TYPE_GRASS", - "TYPE_FLYING" - ], + "types": [ "TYPE_GRASS", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 120, "base_friendship": 100, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SERENE_GRACE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_SERENE_GRACE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWTH" ], + [ 10, "MOVE_MAGICAL_LEAF" ], + [ 19, "MOVE_LEECH_SEED" ], + [ 28, "MOVE_QUICK_ATTACK" ], + [ 37, "MOVE_SWEET_SCENT" ], + [ 46, "MOVE_NATURAL_GIFT" ], + [ 55, "MOVE_WORRY_SEED" ], + [ 64, "MOVE_AIR_SLASH" ], + [ 73, "MOVE_ENERGY_BALL" ], + [ 82, "MOVE_SWEET_KISS" ], + [ 91, "MOVE_LEAF_STORM" ], + [ 100, "MOVE_SEED_FLARE" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,21 +78,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_GROWTH", - "10": "MOVE_MAGICAL_LEAF", - "19": "MOVE_LEECH_SEED", - "28": "MOVE_QUICK_ATTACK", - "37": "MOVE_SWEET_SCENT", - "46": "MOVE_NATURAL_GIFT", - "55": "MOVE_WORRY_SEED", - "64": "MOVE_AIR_SLASH", - "73": "MOVE_ENERGY_BALL", - "82": "MOVE_SWEET_KISS", - "91": "MOVE_LEAF_STORM", - "100": "MOVE_SEED_FLARE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -98,5 +89,6 @@ "MOVE_LAST_RESORT", "MOVE_SWIFT" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/shedinja/data.json b/res/pokemon/shedinja/data.json index 8f254e6378..c8b1ee4ac2 100644 --- a/res/pokemon/shedinja/data.json +++ b/res/pokemon/shedinja/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_BUG", - "TYPE_GHOST" - ], + "types": [ "TYPE_BUG", "TYPE_GHOST" ], "catch_rate": 45, "base_exp_reward": 95, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_WONDER_GUARD", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_WONDER_GUARD", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_HARDEN" ], + [ 5, "MOVE_LEECH_LIFE" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 14, "MOVE_FURY_SWIPES" ], + [ 19, "MOVE_MIND_READER" ], + [ 25, "MOVE_SPITE" ], + [ 31, "MOVE_CONFUSE_RAY" ], + [ 38, "MOVE_SHADOW_SNEAK" ], + [ 45, "MOVE_GRUDGE" ], + [ 52, "MOVE_HEAL_BLOCK" ], + [ 59, "MOVE_SHADOW_BALL" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,23 +82,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_HARDEN" - ], - "5": "MOVE_LEECH_LIFE", - "9": "MOVE_SAND_ATTACK", - "14": "MOVE_FURY_SWIPES", - "19": "MOVE_MIND_READER", - "25": "MOVE_SPITE", - "31": "MOVE_CONFUSE_RAY", - "38": "MOVE_SHADOW_SNEAK", - "45": "MOVE_GRUDGE", - "52": "MOVE_HEAL_BLOCK", - "59": "MOVE_SHADOW_BALL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -102,9 +91,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -118,8 +108,8 @@ "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’s spirit.", - "category": "Shed Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/shelgon/data.json b/res/pokemon/shelgon/data.json index 00fc4c05b0..0999d16113 100644 --- a/res/pokemon/shelgon/data.json +++ b/res/pokemon/shelgon/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 50 }, - "types": [ - "TYPE_DRAGON", - "TYPE_DRAGON" - ], + "types": [ "TYPE_DRAGON", "TYPE_DRAGON" ], "catch_rate": 45, "base_exp_reward": 144, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_DRAGON", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_DRAGON", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_RAGE" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_HEADBUTT" ], + [ 5, "MOVE_BITE" ], + [ 10, "MOVE_LEER" ], + [ 16, "MOVE_HEADBUTT" ], + [ 20, "MOVE_FOCUS_ENERGY" ], + [ 25, "MOVE_EMBER" ], + [ 30, "MOVE_PROTECT" ], + [ 32, "MOVE_DRAGON_BREATH" ], + [ 37, "MOVE_ZEN_HEADBUTT" ], + [ 43, "MOVE_SCARY_FACE" ], + [ 50, "MOVE_CRUNCH" ], + [ 55, "MOVE_DRAGON_CLAW" ], + [ 61, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM02", "TM05", "TM06", @@ -77,27 +86,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_RAGE", - "MOVE_BITE", - "MOVE_LEER", - "MOVE_HEADBUTT" - ], - "5": "MOVE_BITE", - "10": "MOVE_LEER", - "16": "MOVE_HEADBUTT", - "20": "MOVE_FOCUS_ENERGY", - "25": "MOVE_EMBER", - "30": "MOVE_PROTECT", - "32": "MOVE_DRAGON_BREATH", - "37": "MOVE_ZEN_HEADBUTT", - "43": "MOVE_SCARY_FACE", - "50": "MOVE_CRUNCH", - "55": "MOVE_DRAGON_CLAW", - "61": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -116,8 +105,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -132,7 +121,7 @@ "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émon" + "category": "Endurance Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -141,4 +130,4 @@ "rarity": 20, "unused": 3855 } -} +} \ No newline at end of file diff --git a/res/pokemon/shellder/data.json b/res/pokemon/shellder/data.json index 3a3cf4f933..d495c02efd 100644 --- a/res/pokemon/shellder/data.json +++ b/res/pokemon/shellder/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 25 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 97, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_SHELL_ARMOR", - "ABILITY_SKILL_LINK" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_WITHDRAW" ], + [ 8, "MOVE_SUPERSONIC" ], + [ 13, "MOVE_ICICLE_SPEAR" ], + [ 16, "MOVE_PROTECT" ], + [ 20, "MOVE_LEER" ], + [ 25, "MOVE_CLAMP" ], + [ 28, "MOVE_ICE_SHARD" ], + [ 32, "MOVE_AURORA_BEAM" ], + [ 37, "MOVE_WHIRLPOOL" ], + [ 40, "MOVE_IRON_DEFENSE" ], + [ 44, "MOVE_BRINE" ], + [ 49, "MOVE_ICE_BEAM" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -71,22 +77,7 @@ "TM90", "HM03" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_WITHDRAW", - "8": "MOVE_SUPERSONIC", - "13": "MOVE_ICICLE_SPEAR", - "16": "MOVE_PROTECT", - "20": "MOVE_LEER", - "25": "MOVE_CLAMP", - "28": "MOVE_ICE_SHARD", - "32": "MOVE_AURORA_BEAM", - "37": "MOVE_WHIRLPOOL", - "40": "MOVE_IRON_DEFENSE", - "44": "MOVE_BRINE", - "49": "MOVE_ICE_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -102,8 +93,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -118,7 +109,7 @@ "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émon" + "category": "Bivalve Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/shellos/data.json b/res/pokemon/shellos/data.json index 8a07df2bd6..6d43d7abc4 100644 --- a/res/pokemon/shellos/data.json +++ b/res/pokemon/shellos/data.json @@ -8,10 +8,7 @@ "special_attack": 57, "special_defense": 62 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 190, "base_exp_reward": 73, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_STICKY_HOLD", - "ABILITY_STORM_DRAIN" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MUD_SLAP" ], + [ 2, "MOVE_MUD_SPORT" ], + [ 4, "MOVE_HARDEN" ], + [ 7, "MOVE_WATER_PULSE" ], + [ 11, "MOVE_MUD_BOMB" ], + [ 16, "MOVE_HIDDEN_POWER" ], + [ 22, "MOVE_RAIN_DANCE" ], + [ 29, "MOVE_BODY_SLAM" ], + [ 37, "MOVE_MUDDY_WATER" ], + [ 46, "MOVE_RECOVER" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -69,19 +72,7 @@ "TM90", "HM03" ], - "level_up": { - "1": "MOVE_MUD_SLAP", - "2": "MOVE_MUD_SPORT", - "4": "MOVE_HARDEN", - "7": "MOVE_WATER_PULSE", - "11": "MOVE_MUD_BOMB", - "16": "MOVE_HIDDEN_POWER", - "22": "MOVE_RAIN_DANCE", - "29": "MOVE_BODY_SLAM", - "37": "MOVE_MUDDY_WATER", - "46": "MOVE_RECOVER" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -98,8 +89,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -114,7 +105,7 @@ "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émon" + "category": "Sea Slug Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -123,4 +114,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/shieldon/data.json b/res/pokemon/shieldon/data.json index 26abd45059..abc5c20ab5 100644 --- a/res/pokemon/shieldon/data.json +++ b/res/pokemon/shieldon/data.json @@ -8,10 +8,7 @@ "special_attack": 42, "special_defense": 88 }, - "types": [ - "TYPE_ROCK", - "TYPE_STEEL" - ], + "types": [ "TYPE_ROCK", "TYPE_STEEL" ], "catch_rate": 45, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_PROTECT" ], + [ 6, "MOVE_TAUNT" ], + [ 10, "MOVE_METAL_SOUND" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 19, "MOVE_IRON_DEFENSE" ], + [ 24, "MOVE_SWAGGER" ], + [ 28, "MOVE_ANCIENT_POWER" ], + [ 33, "MOVE_ENDURE" ], + [ 37, "MOVE_METAL_BURST" ], + [ 43, "MOVE_IRON_HEAD" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -86,22 +90,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_PROTECT" - ], - "6": "MOVE_TAUNT", - "10": "MOVE_METAL_SOUND", - "15": "MOVE_TAKE_DOWN", - "19": "MOVE_IRON_DEFENSE", - "24": "MOVE_SWAGGER", - "28": "MOVE_ANCIENT_POWER", - "33": "MOVE_ENDURE", - "37": "MOVE_METAL_BURST", - "43": "MOVE_IRON_HEAD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -135,7 +124,7 @@ "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émon" + "category": "Shield Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -144,4 +133,4 @@ "rarity": 20, "unused": 2827 } -} +} \ No newline at end of file diff --git a/res/pokemon/shiftry/data.json b/res/pokemon/shiftry/data.json index 9de889eff6..0fafabd012 100644 --- a/res/pokemon/shiftry/data.json +++ b/res/pokemon/shiftry/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 60 }, - "types": [ - "TYPE_GRASS", - "TYPE_DARK" - ], + "types": [ "TYPE_GRASS", "TYPE_DARK" ], "catch_rate": 45, "base_exp_reward": 181, "ev_yields": { @@ -30,21 +27,22 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FAINT_ATTACK" ], + [ 1, "MOVE_WHIRLWIND" ], + [ 1, "MOVE_NASTY_PLOT" ], + [ 1, "MOVE_RAZOR_LEAF" ], + [ 49, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -93,16 +91,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_FAINT_ATTACK", - "MOVE_WHIRLWIND", - "MOVE_NASTY_PLOT", - "MOVE_RAZOR_LEAF" - ], - "49": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -120,9 +109,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -137,7 +127,7 @@ "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émon" + "category": "Wicked Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/shinx/data.json b/res/pokemon/shinx/data.json index bddab1ea26..ffa6252e0b 100644 --- a/res/pokemon/shinx/data.json +++ b/res/pokemon/shinx/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 34 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 235, "base_exp_reward": 60, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_RIVALRY", - "ABILITY_INTIMIDATE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_RIVALRY", "ABILITY_INTIMIDATE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_LEER" ], + [ 9, "MOVE_CHARGE" ], + [ 13, "MOVE_SPARK" ], + [ 17, "MOVE_BITE" ], + [ 21, "MOVE_ROAR" ], + [ 25, "MOVE_SWAGGER" ], + [ 29, "MOVE_THUNDER_FANG" ], + [ 33, "MOVE_CRUNCH" ], + [ 37, "MOVE_SCARY_FACE" ], + [ 41, "MOVE_DISCHARGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -74,20 +78,7 @@ "TM90", "HM04" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_LEER", - "9": "MOVE_CHARGE", - "13": "MOVE_SPARK", - "17": "MOVE_BITE", - "21": "MOVE_ROAR", - "25": "MOVE_SWAGGER", - "29": "MOVE_THUNDER_FANG", - "33": "MOVE_CRUNCH", - "37": "MOVE_SCARY_FACE", - "41": "MOVE_DISCHARGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -104,8 +95,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -120,7 +111,7 @@ "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émon" + "category": "Flash Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -129,4 +120,4 @@ "rarity": 30, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/shroomish/data.json b/res/pokemon/shroomish/data.json index e77126fae3..e42dca712b 100644 --- a/res/pokemon/shroomish/data.json +++ b/res/pokemon/shroomish/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 60 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 255, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_EFFECT_SPORE", - "ABILITY_POISON_HEAL" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 5, "MOVE_TACKLE" ], + [ 9, "MOVE_STUN_SPORE" ], + [ 13, "MOVE_LEECH_SEED" ], + [ 17, "MOVE_MEGA_DRAIN" ], + [ 21, "MOVE_HEADBUTT" ], + [ 25, "MOVE_POISON_POWDER" ], + [ 29, "MOVE_WORRY_SEED" ], + [ 33, "MOVE_GROWTH" ], + [ 37, "MOVE_GIGA_DRAIN" ], + [ 41, "MOVE_SEED_BOMB" ], + [ 45, "MOVE_SPORE" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,21 +78,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_ABSORB", - "5": "MOVE_TACKLE", - "9": "MOVE_STUN_SPORE", - "13": "MOVE_LEECH_SEED", - "17": "MOVE_MEGA_DRAIN", - "21": "MOVE_HEADBUTT", - "25": "MOVE_POISON_POWDER", - "29": "MOVE_WORRY_SEED", - "33": "MOVE_GROWTH", - "37": "MOVE_GIGA_DRAIN", - "41": "MOVE_SEED_BOMB", - "45": "MOVE_SPORE" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_HELPING_HAND", "MOVE_SYNTHESIS", @@ -102,8 +93,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -118,7 +109,7 @@ "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émon" + "category": "Mushroom Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -127,4 +118,4 @@ "rarity": 30, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/shuckle/data.json b/res/pokemon/shuckle/data.json index 1cac496428..0e50f7f5ff 100644 --- a/res/pokemon/shuckle/data.json +++ b/res/pokemon/shuckle/data.json @@ -8,10 +8,7 @@ "special_attack": 10, "special_defense": 230 }, - "types": [ - "TYPE_BUG", - "TYPE_ROCK" - ], + "types": [ "TYPE_BUG", "TYPE_ROCK" ], "catch_rate": 190, "base_exp_reward": 80, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_GLUTTONY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_GLUTTONY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WITHDRAW" ], + [ 1, "MOVE_CONSTRICT" ], + [ 1, "MOVE_BIDE" ], + [ 9, "MOVE_ENCORE" ], + [ 14, "MOVE_SAFEGUARD" ], + [ 22, "MOVE_WRAP" ], + [ 27, "MOVE_REST" ], + [ 35, "MOVE_GASTRO_ACID" ], + [ 40, "MOVE_BUG_BITE" ], + [ 48, "MOVE_POWER_TRICK" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,21 +80,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_WITHDRAW", - "MOVE_CONSTRICT", - "MOVE_BIDE" - ], - "9": "MOVE_ENCORE", - "14": "MOVE_SAFEGUARD", - "22": "MOVE_WRAP", - "27": "MOVE_REST", - "35": "MOVE_GASTRO_ACID", - "40": "MOVE_BUG_BITE", - "48": "MOVE_POWER_TRICK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_GASTRO_ACID", @@ -101,9 +90,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -118,7 +108,7 @@ "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émon" + "category": "Mold Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/shuppet/data.json b/res/pokemon/shuppet/data.json index aba5563a7a..617aefa37f 100644 --- a/res/pokemon/shuppet/data.json +++ b/res/pokemon/shuppet/data.json @@ -8,10 +8,7 @@ "special_attack": 63, "special_defense": 33 }, - "types": [ - "TYPE_GHOST", - "TYPE_GHOST" - ], + "types": [ "TYPE_GHOST", "TYPE_GHOST" ], "catch_rate": 225, "base_exp_reward": 97, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 35, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_INSOMNIA", - "ABILITY_FRISK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_INSOMNIA", "ABILITY_FRISK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_KNOCK_OFF" ], + [ 5, "MOVE_SCREECH" ], + [ 8, "MOVE_NIGHT_SHADE" ], + [ 13, "MOVE_CURSE" ], + [ 16, "MOVE_SPITE" ], + [ 20, "MOVE_SHADOW_SNEAK" ], + [ 23, "MOVE_WILL_O_WISP" ], + [ 28, "MOVE_FAINT_ATTACK" ], + [ 31, "MOVE_SHADOW_BALL" ], + [ 35, "MOVE_SUCKER_PUNCH" ], + [ 38, "MOVE_EMBARGO" ], + [ 43, "MOVE_SNATCH" ], + [ 46, "MOVE_GRUDGE" ], + [ 50, "MOVE_TRICK" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -85,23 +92,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_KNOCK_OFF", - "5": "MOVE_SCREECH", - "8": "MOVE_NIGHT_SHADE", - "13": "MOVE_CURSE", - "16": "MOVE_SPITE", - "20": "MOVE_SHADOW_SNEAK", - "23": "MOVE_WILL_O_WISP", - "28": "MOVE_FAINT_ATTACK", - "31": "MOVE_SHADOW_BALL", - "35": "MOVE_SUCKER_PUNCH", - "38": "MOVE_EMBARGO", - "43": "MOVE_SNATCH", - "46": "MOVE_GRUDGE", - "50": "MOVE_TRICK" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", "MOVE_SPITE", @@ -118,8 +109,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -134,7 +125,7 @@ "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émon" + "category": "Puppet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -143,4 +134,4 @@ "rarity": 30, "unused": 3084 } -} +} \ No newline at end of file diff --git a/res/pokemon/silcoon/data.json b/res/pokemon/silcoon/data.json index bd6db0837e..8ca018ac01 100644 --- a/res/pokemon/silcoon/data.json +++ b/res/pokemon/silcoon/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 25 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 120, "base_exp_reward": 72, "ev_yields": { @@ -30,28 +27,20 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHED_SKIN", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHED_SKIN", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_HARDEN", - "7": "MOVE_HARDEN" - }, - "tutor": [ - "MOVE_IRON_DEFENSE" - ] + "by_level": [ + [ 1, "MOVE_HARDEN" ], + [ 7, "MOVE_HARDEN" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_IRON_DEFENSE" ] }, "evolutions": [ [ @@ -61,8 +50,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 6, @@ -77,7 +66,7 @@ "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émon" + "category": "Cocoon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -86,4 +75,4 @@ "rarity": 30, "unused": 1028 } -} +} \ No newline at end of file diff --git a/res/pokemon/skarmory/data.json b/res/pokemon/skarmory/data.json index a0911a76c5..732d4c5f14 100644 --- a/res/pokemon/skarmory/data.json +++ b/res/pokemon/skarmory/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 70 }, - "types": [ - "TYPE_STEEL", - "TYPE_FLYING" - ], + "types": [ "TYPE_STEEL", "TYPE_FLYING" ], "catch_rate": 25, "base_exp_reward": 168, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_PECK" ], + [ 6, "MOVE_SAND_ATTACK" ], + [ 9, "MOVE_SWIFT" ], + [ 12, "MOVE_AGILITY" ], + [ 17, "MOVE_FURY_ATTACK" ], + [ 20, "MOVE_FEINT" ], + [ 23, "MOVE_AIR_CUTTER" ], + [ 28, "MOVE_SPIKES" ], + [ 31, "MOVE_METAL_SOUND" ], + [ 34, "MOVE_STEEL_WING" ], + [ 39, "MOVE_AIR_SLASH" ], + [ 42, "MOVE_SLASH" ], + [ 45, "MOVE_NIGHT_SLASH" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -85,25 +92,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_PECK" - ], - "6": "MOVE_SAND_ATTACK", - "9": "MOVE_SWIFT", - "12": "MOVE_AGILITY", - "17": "MOVE_FURY_ATTACK", - "20": "MOVE_FEINT", - "23": "MOVE_AIR_CUTTER", - "28": "MOVE_SPIKES", - "31": "MOVE_METAL_SOUND", - "34": "MOVE_STEEL_WING", - "39": "MOVE_AIR_SLASH", - "42": "MOVE_SLASH", - "45": "MOVE_NIGHT_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -115,9 +104,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -132,7 +122,7 @@ "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émon" + "category": "Armor Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/skiploom/data.json b/res/pokemon/skiploom/data.json index 892c74fc96..a061298d65 100644 --- a/res/pokemon/skiploom/data.json +++ b/res/pokemon/skiploom/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 65 }, - "types": [ - "TYPE_GRASS", - "TYPE_FLYING" - ], + "types": [ "TYPE_GRASS", "TYPE_FLYING" ], "catch_rate": 120, "base_exp_reward": 136, "ev_yields": { @@ -30,21 +27,36 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_LEAF_GUARD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_SYNTHESIS" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_SYNTHESIS" ], + [ 7, "MOVE_TAIL_WHIP" ], + [ 10, "MOVE_TACKLE" ], + [ 12, "MOVE_POISON_POWDER" ], + [ 14, "MOVE_STUN_SPORE" ], + [ 16, "MOVE_SLEEP_POWDER" ], + [ 20, "MOVE_BULLET_SEED" ], + [ 24, "MOVE_LEECH_SEED" ], + [ 28, "MOVE_MEGA_DRAIN" ], + [ 32, "MOVE_COTTON_SPORE" ], + [ 36, "MOVE_U_TURN" ], + [ 40, "MOVE_WORRY_SEED" ], + [ 44, "MOVE_GIGA_DRAIN" ], + [ 48, "MOVE_BOUNCE" ], + [ 52, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,30 +85,7 @@ "TM89", "TM90" ], - "level_up": { - "1": [ - "MOVE_SPLASH", - "MOVE_SYNTHESIS", - "MOVE_TAIL_WHIP", - "MOVE_TACKLE" - ], - "4": "MOVE_SYNTHESIS", - "7": "MOVE_TAIL_WHIP", - "10": "MOVE_TACKLE", - "12": "MOVE_POISON_POWDER", - "14": "MOVE_STUN_SPORE", - "16": "MOVE_SLEEP_POWDER", - "20": "MOVE_BULLET_SEED", - "24": "MOVE_LEECH_SEED", - "28": "MOVE_MEGA_DRAIN", - "32": "MOVE_COTTON_SPORE", - "36": "MOVE_U_TURN", - "40": "MOVE_WORRY_SEED", - "44": "MOVE_GIGA_DRAIN", - "48": "MOVE_BOUNCE", - "52": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_HELPING_HAND", "MOVE_SYNTHESIS", @@ -112,8 +101,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -128,7 +117,7 @@ "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émon" + "category": "Cottonweed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -137,4 +126,4 @@ "rarity": 20, "unused": 4353 } -} +} \ No newline at end of file diff --git a/res/pokemon/skitty/data.json b/res/pokemon/skitty/data.json index eb475c5c9c..22d94d2504 100644 --- a/res/pokemon/skitty/data.json +++ b/res/pokemon/skitty/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_NORMALIZE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NORMALIZE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FAKE_OUT" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_FORESIGHT" ], + [ 8, "MOVE_ATTRACT" ], + [ 11, "MOVE_SING" ], + [ 15, "MOVE_DOUBLE_SLAP" ], + [ 18, "MOVE_COPYCAT" ], + [ 22, "MOVE_ASSIST" ], + [ 25, "MOVE_CHARM" ], + [ 29, "MOVE_FAINT_ATTACK" ], + [ 32, "MOVE_WAKE_UP_SLAP" ], + [ 36, "MOVE_COVET" ], + [ 39, "MOVE_HEAL_BELL" ], + [ 42, "MOVE_DOUBLE_EDGE" ], + [ 46, "MOVE_CAPTIVATE" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -83,28 +93,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_FAKE_OUT", - "MOVE_GROWL", - "MOVE_TAIL_WHIP", - "MOVE_TACKLE" - ], - "4": "MOVE_FORESIGHT", - "8": "MOVE_ATTRACT", - "11": "MOVE_SING", - "15": "MOVE_DOUBLE_SLAP", - "18": "MOVE_COPYCAT", - "22": "MOVE_ASSIST", - "25": "MOVE_CHARM", - "29": "MOVE_FAINT_ATTACK", - "32": "MOVE_WAKE_UP_SLAP", - "36": "MOVE_COVET", - "39": "MOVE_HEAL_BELL", - "42": "MOVE_DOUBLE_EDGE", - "46": "MOVE_CAPTIVATE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -124,8 +113,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -139,8 +128,8 @@ "pokemon_pos_f": 21, "trainer_pos_m": 9, "pokemon_pos_m": 21, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/skorupi/data.json b/res/pokemon/skorupi/data.json index 8e89ba064b..566abe3dbf 100644 --- a/res/pokemon/skorupi/data.json +++ b/res/pokemon/skorupi/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 55 }, - "types": [ - "TYPE_POISON", - "TYPE_BUG" - ], + "types": [ "TYPE_POISON", "TYPE_BUG" ], "catch_rate": 120, "base_exp_reward": 114, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_BATTLE_ARMOR", - "ABILITY_SNIPER" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_KNOCK_OFF" ], + [ 12, "MOVE_PIN_MISSILE" ], + [ 17, "MOVE_ACUPRESSURE" ], + [ 23, "MOVE_SCARY_FACE" ], + [ 28, "MOVE_TOXIC_SPIKES" ], + [ 34, "MOVE_BUG_BITE" ], + [ 39, "MOVE_POISON_FANG" ], + [ 45, "MOVE_CRUNCH" ], + [ 50, "MOVE_CROSS_POISON" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -85,23 +90,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_POISON_STING", - "MOVE_LEER" - ], - "6": "MOVE_KNOCK_OFF", - "12": "MOVE_PIN_MISSILE", - "17": "MOVE_ACUPRESSURE", - "23": "MOVE_SCARY_FACE", - "28": "MOVE_TOXIC_SPIKES", - "34": "MOVE_BUG_BITE", - "39": "MOVE_POISON_FANG", - "45": "MOVE_CRUNCH", - "50": "MOVE_CROSS_POISON" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_AQUA_TAIL", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 8, @@ -133,7 +122,7 @@ "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émon" + "category": "Scorpion Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -142,4 +131,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/skuntank/data.json b/res/pokemon/skuntank/data.json index 9f9465fe75..97df91817c 100644 --- a/res/pokemon/skuntank/data.json +++ b/res/pokemon/skuntank/data.json @@ -8,10 +8,7 @@ "special_attack": 71, "special_defense": 61 }, - "types": [ - "TYPE_POISON", - "TYPE_DARK" - ], + "types": [ "TYPE_POISON", "TYPE_DARK" ], "catch_rate": 60, "base_exp_reward": 209, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STENCH", - "ABILITY_AFTERMATH" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STENCH", "ABILITY_AFTERMATH" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_POISON_GAS" ], + [ 4, "MOVE_POISON_GAS" ], + [ 7, "MOVE_SCREECH" ], + [ 10, "MOVE_FURY_SWIPES" ], + [ 14, "MOVE_SMOKE_SCREEN" ], + [ 18, "MOVE_FEINT" ], + [ 22, "MOVE_SLASH" ], + [ 27, "MOVE_TOXIC" ], + [ 32, "MOVE_NIGHT_SLASH" ], + [ 34, "MOVE_FLAMETHROWER" ], + [ 42, "MOVE_MEMENTO" ], + [ 52, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -86,25 +93,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_FOCUS_ENERGY", - "MOVE_POISON_GAS" - ], - "4": "MOVE_POISON_GAS", - "7": "MOVE_SCREECH", - "10": "MOVE_FURY_SWIPES", - "14": "MOVE_SMOKE_SCREEN", - "18": "MOVE_FEINT", - "22": "MOVE_SLASH", - "27": "MOVE_TOXIC", - "32": "MOVE_NIGHT_SLASH", - "34": "MOVE_FLAMETHROWER", - "42": "MOVE_MEMENTO", - "52": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -112,9 +101,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -129,7 +119,7 @@ "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émon" + "category": "Skunk Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/slaking/data.json b/res/pokemon/slaking/data.json index e8bfc791a6..e81cbf9e9d 100644 --- a/res/pokemon/slaking/data.json +++ b/res/pokemon/slaking/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_TRUANT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_TRUANT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_ENCORE" ], + [ 1, "MOVE_SLACK_OFF" ], + [ 7, "MOVE_ENCORE" ], + [ 13, "MOVE_SLACK_OFF" ], + [ 19, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_AMNESIA" ], + [ 31, "MOVE_COVET" ], + [ 36, "MOVE_SWAGGER" ], + [ 37, "MOVE_COUNTER" ], + [ 43, "MOVE_FLAIL" ], + [ 49, "MOVE_FLING" ], + [ 55, "MOVE_PUNISHMENT" ], + [ 61, "MOVE_HAMMER_ARM" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -92,26 +100,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_YAWN", - "MOVE_ENCORE", - "MOVE_SLACK_OFF" - ], - "7": "MOVE_ENCORE", - "13": "MOVE_SLACK_OFF", - "19": "MOVE_FAINT_ATTACK", - "25": "MOVE_AMNESIA", - "31": "MOVE_COVET", - "36": "MOVE_SWAGGER", - "37": "MOVE_COUNTER", - "43": "MOVE_FLAIL", - "49": "MOVE_FLING", - "55": "MOVE_PUNISHMENT", - "61": "MOVE_HAMMER_ARM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -123,9 +112,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -139,8 +129,8 @@ "pokemon_pos_f": 5, "trainer_pos_m": 9, "pokemon_pos_m": 7, - "entry_text": "The world’s laziest Pokémon. When\nit is lounging, it is actually saving\nenergy for striking back.", - "category": "Lazy Pokémon" + "entry_text": "The world\u2019s laziest Pok\u00e9mon. When\nit is lounging, it is actually saving\nenergy for striking back.", + "category": "Lazy Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/slakoth/data.json b/res/pokemon/slakoth/data.json index 346f21e043..b2f6ad7733 100644 --- a/res/pokemon/slakoth/data.json +++ b/res/pokemon/slakoth/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 83, "ev_yields": { @@ -30,21 +27,26 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_TRUANT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_TRUANT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_YAWN" ], + [ 7, "MOVE_ENCORE" ], + [ 13, "MOVE_SLACK_OFF" ], + [ 19, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_AMNESIA" ], + [ 31, "MOVE_COVET" ], + [ 37, "MOVE_COUNTER" ], + [ 43, "MOVE_FLAIL" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -85,20 +87,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_YAWN" - ], - "7": "MOVE_ENCORE", - "13": "MOVE_SLACK_OFF", - "19": "MOVE_FAINT_ATTACK", - "25": "MOVE_AMNESIA", - "31": "MOVE_COVET", - "37": "MOVE_COUNTER", - "43": "MOVE_FLAIL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -134,7 +123,7 @@ "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émon" + "category": "Slacker Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -143,4 +132,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/slowbro/data.json b/res/pokemon/slowbro/data.json index 15c4ec949b..0a809f1402 100644 --- a/res/pokemon/slowbro/data.json +++ b/res/pokemon/slowbro/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 80 }, - "types": [ - "TYPE_WATER", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_WATER", "TYPE_PSYCHIC" ], "catch_rate": 75, "base_exp_reward": 164, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CURSE" ], + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 6, "MOVE_GROWL" ], + [ 11, "MOVE_WATER_GUN" ], + [ 15, "MOVE_CONFUSION" ], + [ 20, "MOVE_DISABLE" ], + [ 25, "MOVE_HEADBUTT" ], + [ 29, "MOVE_WATER_PULSE" ], + [ 34, "MOVE_ZEN_HEADBUTT" ], + [ 37, "MOVE_WITHDRAW" ], + [ 41, "MOVE_SLACK_OFF" ], + [ 47, "MOVE_AMNESIA" ], + [ 54, "MOVE_PSYCHIC" ], + [ 61, "MOVE_RAIN_DANCE" ], + [ 67, "MOVE_PSYCH_UP" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -98,28 +108,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_CURSE", - "MOVE_YAWN", - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "6": "MOVE_GROWL", - "11": "MOVE_WATER_GUN", - "15": "MOVE_CONFUSION", - "20": "MOVE_DISABLE", - "25": "MOVE_HEADBUTT", - "29": "MOVE_WATER_PULSE", - "34": "MOVE_ZEN_HEADBUTT", - "37": "MOVE_WITHDRAW", - "41": "MOVE_SLACK_OFF", - "47": "MOVE_AMNESIA", - "54": "MOVE_PSYCHIC", - "61": "MOVE_RAIN_DANCE", - "67": "MOVE_PSYCH_UP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -134,9 +123,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -151,7 +141,7 @@ "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émon" + "category": "Hermit Crab Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/slowking/data.json b/res/pokemon/slowking/data.json index 2c5e317d82..7e74b0bcd1 100644 --- a/res/pokemon/slowking/data.json +++ b/res/pokemon/slowking/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 110 }, - "types": [ - "TYPE_WATER", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_WATER", "TYPE_PSYCHIC" ], "catch_rate": 70, "base_exp_reward": 164, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWER_GEM" ], + [ 1, "MOVE_HIDDEN_POWER" ], + [ 1, "MOVE_CURSE" ], + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_TACKLE" ], + [ 6, "MOVE_GROWL" ], + [ 11, "MOVE_WATER_GUN" ], + [ 15, "MOVE_CONFUSION" ], + [ 20, "MOVE_DISABLE" ], + [ 25, "MOVE_HEADBUTT" ], + [ 29, "MOVE_WATER_PULSE" ], + [ 34, "MOVE_ZEN_HEADBUTT" ], + [ 39, "MOVE_NASTY_PLOT" ], + [ 43, "MOVE_SWAGGER" ], + [ 48, "MOVE_PSYCHIC" ], + [ 53, "MOVE_TRUMP_CARD" ], + [ 57, "MOVE_PSYCH_UP" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -98,28 +108,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POWER_GEM", - "MOVE_HIDDEN_POWER", - "MOVE_CURSE", - "MOVE_YAWN", - "MOVE_TACKLE" - ], - "6": "MOVE_GROWL", - "11": "MOVE_WATER_GUN", - "15": "MOVE_CONFUSION", - "20": "MOVE_DISABLE", - "25": "MOVE_HEADBUTT", - "29": "MOVE_WATER_PULSE", - "34": "MOVE_ZEN_HEADBUTT", - "39": "MOVE_NASTY_PLOT", - "43": "MOVE_SWAGGER", - "48": "MOVE_PSYCHIC", - "53": "MOVE_TRUMP_CARD", - "57": "MOVE_PSYCH_UP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -134,9 +123,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -151,7 +141,7 @@ "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émon" + "category": "Royal Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/slowpoke/data.json b/res/pokemon/slowpoke/data.json index dfa1bca464..05d801d5c8 100644 --- a/res/pokemon/slowpoke/data.json +++ b/res/pokemon/slowpoke/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_WATER", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_WATER", "TYPE_PSYCHIC" ], "catch_rate": 190, "base_exp_reward": 99, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CURSE" ], + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_TACKLE" ], + [ 6, "MOVE_GROWL" ], + [ 11, "MOVE_WATER_GUN" ], + [ 15, "MOVE_CONFUSION" ], + [ 20, "MOVE_DISABLE" ], + [ 25, "MOVE_HEADBUTT" ], + [ 29, "MOVE_WATER_PULSE" ], + [ 34, "MOVE_ZEN_HEADBUTT" ], + [ 39, "MOVE_SLACK_OFF" ], + [ 43, "MOVE_AMNESIA" ], + [ 48, "MOVE_PSYCHIC" ], + [ 53, "MOVE_RAIN_DANCE" ], + [ 57, "MOVE_PSYCH_UP" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -89,26 +97,7 @@ "HM03", "HM04" ], - "level_up": { - "1": [ - "MOVE_CURSE", - "MOVE_YAWN", - "MOVE_TACKLE" - ], - "6": "MOVE_GROWL", - "11": "MOVE_WATER_GUN", - "15": "MOVE_CONFUSION", - "20": "MOVE_DISABLE", - "25": "MOVE_HEADBUTT", - "29": "MOVE_WATER_PULSE", - "34": "MOVE_ZEN_HEADBUTT", - "39": "MOVE_SLACK_OFF", - "43": "MOVE_AMNESIA", - "48": "MOVE_PSYCHIC", - "53": "MOVE_RAIN_DANCE", - "57": "MOVE_PSYCH_UP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -133,8 +122,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -149,7 +138,7 @@ "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émon" + "category": "Dopey Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -158,4 +147,4 @@ "rarity": 30, "unused": 2563 } -} +} \ No newline at end of file diff --git a/res/pokemon/slugma/data.json b/res/pokemon/slugma/data.json index 4e0f401dc4..2d35011415 100644 --- a/res/pokemon/slugma/data.json +++ b/res/pokemon/slugma/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 40 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 190, "base_exp_reward": 78, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_MAGMA_ARMOR", - "ABILITY_FLAME_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_SMOG" ], + [ 8, "MOVE_EMBER" ], + [ 11, "MOVE_ROCK_THROW" ], + [ 16, "MOVE_HARDEN" ], + [ 23, "MOVE_RECOVER" ], + [ 26, "MOVE_ANCIENT_POWER" ], + [ 31, "MOVE_AMNESIA" ], + [ 38, "MOVE_LAVA_PLUME" ], + [ 41, "MOVE_ROCK_SLIDE" ], + [ 46, "MOVE_BODY_SLAM" ], + [ 53, "MOVE_FLAMETHROWER" ], + [ 56, "MOVE_EARTH_POWER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,24 +78,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_YAWN", - "MOVE_SMOG" - ], - "8": "MOVE_EMBER", - "11": "MOVE_ROCK_THROW", - "16": "MOVE_HARDEN", - "23": "MOVE_RECOVER", - "26": "MOVE_ANCIENT_POWER", - "31": "MOVE_AMNESIA", - "38": "MOVE_LAVA_PLUME", - "41": "MOVE_ROCK_SLIDE", - "46": "MOVE_BODY_SLAM", - "53": "MOVE_FLAMETHROWER", - "56": "MOVE_EARTH_POWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -122,8 +111,8 @@ "pokemon_pos_f": 19, "trainer_pos_m": 9, "pokemon_pos_m": 19, - "entry_text": "Its body is made of magma.\nIf it doesn’t keep moving, its\nbody will cool and harden.", - "category": "Lava Pokémon" + "entry_text": "Its body is made of magma.\nIf it doesn\u2019t keep moving, its\nbody will cool and harden.", + "category": "Lava Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -132,4 +121,4 @@ "rarity": 30, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/smeargle/data.json b/res/pokemon/smeargle/data.json index a18aa85247..653640e62d 100644 --- a/res/pokemon/smeargle/data.json +++ b/res/pokemon/smeargle/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 45 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 106, "ev_yields": { @@ -30,38 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_OWN_TEMPO", - "ABILITY_TECHNICIAN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_OWN_TEMPO", "ABILITY_TECHNICIAN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_SKETCH", - "11": "MOVE_SKETCH", - "21": "MOVE_SKETCH", - "31": "MOVE_SKETCH", - "41": "MOVE_SKETCH", - "51": "MOVE_SKETCH", - "61": "MOVE_SKETCH", - "71": "MOVE_SKETCH", - "81": "MOVE_SKETCH", - "91": "MOVE_SKETCH" - }, - "tutor": [] + "by_level": [ + [ 1, "MOVE_SKETCH" ], + [ 11, "MOVE_SKETCH" ], + [ 21, "MOVE_SKETCH" ], + [ 31, "MOVE_SKETCH" ], + [ 41, "MOVE_SKETCH" ], + [ 51, "MOVE_SKETCH" ], + [ 61, "MOVE_SKETCH" ], + [ 71, "MOVE_SKETCH" ], + [ 81, "MOVE_SKETCH" ], + [ 91, "MOVE_SKETCH" ] + ], + "by_tm": [ ], + "by_tutor": [ ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -76,7 +68,7 @@ "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émon" + "category": "Painter Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/smoochum/data.json b/res/pokemon/smoochum/data.json index 6f59a3420e..3e78996529 100644 --- a/res/pokemon/smoochum/data.json +++ b/res/pokemon/smoochum/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 65 }, - "types": [ - "TYPE_ICE", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_ICE", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 87, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_FOREWARN" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_FOREWARN" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 5, "MOVE_LICK" ], + [ 8, "MOVE_SWEET_KISS" ], + [ 11, "MOVE_POWDER_SNOW" ], + [ 15, "MOVE_CONFUSION" ], + [ 18, "MOVE_SING" ], + [ 21, "MOVE_MEAN_LOOK" ], + [ 25, "MOVE_FAKE_TEARS" ], + [ 28, "MOVE_LUCKY_CHANT" ], + [ 31, "MOVE_AVALANCHE" ], + [ 35, "MOVE_PSYCHIC" ], + [ 38, "MOVE_COPYCAT" ], + [ 41, "MOVE_PERISH_SONG" ], + [ 45, "MOVE_BLIZZARD" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -83,23 +90,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_POUND", - "5": "MOVE_LICK", - "8": "MOVE_SWEET_KISS", - "11": "MOVE_POWDER_SNOW", - "15": "MOVE_CONFUSION", - "18": "MOVE_SING", - "21": "MOVE_MEAN_LOOK", - "25": "MOVE_FAKE_TEARS", - "28": "MOVE_LUCKY_CHANT", - "31": "MOVE_AVALANCHE", - "35": "MOVE_PSYCHIC", - "38": "MOVE_COPYCAT", - "41": "MOVE_PERISH_SONG", - "45": "MOVE_BLIZZARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ICE_PUNCH", @@ -119,8 +110,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -135,7 +126,7 @@ "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émon" + "category": "Kiss Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -144,4 +135,4 @@ "rarity": 10, "unused": 2573 } -} +} \ No newline at end of file diff --git a/res/pokemon/sneasel/data.json b/res/pokemon/sneasel/data.json index 654bc8b9ca..855f608cd3 100644 --- a/res/pokemon/sneasel/data.json +++ b/res/pokemon/sneasel/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 75 }, - "types": [ - "TYPE_DARK", - "TYPE_ICE" - ], + "types": [ "TYPE_DARK", "TYPE_ICE" ], "catch_rate": 60, "base_exp_reward": 132, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_KEEN_EYE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_TAUNT" ], + [ 8, "MOVE_QUICK_ATTACK" ], + [ 10, "MOVE_SCREECH" ], + [ 14, "MOVE_FAINT_ATTACK" ], + [ 21, "MOVE_FURY_SWIPES" ], + [ 24, "MOVE_AGILITY" ], + [ 28, "MOVE_ICY_WIND" ], + [ 35, "MOVE_SLASH" ], + [ 38, "MOVE_BEAT_UP" ], + [ 42, "MOVE_METAL_CLAW" ], + [ 49, "MOVE_ICE_SHARD" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -94,24 +100,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_TAUNT" - ], - "8": "MOVE_QUICK_ATTACK", - "10": "MOVE_SCREECH", - "14": "MOVE_FAINT_ATTACK", - "21": "MOVE_FURY_SWIPES", - "24": "MOVE_AGILITY", - "28": "MOVE_ICY_WIND", - "35": "MOVE_SLASH", - "38": "MOVE_BEAT_UP", - "42": "MOVE_METAL_CLAW", - "49": "MOVE_ICE_SHARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -130,8 +119,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 9, @@ -145,8 +134,8 @@ "pokemon_pos_f": 12, "trainer_pos_m": 9, "pokemon_pos_m": 12, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -155,4 +144,4 @@ "rarity": 30, "unused": 3344 } -} +} \ No newline at end of file diff --git a/res/pokemon/snorlax/data.json b/res/pokemon/snorlax/data.json index 0b526889f0..29f7d15344 100644 --- a/res/pokemon/snorlax/data.json +++ b/res/pokemon/snorlax/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 110 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 25, "base_exp_reward": 154, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_IMMUNITY", - "ABILITY_THICK_FAT" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_IMMUNITY", "ABILITY_THICK_FAT" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_DEFENSE_CURL" ], + [ 9, "MOVE_AMNESIA" ], + [ 12, "MOVE_LICK" ], + [ 17, "MOVE_BELLY_DRUM" ], + [ 20, "MOVE_YAWN" ], + [ 25, "MOVE_REST" ], + [ 28, "MOVE_SNORE" ], + [ 28, "MOVE_SLEEP_TALK" ], + [ 33, "MOVE_BODY_SLAM" ], + [ 36, "MOVE_BLOCK" ], + [ 41, "MOVE_ROLLOUT" ], + [ 44, "MOVE_CRUNCH" ], + [ 49, "MOVE_GIGA_IMPACT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -90,25 +97,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_DEFENSE_CURL", - "9": "MOVE_AMNESIA", - "12": "MOVE_LICK", - "17": "MOVE_BELLY_DRUM", - "20": "MOVE_YAWN", - "25": "MOVE_REST", - "28": [ - "MOVE_SNORE", - "MOVE_SLEEP_TALK" - ], - "33": "MOVE_BODY_SLAM", - "36": "MOVE_BLOCK", - "41": "MOVE_ROLLOUT", - "44": "MOVE_CRUNCH", - "49": "MOVE_GIGA_IMPACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -125,9 +114,10 @@ "MOVE_LAST_RESORT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 21, @@ -142,7 +132,7 @@ "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émon" + "category": "Sleeping Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/snorunt/data.json b/res/pokemon/snorunt/data.json index f46872d89f..9ba0767f0c 100644 --- a/res/pokemon/snorunt/data.json +++ b/res/pokemon/snorunt/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_ICE", - "TYPE_ICE" - ], + "types": [ "TYPE_ICE", "TYPE_ICE" ], "catch_rate": 190, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_ICE_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_LEER" ], + [ 4, "MOVE_DOUBLE_TEAM" ], + [ 10, "MOVE_BITE" ], + [ 13, "MOVE_ICY_WIND" ], + [ 19, "MOVE_HEADBUTT" ], + [ 22, "MOVE_PROTECT" ], + [ 28, "MOVE_ICE_FANG" ], + [ 31, "MOVE_CRUNCH" ], + [ 37, "MOVE_ICE_SHARD" ], + [ 40, "MOVE_HAIL" ], + [ 46, "MOVE_BLIZZARD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -72,23 +77,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POWDER_SNOW", - "MOVE_LEER" - ], - "4": "MOVE_DOUBLE_TEAM", - "10": "MOVE_BITE", - "13": "MOVE_ICY_WIND", - "19": "MOVE_HEADBUTT", - "22": "MOVE_PROTECT", - "28": "MOVE_ICE_FANG", - "31": "MOVE_CRUNCH", - "37": "MOVE_ICE_SHARD", - "40": "MOVE_HAIL", - "46": "MOVE_BLIZZARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -108,8 +97,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -124,7 +113,7 @@ "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émon" + "category": "Snow Hat Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -133,4 +122,4 @@ "rarity": 30, "unused": 3341 } -} +} \ No newline at end of file diff --git a/res/pokemon/snover/data.json b/res/pokemon/snover/data.json index d0c8b2f0c7..b7c6349fb5 100644 --- a/res/pokemon/snover/data.json +++ b/res/pokemon/snover/data.json @@ -8,10 +8,7 @@ "special_attack": 62, "special_defense": 60 }, - "types": [ - "TYPE_GRASS", - "TYPE_ICE" - ], + "types": [ "TYPE_GRASS", "TYPE_ICE" ], "catch_rate": 120, "base_exp_reward": 131, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_SNOW_WARNING", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_SNOW_WARNING", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_RAZOR_LEAF" ], + [ 9, "MOVE_ICY_WIND" ], + [ 13, "MOVE_GRASS_WHISTLE" ], + [ 17, "MOVE_SWAGGER" ], + [ 21, "MOVE_MIST" ], + [ 26, "MOVE_ICE_SHARD" ], + [ 31, "MOVE_INGRAIN" ], + [ 36, "MOVE_WOOD_HAMMER" ], + [ 41, "MOVE_BLIZZARD" ], + [ 46, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,23 +84,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POWDER_SNOW", - "MOVE_LEER" - ], - "5": "MOVE_RAZOR_LEAF", - "9": "MOVE_ICY_WIND", - "13": "MOVE_GRASS_WHISTLE", - "17": "MOVE_SWAGGER", - "21": "MOVE_MIST", - "26": "MOVE_ICE_SHARD", - "31": "MOVE_INGRAIN", - "36": "MOVE_WOOD_HAMMER", - "41": "MOVE_BLIZZARD", - "46": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ICE_PUNCH", @@ -112,8 +101,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -128,7 +117,7 @@ "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émon" + "category": "Frost Tree Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -137,4 +126,4 @@ "rarity": 30, "unused": 2063 } -} +} \ No newline at end of file diff --git a/res/pokemon/snubbull/data.json b/res/pokemon/snubbull/data.json index 5fa1e20020..4c02681f38 100644 --- a/res/pokemon/snubbull/data.json +++ b/res/pokemon/snubbull/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 190, "base_exp_reward": 63, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_RUN_AWAY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_RUN_AWAY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SCARY_FACE" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_CHARM" ], + [ 7, "MOVE_BITE" ], + [ 13, "MOVE_LICK" ], + [ 19, "MOVE_HEADBUTT" ], + [ 25, "MOVE_ROAR" ], + [ 31, "MOVE_RAGE" ], + [ 37, "MOVE_TAKE_DOWN" ], + [ 43, "MOVE_PAYBACK" ], + [ 49, "MOVE_CRUNCH" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -88,26 +96,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_THUNDER_FANG", - "MOVE_TACKLE", - "MOVE_SCARY_FACE", - "MOVE_TAIL_WHIP", - "MOVE_CHARM" - ], - "7": "MOVE_BITE", - "13": "MOVE_LICK", - "19": "MOVE_HEADBUTT", - "25": "MOVE_ROAR", - "31": "MOVE_RAGE", - "37": "MOVE_TAKE_DOWN", - "43": "MOVE_PAYBACK", - "49": "MOVE_CRUNCH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -125,8 +114,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -140,8 +129,8 @@ "pokemon_pos_f": 22, "trainer_pos_m": 9, "pokemon_pos_m": 22, - "entry_text": "Small Pokémon flee from its scary\nface. It is, however, considered\nby women to be cute.", - "category": "Fairy Pokémon" + "entry_text": "Small Pok\u00e9mon flee from its scary\nface. It is, however, considered\nby women to be cute.", + "category": "Fairy Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -150,4 +139,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/solrock/data.json b/res/pokemon/solrock/data.json index 492709847a..2f21ce2119 100644 --- a/res/pokemon/solrock/data.json +++ b/res/pokemon/solrock/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 65 }, - "types": [ - "TYPE_ROCK", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_ROCK", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 150, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_CONFUSION" ], + [ 9, "MOVE_ROCK_THROW" ], + [ 12, "MOVE_FIRE_SPIN" ], + [ 20, "MOVE_ROCK_POLISH" ], + [ 23, "MOVE_PSYWAVE" ], + [ 31, "MOVE_EMBARGO" ], + [ 34, "MOVE_COSMIC_POWER" ], + [ 42, "MOVE_HEAL_BLOCK" ], + [ 45, "MOVE_ROCK_SLIDE" ], + [ 53, "MOVE_SOLAR_BEAM" ], + [ 56, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -92,24 +98,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HARDEN", - "MOVE_CONFUSION" - ], - "9": "MOVE_ROCK_THROW", - "12": "MOVE_FIRE_SPIN", - "20": "MOVE_ROCK_POLISH", - "23": "MOVE_PSYWAVE", - "31": "MOVE_EMBARGO", - "34": "MOVE_COSMIC_POWER", - "42": "MOVE_HEAL_BLOCK", - "45": "MOVE_ROCK_SLIDE", - "53": "MOVE_SOLAR_BEAM", - "56": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -122,9 +111,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -138,8 +128,8 @@ "pokemon_pos_f": 65528, "trainer_pos_m": 9, "pokemon_pos_m": 65528, - "entry_text": "A new Pokémon species, rumored\nto be from the sun. It gives off\nlight while spinning.", - "category": "Meteorite Pokémon" + "entry_text": "A new Pok\u00e9mon species, rumored\nto be from the sun. It gives off\nlight while spinning.", + "category": "Meteorite Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/spearow/data.json b/res/pokemon/spearow/data.json index 9c67163ea8..9cb1091fce 100644 --- a/res/pokemon/spearow/data.json +++ b/res/pokemon/spearow/data.json @@ -8,10 +8,7 @@ "special_attack": 31, "special_defense": 31 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 58, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_LEER" ], + [ 9, "MOVE_FURY_ATTACK" ], + [ 13, "MOVE_PURSUIT" ], + [ 17, "MOVE_AERIAL_ACE" ], + [ 21, "MOVE_MIRROR_MOVE" ], + [ 25, "MOVE_AGILITY" ], + [ 29, "MOVE_ASSURANCE" ], + [ 33, "MOVE_ROOST" ], + [ 37, "MOVE_DRILL_PECK" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,22 +76,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_GROWL" - ], - "5": "MOVE_LEER", - "9": "MOVE_FURY_ATTACK", - "13": "MOVE_PURSUIT", - "17": "MOVE_AERIAL_ACE", - "21": "MOVE_MIRROR_MOVE", - "25": "MOVE_AGILITY", - "29": "MOVE_ASSURANCE", - "33": "MOVE_ROOST", - "37": "MOVE_DRILL_PECK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -105,8 +94,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -121,7 +110,7 @@ "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émon" + "category": "Tiny Bird Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -130,4 +119,4 @@ "rarity": 50, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/spheal/data.json b/res/pokemon/spheal/data.json index e46afe5ad7..78bf7873f2 100644 --- a/res/pokemon/spheal/data.json +++ b/res/pokemon/spheal/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 50 }, - "types": [ - "TYPE_ICE", - "TYPE_WATER" - ], + "types": [ "TYPE_ICE", "TYPE_WATER" ], "catch_rate": 255, "base_exp_reward": 75, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_ICE_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 7, "MOVE_ENCORE" ], + [ 13, "MOVE_ICE_BALL" ], + [ 19, "MOVE_BODY_SLAM" ], + [ 25, "MOVE_AURORA_BEAM" ], + [ 31, "MOVE_HAIL" ], + [ 37, "MOVE_REST" ], + [ 37, "MOVE_SNORE" ], + [ 43, "MOVE_BLIZZARD" ], + [ 49, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,26 +82,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_DEFENSE_CURL", - "MOVE_POWDER_SNOW", - "MOVE_GROWL", - "MOVE_WATER_GUN" - ], - "7": "MOVE_ENCORE", - "13": "MOVE_ICE_BALL", - "19": "MOVE_BODY_SLAM", - "25": "MOVE_AURORA_BEAM", - "31": "MOVE_HAIL", - "37": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "43": "MOVE_BLIZZARD", - "49": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -113,8 +100,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 8, @@ -129,7 +116,7 @@ "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émon" + "category": "Clap Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -138,4 +125,4 @@ "rarity": 30, "unused": 781 } -} +} \ No newline at end of file diff --git a/res/pokemon/spinarak/data.json b/res/pokemon/spinarak/data.json index 8928437476..f39713b3d5 100644 --- a/res/pokemon/spinarak/data.json +++ b/res/pokemon/spinarak/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 255, "base_exp_reward": 54, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWARM", - "ABILITY_INSOMNIA" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SWARM", "ABILITY_INSOMNIA" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_STRING_SHOT" ], + [ 5, "MOVE_SCARY_FACE" ], + [ 8, "MOVE_CONSTRICT" ], + [ 12, "MOVE_LEECH_LIFE" ], + [ 15, "MOVE_NIGHT_SHADE" ], + [ 19, "MOVE_SHADOW_SNEAK" ], + [ 22, "MOVE_FURY_SWIPES" ], + [ 26, "MOVE_SUCKER_PUNCH" ], + [ 29, "MOVE_SPIDER_WEB" ], + [ 33, "MOVE_AGILITY" ], + [ 36, "MOVE_PIN_MISSILE" ], + [ 40, "MOVE_PSYCHIC" ], + [ 43, "MOVE_POISON_JAB" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -71,25 +78,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POISON_STING", - "MOVE_STRING_SHOT" - ], - "5": "MOVE_SCARY_FACE", - "8": "MOVE_CONSTRICT", - "12": "MOVE_LEECH_LIFE", - "15": "MOVE_NIGHT_SHADE", - "19": "MOVE_SHADOW_SNEAK", - "22": "MOVE_FURY_SWIPES", - "26": "MOVE_SUCKER_PUNCH", - "29": "MOVE_SPIDER_WEB", - "33": "MOVE_AGILITY", - "36": "MOVE_PIN_MISSILE", - "40": "MOVE_PSYCHIC", - "43": "MOVE_POISON_JAB" - }, - "tutor": [ + "by_tutor": [ "MOVE_SIGNAL_BEAM", "MOVE_BOUNCE", "MOVE_SUCKER_PUNCH" @@ -103,8 +92,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -119,7 +108,7 @@ "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émon" + "category": "String Spit Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -128,4 +117,4 @@ "rarity": 50, "unused": 1540 } -} +} \ No newline at end of file diff --git a/res/pokemon/spinda/data.json b/res/pokemon/spinda/data.json index 36c3685bef..1a3615dfdf 100644 --- a/res/pokemon/spinda/data.json +++ b/res/pokemon/spinda/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 85, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_OWN_TEMPO", - "ABILITY_TANGLED_FEET" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_UPROAR" ], + [ 10, "MOVE_COPYCAT" ], + [ 14, "MOVE_FAINT_ATTACK" ], + [ 19, "MOVE_PSYBEAM" ], + [ 23, "MOVE_HYPNOSIS" ], + [ 28, "MOVE_DIZZY_PUNCH" ], + [ 32, "MOVE_SUCKER_PUNCH" ], + [ 37, "MOVE_TEETER_DANCE" ], + [ 41, "MOVE_PSYCH_UP" ], + [ 46, "MOVE_DOUBLE_EDGE" ], + [ 50, "MOVE_FLAIL" ], + [ 55, "MOVE_THRASH" ] + ], + "by_tm": [ "TM01", "TM03", "TM04", @@ -87,22 +93,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_UPROAR", - "10": "MOVE_COPYCAT", - "14": "MOVE_FAINT_ATTACK", - "19": "MOVE_PSYBEAM", - "23": "MOVE_HYPNOSIS", - "28": "MOVE_DIZZY_PUNCH", - "32": "MOVE_SUCKER_PUNCH", - "37": "MOVE_TEETER_DANCE", - "41": "MOVE_PSYCH_UP", - "46": "MOVE_DOUBLE_EDGE", - "50": "MOVE_FLAIL", - "55": "MOVE_THRASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -118,9 +109,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -135,7 +127,7 @@ "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émon" + "category": "Spot Panda Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/spiritomb/data.json b/res/pokemon/spiritomb/data.json index b882b9bacd..69f0bb8def 100644 --- a/res/pokemon/spiritomb/data.json +++ b/res/pokemon/spiritomb/data.json @@ -8,10 +8,7 @@ "special_attack": 92, "special_defense": 108 }, - "types": [ - "TYPE_GHOST", - "TYPE_DARK" - ], + "types": [ "TYPE_GHOST", "TYPE_DARK" ], "catch_rate": 100, "base_exp_reward": 168, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 30, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CURSE" ], + [ 1, "MOVE_PURSUIT" ], + [ 1, "MOVE_CONFUSE_RAY" ], + [ 1, "MOVE_SPITE" ], + [ 1, "MOVE_SHADOW_SNEAK" ], + [ 7, "MOVE_FAINT_ATTACK" ], + [ 13, "MOVE_HYPNOSIS" ], + [ 19, "MOVE_DREAM_EATER" ], + [ 25, "MOVE_OMINOUS_WIND" ], + [ 31, "MOVE_SUCKER_PUNCH" ], + [ 37, "MOVE_NASTY_PLOT" ], + [ 43, "MOVE_MEMENTO" ], + [ 49, "MOVE_DARK_PULSE" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -83,24 +89,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_CURSE", - "MOVE_PURSUIT", - "MOVE_CONFUSE_RAY", - "MOVE_SPITE", - "MOVE_SHADOW_SNEAK" - ], - "7": "MOVE_FAINT_ATTACK", - "13": "MOVE_HYPNOSIS", - "19": "MOVE_DREAM_EATER", - "25": "MOVE_OMINOUS_WIND", - "31": "MOVE_SUCKER_PUNCH", - "37": "MOVE_NASTY_PLOT", - "43": "MOVE_MEMENTO", - "49": "MOVE_DARK_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -110,9 +99,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 10, @@ -127,7 +117,7 @@ "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émon" + "category": "Forbidden Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/spoink/data.json b/res/pokemon/spoink/data.json index af1aa4051a..de4d449519 100644 --- a/res/pokemon/spoink/data.json +++ b/res/pokemon/spoink/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 80 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 255, "base_exp_reward": 89, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_OWN_TEMPO" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 7, "MOVE_PSYWAVE" ], + [ 10, "MOVE_ODOR_SLEUTH" ], + [ 14, "MOVE_PSYBEAM" ], + [ 15, "MOVE_PSYCH_UP" ], + [ 18, "MOVE_CONFUSE_RAY" ], + [ 21, "MOVE_MAGIC_COAT" ], + [ 26, "MOVE_ZEN_HEADBUTT" ], + [ 29, "MOVE_REST" ], + [ 29, "MOVE_SNORE" ], + [ 34, "MOVE_PAYBACK" ], + [ 41, "MOVE_PSYCHIC" ], + [ 46, "MOVE_POWER_GEM" ], + [ 48, "MOVE_BOUNCE" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -85,25 +92,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_SPLASH", - "7": "MOVE_PSYWAVE", - "10": "MOVE_ODOR_SLEUTH", - "14": "MOVE_PSYBEAM", - "15": "MOVE_PSYCH_UP", - "18": "MOVE_CONFUSE_RAY", - "21": "MOVE_MAGIC_COAT", - "26": "MOVE_ZEN_HEADBUTT", - "29": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "34": "MOVE_PAYBACK", - "41": "MOVE_PSYCHIC", - "46": "MOVE_POWER_GEM", - "48": "MOVE_BOUNCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -121,8 +110,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 7, @@ -137,7 +126,7 @@ "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émon" + "category": "Bounce Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -146,4 +135,4 @@ "rarity": 30, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/squirtle/data.json b/res/pokemon/squirtle/data.json index 4c002c9715..aad5a73992 100644 --- a/res/pokemon/squirtle/data.json +++ b/res/pokemon/squirtle/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 64 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 66, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 4, "MOVE_TAIL_WHIP" ], + [ 7, "MOVE_BUBBLE" ], + [ 10, "MOVE_WITHDRAW" ], + [ 13, "MOVE_WATER_GUN" ], + [ 16, "MOVE_BITE" ], + [ 19, "MOVE_RAPID_SPIN" ], + [ 22, "MOVE_PROTECT" ], + [ 25, "MOVE_WATER_PULSE" ], + [ 28, "MOVE_AQUA_TAIL" ], + [ 31, "MOVE_SKULL_BASH" ], + [ 34, "MOVE_IRON_DEFENSE" ], + [ 37, "MOVE_RAIN_DANCE" ], + [ 40, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -79,23 +86,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_TACKLE", - "4": "MOVE_TAIL_WHIP", - "7": "MOVE_BUBBLE", - "10": "MOVE_WITHDRAW", - "13": "MOVE_WATER_GUN", - "16": "MOVE_BITE", - "19": "MOVE_RAPID_SPIN", - "22": "MOVE_PROTECT", - "25": "MOVE_WATER_PULSE", - "28": "MOVE_AQUA_TAIL", - "31": "MOVE_SKULL_BASH", - "34": "MOVE_IRON_DEFENSE", - "37": "MOVE_RAIN_DANCE", - "40": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -115,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -131,7 +122,7 @@ "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émon" + "category": "Tiny Turtle Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -140,4 +131,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/stantler/data.json b/res/pokemon/stantler/data.json index 8864997e81..5a44087969 100644 --- a/res/pokemon/stantler/data.json +++ b/res/pokemon/stantler/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 165, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_FRISK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_FRISK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 3, "MOVE_LEER" ], + [ 7, "MOVE_ASTONISH" ], + [ 10, "MOVE_HYPNOSIS" ], + [ 13, "MOVE_STOMP" ], + [ 16, "MOVE_SAND_ATTACK" ], + [ 21, "MOVE_TAKE_DOWN" ], + [ 23, "MOVE_CONFUSE_RAY" ], + [ 27, "MOVE_CALM_MIND" ], + [ 33, "MOVE_ROLE_PLAY" ], + [ 38, "MOVE_ZEN_HEADBUTT" ], + [ 43, "MOVE_IMPRISON" ], + [ 49, "MOVE_CAPTIVATE" ], + [ 53, "MOVE_ME_FIRST" ] + ], + "by_tm": [ "TM04", "TM05", "TM06", @@ -86,23 +93,7 @@ "TM90", "TM92" ], - "level_up": { - "1": "MOVE_TACKLE", - "3": "MOVE_LEER", - "7": "MOVE_ASTONISH", - "10": "MOVE_HYPNOSIS", - "13": "MOVE_STOMP", - "16": "MOVE_SAND_ATTACK", - "21": "MOVE_TAKE_DOWN", - "23": "MOVE_CONFUSE_RAY", - "27": "MOVE_CALM_MIND", - "33": "MOVE_ROLE_PLAY", - "38": "MOVE_ZEN_HEADBUTT", - "43": "MOVE_IMPRISON", - "49": "MOVE_CAPTIVATE", - "53": "MOVE_ME_FIRST" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SPITE", @@ -115,9 +106,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -132,7 +124,7 @@ "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émon" + "category": "Big Horn Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/staraptor/data.json b/res/pokemon/staraptor/data.json index 65ebcfa9b8..25585f9f5b 100644 --- a/res/pokemon/staraptor/data.json +++ b/res/pokemon/staraptor/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 172, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_WING_ATTACK" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 9, "MOVE_WING_ATTACK" ], + [ 13, "MOVE_DOUBLE_TEAM" ], + [ 18, "MOVE_ENDEAVOR" ], + [ 23, "MOVE_WHIRLWIND" ], + [ 28, "MOVE_AERIAL_ACE" ], + [ 33, "MOVE_TAKE_DOWN" ], + [ 34, "MOVE_CLOSE_COMBAT" ], + [ 41, "MOVE_AGILITY" ], + [ 49, "MOVE_BRAVE_BIRD" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -74,25 +81,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_QUICK_ATTACK", - "MOVE_WING_ATTACK" - ], - "5": "MOVE_QUICK_ATTACK", - "9": "MOVE_WING_ATTACK", - "13": "MOVE_DOUBLE_TEAM", - "18": "MOVE_ENDEAVOR", - "23": "MOVE_WHIRLWIND", - "28": "MOVE_AERIAL_ACE", - "33": "MOVE_TAKE_DOWN", - "34": "MOVE_CLOSE_COMBAT", - "41": "MOVE_AGILITY", - "49": "MOVE_BRAVE_BIRD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -103,9 +92,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -120,7 +110,7 @@ "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émon" + "category": "Predator Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/staravia/data.json b/res/pokemon/staravia/data.json index 362912913a..ffe0078275 100644 --- a/res/pokemon/staravia/data.json +++ b/res/pokemon/staravia/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 40 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 120, "base_exp_reward": 113, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_NONE" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 9, "MOVE_WING_ATTACK" ], + [ 13, "MOVE_DOUBLE_TEAM" ], + [ 18, "MOVE_ENDEAVOR" ], + [ 23, "MOVE_WHIRLWIND" ], + [ 28, "MOVE_AERIAL_ACE" ], + [ 33, "MOVE_TAKE_DOWN" ], + [ 38, "MOVE_AGILITY" ], + [ 43, "MOVE_BRAVE_BIRD" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,23 +77,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_QUICK_ATTACK" - ], - "5": "MOVE_QUICK_ATTACK", - "9": "MOVE_WING_ATTACK", - "13": "MOVE_DOUBLE_TEAM", - "18": "MOVE_ENDEAVOR", - "23": "MOVE_WHIRLWIND", - "28": "MOVE_AERIAL_ACE", - "33": "MOVE_TAKE_DOWN", - "38": "MOVE_AGILITY", - "43": "MOVE_BRAVE_BIRD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -107,8 +96,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -123,7 +112,7 @@ "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émon" + "category": "Starling Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -132,4 +121,4 @@ "rarity": 30, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/starly/data.json b/res/pokemon/starly/data.json index b212a422a9..f8b4365915 100644 --- a/res/pokemon/starly/data.json +++ b/res/pokemon/starly/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 56, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 90, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_KEEN_EYE", "ABILITY_NONE" ], + "safari_flee_rate": 90, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 9, "MOVE_WING_ATTACK" ], + [ 13, "MOVE_DOUBLE_TEAM" ], + [ 17, "MOVE_ENDEAVOR" ], + [ 21, "MOVE_WHIRLWIND" ], + [ 25, "MOVE_AERIAL_ACE" ], + [ 29, "MOVE_TAKE_DOWN" ], + [ 33, "MOVE_AGILITY" ], + [ 37, "MOVE_BRAVE_BIRD" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,22 +76,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "5": "MOVE_QUICK_ATTACK", - "9": "MOVE_WING_ATTACK", - "13": "MOVE_DOUBLE_TEAM", - "17": "MOVE_ENDEAVOR", - "21": "MOVE_WHIRLWIND", - "25": "MOVE_AERIAL_ACE", - "29": "MOVE_TAKE_DOWN", - "33": "MOVE_AGILITY", - "37": "MOVE_BRAVE_BIRD" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -106,8 +95,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -122,7 +111,7 @@ "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émon" + "category": "Starling Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -131,4 +120,4 @@ "rarity": 50, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/starmie/data.json b/res/pokemon/starmie/data.json index 652fb9457e..f9d0c6bb47 100644 --- a/res/pokemon/starmie/data.json +++ b/res/pokemon/starmie/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 85 }, - "types": [ - "TYPE_WATER", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_WATER", "TYPE_PSYCHIC" ], "catch_rate": 60, "base_exp_reward": 207, "ev_yields": { @@ -30,21 +27,22 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_ILLUMINATE", - "ABILITY_NATURAL_CURE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_RAPID_SPIN" ], + [ 1, "MOVE_RECOVER" ], + [ 1, "MOVE_SWIFT" ], + [ 28, "MOVE_CONFUSE_RAY" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -86,16 +84,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_WATER_GUN", - "MOVE_RAPID_SPIN", - "MOVE_RECOVER", - "MOVE_SWIFT" - ], - "28": "MOVE_CONFUSE_RAY" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -106,9 +95,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 11, @@ -123,7 +113,7 @@ "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émon" + "category": "Mysterious Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/staryu/data.json b/res/pokemon/staryu/data.json index a5dab28066..4698522bcd 100644 --- a/res/pokemon/staryu/data.json +++ b/res/pokemon/staryu/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 55 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 225, "base_exp_reward": 106, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_ILLUMINATE", - "ABILITY_NATURAL_CURE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 6, "MOVE_WATER_GUN" ], + [ 10, "MOVE_RAPID_SPIN" ], + [ 15, "MOVE_RECOVER" ], + [ 19, "MOVE_CAMOUFLAGE" ], + [ 24, "MOVE_SWIFT" ], + [ 28, "MOVE_BUBBLE_BEAM" ], + [ 33, "MOVE_MINIMIZE" ], + [ 37, "MOVE_GYRO_BALL" ], + [ 42, "MOVE_LIGHT_SCREEN" ], + [ 46, "MOVE_POWER_GEM" ], + [ 51, "MOVE_COSMIC_POWER" ], + [ 55, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,25 +86,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HARDEN" - ], - "6": "MOVE_WATER_GUN", - "10": "MOVE_RAPID_SPIN", - "15": "MOVE_RECOVER", - "19": "MOVE_CAMOUFLAGE", - "24": "MOVE_SWIFT", - "28": "MOVE_BUBBLE_BEAM", - "33": "MOVE_MINIMIZE", - "37": "MOVE_GYRO_BALL", - "42": "MOVE_LIGHT_SCREEN", - "46": "MOVE_POWER_GEM", - "51": "MOVE_COSMIC_POWER", - "55": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -115,8 +104,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 8, @@ -131,7 +120,7 @@ "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émon" + "category": "Star Shape Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/steelix/data.json b/res/pokemon/steelix/data.json index c1dc279b02..7e42dc2fa7 100644 --- a/res/pokemon/steelix/data.json +++ b/res/pokemon/steelix/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 65 }, - "types": [ - "TYPE_STEEL", - "TYPE_GROUND" - ], + "types": [ "TYPE_STEEL", "TYPE_GROUND" ], "catch_rate": 25, "base_exp_reward": 196, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_ROCK_HEAD", - "ABILITY_STURDY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_ROCK_HEAD", "ABILITY_STURDY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HARDEN" ], + [ 1, "MOVE_BIND" ], + [ 6, "MOVE_SCREECH" ], + [ 9, "MOVE_ROCK_THROW" ], + [ 14, "MOVE_RAGE" ], + [ 17, "MOVE_ROCK_TOMB" ], + [ 22, "MOVE_SANDSTORM" ], + [ 25, "MOVE_SLAM" ], + [ 30, "MOVE_ROCK_POLISH" ], + [ 33, "MOVE_DRAGON_BREATH" ], + [ 38, "MOVE_CURSE" ], + [ 41, "MOVE_IRON_TAIL" ], + [ 46, "MOVE_CRUNCH" ], + [ 49, "MOVE_DOUBLE_EDGE" ], + [ 54, "MOVE_STONE_EDGE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -88,31 +101,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_THUNDER_FANG", - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_MUD_SPORT", - "MOVE_TACKLE", - "MOVE_HARDEN", - "MOVE_BIND" - ], - "6": "MOVE_SCREECH", - "9": "MOVE_ROCK_THROW", - "14": "MOVE_RAGE", - "17": "MOVE_ROCK_TOMB", - "22": "MOVE_SANDSTORM", - "25": "MOVE_SLAM", - "30": "MOVE_ROCK_POLISH", - "33": "MOVE_DRAGON_BREATH", - "38": "MOVE_CURSE", - "41": "MOVE_IRON_TAIL", - "46": "MOVE_CRUNCH", - "49": "MOVE_DOUBLE_EDGE", - "54": "MOVE_STONE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_IRON_HEAD", @@ -124,9 +113,10 @@ "MOVE_MAGNET_RISE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 92, @@ -141,7 +131,7 @@ "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émon" + "category": "Iron Snake Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/stunky/data.json b/res/pokemon/stunky/data.json index de8f503431..0c82911e18 100644 --- a/res/pokemon/stunky/data.json +++ b/res/pokemon/stunky/data.json @@ -8,10 +8,7 @@ "special_attack": 41, "special_defense": 41 }, - "types": [ - "TYPE_POISON", - "TYPE_DARK" - ], + "types": [ "TYPE_POISON", "TYPE_DARK" ], "catch_rate": 225, "base_exp_reward": 79, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_STENCH", - "ABILITY_AFTERMATH" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_STENCH", "ABILITY_AFTERMATH" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 4, "MOVE_POISON_GAS" ], + [ 7, "MOVE_SCREECH" ], + [ 10, "MOVE_FURY_SWIPES" ], + [ 14, "MOVE_SMOKE_SCREEN" ], + [ 18, "MOVE_FEINT" ], + [ 22, "MOVE_SLASH" ], + [ 27, "MOVE_TOXIC" ], + [ 32, "MOVE_NIGHT_SLASH" ], + [ 38, "MOVE_MEMENTO" ], + [ 44, "MOVE_EXPLOSION" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -82,23 +87,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_FOCUS_ENERGY" - ], - "4": "MOVE_POISON_GAS", - "7": "MOVE_SCREECH", - "10": "MOVE_FURY_SWIPES", - "14": "MOVE_SMOKE_SCREEN", - "18": "MOVE_FEINT", - "22": "MOVE_SLASH", - "27": "MOVE_TOXIC", - "32": "MOVE_NIGHT_SLASH", - "38": "MOVE_MEMENTO", - "44": "MOVE_EXPLOSION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -129,8 +118,8 @@ "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émon away.", - "category": "Skunk Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -139,4 +128,4 @@ "rarity": 10, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/sudowoodo/data.json b/res/pokemon/sudowoodo/data.json index 2ae11b8028..d5d8eb2250 100644 --- a/res/pokemon/sudowoodo/data.json +++ b/res/pokemon/sudowoodo/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 65 }, - "types": [ - "TYPE_ROCK", - "TYPE_ROCK" - ], + "types": [ "TYPE_ROCK", "TYPE_ROCK" ], "catch_rate": 65, "base_exp_reward": 135, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_STURDY", - "ABILITY_ROCK_HEAD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_STURDY", "ABILITY_ROCK_HEAD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WOOD_HAMMER" ], + [ 1, "MOVE_COPYCAT" ], + [ 1, "MOVE_FLAIL" ], + [ 1, "MOVE_LOW_KICK" ], + [ 1, "MOVE_ROCK_THROW" ], + [ 6, "MOVE_FLAIL" ], + [ 9, "MOVE_LOW_KICK" ], + [ 14, "MOVE_ROCK_THROW" ], + [ 17, "MOVE_MIMIC" ], + [ 22, "MOVE_BLOCK" ], + [ 25, "MOVE_FAINT_ATTACK" ], + [ 30, "MOVE_ROCK_TOMB" ], + [ 33, "MOVE_ROCK_SLIDE" ], + [ 38, "MOVE_SLAM" ], + [ 41, "MOVE_SUCKER_PUNCH" ], + [ 46, "MOVE_DOUBLE_EDGE" ], + [ 49, "MOVE_HAMMER_ARM" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -82,28 +92,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_WOOD_HAMMER", - "MOVE_COPYCAT", - "MOVE_FLAIL", - "MOVE_LOW_KICK", - "MOVE_ROCK_THROW" - ], - "6": "MOVE_FLAIL", - "9": "MOVE_LOW_KICK", - "14": "MOVE_ROCK_THROW", - "17": "MOVE_MIMIC", - "22": "MOVE_BLOCK", - "25": "MOVE_FAINT_ATTACK", - "30": "MOVE_ROCK_TOMB", - "33": "MOVE_ROCK_SLIDE", - "38": "MOVE_SLAM", - "41": "MOVE_SUCKER_PUNCH", - "46": "MOVE_DOUBLE_EDGE", - "49": "MOVE_HAMMER_ARM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -115,9 +104,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -132,7 +122,7 @@ "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émon" + "category": "Imitation Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/suicune/data.json b/res/pokemon/suicune/data.json index d6bc7bc086..320284fb62 100644 --- a/res/pokemon/suicune/data.json +++ b/res/pokemon/suicune/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 115 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 3, "base_exp_reward": 215, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 8, "MOVE_BUBBLE_BEAM" ], + [ 15, "MOVE_RAIN_DANCE" ], + [ 22, "MOVE_GUST" ], + [ 29, "MOVE_AURORA_BEAM" ], + [ 36, "MOVE_MIST" ], + [ 43, "MOVE_MIRROR_COAT" ], + [ 50, "MOVE_ICE_FANG" ], + [ 57, "MOVE_TAILWIND" ], + [ 64, "MOVE_EXTRASENSORY" ], + [ 71, "MOVE_HYDRO_PUMP" ], + [ 78, "MOVE_CALM_MIND" ], + [ 85, "MOVE_BLIZZARD" ] + ], + "by_tm": [ "TM03", "TM04", "TM05", @@ -83,25 +90,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_BITE", - "MOVE_LEER" - ], - "8": "MOVE_BUBBLE_BEAM", - "15": "MOVE_RAIN_DANCE", - "22": "MOVE_GUST", - "29": "MOVE_AURORA_BEAM", - "36": "MOVE_MIST", - "43": "MOVE_MIRROR_COAT", - "50": "MOVE_ICE_FANG", - "57": "MOVE_TAILWIND", - "64": "MOVE_EXTRASENSORY", - "71": "MOVE_HYDRO_PUMP", - "78": "MOVE_CALM_MIND", - "85": "MOVE_BLIZZARD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -112,9 +101,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -129,7 +119,7 @@ "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émon" + "category": "Aurora Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/sunflora/data.json b/res/pokemon/sunflora/data.json index e8fbcd520b..cd58829b7f 100644 --- a/res/pokemon/sunflora/data.json +++ b/res/pokemon/sunflora/data.json @@ -8,10 +8,7 @@ "special_attack": 105, "special_defense": 85 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 120, "base_exp_reward": 146, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_SOLAR_POWER" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_SOLAR_POWER" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_GROWTH" ], + [ 5, "MOVE_MEGA_DRAIN" ], + [ 9, "MOVE_INGRAIN" ], + [ 13, "MOVE_GRASS_WHISTLE" ], + [ 17, "MOVE_LEECH_SEED" ], + [ 21, "MOVE_BULLET_SEED" ], + [ 25, "MOVE_WORRY_SEED" ], + [ 29, "MOVE_RAZOR_LEAF" ], + [ 33, "MOVE_PETAL_DANCE" ], + [ 37, "MOVE_SUNNY_DAY" ], + [ 41, "MOVE_SOLAR_BEAM" ], + [ 43, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -76,25 +83,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_ABSORB", - "MOVE_POUND", - "MOVE_GROWTH" - ], - "5": "MOVE_MEGA_DRAIN", - "9": "MOVE_INGRAIN", - "13": "MOVE_GRASS_WHISTLE", - "17": "MOVE_LEECH_SEED", - "21": "MOVE_BULLET_SEED", - "25": "MOVE_WORRY_SEED", - "29": "MOVE_RAZOR_LEAF", - "33": "MOVE_PETAL_DANCE", - "37": "MOVE_SUNNY_DAY", - "41": "MOVE_SOLAR_BEAM", - "43": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_HELPING_HAND", "MOVE_ENDEAVOR", @@ -103,9 +92,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 8, @@ -120,7 +110,7 @@ "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émon" + "category": "Sun Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/sunkern/data.json b/res/pokemon/sunkern/data.json index b07779e3e6..b735c977f5 100644 --- a/res/pokemon/sunkern/data.json +++ b/res/pokemon/sunkern/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 235, "base_exp_reward": 52, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_SOLAR_POWER" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_SOLAR_POWER" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_GROWTH" ], + [ 5, "MOVE_MEGA_DRAIN" ], + [ 9, "MOVE_INGRAIN" ], + [ 13, "MOVE_GRASS_WHISTLE" ], + [ 17, "MOVE_LEECH_SEED" ], + [ 21, "MOVE_ENDEAVOR" ], + [ 25, "MOVE_WORRY_SEED" ], + [ 29, "MOVE_RAZOR_LEAF" ], + [ 33, "MOVE_SYNTHESIS" ], + [ 37, "MOVE_SUNNY_DAY" ], + [ 41, "MOVE_GIGA_DRAIN" ], + [ 45, "MOVE_SEED_BOMB" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -74,24 +80,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_ABSORB", - "MOVE_GROWTH" - ], - "5": "MOVE_MEGA_DRAIN", - "9": "MOVE_INGRAIN", - "13": "MOVE_GRASS_WHISTLE", - "17": "MOVE_LEECH_SEED", - "21": "MOVE_ENDEAVOR", - "25": "MOVE_WORRY_SEED", - "29": "MOVE_RAZOR_LEAF", - "33": "MOVE_SYNTHESIS", - "37": "MOVE_SUNNY_DAY", - "41": "MOVE_GIGA_DRAIN", - "45": "MOVE_SEED_BOMB" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_HELPING_HAND", "MOVE_ENDEAVOR", @@ -108,8 +97,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 3, @@ -124,7 +113,7 @@ "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émon" + "category": "Seed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/surskit/data.json b/res/pokemon/surskit/data.json index 2f738a8f69..0efa855526 100644 --- a/res/pokemon/surskit/data.json +++ b/res/pokemon/surskit/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 52 }, - "types": [ - "TYPE_BUG", - "TYPE_WATER" - ], + "types": [ "TYPE_BUG", "TYPE_WATER" ], "catch_rate": 200, "base_exp_reward": 63, "ev_yields": { @@ -30,21 +27,26 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SWIFT_SWIM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BUBBLE" ], + [ 7, "MOVE_QUICK_ATTACK" ], + [ 13, "MOVE_SWEET_SCENT" ], + [ 19, "MOVE_WATER_SPORT" ], + [ 25, "MOVE_BUBBLE_BEAM" ], + [ 31, "MOVE_AGILITY" ], + [ 37, "MOVE_MIST" ], + [ 37, "MOVE_HAZE" ], + [ 43, "MOVE_BATON_PASS" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -73,20 +75,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_BUBBLE", - "7": "MOVE_QUICK_ATTACK", - "13": "MOVE_SWEET_SCENT", - "19": "MOVE_WATER_SPORT", - "25": "MOVE_BUBBLE_BEAM", - "31": "MOVE_AGILITY", - "37": [ - "MOVE_MIST", - "MOVE_HAZE" - ], - "43": "MOVE_BATON_PASS" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -102,8 +91,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 5, @@ -118,7 +107,7 @@ "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émon" + "category": "Pond Skater Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -127,4 +116,4 @@ "rarity": 30, "unused": 772 } -} +} \ No newline at end of file diff --git a/res/pokemon/swablu/data.json b/res/pokemon/swablu/data.json index 831ec6315b..eb7321380e 100644 --- a/res/pokemon/swablu/data.json +++ b/res/pokemon/swablu/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 75 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_NATURAL_CURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_NATURAL_CURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_ASTONISH" ], + [ 9, "MOVE_SING" ], + [ 13, "MOVE_FURY_ATTACK" ], + [ 18, "MOVE_SAFEGUARD" ], + [ 23, "MOVE_MIST" ], + [ 28, "MOVE_TAKE_DOWN" ], + [ 32, "MOVE_NATURAL_GIFT" ], + [ 36, "MOVE_MIRROR_MOVE" ], + [ 40, "MOVE_REFRESH" ], + [ 45, "MOVE_DRAGON_PULSE" ], + [ 50, "MOVE_PERISH_SONG" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -76,24 +82,7 @@ "TM90", "HM02" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_GROWL" - ], - "5": "MOVE_ASTONISH", - "9": "MOVE_SING", - "13": "MOVE_FURY_ATTACK", - "18": "MOVE_SAFEGUARD", - "23": "MOVE_MIST", - "28": "MOVE_TAKE_DOWN", - "32": "MOVE_NATURAL_GIFT", - "36": "MOVE_MIRROR_MOVE", - "40": "MOVE_REFRESH", - "45": "MOVE_DRAGON_PULSE", - "50": "MOVE_PERISH_SONG" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -128,8 +117,8 @@ "pokemon_pos_f": 65522, "trainer_pos_m": 9, "pokemon_pos_m": 65522, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -138,4 +127,4 @@ "rarity": 30, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/swalot/data.json b/res/pokemon/swalot/data.json index bdc5dd7286..41d6a696fe 100644 --- a/res/pokemon/swalot/data.json +++ b/res/pokemon/swalot/data.json @@ -8,10 +8,7 @@ "special_attack": 73, "special_defense": 83 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 75, "base_exp_reward": 168, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LIQUID_OOZE", - "ABILITY_STICKY_HOLD" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_YAWN" ], + [ 1, "MOVE_POISON_GAS" ], + [ 1, "MOVE_SLUDGE" ], + [ 6, "MOVE_YAWN" ], + [ 9, "MOVE_POISON_GAS" ], + [ 14, "MOVE_SLUDGE" ], + [ 17, "MOVE_AMNESIA" ], + [ 23, "MOVE_ENCORE" ], + [ 26, "MOVE_BODY_SLAM" ], + [ 30, "MOVE_TOXIC" ], + [ 38, "MOVE_STOCKPILE" ], + [ 38, "MOVE_SPIT_UP" ], + [ 38, "MOVE_SWALLOW" ], + [ 45, "MOVE_SLUDGE_BOMB" ], + [ 52, "MOVE_GASTRO_ACID" ], + [ 59, "MOVE_WRING_OUT" ], + [ 66, "MOVE_GUNK_SHOT" ] + ], + "by_tm": [ "TM03", "TM06", "TM09", @@ -80,31 +91,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_YAWN", - "MOVE_POISON_GAS", - "MOVE_SLUDGE" - ], - "6": "MOVE_YAWN", - "9": "MOVE_POISON_GAS", - "14": "MOVE_SLUDGE", - "17": "MOVE_AMNESIA", - "23": "MOVE_ENCORE", - "26": "MOVE_BODY_SLAM", - "30": "MOVE_TOXIC", - "38": [ - "MOVE_STOCKPILE", - "MOVE_SPIT_UP", - "MOVE_SWALLOW" - ], - "45": "MOVE_SLUDGE_BOMB", - "52": "MOVE_GASTRO_ACID", - "59": "MOVE_WRING_OUT", - "66": "MOVE_GUNK_SHOT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_THUNDER_PUNCH", @@ -116,9 +103,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -133,7 +121,7 @@ "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émon" + "category": "Poison Bag Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/swampert/data.json b/res/pokemon/swampert/data.json index 0144ba9131..9c36021144 100644 --- a/res/pokemon/swampert/data.json +++ b/res/pokemon/swampert/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 90 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_WATER_GUN" ], + [ 6, "MOVE_MUD_SLAP" ], + [ 10, "MOVE_WATER_GUN" ], + [ 15, "MOVE_BIDE" ], + [ 16, "MOVE_MUD_SHOT" ], + [ 20, "MOVE_FORESIGHT" ], + [ 25, "MOVE_MUD_BOMB" ], + [ 31, "MOVE_TAKE_DOWN" ], + [ 39, "MOVE_MUDDY_WATER" ], + [ 46, "MOVE_PROTECT" ], + [ 52, "MOVE_EARTHQUAKE" ], + [ 61, "MOVE_ENDEAVOR" ], + [ 69, "MOVE_HAMMER_ARM" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -87,27 +96,7 @@ "HM07", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_MUD_SLAP", - "MOVE_WATER_GUN" - ], - "6": "MOVE_MUD_SLAP", - "10": "MOVE_WATER_GUN", - "15": "MOVE_BIDE", - "16": "MOVE_MUD_SHOT", - "20": "MOVE_FORESIGHT", - "25": "MOVE_MUD_BOMB", - "31": "MOVE_TAKE_DOWN", - "39": "MOVE_MUDDY_WATER", - "46": "MOVE_PROTECT", - "52": "MOVE_EARTHQUAKE", - "61": "MOVE_ENDEAVOR", - "69": "MOVE_HAMMER_ARM" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -122,9 +111,10 @@ "MOVE_EARTH_POWER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 15, @@ -139,7 +129,7 @@ "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émon" + "category": "Mud Fish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/swellow/data.json b/res/pokemon/swellow/data.json index 702864a023..52dd876ebd 100644 --- a/res/pokemon/swellow/data.json +++ b/res/pokemon/swellow/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 162, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_GUTS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PLUCK" ], + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 4, "MOVE_FOCUS_ENERGY" ], + [ 8, "MOVE_QUICK_ATTACK" ], + [ 13, "MOVE_WING_ATTACK" ], + [ 19, "MOVE_DOUBLE_TEAM" ], + [ 28, "MOVE_ENDEAVOR" ], + [ 38, "MOVE_AERIAL_ACE" ], + [ 49, "MOVE_AGILITY" ], + [ 61, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -74,24 +80,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_PLUCK", - "MOVE_PECK", - "MOVE_GROWL", - "MOVE_FOCUS_ENERGY", - "MOVE_QUICK_ATTACK" - ], - "4": "MOVE_FOCUS_ENERGY", - "8": "MOVE_QUICK_ATTACK", - "13": "MOVE_WING_ATTACK", - "19": "MOVE_DOUBLE_TEAM", - "28": "MOVE_ENDEAVOR", - "38": "MOVE_AERIAL_ACE", - "49": "MOVE_AGILITY", - "61": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -102,9 +91,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -119,7 +109,7 @@ "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émon" + "category": "Swallow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/swinub/data.json b/res/pokemon/swinub/data.json index 936a581cd4..e6d4ab8459 100644 --- a/res/pokemon/swinub/data.json +++ b/res/pokemon/swinub/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_ICE", - "TYPE_GROUND" - ], + "types": [ "TYPE_ICE", "TYPE_GROUND" ], "catch_rate": 225, "base_exp_reward": 78, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_SNOW_CLOAK" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_OBLIVIOUS", "ABILITY_SNOW_CLOAK" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_ODOR_SLEUTH" ], + [ 4, "MOVE_MUD_SPORT" ], + [ 8, "MOVE_POWDER_SNOW" ], + [ 13, "MOVE_MUD_SLAP" ], + [ 16, "MOVE_ENDURE" ], + [ 20, "MOVE_MUD_BOMB" ], + [ 25, "MOVE_ICY_WIND" ], + [ 28, "MOVE_ICE_SHARD" ], + [ 32, "MOVE_TAKE_DOWN" ], + [ 37, "MOVE_EARTHQUAKE" ], + [ 40, "MOVE_MIST" ], + [ 44, "MOVE_BLIZZARD" ], + [ 49, "MOVE_AMNESIA" ] + ], + "by_tm": [ "TM05", "TM06", "TM07", @@ -77,25 +84,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_ODOR_SLEUTH" - ], - "4": "MOVE_MUD_SPORT", - "8": "MOVE_POWDER_SNOW", - "13": "MOVE_MUD_SLAP", - "16": "MOVE_ENDURE", - "20": "MOVE_MUD_BOMB", - "25": "MOVE_ICY_WIND", - "28": "MOVE_ICE_SHARD", - "32": "MOVE_TAKE_DOWN", - "37": "MOVE_EARTHQUAKE", - "40": "MOVE_MIST", - "44": "MOVE_BLIZZARD", - "49": "MOVE_AMNESIA" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_SUPERPOWER", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -129,7 +118,7 @@ "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émon" + "category": "Pig Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -138,4 +127,4 @@ "rarity": 30, "unused": 2061 } -} +} \ No newline at end of file diff --git a/res/pokemon/taillow/data.json b/res/pokemon/taillow/data.json index 2fb21ad866..c84416b549 100644 --- a/res/pokemon/taillow/data.json +++ b/res/pokemon/taillow/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 30 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 200, "base_exp_reward": 59, "ev_yields": { @@ -30,21 +27,27 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_GUTS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_GROWL" ], + [ 4, "MOVE_FOCUS_ENERGY" ], + [ 8, "MOVE_QUICK_ATTACK" ], + [ 13, "MOVE_WING_ATTACK" ], + [ 19, "MOVE_DOUBLE_TEAM" ], + [ 26, "MOVE_ENDEAVOR" ], + [ 34, "MOVE_AERIAL_ACE" ], + [ 43, "MOVE_AGILITY" ], + [ 53, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -72,21 +75,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_GROWL" - ], - "4": "MOVE_FOCUS_ENERGY", - "8": "MOVE_QUICK_ATTACK", - "13": "MOVE_WING_ATTACK", - "19": "MOVE_DOUBLE_TEAM", - "26": "MOVE_ENDEAVOR", - "34": "MOVE_AERIAL_ACE", - "43": "MOVE_AGILITY", - "53": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -105,8 +94,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 3, @@ -121,7 +110,7 @@ "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émon" + "category": "TinySwallow Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -130,4 +119,4 @@ "rarity": 50, "unused": 4357 } -} +} \ No newline at end of file diff --git a/res/pokemon/tangela/data.json b/res/pokemon/tangela/data.json index c06bc83ff8..92a61b17ba 100644 --- a/res/pokemon/tangela/data.json +++ b/res/pokemon/tangela/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 40 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 166, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_LEAF_GUARD" - ], - "great_marsh_flee_rate": 90, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], + "safari_flee_rate": 90, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_INGRAIN" ], + [ 1, "MOVE_CONSTRICT" ], + [ 5, "MOVE_SLEEP_POWDER" ], + [ 8, "MOVE_ABSORB" ], + [ 12, "MOVE_GROWTH" ], + [ 15, "MOVE_POISON_POWDER" ], + [ 19, "MOVE_VINE_WHIP" ], + [ 22, "MOVE_BIND" ], + [ 26, "MOVE_MEGA_DRAIN" ], + [ 29, "MOVE_STUN_SPORE" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 36, "MOVE_KNOCK_OFF" ], + [ 40, "MOVE_NATURAL_GIFT" ], + [ 43, "MOVE_SLAM" ], + [ 47, "MOVE_TICKLE" ], + [ 50, "MOVE_WRING_OUT" ], + [ 54, "MOVE_POWER_WHIP" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -79,28 +89,7 @@ "HM01", "HM06" ], - "level_up": { - "1": [ - "MOVE_INGRAIN", - "MOVE_CONSTRICT" - ], - "5": "MOVE_SLEEP_POWDER", - "8": "MOVE_ABSORB", - "12": "MOVE_GROWTH", - "15": "MOVE_POISON_POWDER", - "19": "MOVE_VINE_WHIP", - "22": "MOVE_BIND", - "26": "MOVE_MEGA_DRAIN", - "29": "MOVE_STUN_SPORE", - "33": "MOVE_ANCIENT_POWER", - "36": "MOVE_KNOCK_OFF", - "40": "MOVE_NATURAL_GIFT", - "43": "MOVE_SLAM", - "47": "MOVE_TICKLE", - "50": "MOVE_WRING_OUT", - "54": "MOVE_POWER_WHIP" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_ANCIENT_POWER", "MOVE_SYNTHESIS", @@ -116,8 +105,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -132,7 +121,7 @@ "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émon" + "category": "Vine Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -141,4 +130,4 @@ "rarity": 30, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/tangrowth/data.json b/res/pokemon/tangrowth/data.json index 00e2f59293..8d7a176c6d 100644 --- a/res/pokemon/tangrowth/data.json +++ b/res/pokemon/tangrowth/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 50 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 30, "base_exp_reward": 211, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_LEAF_GUARD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_LEAF_GUARD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_INGRAIN" ], + [ 1, "MOVE_CONSTRICT" ], + [ 5, "MOVE_SLEEP_POWDER" ], + [ 8, "MOVE_ABSORB" ], + [ 12, "MOVE_GROWTH" ], + [ 15, "MOVE_POISON_POWDER" ], + [ 19, "MOVE_VINE_WHIP" ], + [ 22, "MOVE_BIND" ], + [ 26, "MOVE_MEGA_DRAIN" ], + [ 29, "MOVE_STUN_SPORE" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 36, "MOVE_KNOCK_OFF" ], + [ 40, "MOVE_NATURAL_GIFT" ], + [ 43, "MOVE_SLAM" ], + [ 47, "MOVE_TICKLE" ], + [ 50, "MOVE_WRING_OUT" ], + [ 54, "MOVE_POWER_WHIP" ], + [ 57, "MOVE_BLOCK" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -89,29 +100,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_INGRAIN", - "MOVE_CONSTRICT" - ], - "5": "MOVE_SLEEP_POWDER", - "8": "MOVE_ABSORB", - "12": "MOVE_GROWTH", - "15": "MOVE_POISON_POWDER", - "19": "MOVE_VINE_WHIP", - "22": "MOVE_BIND", - "26": "MOVE_MEGA_DRAIN", - "29": "MOVE_STUN_SPORE", - "33": "MOVE_ANCIENT_POWER", - "36": "MOVE_KNOCK_OFF", - "40": "MOVE_NATURAL_GIFT", - "43": "MOVE_SLAM", - "47": "MOVE_TICKLE", - "50": "MOVE_WRING_OUT", - "54": "MOVE_POWER_WHIP", - "57": "MOVE_BLOCK" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_ANCIENT_POWER", @@ -120,9 +109,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -137,7 +127,7 @@ "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émon" + "category": "Vine Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/tauros/data.json b/res/pokemon/tauros/data.json index 6e108cb108..2a098828de 100644 --- a/res/pokemon/tauros/data.json +++ b/res/pokemon/tauros/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 70 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 45, "base_exp_reward": 211, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_INTIMIDATE", - "ABILITY_ANGER_POINT" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_INTIMIDATE", "ABILITY_ANGER_POINT" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 3, "MOVE_TAIL_WHIP" ], + [ 5, "MOVE_RAGE" ], + [ 8, "MOVE_HORN_ATTACK" ], + [ 11, "MOVE_SCARY_FACE" ], + [ 15, "MOVE_PURSUIT" ], + [ 19, "MOVE_REST" ], + [ 24, "MOVE_PAYBACK" ], + [ 29, "MOVE_ZEN_HEADBUTT" ], + [ 35, "MOVE_TAKE_DOWN" ], + [ 41, "MOVE_SWAGGER" ], + [ 48, "MOVE_THRASH" ], + [ 55, "MOVE_GIGA_IMPACT" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -86,22 +92,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_TACKLE", - "3": "MOVE_TAIL_WHIP", - "5": "MOVE_RAGE", - "8": "MOVE_HORN_ATTACK", - "11": "MOVE_SCARY_FACE", - "15": "MOVE_PURSUIT", - "19": "MOVE_REST", - "24": "MOVE_PAYBACK", - "29": "MOVE_ZEN_HEADBUTT", - "35": "MOVE_TAKE_DOWN", - "41": "MOVE_SWAGGER", - "48": "MOVE_THRASH", - "55": "MOVE_GIGA_IMPACT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ICY_WIND", "MOVE_IRON_HEAD", "MOVE_SNORE", @@ -113,9 +104,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -130,7 +122,7 @@ "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émon" + "category": "Wild Bull Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/teddiursa/data.json b/res/pokemon/teddiursa/data.json index 28c1613ea0..68f9bd6f09 100644 --- a/res/pokemon/teddiursa/data.json +++ b/res/pokemon/teddiursa/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 120, "base_exp_reward": 124, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PICKUP", - "ABILITY_QUICK_FEET" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PICKUP", "ABILITY_QUICK_FEET" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_COVET" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_LICK" ], + [ 1, "MOVE_FAKE_TEARS" ], + [ 8, "MOVE_FURY_SWIPES" ], + [ 15, "MOVE_FAINT_ATTACK" ], + [ 22, "MOVE_SWEET_SCENT" ], + [ 29, "MOVE_SLASH" ], + [ 36, "MOVE_CHARM" ], + [ 43, "MOVE_REST" ], + [ 43, "MOVE_SNORE" ], + [ 50, "MOVE_THRASH" ], + [ 57, "MOVE_FLING" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -83,27 +90,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_COVET", - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_LICK", - "MOVE_FAKE_TEARS" - ], - "8": "MOVE_FURY_SWIPES", - "15": "MOVE_FAINT_ATTACK", - "22": "MOVE_SWEET_SCENT", - "29": "MOVE_SLASH", - "36": "MOVE_CHARM", - "43": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "50": "MOVE_THRASH", - "57": "MOVE_FLING" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -126,8 +113,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -142,7 +129,7 @@ "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émon" + "category": "Little Bear Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -151,4 +138,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/tentacool/data.json b/res/pokemon/tentacool/data.json index b7ddf07c93..a13127146b 100644 --- a/res/pokemon/tentacool/data.json +++ b/res/pokemon/tentacool/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 100 }, - "types": [ - "TYPE_WATER", - "TYPE_POISON" - ], + "types": [ "TYPE_WATER", "TYPE_POISON" ], "catch_rate": 190, "base_exp_reward": 105, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_LIQUID_OOZE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_STING" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 8, "MOVE_CONSTRICT" ], + [ 12, "MOVE_ACID" ], + [ 15, "MOVE_TOXIC_SPIKES" ], + [ 19, "MOVE_BUBBLE_BEAM" ], + [ 22, "MOVE_WRAP" ], + [ 26, "MOVE_BARRIER" ], + [ 29, "MOVE_WATER_PULSE" ], + [ 33, "MOVE_POISON_JAB" ], + [ 36, "MOVE_SCREECH" ], + [ 40, "MOVE_HYDRO_PUMP" ], + [ 43, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -77,22 +83,7 @@ "HM03", "HM07" ], - "level_up": { - "1": "MOVE_POISON_STING", - "5": "MOVE_SUPERSONIC", - "8": "MOVE_CONSTRICT", - "12": "MOVE_ACID", - "15": "MOVE_TOXIC_SPIKES", - "19": "MOVE_BUBBLE_BEAM", - "22": "MOVE_WRAP", - "26": "MOVE_BARRIER", - "29": "MOVE_WATER_PULSE", - "33": "MOVE_POISON_JAB", - "36": "MOVE_SCREECH", - "40": "MOVE_HYDRO_PUMP", - "43": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", @@ -107,8 +98,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 9, @@ -123,7 +114,7 @@ "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émon" + "category": "Jellyfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -132,4 +123,4 @@ "rarity": 50, "unused": 1539 } -} +} \ No newline at end of file diff --git a/res/pokemon/tentacruel/data.json b/res/pokemon/tentacruel/data.json index 74c511f615..87eab67249 100644 --- a/res/pokemon/tentacruel/data.json +++ b/res/pokemon/tentacruel/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 120 }, - "types": [ - "TYPE_WATER", - "TYPE_POISON" - ], + "types": [ "TYPE_WATER", "TYPE_POISON" ], "catch_rate": 60, "base_exp_reward": 205, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_3", - "EGG_GROUP_WATER_3" - ], - "abilities": [ - "ABILITY_CLEAR_BODY", - "ABILITY_LIQUID_OOZE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 1, "MOVE_CONSTRICT" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 8, "MOVE_CONSTRICT" ], + [ 12, "MOVE_ACID" ], + [ 15, "MOVE_TOXIC_SPIKES" ], + [ 19, "MOVE_BUBBLE_BEAM" ], + [ 22, "MOVE_WRAP" ], + [ 26, "MOVE_BARRIER" ], + [ 29, "MOVE_WATER_PULSE" ], + [ 36, "MOVE_POISON_JAB" ], + [ 42, "MOVE_SCREECH" ], + [ 49, "MOVE_HYDRO_PUMP" ], + [ 55, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -79,35 +87,17 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_POISON_STING", - "MOVE_SUPERSONIC", - "MOVE_CONSTRICT" - ], - "5": "MOVE_SUPERSONIC", - "8": "MOVE_CONSTRICT", - "12": "MOVE_ACID", - "15": "MOVE_TOXIC_SPIKES", - "19": "MOVE_BUBBLE_BEAM", - "22": "MOVE_WRAP", - "26": "MOVE_BARRIER", - "29": "MOVE_WATER_PULSE", - "36": "MOVE_POISON_JAB", - "42": "MOVE_SCREECH", - "49": "MOVE_HYDRO_PUMP", - "55": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_SNORE", "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 16, @@ -122,7 +112,7 @@ "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émon" + "category": "Jellyfish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/togekiss/data.json b/res/pokemon/togekiss/data.json index 3b763bf478..8e8994b503 100644 --- a/res/pokemon/togekiss/data.json +++ b/res/pokemon/togekiss/data.json @@ -8,10 +8,7 @@ "special_attack": 120, "special_defense": 115 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 30, "base_exp_reward": 220, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_HUSTLE", - "ABILITY_SERENE_GRACE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_HUSTLE", "ABILITY_SERENE_GRACE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SKY_ATTACK" ], + [ 1, "MOVE_EXTREME_SPEED" ], + [ 1, "MOVE_AURA_SPHERE" ], + [ 1, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -93,15 +90,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_SKY_ATTACK", - "MOVE_EXTREME_SPEED", - "MOVE_AURA_SPHERE", - "MOVE_AIR_SLASH" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_OMINOUS_WIND", @@ -118,9 +107,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -134,8 +124,8 @@ "pokemon_pos_f": 65534, "trainer_pos_m": 9, "pokemon_pos_m": 65534, - "entry_text": "It shares many blessings with\npeople who respect one another’s\nrights and avoid needless strife.", - "category": "Jubilee Pokémon" + "entry_text": "It shares many blessings with\npeople who respect one another\u2019s\nrights and avoid needless strife.", + "category": "Jubilee Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/togepi/data.json b/res/pokemon/togepi/data.json index de6571b41d..d285d7d471 100644 --- a/res/pokemon/togepi/data.json +++ b/res/pokemon/togepi/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 65 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 190, "base_exp_reward": 74, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_HUSTLE", - "ABILITY_SERENE_GRACE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_HUSTLE", "ABILITY_SERENE_GRACE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_CHARM" ], + [ 6, "MOVE_METRONOME" ], + [ 10, "MOVE_SWEET_KISS" ], + [ 15, "MOVE_YAWN" ], + [ 19, "MOVE_ENCORE" ], + [ 24, "MOVE_FOLLOW_ME" ], + [ 28, "MOVE_WISH" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 37, "MOVE_SAFEGUARD" ], + [ 42, "MOVE_BATON_PASS" ], + [ 46, "MOVE_DOUBLE_EDGE" ], + [ 51, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -81,24 +87,7 @@ "TM90", "HM06" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_CHARM" - ], - "6": "MOVE_METRONOME", - "10": "MOVE_SWEET_KISS", - "15": "MOVE_YAWN", - "19": "MOVE_ENCORE", - "24": "MOVE_FOLLOW_ME", - "28": "MOVE_WISH", - "33": "MOVE_ANCIENT_POWER", - "37": "MOVE_SAFEGUARD", - "42": "MOVE_BATON_PASS", - "46": "MOVE_DOUBLE_EDGE", - "51": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -113,14 +102,11 @@ ] }, "evolutions": [ - [ - "EVO_LEVEL_HAPPINESS", - "SPECIES_TOGETIC" - ] + [ "EVO_LEVEL_HAPPINESS", "SPECIES_TOGETIC" ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -135,7 +121,7 @@ "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émon" + "category": "Spike Ball Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -144,4 +130,4 @@ "rarity": 10, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/togetic/data.json b/res/pokemon/togetic/data.json index e257226ecd..4459013b36 100644 --- a/res/pokemon/togetic/data.json +++ b/res/pokemon/togetic/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 105 }, - "types": [ - "TYPE_NORMAL", - "TYPE_FLYING" - ], + "types": [ "TYPE_NORMAL", "TYPE_FLYING" ], "catch_rate": 75, "base_exp_reward": 114, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_HUSTLE", - "ABILITY_SERENE_GRACE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_HUSTLE", "ABILITY_SERENE_GRACE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MAGICAL_LEAF" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_CHARM" ], + [ 1, "MOVE_METRONOME" ], + [ 1, "MOVE_SWEET_KISS" ], + [ 6, "MOVE_METRONOME" ], + [ 10, "MOVE_SWEET_KISS" ], + [ 15, "MOVE_YAWN" ], + [ 19, "MOVE_ENCORE" ], + [ 24, "MOVE_FOLLOW_ME" ], + [ 28, "MOVE_WISH" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 37, "MOVE_SAFEGUARD" ], + [ 42, "MOVE_BATON_PASS" ], + [ 46, "MOVE_DOUBLE_EDGE" ], + [ 51, "MOVE_LAST_RESORT" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -92,27 +101,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_MAGICAL_LEAF", - "MOVE_GROWL", - "MOVE_CHARM", - "MOVE_METRONOME", - "MOVE_SWEET_KISS" - ], - "6": "MOVE_METRONOME", - "10": "MOVE_SWEET_KISS", - "15": "MOVE_YAWN", - "19": "MOVE_ENCORE", - "24": "MOVE_FOLLOW_ME", - "28": "MOVE_WISH", - "33": "MOVE_ANCIENT_POWER", - "37": "MOVE_SAFEGUARD", - "42": "MOVE_BATON_PASS", - "46": "MOVE_DOUBLE_EDGE", - "51": "MOVE_LAST_RESORT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_OMINOUS_WIND", @@ -137,8 +126,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -153,7 +142,7 @@ "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émon" + "category": "Happiness Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/torchic/data.json b/res/pokemon/torchic/data.json index 2cfade1db8..7dfe8218b8 100644 --- a/res/pokemon/torchic/data.json +++ b/res/pokemon/torchic/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 50 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_GROWL" ], + [ 7, "MOVE_FOCUS_ENERGY" ], + [ 10, "MOVE_EMBER" ], + [ 16, "MOVE_PECK" ], + [ 19, "MOVE_SAND_ATTACK" ], + [ 25, "MOVE_FIRE_SPIN" ], + [ 28, "MOVE_QUICK_ATTACK" ], + [ 34, "MOVE_SLASH" ], + [ 37, "MOVE_MIRROR_MOVE" ], + [ 43, "MOVE_FLAMETHROWER" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -76,22 +80,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_GROWL" - ], - "7": "MOVE_FOCUS_ENERGY", - "10": "MOVE_EMBER", - "16": "MOVE_PECK", - "19": "MOVE_SAND_ATTACK", - "25": "MOVE_FIRE_SPIN", - "28": "MOVE_QUICK_ATTACK", - "34": "MOVE_SLASH", - "37": "MOVE_MIRROR_MOVE", - "43": "MOVE_FLAMETHROWER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -109,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -125,7 +114,7 @@ "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émon" + "category": "Chick Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -134,4 +123,4 @@ "rarity": 30, "unused": 514 } -} +} \ No newline at end of file diff --git a/res/pokemon/torkoal/data.json b/res/pokemon/torkoal/data.json index 06b2e79cec..6b798672a9 100644 --- a/res/pokemon/torkoal/data.json +++ b/res/pokemon/torkoal/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 70 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 90, "base_exp_reward": 161, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_WHITE_SMOKE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_WHITE_SMOKE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_EMBER" ], + [ 4, "MOVE_SMOG" ], + [ 7, "MOVE_WITHDRAW" ], + [ 12, "MOVE_CURSE" ], + [ 17, "MOVE_FIRE_SPIN" ], + [ 20, "MOVE_SMOKE_SCREEN" ], + [ 23, "MOVE_RAPID_SPIN" ], + [ 28, "MOVE_FLAMETHROWER" ], + [ 33, "MOVE_BODY_SLAM" ], + [ 36, "MOVE_PROTECT" ], + [ 39, "MOVE_LAVA_PLUME" ], + [ 44, "MOVE_IRON_DEFENSE" ], + [ 49, "MOVE_AMNESIA" ], + [ 52, "MOVE_FLAIL" ], + [ 55, "MOVE_HEAT_WAVE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -81,24 +89,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_EMBER", - "4": "MOVE_SMOG", - "7": "MOVE_WITHDRAW", - "12": "MOVE_CURSE", - "17": "MOVE_FIRE_SPIN", - "20": "MOVE_SMOKE_SCREEN", - "23": "MOVE_RAPID_SPIN", - "28": "MOVE_FLAMETHROWER", - "33": "MOVE_BODY_SLAM", - "36": "MOVE_PROTECT", - "39": "MOVE_LAVA_PLUME", - "44": "MOVE_IRON_DEFENSE", - "49": "MOVE_AMNESIA", - "52": "MOVE_FLAIL", - "55": "MOVE_HEAT_WAVE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -107,9 +98,10 @@ "MOVE_HEAT_WAVE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -124,7 +116,7 @@ "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émon" + "category": "Coal Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/torterra/data.json b/res/pokemon/torterra/data.json index 0015b1aab2..470d321d4e 100644 --- a/res/pokemon/torterra/data.json +++ b/res/pokemon/torterra/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 85 }, - "types": [ - "TYPE_GRASS", - "TYPE_GROUND" - ], + "types": [ "TYPE_GRASS", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 208, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WOOD_HAMMER" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_WITHDRAW" ], + [ 1, "MOVE_ABSORB" ], + [ 1, "MOVE_RAZOR_LEAF" ], + [ 5, "MOVE_WITHDRAW" ], + [ 9, "MOVE_ABSORB" ], + [ 13, "MOVE_RAZOR_LEAF" ], + [ 17, "MOVE_CURSE" ], + [ 22, "MOVE_BITE" ], + [ 27, "MOVE_MEGA_DRAIN" ], + [ 32, "MOVE_EARTHQUAKE" ], + [ 33, "MOVE_LEECH_SEED" ], + [ 39, "MOVE_SYNTHESIS" ], + [ 45, "MOVE_CRUNCH" ], + [ 51, "MOVE_GIGA_DRAIN" ], + [ 57, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM05", "TM06", "TM09", @@ -88,28 +98,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_WOOD_HAMMER", - "MOVE_TACKLE", - "MOVE_WITHDRAW", - "MOVE_ABSORB", - "MOVE_RAZOR_LEAF" - ], - "5": "MOVE_WITHDRAW", - "9": "MOVE_ABSORB", - "13": "MOVE_RAZOR_LEAF", - "17": "MOVE_CURSE", - "22": "MOVE_BITE", - "27": "MOVE_MEGA_DRAIN", - "32": "MOVE_EARTHQUAKE", - "33": "MOVE_LEECH_SEED", - "39": "MOVE_SYNTHESIS", - "45": "MOVE_CRUNCH", - "51": "MOVE_GIGA_DRAIN", - "57": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_IRON_HEAD", @@ -120,9 +109,10 @@ "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 22, @@ -136,8 +126,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 16, "pokemon_pos_m": 0, - "entry_text": "Some Pokémon are born on a\nTORTERRA’s back and spend their\nentire life there.", - "category": "Continent Pokémon" + "entry_text": "Some Pok\u00e9mon are born on a\nTORTERRA\u2019s back and spend their\nentire life there.", + "category": "Continent Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/totodile/data.json b/res/pokemon/totodile/data.json index d702975731..16286c5e12 100644 --- a/res/pokemon/totodile/data.json +++ b/res/pokemon/totodile/data.json @@ -8,10 +8,7 @@ "special_attack": 44, "special_defense": 48 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 66, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_WATER_GUN" ], + [ 8, "MOVE_RAGE" ], + [ 13, "MOVE_BITE" ], + [ 15, "MOVE_SCARY_FACE" ], + [ 20, "MOVE_ICE_FANG" ], + [ 22, "MOVE_FLAIL" ], + [ 27, "MOVE_CRUNCH" ], + [ 29, "MOVE_SLASH" ], + [ 34, "MOVE_SCREECH" ], + [ 36, "MOVE_THRASH" ], + [ 41, "MOVE_AQUA_TAIL" ], + [ 43, "MOVE_SUPERPOWER" ], + [ 48, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -80,26 +88,7 @@ "HM03", "HM07" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER" - ], - "6": "MOVE_WATER_GUN", - "8": "MOVE_RAGE", - "13": "MOVE_BITE", - "15": "MOVE_SCARY_FACE", - "20": "MOVE_ICE_FANG", - "22": "MOVE_FLAIL", - "27": "MOVE_CRUNCH", - "29": "MOVE_SLASH", - "34": "MOVE_SCREECH", - "36": "MOVE_THRASH", - "41": "MOVE_AQUA_TAIL", - "43": "MOVE_SUPERPOWER", - "48": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -120,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -136,7 +125,7 @@ "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émon" + "category": "Big Jaw Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -145,4 +134,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/toxicroak/data.json b/res/pokemon/toxicroak/data.json index c5fb99d5b5..15e8fed35c 100644 --- a/res/pokemon/toxicroak/data.json +++ b/res/pokemon/toxicroak/data.json @@ -8,10 +8,7 @@ "special_attack": 86, "special_defense": 65 }, - "types": [ - "TYPE_POISON", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_POISON", "TYPE_FIGHTING" ], "catch_rate": 75, "base_exp_reward": 181, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_HUMAN_LIKE", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_ANTICIPATION", - "ABILITY_DRY_SKIN" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ASTONISH" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_POISON_STING" ], + [ 3, "MOVE_MUD_SLAP" ], + [ 8, "MOVE_POISON_STING" ], + [ 10, "MOVE_TAUNT" ], + [ 15, "MOVE_PURSUIT" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 22, "MOVE_REVENGE" ], + [ 24, "MOVE_SWAGGER" ], + [ 29, "MOVE_MUD_BOMB" ], + [ 31, "MOVE_SUCKER_PUNCH" ], + [ 36, "MOVE_NASTY_PLOT" ], + [ 41, "MOVE_POISON_JAB" ], + [ 49, "MOVE_SLUDGE_BOMB" ], + [ 54, "MOVE_FLATTER" ] + ], + "by_tm": [ "TM01", "TM06", "TM08", @@ -92,27 +101,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_ASTONISH", - "MOVE_MUD_SLAP", - "MOVE_POISON_STING" - ], - "3": "MOVE_MUD_SLAP", - "8": "MOVE_POISON_STING", - "10": "MOVE_TAUNT", - "15": "MOVE_PURSUIT", - "17": "MOVE_FAINT_ATTACK", - "22": "MOVE_REVENGE", - "24": "MOVE_SWAGGER", - "29": "MOVE_MUD_BOMB", - "31": "MOVE_SUCKER_PUNCH", - "36": "MOVE_NASTY_PLOT", - "41": "MOVE_POISON_JAB", - "49": "MOVE_SLUDGE_BOMB", - "54": "MOVE_FLATTER" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -128,9 +117,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -145,7 +135,7 @@ "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émon" + "category": "Toxic Mouth Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/trapinch/data.json b/res/pokemon/trapinch/data.json index 2678590028..46e0137d59 100644 --- a/res/pokemon/trapinch/data.json +++ b/res/pokemon/trapinch/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 45 }, - "types": [ - "TYPE_GROUND", - "TYPE_GROUND" - ], + "types": [ "TYPE_GROUND", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 73, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_HYPER_CUTTER", - "ABILITY_ARENA_TRAP" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_BITE" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_SAND_TOMB" ], + [ 33, "MOVE_CRUNCH" ], + [ 41, "MOVE_DIG" ], + [ 49, "MOVE_SANDSTORM" ], + [ 57, "MOVE_HYPER_BEAM" ], + [ 65, "MOVE_EARTH_POWER" ], + [ 73, "MOVE_EARTHQUAKE" ], + [ 81, "MOVE_FEINT" ], + [ 89, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -73,21 +78,7 @@ "HM04", "HM06" ], - "level_up": { - "1": "MOVE_BITE", - "9": "MOVE_SAND_ATTACK", - "17": "MOVE_FAINT_ATTACK", - "25": "MOVE_SAND_TOMB", - "33": "MOVE_CRUNCH", - "41": "MOVE_DIG", - "49": "MOVE_SANDSTORM", - "57": "MOVE_HYPER_BEAM", - "65": "MOVE_EARTH_POWER", - "73": "MOVE_EARTHQUAKE", - "81": "MOVE_FEINT", - "89": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -102,8 +93,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -118,7 +109,7 @@ "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émon" + "category": "Ant Pit Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -127,4 +118,4 @@ "rarity": 30, "unused": 2056 } -} +} \ No newline at end of file diff --git a/res/pokemon/treecko/data.json b/res/pokemon/treecko/data.json index ce41b12d84..256f738266 100644 --- a/res/pokemon/treecko/data.json +++ b/res/pokemon/treecko/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 55 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 65, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_DRAGON" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_DRAGON" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_ABSORB" ], + [ 11, "MOVE_QUICK_ATTACK" ], + [ 16, "MOVE_PURSUIT" ], + [ 21, "MOVE_SCREECH" ], + [ 26, "MOVE_MEGA_DRAIN" ], + [ 31, "MOVE_AGILITY" ], + [ 36, "MOVE_SLAM" ], + [ 41, "MOVE_DETECT" ], + [ 46, "MOVE_GIGA_DRAIN" ], + [ 51, "MOVE_ENERGY_BALL" ] + ], + "by_tm": [ "TM01", "TM06", "TM09", @@ -83,23 +88,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_POUND", - "MOVE_LEER" - ], - "6": "MOVE_ABSORB", - "11": "MOVE_QUICK_ATTACK", - "16": "MOVE_PURSUIT", - "21": "MOVE_SCREECH", - "26": "MOVE_MEGA_DRAIN", - "31": "MOVE_AGILITY", - "36": "MOVE_SLAM", - "41": "MOVE_DETECT", - "46": "MOVE_GIGA_DRAIN", - "51": "MOVE_ENERGY_BALL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -118,8 +107,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 5, @@ -134,7 +123,7 @@ "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émon" + "category": "Wood Gecko Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -143,4 +132,4 @@ "rarity": 30, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/tropius/data.json b/res/pokemon/tropius/data.json index 82415a6e71..81fede5408 100644 --- a/res/pokemon/tropius/data.json +++ b/res/pokemon/tropius/data.json @@ -8,10 +8,7 @@ "special_attack": 72, "special_defense": 87 }, - "types": [ - "TYPE_GRASS", - "TYPE_FLYING" - ], + "types": [ "TYPE_GRASS", "TYPE_FLYING" ], "catch_rate": 200, "base_exp_reward": 169, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_SOLAR_POWER" - ], - "great_marsh_flee_rate": 60, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_SOLAR_POWER" ], + "safari_flee_rate": 60, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_GUST" ], + [ 7, "MOVE_GROWTH" ], + [ 11, "MOVE_RAZOR_LEAF" ], + [ 17, "MOVE_STOMP" ], + [ 21, "MOVE_SWEET_SCENT" ], + [ 27, "MOVE_WHIRLWIND" ], + [ 31, "MOVE_MAGICAL_LEAF" ], + [ 37, "MOVE_BODY_SLAM" ], + [ 41, "MOVE_SYNTHESIS" ], + [ 47, "MOVE_AIR_SLASH" ], + [ 51, "MOVE_SOLAR_BEAM" ], + [ 57, "MOVE_NATURAL_GIFT" ], + [ 61, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM05", "TM06", "TM09", @@ -84,25 +91,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_LEER", - "MOVE_GUST" - ], - "7": "MOVE_GROWTH", - "11": "MOVE_RAZOR_LEAF", - "17": "MOVE_STOMP", - "21": "MOVE_SWEET_SCENT", - "27": "MOVE_WHIRLWIND", - "31": "MOVE_MAGICAL_LEAF", - "37": "MOVE_BODY_SLAM", - "41": "MOVE_SYNTHESIS", - "47": "MOVE_AIR_SLASH", - "51": "MOVE_SOLAR_BEAM", - "57": "MOVE_NATURAL_GIFT", - "61": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", @@ -113,9 +102,10 @@ "MOVE_TWISTER" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -130,7 +120,7 @@ "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émon" + "category": "Fruit Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/turtwig/data.json b/res/pokemon/turtwig/data.json index a322cc407c..875d26ed14 100644 --- a/res/pokemon/turtwig/data.json +++ b/res/pokemon/turtwig/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 55 }, - "types": [ - "TYPE_GRASS", - "TYPE_GRASS" - ], + "types": [ "TYPE_GRASS", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_WITHDRAW" ], + [ 9, "MOVE_ABSORB" ], + [ 13, "MOVE_RAZOR_LEAF" ], + [ 17, "MOVE_CURSE" ], + [ 21, "MOVE_BITE" ], + [ 25, "MOVE_MEGA_DRAIN" ], + [ 29, "MOVE_LEECH_SEED" ], + [ 33, "MOVE_SYNTHESIS" ], + [ 37, "MOVE_CRUNCH" ], + [ 41, "MOVE_GIGA_DRAIN" ], + [ 45, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -79,21 +84,7 @@ "HM06", "HM08" ], - "level_up": { - "1": "MOVE_TACKLE", - "5": "MOVE_WITHDRAW", - "9": "MOVE_ABSORB", - "13": "MOVE_RAZOR_LEAF", - "17": "MOVE_CURSE", - "21": "MOVE_BITE", - "25": "MOVE_MEGA_DRAIN", - "29": "MOVE_LEECH_SEED", - "33": "MOVE_SYNTHESIS", - "37": "MOVE_CRUNCH", - "41": "MOVE_GIGA_DRAIN", - "45": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SUPERPOWER", "MOVE_SNORE", @@ -110,8 +101,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -126,7 +117,7 @@ "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émon" + "category": "Tiny Leaf Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -135,4 +126,4 @@ "rarity": 30, "unused": 257 } -} +} \ No newline at end of file diff --git a/res/pokemon/typhlosion/data.json b/res/pokemon/typhlosion/data.json index 737c000e3a..0bce311aad 100644 --- a/res/pokemon/typhlosion/data.json +++ b/res/pokemon/typhlosion/data.json @@ -8,10 +8,7 @@ "special_attack": 109, "special_defense": 85 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 45, "base_exp_reward": 209, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_BLAZE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_BLAZE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GYRO_BALL" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 1, "MOVE_EMBER" ], + [ 4, "MOVE_SMOKE_SCREEN" ], + [ 10, "MOVE_EMBER" ], + [ 13, "MOVE_QUICK_ATTACK" ], + [ 20, "MOVE_FLAME_WHEEL" ], + [ 24, "MOVE_DEFENSE_CURL" ], + [ 31, "MOVE_SWIFT" ], + [ 35, "MOVE_LAVA_PLUME" ], + [ 42, "MOVE_FLAMETHROWER" ], + [ 46, "MOVE_ROLLOUT" ], + [ 53, "MOVE_DOUBLE_EDGE" ], + [ 57, "MOVE_ERUPTION" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -86,27 +95,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_GYRO_BALL", - "MOVE_TACKLE", - "MOVE_LEER", - "MOVE_SMOKE_SCREEN", - "MOVE_EMBER" - ], - "4": "MOVE_SMOKE_SCREEN", - "10": "MOVE_EMBER", - "13": "MOVE_QUICK_ATTACK", - "20": "MOVE_FLAME_WHEEL", - "24": "MOVE_DEFENSE_CURL", - "31": "MOVE_SWIFT", - "35": "MOVE_LAVA_PLUME", - "42": "MOVE_FLAMETHROWER", - "46": "MOVE_ROLLOUT", - "53": "MOVE_DOUBLE_EDGE", - "57": "MOVE_ERUPTION" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -117,9 +106,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 17, @@ -134,7 +124,7 @@ "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émon" + "category": "Volcano Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/tyranitar/data.json b/res/pokemon/tyranitar/data.json index fac78a398d..7d93378957 100644 --- a/res/pokemon/tyranitar/data.json +++ b/res/pokemon/tyranitar/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 100 }, - "types": [ - "TYPE_ROCK", - "TYPE_DARK" - ], + "types": [ "TYPE_ROCK", "TYPE_DARK" ], "catch_rate": 45, "base_exp_reward": 218, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 40, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_MONSTER" - ], - "abilities": [ - "ABILITY_SAND_STREAM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_MONSTER" ], + "abilities": [ "ABILITY_SAND_STREAM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_THUNDER_FANG" ], + [ 1, "MOVE_ICE_FANG" ], + [ 1, "MOVE_FIRE_FANG" ], + [ 1, "MOVE_BITE" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_SANDSTORM" ], + [ 1, "MOVE_SCREECH" ], + [ 5, "MOVE_SANDSTORM" ], + [ 10, "MOVE_SCREECH" ], + [ 14, "MOVE_ROCK_SLIDE" ], + [ 19, "MOVE_SCARY_FACE" ], + [ 23, "MOVE_THRASH" ], + [ 28, "MOVE_DARK_PULSE" ], + [ 34, "MOVE_PAYBACK" ], + [ 41, "MOVE_CRUNCH" ], + [ 47, "MOVE_EARTHQUAKE" ], + [ 54, "MOVE_STONE_EDGE" ], + [ 70, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM01", "TM02", "TM03", @@ -103,29 +114,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_THUNDER_FANG", - "MOVE_ICE_FANG", - "MOVE_FIRE_FANG", - "MOVE_BITE", - "MOVE_LEER", - "MOVE_SANDSTORM", - "MOVE_SCREECH" - ], - "5": "MOVE_SANDSTORM", - "10": "MOVE_SCREECH", - "14": "MOVE_ROCK_SLIDE", - "19": "MOVE_SCARY_FACE", - "23": "MOVE_THRASH", - "28": "MOVE_DARK_PULSE", - "34": "MOVE_PAYBACK", - "41": "MOVE_CRUNCH", - "47": "MOVE_EARTHQUAKE", - "54": "MOVE_STONE_EDGE", - "70": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_THUNDER_PUNCH", @@ -142,9 +131,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 20, @@ -159,7 +149,7 @@ "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émon" + "category": "Armor Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/tyrogue/data.json b/res/pokemon/tyrogue/data.json index 4b8261044b..37d629ea03 100644 --- a/res/pokemon/tyrogue/data.json +++ b/res/pokemon/tyrogue/data.json @@ -8,10 +8,7 @@ "special_attack": 35, "special_defense": 35 }, - "types": [ - "TYPE_FIGHTING", - "TYPE_FIGHTING" - ], + "types": [ "TYPE_FIGHTING", "TYPE_FIGHTING" ], "catch_rate": 75, "base_exp_reward": 91, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 25, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_STEADFAST" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_GUTS", "ABILITY_STEADFAST" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 1, "MOVE_FAKE_OUT" ], + [ 1, "MOVE_FORESIGHT" ] + ], + "by_tm": [ "TM06", "TM08", "TM10", @@ -71,15 +68,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_HELPING_HAND", - "MOVE_FAKE_OUT", - "MOVE_FORESIGHT" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_HELPING_HAND", @@ -106,8 +95,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -122,7 +111,7 @@ "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émon" + "category": "Scuffle Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/umbreon/data.json b/res/pokemon/umbreon/data.json index d66f72227e..8465bcf222 100644 --- a/res/pokemon/umbreon/data.json +++ b/res/pokemon/umbreon/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 130 }, - "types": [ - "TYPE_DARK", - "TYPE_DARK" - ], + "types": [ "TYPE_DARK", "TYPE_DARK" ], "catch_rate": 45, "base_exp_reward": 197, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_SYNCHRONIZE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_SYNCHRONIZE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_PURSUIT" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_CONFUSE_RAY" ], + [ 36, "MOVE_FAINT_ATTACK" ], + [ 43, "MOVE_ASSURANCE" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_MEAN_LOOK" ], + [ 64, "MOVE_SCREECH" ], + [ 71, "MOVE_MOONLIGHT" ], + [ 78, "MOVE_GUARD_SWAP" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,25 +86,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_PURSUIT", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_CONFUSE_RAY", - "36": "MOVE_FAINT_ATTACK", - "43": "MOVE_ASSURANCE", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_MEAN_LOOK", - "64": "MOVE_SCREECH", - "71": "MOVE_MOONLIGHT", - "78": "MOVE_GUARD_SWAP" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_SNORE", "MOVE_SPITE", @@ -107,9 +96,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -123,8 +113,8 @@ "pokemon_pos_f": 15, "trainer_pos_m": 9, "pokemon_pos_m": 15, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/unown/data.json b/res/pokemon/unown/data.json index 43859f2643..a3ee9b5212 100644 --- a/res/pokemon/unown/data.json +++ b/res/pokemon/unown/data.json @@ -8,10 +8,7 @@ "special_attack": 72, "special_defense": 48 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 225, "base_exp_reward": 61, "ev_yields": { @@ -30,29 +27,24 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [], - "level_up": { - "1": "MOVE_HIDDEN_POWER" - }, - "tutor": [] + "by_level": [ + [ 1, "MOVE_HIDDEN_POWER" ] + ], + "by_tm": [ ], + "by_tutor": [ ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 5, @@ -67,7 +59,7 @@ "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émon" + "category": "Symbol Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/ursaring/data.json b/res/pokemon/ursaring/data.json index b22c9023e1..0f8cef5688 100644 --- a/res/pokemon/ursaring/data.json +++ b/res/pokemon/ursaring/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 75 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 60, "base_exp_reward": 189, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_GUTS", - "ABILITY_QUICK_FEET" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_GUTS", "ABILITY_QUICK_FEET" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_COVET" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_LICK" ], + [ 1, "MOVE_FAKE_TEARS" ], + [ 8, "MOVE_FURY_SWIPES" ], + [ 15, "MOVE_FAINT_ATTACK" ], + [ 22, "MOVE_SWEET_SCENT" ], + [ 29, "MOVE_SLASH" ], + [ 38, "MOVE_SCARY_FACE" ], + [ 47, "MOVE_REST" ], + [ 49, "MOVE_SNORE" ], + [ 58, "MOVE_THRASH" ], + [ 67, "MOVE_HAMMER_ARM" ] + ], + "by_tm": [ "TM01", "TM05", "TM06", @@ -89,25 +96,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_COVET", - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_LICK", - "MOVE_FAKE_TEARS" - ], - "8": "MOVE_FURY_SWIPES", - "15": "MOVE_FAINT_ATTACK", - "22": "MOVE_SWEET_SCENT", - "29": "MOVE_SLASH", - "38": "MOVE_SCARY_FACE", - "47": "MOVE_REST", - "49": "MOVE_SNORE", - "58": "MOVE_THRASH", - "67": "MOVE_HAMMER_ARM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ROLLOUT", @@ -123,9 +112,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 18, @@ -140,7 +130,7 @@ "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émon" + "category": "Hibernator Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/uxie/data.json b/res/pokemon/uxie/data.json index 0a9541873b..9b4c538eeb 100644 --- a/res/pokemon/uxie/data.json +++ b/res/pokemon/uxie/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 130 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 3, "base_exp_reward": 210, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 80, "base_friendship": 140, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_REST" ], + [ 1, "MOVE_CONFUSION" ], + [ 6, "MOVE_IMPRISON" ], + [ 16, "MOVE_ENDURE" ], + [ 21, "MOVE_SWIFT" ], + [ 31, "MOVE_YAWN" ], + [ 36, "MOVE_FUTURE_SIGHT" ], + [ 46, "MOVE_AMNESIA" ], + [ 51, "MOVE_EXTRASENSORY" ], + [ 61, "MOVE_FLAIL" ], + [ 66, "MOVE_NATURAL_GIFT" ], + [ 76, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM03", "TM04", "TM06", @@ -91,23 +96,7 @@ "TM90", "TM92" ], - "level_up": { - "1": [ - "MOVE_REST", - "MOVE_CONFUSION" - ], - "6": "MOVE_IMPRISON", - "16": "MOVE_ENDURE", - "21": "MOVE_SWIFT", - "31": "MOVE_YAWN", - "36": "MOVE_FUTURE_SIGHT", - "46": "MOVE_AMNESIA", - "51": "MOVE_EXTRASENSORY", - "61": "MOVE_FLAIL", - "66": "MOVE_NATURAL_GIFT", - "76": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_FIRE_PUNCH", @@ -121,9 +110,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -138,7 +128,7 @@ "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émon" + "category": "Knowledge Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/vaporeon/data.json b/res/pokemon/vaporeon/data.json index 76e3ffd6a5..855a89fd51 100644 --- a/res/pokemon/vaporeon/data.json +++ b/res/pokemon/vaporeon/data.json @@ -8,10 +8,7 @@ "special_attack": 110, "special_defense": 95 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 196, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 35, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_WATER_ABSORB", - "ABILITY_WATER_ABSORB" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_HELPING_HAND" ], + [ 8, "MOVE_SAND_ATTACK" ], + [ 15, "MOVE_WATER_GUN" ], + [ 22, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_BITE" ], + [ 36, "MOVE_AURORA_BEAM" ], + [ 43, "MOVE_AQUA_RING" ], + [ 50, "MOVE_LAST_RESORT" ], + [ 57, "MOVE_HAZE" ], + [ 64, "MOVE_ACID_ARMOR" ], + [ 71, "MOVE_HYDRO_PUMP" ], + [ 78, "MOVE_MUDDY_WATER" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -79,25 +86,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TAIL_WHIP", - "MOVE_TACKLE", - "MOVE_HELPING_HAND" - ], - "8": "MOVE_SAND_ATTACK", - "15": "MOVE_WATER_GUN", - "22": "MOVE_QUICK_ATTACK", - "29": "MOVE_BITE", - "36": "MOVE_AURORA_BEAM", - "43": "MOVE_AQUA_RING", - "50": "MOVE_LAST_RESORT", - "57": "MOVE_HAZE", - "64": "MOVE_ACID_ARMOR", - "71": "MOVE_HYDRO_PUMP", - "78": "MOVE_MUDDY_WATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -109,9 +98,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -126,7 +116,7 @@ "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émon" + "category": "Bubble Jet Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/venomoth/data.json b/res/pokemon/venomoth/data.json index 4000c2e3d8..aaf42c9480 100644 --- a/res/pokemon/venomoth/data.json +++ b/res/pokemon/venomoth/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 75 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 75, "base_exp_reward": 138, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHIELD_DUST", - "ABILITY_TINTED_LENS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SILVER_WIND" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_DISABLE" ], + [ 1, "MOVE_FORESIGHT" ], + [ 1, "MOVE_SUPERSONIC" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 11, "MOVE_CONFUSION" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 17, "MOVE_LEECH_LIFE" ], + [ 23, "MOVE_STUN_SPORE" ], + [ 25, "MOVE_PSYBEAM" ], + [ 29, "MOVE_SLEEP_POWDER" ], + [ 31, "MOVE_GUST" ], + [ 37, "MOVE_SIGNAL_BEAM" ], + [ 41, "MOVE_ZEN_HEADBUTT" ], + [ 47, "MOVE_POISON_FANG" ], + [ 55, "MOVE_PSYCHIC" ], + [ 59, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,29 +89,7 @@ "TM90", "HM05" ], - "level_up": { - "1": [ - "MOVE_SILVER_WIND", - "MOVE_TACKLE", - "MOVE_DISABLE", - "MOVE_FORESIGHT", - "MOVE_SUPERSONIC" - ], - "5": "MOVE_SUPERSONIC", - "11": "MOVE_CONFUSION", - "13": "MOVE_POISON_POWDER", - "17": "MOVE_LEECH_LIFE", - "23": "MOVE_STUN_SPORE", - "25": "MOVE_PSYBEAM", - "29": "MOVE_SLEEP_POWDER", - "31": "MOVE_GUST", - "37": "MOVE_SIGNAL_BEAM", - "41": "MOVE_ZEN_HEADBUTT", - "47": "MOVE_POISON_FANG", - "55": "MOVE_PSYCHIC", - "59": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -110,9 +99,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 15, @@ -127,7 +117,7 @@ "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émon" + "category": "Poison Moth Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/venonat/data.json b/res/pokemon/venonat/data.json index df1010469f..83fc7791c3 100644 --- a/res/pokemon/venonat/data.json +++ b/res/pokemon/venonat/data.json @@ -8,10 +8,7 @@ "special_attack": 40, "special_defense": 55 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 190, "base_exp_reward": 75, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_COMPOUND_EYES", - "ABILITY_TINTED_LENS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_DISABLE" ], + [ 1, "MOVE_FORESIGHT" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 11, "MOVE_CONFUSION" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 17, "MOVE_LEECH_LIFE" ], + [ 23, "MOVE_STUN_SPORE" ], + [ 25, "MOVE_PSYBEAM" ], + [ 29, "MOVE_SLEEP_POWDER" ], + [ 35, "MOVE_SIGNAL_BEAM" ], + [ 37, "MOVE_ZEN_HEADBUTT" ], + [ 41, "MOVE_POISON_FANG" ], + [ 47, "MOVE_PSYCHIC" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -70,25 +77,7 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_DISABLE", - "MOVE_FORESIGHT" - ], - "5": "MOVE_SUPERSONIC", - "11": "MOVE_CONFUSION", - "13": "MOVE_POISON_POWDER", - "17": "MOVE_LEECH_LIFE", - "23": "MOVE_STUN_SPORE", - "25": "MOVE_PSYBEAM", - "29": "MOVE_SLEEP_POWDER", - "35": "MOVE_SIGNAL_BEAM", - "37": "MOVE_ZEN_HEADBUTT", - "41": "MOVE_POISON_FANG", - "47": "MOVE_PSYCHIC" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_SIGNAL_BEAM", "MOVE_ZEN_HEADBUTT", @@ -103,8 +92,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -119,7 +108,7 @@ "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émon" + "category": "Insect Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -128,4 +117,4 @@ "rarity": 50, "unused": 1540 } -} +} \ No newline at end of file diff --git a/res/pokemon/venusaur/data.json b/res/pokemon/venusaur/data.json index e2308fef52..e576bf929f 100644 --- a/res/pokemon/venusaur/data.json +++ b/res/pokemon/venusaur/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 100 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 208, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_OVERGROW", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_OVERGROW", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_LEECH_SEED" ], + [ 1, "MOVE_VINE_WHIP" ], + [ 3, "MOVE_GROWL" ], + [ 7, "MOVE_LEECH_SEED" ], + [ 9, "MOVE_VINE_WHIP" ], + [ 13, "MOVE_POISON_POWDER" ], + [ 13, "MOVE_SLEEP_POWDER" ], + [ 15, "MOVE_TAKE_DOWN" ], + [ 20, "MOVE_RAZOR_LEAF" ], + [ 23, "MOVE_SWEET_SCENT" ], + [ 28, "MOVE_GROWTH" ], + [ 31, "MOVE_DOUBLE_EDGE" ], + [ 32, "MOVE_PETAL_DANCE" ], + [ 39, "MOVE_WORRY_SEED" ], + [ 45, "MOVE_SYNTHESIS" ], + [ 53, "MOVE_SOLAR_BEAM" ] + ], + "by_tm": [ "TM05", "TM06", "TM09", @@ -79,31 +90,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL", - "MOVE_LEECH_SEED", - "MOVE_VINE_WHIP" - ], - "3": "MOVE_GROWL", - "7": "MOVE_LEECH_SEED", - "9": "MOVE_VINE_WHIP", - "13": [ - "MOVE_POISON_POWDER", - "MOVE_SLEEP_POWDER" - ], - "15": "MOVE_TAKE_DOWN", - "20": "MOVE_RAZOR_LEAF", - "23": "MOVE_SWEET_SCENT", - "28": "MOVE_GROWTH", - "31": "MOVE_DOUBLE_EDGE", - "32": "MOVE_PETAL_DANCE", - "39": "MOVE_WORRY_SEED", - "45": "MOVE_SYNTHESIS", - "53": "MOVE_SOLAR_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_SNORE", @@ -113,9 +100,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_LARGE" + "has": true, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -129,8 +117,8 @@ "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émon.", - "category": "Seed Pokémon" + "entry_text": "After a rainy day, the flower on\nits back smells stronger. The\nscent attracts other Pok\u00e9mon.", + "category": "Seed Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/vespiquen/data.json b/res/pokemon/vespiquen/data.json index 7277fcc4f0..77d3c93bb8 100644 --- a/res/pokemon/vespiquen/data.json +++ b/res/pokemon/vespiquen/data.json @@ -8,10 +8,7 @@ "special_attack": 80, "special_defense": 102 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 45, "base_exp_reward": 188, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SWEET_SCENT" ], + [ 1, "MOVE_GUST" ], + [ 3, "MOVE_POISON_STING" ], + [ 7, "MOVE_CONFUSE_RAY" ], + [ 9, "MOVE_FURY_CUTTER" ], + [ 13, "MOVE_DEFEND_ORDER" ], + [ 15, "MOVE_PURSUIT" ], + [ 19, "MOVE_FURY_SWIPES" ], + [ 21, "MOVE_POWER_GEM" ], + [ 25, "MOVE_HEAL_ORDER" ], + [ 27, "MOVE_TOXIC" ], + [ 31, "MOVE_SLASH" ], + [ 33, "MOVE_CAPTIVATE" ], + [ 37, "MOVE_ATTACK_ORDER" ], + [ 39, "MOVE_SWAGGER" ], + [ 43, "MOVE_DESTINY_BOND" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,27 +86,7 @@ "HM01", "HM05" ], - "level_up": { - "1": [ - "MOVE_SWEET_SCENT", - "MOVE_GUST" - ], - "3": "MOVE_POISON_STING", - "7": "MOVE_CONFUSE_RAY", - "9": "MOVE_FURY_CUTTER", - "13": "MOVE_DEFEND_ORDER", - "15": "MOVE_PURSUIT", - "19": "MOVE_FURY_SWIPES", - "21": "MOVE_POWER_GEM", - "25": "MOVE_HEAL_ORDER", - "27": "MOVE_TOXIC", - "31": "MOVE_SLASH", - "33": "MOVE_CAPTIVATE", - "37": "MOVE_ATTACK_ORDER", - "39": "MOVE_SWAGGER", - "43": "MOVE_DESTINY_BOND" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", @@ -108,9 +97,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -125,7 +115,7 @@ "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émon" + "category": "Beehive Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/vibrava/data.json b/res/pokemon/vibrava/data.json index eb4c52969f..56c50cff15 100644 --- a/res/pokemon/vibrava/data.json +++ b/res/pokemon/vibrava/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 50 }, - "types": [ - "TYPE_GROUND", - "TYPE_DRAGON" - ], + "types": [ "TYPE_GROUND", "TYPE_DRAGON" ], "catch_rate": 120, "base_exp_reward": 126, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_LEVITATE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_LEVITATE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SONIC_BOOM" ], + [ 1, "MOVE_SAND_ATTACK" ], + [ 1, "MOVE_FAINT_ATTACK" ], + [ 1, "MOVE_SAND_TOMB" ], + [ 9, "MOVE_SAND_ATTACK" ], + [ 17, "MOVE_FAINT_ATTACK" ], + [ 25, "MOVE_SAND_TOMB" ], + [ 33, "MOVE_SUPERSONIC" ], + [ 35, "MOVE_DRAGON_BREATH" ], + [ 41, "MOVE_SCREECH" ], + [ 49, "MOVE_SANDSTORM" ], + [ 57, "MOVE_HYPER_BEAM" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -80,23 +85,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_SONIC_BOOM", - "MOVE_SAND_ATTACK", - "MOVE_FAINT_ATTACK", - "MOVE_SAND_TOMB" - ], - "9": "MOVE_SAND_ATTACK", - "17": "MOVE_FAINT_ATTACK", - "25": "MOVE_SAND_TOMB", - "33": "MOVE_SUPERSONIC", - "35": "MOVE_DRAGON_BREATH", - "41": "MOVE_SCREECH", - "49": "MOVE_SANDSTORM", - "57": "MOVE_HYPER_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_OMINOUS_WIND", @@ -117,8 +106,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -133,7 +122,7 @@ "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émon" + "category": "Vibration Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -142,4 +131,4 @@ "rarity": 20, "unused": 3848 } -} +} \ No newline at end of file diff --git a/res/pokemon/victreebel/data.json b/res/pokemon/victreebel/data.json index 0d413bacb5..48ff3fd314 100644 --- a/res/pokemon/victreebel/data.json +++ b/res/pokemon/victreebel/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 60 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 191, "ev_yields": { @@ -30,21 +27,26 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_STOCKPILE" ], + [ 1, "MOVE_SWALLOW" ], + [ 1, "MOVE_SPIT_UP" ], + [ 1, "MOVE_VINE_WHIP" ], + [ 1, "MOVE_SLEEP_POWDER" ], + [ 1, "MOVE_SWEET_SCENT" ], + [ 1, "MOVE_RAZOR_LEAF" ], + [ 47, "MOVE_LEAF_STORM" ], + [ 47, "MOVE_LEAF_BLADE" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -75,22 +77,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_STOCKPILE", - "MOVE_SWALLOW", - "MOVE_SPIT_UP", - "MOVE_VINE_WHIP", - "MOVE_SLEEP_POWDER", - "MOVE_SWEET_SCENT", - "MOVE_RAZOR_LEAF" - ], - "47": [ - "MOVE_LEAF_STORM", - "MOVE_LEAF_BLADE" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -99,9 +86,10 @@ "MOVE_SUCKER_PUNCH" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 17, @@ -116,7 +104,7 @@ "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émon" + "category": "Flycatcher Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/vigoroth/data.json b/res/pokemon/vigoroth/data.json index b9e6e015e2..b3440a5702 100644 --- a/res/pokemon/vigoroth/data.json +++ b/res/pokemon/vigoroth/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 120, "base_exp_reward": 126, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_VITAL_SPIRIT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_VITAL_SPIRIT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_FOCUS_ENERGY" ], + [ 1, "MOVE_ENCORE" ], + [ 1, "MOVE_UPROAR" ], + [ 7, "MOVE_ENCORE" ], + [ 13, "MOVE_UPROAR" ], + [ 19, "MOVE_FURY_SWIPES" ], + [ 25, "MOVE_ENDURE" ], + [ 31, "MOVE_SLASH" ], + [ 37, "MOVE_COUNTER" ], + [ 43, "MOVE_FOCUS_PUNCH" ], + [ 49, "MOVE_REVERSAL" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -90,23 +95,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_FOCUS_ENERGY", - "MOVE_ENCORE", - "MOVE_UPROAR" - ], - "7": "MOVE_ENCORE", - "13": "MOVE_UPROAR", - "19": "MOVE_FURY_SWIPES", - "25": "MOVE_ENDURE", - "31": "MOVE_SLASH", - "37": "MOVE_COUNTER", - "43": "MOVE_FOCUS_PUNCH", - "49": "MOVE_REVERSAL" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -126,8 +115,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 14, @@ -142,7 +131,7 @@ "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émon" + "category": "Wild Monkey Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -151,4 +140,4 @@ "rarity": 20, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/vileplume/data.json b/res/pokemon/vileplume/data.json index ca19a74b4c..678ebd481a 100644 --- a/res/pokemon/vileplume/data.json +++ b/res/pokemon/vileplume/data.json @@ -8,10 +8,7 @@ "special_attack": 100, "special_defense": 90 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 45, "base_exp_reward": 184, "ev_yields": { @@ -30,21 +27,23 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_MEGA_DRAIN" ], + [ 1, "MOVE_AROMATHERAPY" ], + [ 1, "MOVE_STUN_SPORE" ], + [ 1, "MOVE_POISON_POWDER" ], + [ 53, "MOVE_PETAL_DANCE" ], + [ 65, "MOVE_SOLAR_BEAM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -76,26 +75,17 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_MEGA_DRAIN", - "MOVE_AROMATHERAPY", - "MOVE_STUN_SPORE", - "MOVE_POISON_POWDER" - ], - "53": "MOVE_PETAL_DANCE", - "65": "MOVE_SOLAR_BEAM" - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", "MOVE_SEED_BOMB" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 12, @@ -110,7 +100,7 @@ "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émon" + "category": "Flower Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/volbeat/data.json b/res/pokemon/volbeat/data.json index 5ac014211e..153b917b24 100644 --- a/res/pokemon/volbeat/data.json +++ b/res/pokemon/volbeat/data.json @@ -8,10 +8,7 @@ "special_attack": 47, "special_defense": 75 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 150, "base_exp_reward": 146, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_HUMAN_LIKE" - ], - "abilities": [ - "ABILITY_ILLUMINATE", - "ABILITY_SWARM" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_HUMAN_LIKE" ], + "abilities": [ "ABILITY_ILLUMINATE", "ABILITY_SWARM" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_FLASH" ], + [ 1, "MOVE_TACKLE" ], + [ 5, "MOVE_DOUBLE_TEAM" ], + [ 9, "MOVE_CONFUSE_RAY" ], + [ 13, "MOVE_MOONLIGHT" ], + [ 17, "MOVE_QUICK_ATTACK" ], + [ 21, "MOVE_TAIL_GLOW" ], + [ 25, "MOVE_SIGNAL_BEAM" ], + [ 29, "MOVE_PROTECT" ], + [ 33, "MOVE_HELPING_HAND" ], + [ 37, "MOVE_ZEN_HEADBUTT" ], + [ 41, "MOVE_BUG_BUZZ" ], + [ 45, "MOVE_DOUBLE_EDGE" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -84,24 +90,7 @@ "TM89", "TM90" ], - "level_up": { - "1": [ - "MOVE_FLASH", - "MOVE_TACKLE" - ], - "5": "MOVE_DOUBLE_TEAM", - "9": "MOVE_CONFUSE_RAY", - "13": "MOVE_MOONLIGHT", - "17": "MOVE_QUICK_ATTACK", - "21": "MOVE_TAIL_GLOW", - "25": "MOVE_SIGNAL_BEAM", - "29": "MOVE_PROTECT", - "33": "MOVE_HELPING_HAND", - "37": "MOVE_ZEN_HEADBUTT", - "41": "MOVE_BUG_BUZZ", - "45": "MOVE_DOUBLE_EDGE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_THUNDER_PUNCH", "MOVE_ICE_PUNCH", @@ -114,9 +103,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 7, @@ -130,8 +120,8 @@ "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’s sweet aroma.", - "category": "Firefly Pokémon" + "entry_text": "It communicates with others by\nlighting up its rear at night. It\nloves ILLUMISE\u2019s sweet aroma.", + "category": "Firefly Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/voltorb/data.json b/res/pokemon/voltorb/data.json index a8f29d4b58..8b7cbeab81 100644 --- a/res/pokemon/voltorb/data.json +++ b/res/pokemon/voltorb/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 55 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_ELECTRIC" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_ELECTRIC" ], "catch_rate": 190, "base_exp_reward": 103, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_MINERAL", - "EGG_GROUP_MINERAL" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_STATIC" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MINERAL", "EGG_GROUP_MINERAL" ], + "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_STATIC" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CHARGE" ], + [ 5, "MOVE_TACKLE" ], + [ 8, "MOVE_SONIC_BOOM" ], + [ 12, "MOVE_SPARK" ], + [ 15, "MOVE_ROLLOUT" ], + [ 19, "MOVE_SCREECH" ], + [ 22, "MOVE_LIGHT_SCREEN" ], + [ 26, "MOVE_CHARGE_BEAM" ], + [ 29, "MOVE_SELFDESTRUCT" ], + [ 33, "MOVE_SWIFT" ], + [ 36, "MOVE_MAGNET_RISE" ], + [ 40, "MOVE_GYRO_BALL" ], + [ 43, "MOVE_EXPLOSION" ], + [ 47, "MOVE_MIRROR_COAT" ] + ], + "by_tm": [ "TM06", "TM10", "TM12", @@ -73,23 +80,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_CHARGE", - "5": "MOVE_TACKLE", - "8": "MOVE_SONIC_BOOM", - "12": "MOVE_SPARK", - "15": "MOVE_ROLLOUT", - "19": "MOVE_SCREECH", - "22": "MOVE_LIGHT_SCREEN", - "26": "MOVE_CHARGE_BEAM", - "29": "MOVE_SELFDESTRUCT", - "33": "MOVE_SWIFT", - "36": "MOVE_MAGNET_RISE", - "40": "MOVE_GYRO_BALL", - "43": "MOVE_EXPLOSION", - "47": "MOVE_MIRROR_COAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SIGNAL_BEAM", @@ -106,8 +97,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 5, @@ -121,8 +112,8 @@ "pokemon_pos_f": 24, "trainer_pos_m": 9, "pokemon_pos_m": 24, - "entry_text": "It looks just like a Poké Ball.\nIt is dangerous because it may\nelectrocute or explode on touch.", - "category": "Ball Pokémon" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -131,4 +122,4 @@ "rarity": 30, "unused": 1799 } -} +} \ No newline at end of file diff --git a/res/pokemon/vulpix/data.json b/res/pokemon/vulpix/data.json index 869177c6be..59fb65c06b 100644 --- a/res/pokemon/vulpix/data.json +++ b/res/pokemon/vulpix/data.json @@ -8,10 +8,7 @@ "special_attack": 50, "special_defense": 65 }, - "types": [ - "TYPE_FIRE", - "TYPE_FIRE" - ], + "types": [ "TYPE_FIRE", "TYPE_FIRE" ], "catch_rate": 190, "base_exp_reward": 63, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_FLASH_FIRE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_FLASH_FIRE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_EMBER" ], + [ 4, "MOVE_TAIL_WHIP" ], + [ 7, "MOVE_ROAR" ], + [ 11, "MOVE_QUICK_ATTACK" ], + [ 14, "MOVE_WILL_O_WISP" ], + [ 17, "MOVE_CONFUSE_RAY" ], + [ 21, "MOVE_IMPRISON" ], + [ 24, "MOVE_FLAMETHROWER" ], + [ 27, "MOVE_SAFEGUARD" ], + [ 31, "MOVE_PAYBACK" ], + [ 34, "MOVE_FIRE_SPIN" ], + [ 37, "MOVE_CAPTIVATE" ], + [ 41, "MOVE_GRUDGE" ], + [ 44, "MOVE_EXTRASENSORY" ], + [ 47, "MOVE_FIRE_BLAST" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -74,24 +82,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_EMBER", - "4": "MOVE_TAIL_WHIP", - "7": "MOVE_ROAR", - "11": "MOVE_QUICK_ATTACK", - "14": "MOVE_WILL_O_WISP", - "17": "MOVE_CONFUSE_RAY", - "21": "MOVE_IMPRISON", - "24": "MOVE_FLAMETHROWER", - "27": "MOVE_SAFEGUARD", - "31": "MOVE_PAYBACK", - "34": "MOVE_FIRE_SPIN", - "37": "MOVE_CAPTIVATE", - "41": "MOVE_GRUDGE", - "44": "MOVE_EXTRASENSORY", - "47": "MOVE_FIRE_BLAST" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_SPITE", @@ -108,8 +99,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -124,7 +115,7 @@ "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émon" + "category": "Fox Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/wailmer/data.json b/res/pokemon/wailmer/data.json index fa1b0c54ed..af066feef9 100644 --- a/res/pokemon/wailmer/data.json +++ b/res/pokemon/wailmer/data.json @@ -8,10 +8,7 @@ "special_attack": 70, "special_defense": 35 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 125, "base_exp_reward": 137, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_WATER_VEIL", - "ABILITY_OBLIVIOUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 4, "MOVE_GROWL" ], + [ 7, "MOVE_WATER_GUN" ], + [ 11, "MOVE_ROLLOUT" ], + [ 14, "MOVE_WHIRLPOOL" ], + [ 17, "MOVE_ASTONISH" ], + [ 21, "MOVE_WATER_PULSE" ], + [ 24, "MOVE_MIST" ], + [ 27, "MOVE_REST" ], + [ 31, "MOVE_BRINE" ], + [ 34, "MOVE_WATER_SPOUT" ], + [ 37, "MOVE_AMNESIA" ], + [ 41, "MOVE_DIVE" ], + [ 44, "MOVE_BOUNCE" ], + [ 47, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -76,24 +84,7 @@ "HM06", "HM07" ], - "level_up": { - "1": "MOVE_SPLASH", - "4": "MOVE_GROWL", - "7": "MOVE_WATER_GUN", - "11": "MOVE_ROLLOUT", - "14": "MOVE_WHIRLPOOL", - "17": "MOVE_ASTONISH", - "21": "MOVE_WATER_PULSE", - "24": "MOVE_MIST", - "27": "MOVE_REST", - "31": "MOVE_BRINE", - "34": "MOVE_WATER_SPOUT", - "37": "MOVE_AMNESIA", - "41": "MOVE_DIVE", - "44": "MOVE_BOUNCE", - "47": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -109,8 +100,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 20, @@ -125,7 +116,7 @@ "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émon" + "category": "Ball Whale Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -134,4 +125,4 @@ "rarity": 30, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/wailord/data.json b/res/pokemon/wailord/data.json index 51ee5d0568..8ec5f20b3b 100644 --- a/res/pokemon/wailord/data.json +++ b/res/pokemon/wailord/data.json @@ -8,10 +8,7 @@ "special_attack": 90, "special_defense": 45 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 60, "base_exp_reward": 206, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 40, "base_friendship": 70, "exp_rate": "EXP_RATE_FLUCTUATING", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_WATER_VEIL", - "ABILITY_OBLIVIOUS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_ROLLOUT" ], + [ 4, "MOVE_GROWL" ], + [ 7, "MOVE_WATER_GUN" ], + [ 11, "MOVE_ROLLOUT" ], + [ 14, "MOVE_WHIRLPOOL" ], + [ 17, "MOVE_ASTONISH" ], + [ 21, "MOVE_WATER_PULSE" ], + [ 24, "MOVE_MIST" ], + [ 27, "MOVE_REST" ], + [ 31, "MOVE_BRINE" ], + [ 34, "MOVE_WATER_SPOUT" ], + [ 37, "MOVE_AMNESIA" ], + [ 46, "MOVE_DIVE" ], + [ 54, "MOVE_BOUNCE" ], + [ 62, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -78,29 +89,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_SPLASH", - "MOVE_GROWL", - "MOVE_WATER_GUN", - "MOVE_ROLLOUT" - ], - "4": "MOVE_GROWL", - "7": "MOVE_WATER_GUN", - "11": "MOVE_ROLLOUT", - "14": "MOVE_WHIRLPOOL", - "17": "MOVE_ASTONISH", - "21": "MOVE_WATER_PULSE", - "24": "MOVE_MIST", - "27": "MOVE_REST", - "31": "MOVE_BRINE", - "34": "MOVE_WATER_SPOUT", - "37": "MOVE_AMNESIA", - "46": "MOVE_DIVE", - "54": "MOVE_BOUNCE", - "62": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -109,9 +98,10 @@ "MOVE_BOUNCE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 145, @@ -125,8 +115,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 18, "pokemon_pos_m": 1, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/walrein/data.json b/res/pokemon/walrein/data.json index 0085a36612..ddabcef095 100644 --- a/res/pokemon/walrein/data.json +++ b/res/pokemon/walrein/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 90 }, - "types": [ - "TYPE_ICE", - "TYPE_WATER" - ], + "types": [ "TYPE_ICE", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 192, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_THICK_FAT", - "ABILITY_ICE_BODY" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_CRUNCH" ], + [ 1, "MOVE_POWDER_SNOW" ], + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_ENCORE" ], + [ 7, "MOVE_ENCORE" ], + [ 13, "MOVE_ICE_BALL" ], + [ 19, "MOVE_BODY_SLAM" ], + [ 25, "MOVE_AURORA_BEAM" ], + [ 31, "MOVE_HAIL" ], + [ 32, "MOVE_SWAGGER" ], + [ 39, "MOVE_REST" ], + [ 39, "MOVE_SNORE" ], + [ 44, "MOVE_ICE_FANG" ], + [ 52, "MOVE_BLIZZARD" ], + [ 65, "MOVE_SHEER_COLD" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -80,29 +89,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_CRUNCH", - "MOVE_POWDER_SNOW", - "MOVE_GROWL", - "MOVE_WATER_GUN", - "MOVE_ENCORE" - ], - "7": "MOVE_ENCORE", - "13": "MOVE_ICE_BALL", - "19": "MOVE_BODY_SLAM", - "25": "MOVE_AURORA_BEAM", - "31": "MOVE_HAIL", - "32": "MOVE_SWAGGER", - "39": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "44": "MOVE_ICE_FANG", - "52": "MOVE_BLIZZARD", - "65": "MOVE_SHEER_COLD" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", @@ -114,9 +101,10 @@ "MOVE_SIGNAL_BEAM" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 14, @@ -131,7 +119,7 @@ "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émon" + "category": "Ice Break Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/wartortle/data.json b/res/pokemon/wartortle/data.json index 1eae959c77..f86c7fa44f 100644 --- a/res/pokemon/wartortle/data.json +++ b/res/pokemon/wartortle/data.json @@ -8,10 +8,7 @@ "special_attack": 65, "special_defense": 80 }, - "types": [ - "TYPE_WATER", - "TYPE_WATER" - ], + "types": [ "TYPE_WATER", "TYPE_WATER" ], "catch_rate": 45, "base_exp_reward": 143, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_WATER_1" - ], - "abilities": [ - "ABILITY_TORRENT", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_WATER_1" ], + "abilities": [ "ABILITY_TORRENT", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 1, "MOVE_BUBBLE" ], + [ 4, "MOVE_TAIL_WHIP" ], + [ 7, "MOVE_BUBBLE" ], + [ 10, "MOVE_WITHDRAW" ], + [ 13, "MOVE_WATER_GUN" ], + [ 16, "MOVE_BITE" ], + [ 20, "MOVE_RAPID_SPIN" ], + [ 24, "MOVE_PROTECT" ], + [ 28, "MOVE_WATER_PULSE" ], + [ 32, "MOVE_AQUA_TAIL" ], + [ 36, "MOVE_SKULL_BASH" ], + [ 40, "MOVE_IRON_DEFENSE" ], + [ 44, "MOVE_RAIN_DANCE" ], + [ 48, "MOVE_HYDRO_PUMP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -79,27 +88,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_TAIL_WHIP", - "MOVE_BUBBLE" - ], - "4": "MOVE_TAIL_WHIP", - "7": "MOVE_BUBBLE", - "10": "MOVE_WITHDRAW", - "13": "MOVE_WATER_GUN", - "16": "MOVE_BITE", - "20": "MOVE_RAPID_SPIN", - "24": "MOVE_PROTECT", - "28": "MOVE_WATER_PULSE", - "32": "MOVE_AQUA_TAIL", - "36": "MOVE_SKULL_BASH", - "40": "MOVE_IRON_DEFENSE", - "44": "MOVE_RAIN_DANCE", - "48": "MOVE_HYDRO_PUMP" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -119,8 +108,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -135,7 +124,7 @@ "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émon" + "category": "Turtle Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -144,4 +133,4 @@ "rarity": 10, "unused": 771 } -} +} \ No newline at end of file diff --git a/res/pokemon/weavile/data.json b/res/pokemon/weavile/data.json index 855f9adb0f..45a9493604 100644 --- a/res/pokemon/weavile/data.json +++ b/res/pokemon/weavile/data.json @@ -8,10 +8,7 @@ "special_attack": 45, "special_defense": 85 }, - "types": [ - "TYPE_DARK", - "TYPE_ICE" - ], + "types": [ "TYPE_DARK", "TYPE_ICE" ], "catch_rate": 45, "base_exp_reward": 199, "ev_yields": { @@ -30,21 +27,34 @@ "hatch_cycles": 20, "base_friendship": 35, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_PRESSURE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_PRESSURE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLACK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_EMBARGO" ], + [ 1, "MOVE_REVENGE" ], + [ 1, "MOVE_ASSURANCE" ], + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 1, "MOVE_TAUNT" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 8, "MOVE_QUICK_ATTACK" ], + [ 10, "MOVE_SCREECH" ], + [ 14, "MOVE_FAINT_ATTACK" ], + [ 21, "MOVE_FURY_SWIPES" ], + [ 24, "MOVE_NASTY_PLOT" ], + [ 28, "MOVE_ICY_WIND" ], + [ 35, "MOVE_NIGHT_SLASH" ], + [ 38, "MOVE_FLING" ], + [ 42, "MOVE_METAL_CLAW" ], + [ 49, "MOVE_DARK_PULSE" ] + ], + "by_tm": [ "TM01", "TM04", "TM06", @@ -97,28 +107,7 @@ "HM04", "HM06" ], - "level_up": { - "1": [ - "MOVE_EMBARGO", - "MOVE_REVENGE", - "MOVE_ASSURANCE", - "MOVE_SCRATCH", - "MOVE_LEER", - "MOVE_TAUNT", - "MOVE_QUICK_ATTACK" - ], - "8": "MOVE_QUICK_ATTACK", - "10": "MOVE_SCREECH", - "14": "MOVE_FAINT_ATTACK", - "21": "MOVE_FURY_SWIPES", - "24": "MOVE_NASTY_PLOT", - "28": "MOVE_ICY_WIND", - "35": "MOVE_NIGHT_SLASH", - "38": "MOVE_FLING", - "42": "MOVE_METAL_CLAW", - "49": "MOVE_DARK_PULSE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -129,9 +118,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 11, @@ -146,7 +136,7 @@ "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émon" + "category": "Sharp Claw Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/weedle/data.json b/res/pokemon/weedle/data.json index 76eff6ff18..f9d7290682 100644 --- a/res/pokemon/weedle/data.json +++ b/res/pokemon/weedle/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 20 }, - "types": [ - "TYPE_BUG", - "TYPE_POISON" - ], + "types": [ "TYPE_BUG", "TYPE_POISON" ], "catch_rate": 255, "base_exp_reward": 52, "ev_yields": { @@ -30,29 +27,21 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHIELD_DUST", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_POISON_STING", - "MOVE_STRING_SHOT" - ], - "15": "MOVE_BUG_BITE" - }, - "tutor": [] + "by_level": [ + [ 1, "MOVE_POISON_STING" ], + [ 1, "MOVE_STRING_SHOT" ], + [ 15, "MOVE_BUG_BITE" ] + ], + "by_tm": [ ], + "by_tutor": [ ] }, "evolutions": [ [ @@ -62,8 +51,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -78,7 +67,7 @@ "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émon" + "category": "Hairy Bug Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", @@ -87,4 +76,4 @@ "rarity": 50, "unused": 1540 } -} +} \ No newline at end of file diff --git a/res/pokemon/weepinbell/data.json b/res/pokemon/weepinbell/data.json index 3903c92db1..e66af89788 100644 --- a/res/pokemon/weepinbell/data.json +++ b/res/pokemon/weepinbell/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 45 }, - "types": [ - "TYPE_GRASS", - "TYPE_POISON" - ], + "types": [ "TYPE_GRASS", "TYPE_POISON" ], "catch_rate": 120, "base_exp_reward": 151, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_GRASS", - "EGG_GROUP_GRASS" - ], - "abilities": [ - "ABILITY_CHLOROPHYLL", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_GRASS", "EGG_GROUP_GRASS" ], + "abilities": [ "ABILITY_CHLOROPHYLL", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_VINE_WHIP" ], + [ 1, "MOVE_GROWTH" ], + [ 1, "MOVE_WRAP" ], + [ 7, "MOVE_GROWTH" ], + [ 11, "MOVE_WRAP" ], + [ 13, "MOVE_SLEEP_POWDER" ], + [ 15, "MOVE_POISON_POWDER" ], + [ 17, "MOVE_STUN_SPORE" ], + [ 23, "MOVE_ACID" ], + [ 27, "MOVE_KNOCK_OFF" ], + [ 29, "MOVE_SWEET_SCENT" ], + [ 35, "MOVE_GASTRO_ACID" ], + [ 39, "MOVE_RAZOR_LEAF" ], + [ 41, "MOVE_SLAM" ], + [ 47, "MOVE_WRING_OUT" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -73,26 +81,7 @@ "TM90", "HM01" ], - "level_up": { - "1": [ - "MOVE_VINE_WHIP", - "MOVE_GROWTH", - "MOVE_WRAP" - ], - "7": "MOVE_GROWTH", - "11": "MOVE_WRAP", - "13": "MOVE_SLEEP_POWDER", - "15": "MOVE_POISON_POWDER", - "17": "MOVE_STUN_SPORE", - "23": "MOVE_ACID", - "27": "MOVE_KNOCK_OFF", - "29": "MOVE_SWEET_SCENT", - "35": "MOVE_GASTRO_ACID", - "39": "MOVE_RAZOR_LEAF", - "41": "MOVE_SLAM", - "47": "MOVE_WRING_OUT" - }, - "tutor": [ + "by_tutor": [ "MOVE_GASTRO_ACID", "MOVE_SNORE", "MOVE_SYNTHESIS", @@ -109,8 +98,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 10, @@ -124,8 +113,8 @@ "pokemon_pos_f": 16, "trainer_pos_m": 9, "pokemon_pos_m": 16, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/weezing/data.json b/res/pokemon/weezing/data.json index 7ef5cb680e..d29b82d0b5 100644 --- a/res/pokemon/weezing/data.json +++ b/res/pokemon/weezing/data.json @@ -8,10 +8,7 @@ "special_attack": 85, "special_defense": 70 }, - "types": [ - "TYPE_POISON", - "TYPE_POISON" - ], + "types": [ "TYPE_POISON", "TYPE_POISON" ], "catch_rate": 60, "base_exp_reward": 173, "ev_yields": { @@ -30,21 +27,32 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_LEVITATE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_LEVITATE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POISON_GAS" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_SMOG" ], + [ 1, "MOVE_SMOKE_SCREEN" ], + [ 6, "MOVE_SMOG" ], + [ 10, "MOVE_SMOKE_SCREEN" ], + [ 15, "MOVE_ASSURANCE" ], + [ 19, "MOVE_SELFDESTRUCT" ], + [ 24, "MOVE_SLUDGE" ], + [ 28, "MOVE_HAZE" ], + [ 33, "MOVE_DOUBLE_HIT" ], + [ 40, "MOVE_EXPLOSION" ], + [ 48, "MOVE_SLUDGE_BOMB" ], + [ 55, "MOVE_DESTINY_BOND" ], + [ 63, "MOVE_MEMENTO" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -82,35 +90,17 @@ "TM87", "TM90" ], - "level_up": { - "1": [ - "MOVE_POISON_GAS", - "MOVE_TACKLE", - "MOVE_SMOG", - "MOVE_SMOKE_SCREEN" - ], - "6": "MOVE_SMOG", - "10": "MOVE_SMOKE_SCREEN", - "15": "MOVE_ASSURANCE", - "19": "MOVE_SELFDESTRUCT", - "24": "MOVE_SLUDGE", - "28": "MOVE_HAZE", - "33": "MOVE_DOUBLE_HIT", - "40": "MOVE_EXPLOSION", - "48": "MOVE_SLUDGE_BOMB", - "55": "MOVE_DESTINY_BOND", - "63": "MOVE_MEMENTO" - }, - "tutor": [ + "by_tutor": [ "MOVE_ROLLOUT", "MOVE_SNORE", "MOVE_SPITE", "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 12, @@ -125,7 +115,7 @@ "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émon" + "category": "Poison Gas Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/whiscash/data.json b/res/pokemon/whiscash/data.json index 31a56bf2b9..882ac5379b 100644 --- a/res/pokemon/whiscash/data.json +++ b/res/pokemon/whiscash/data.json @@ -8,10 +8,7 @@ "special_attack": 76, "special_defense": 71 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 75, "base_exp_reward": 158, "ev_yields": { @@ -30,21 +27,35 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_2", - "EGG_GROUP_WATER_2" - ], - "abilities": [ - "ABILITY_OBLIVIOUS", - "ABILITY_ANTICIPATION" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_ZEN_HEADBUTT" ], + [ 1, "MOVE_TICKLE" ], + [ 1, "MOVE_MUD_SLAP" ], + [ 1, "MOVE_MUD_SPORT" ], + [ 1, "MOVE_WATER_SPORT" ], + [ 6, "MOVE_MUD_SPORT" ], + [ 6, "MOVE_WATER_SPORT" ], + [ 10, "MOVE_WATER_GUN" ], + [ 14, "MOVE_MUD_BOMB" ], + [ 18, "MOVE_AMNESIA" ], + [ 22, "MOVE_WATER_PULSE" ], + [ 26, "MOVE_MAGNITUDE" ], + [ 33, "MOVE_REST" ], + [ 33, "MOVE_SNORE" ], + [ 39, "MOVE_AQUA_TAIL" ], + [ 45, "MOVE_EARTHQUAKE" ], + [ 51, "MOVE_FUTURE_SIGHT" ], + [ 57, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -78,33 +89,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_ZEN_HEADBUTT", - "MOVE_TICKLE", - "MOVE_MUD_SLAP", - "MOVE_MUD_SPORT", - "MOVE_WATER_SPORT" - ], - "6": [ - "MOVE_MUD_SPORT", - "MOVE_WATER_SPORT" - ], - "10": "MOVE_WATER_GUN", - "14": "MOVE_MUD_BOMB", - "18": "MOVE_AMNESIA", - "22": "MOVE_WATER_PULSE", - "26": "MOVE_MAGNITUDE", - "33": [ - "MOVE_REST", - "MOVE_SNORE" - ], - "39": "MOVE_AQUA_TAIL", - "45": "MOVE_EARTHQUAKE", - "51": "MOVE_FUTURE_SIGHT", - "57": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -115,9 +100,10 @@ "MOVE_BOUNCE" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 9, @@ -132,7 +118,7 @@ "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émon" + "category": "Whiskers Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", diff --git a/res/pokemon/whismur/data.json b/res/pokemon/whismur/data.json index 79cde25015..5ca6206c68 100644 --- a/res/pokemon/whismur/data.json +++ b/res/pokemon/whismur/data.json @@ -8,10 +8,7 @@ "special_attack": 51, "special_defense": 23 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 190, "base_exp_reward": 68, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_SLOW", - "egg_groups": [ - "EGG_GROUP_MONSTER", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_SOUNDPROOF", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_MONSTER", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_SOUNDPROOF", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_POUND" ], + [ 5, "MOVE_UPROAR" ], + [ 11, "MOVE_ASTONISH" ], + [ 15, "MOVE_HOWL" ], + [ 21, "MOVE_SUPERSONIC" ], + [ 25, "MOVE_STOMP" ], + [ 31, "MOVE_SCREECH" ], + [ 35, "MOVE_ROAR" ], + [ 41, "MOVE_REST" ], + [ 41, "MOVE_SLEEP_TALK" ], + [ 45, "MOVE_HYPER_VOICE" ] + ], + "by_tm": [ "TM03", "TM05", "TM06", @@ -74,22 +78,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_POUND", - "5": "MOVE_UPROAR", - "11": "MOVE_ASTONISH", - "15": "MOVE_HOWL", - "21": "MOVE_SUPERSONIC", - "25": "MOVE_STOMP", - "31": "MOVE_SCREECH", - "35": "MOVE_ROAR", - "41": [ - "MOVE_REST", - "MOVE_SLEEP_TALK" - ], - "45": "MOVE_HYPER_VOICE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -109,8 +98,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -125,7 +114,7 @@ "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émon" + "category": "Whisper Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -134,4 +123,4 @@ "rarity": 30, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/wigglytuff/data.json b/res/pokemon/wigglytuff/data.json index d6c1a4ab6b..380a9229e1 100644 --- a/res/pokemon/wigglytuff/data.json +++ b/res/pokemon/wigglytuff/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 50 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 50, "base_exp_reward": 109, "ev_yields": { @@ -30,21 +27,21 @@ "hatch_cycles": 10, "base_friendship": 70, "exp_rate": "EXP_RATE_FAST", - "egg_groups": [ - "EGG_GROUP_FAIRY", - "EGG_GROUP_FAIRY" - ], - "abilities": [ - "ABILITY_CUTE_CHARM", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FAIRY", "EGG_GROUP_FAIRY" ], + "abilities": [ "ABILITY_CUTE_CHARM", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PINK", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SING" ], + [ 1, "MOVE_DISABLE" ], + [ 1, "MOVE_DEFENSE_CURL" ], + [ 1, "MOVE_DOUBLE_SLAP" ] + ], + "by_tm": [ "TM01", "TM03", "TM06", @@ -97,15 +94,7 @@ "TM90", "HM04" ], - "level_up": { - "1": [ - "MOVE_SING", - "MOVE_DISABLE", - "MOVE_DEFENSE_CURL", - "MOVE_DOUBLE_SLAP" - ] - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_ROLLOUT", @@ -120,9 +109,10 @@ "MOVE_KNOCK_OFF" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 10, @@ -137,7 +127,7 @@ "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émon" + "category": "Balloon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/wingull/data.json b/res/pokemon/wingull/data.json index f9a5995bf3..3b6d8ccb84 100644 --- a/res/pokemon/wingull/data.json +++ b/res/pokemon/wingull/data.json @@ -8,10 +8,7 @@ "special_attack": 55, "special_defense": 30 }, - "types": [ - "TYPE_WATER", - "TYPE_FLYING" - ], + "types": [ "TYPE_WATER", "TYPE_FLYING" ], "catch_rate": 190, "base_exp_reward": 64, "ev_yields": { @@ -30,21 +27,29 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_KEEN_EYE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_GROWL" ], + [ 1, "MOVE_WATER_GUN" ], + [ 6, "MOVE_SUPERSONIC" ], + [ 11, "MOVE_WING_ATTACK" ], + [ 16, "MOVE_MIST" ], + [ 19, "MOVE_WATER_PULSE" ], + [ 24, "MOVE_QUICK_ATTACK" ], + [ 29, "MOVE_ROOST" ], + [ 34, "MOVE_PURSUIT" ], + [ 37, "MOVE_AGILITY" ], + [ 42, "MOVE_AERIAL_ACE" ], + [ 47, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -77,23 +82,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_GROWL", - "MOVE_WATER_GUN" - ], - "6": "MOVE_SUPERSONIC", - "11": "MOVE_WING_ATTACK", - "16": "MOVE_MIST", - "19": "MOVE_WATER_PULSE", - "24": "MOVE_QUICK_ATTACK", - "29": "MOVE_ROOST", - "34": "MOVE_PURSUIT", - "37": "MOVE_AGILITY", - "42": "MOVE_AERIAL_ACE", - "47": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ICY_WIND", "MOVE_OMINOUS_WIND", @@ -113,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -129,7 +118,7 @@ "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émon" + "category": "Seagull Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -138,4 +127,4 @@ "rarity": 50, "unused": 4355 } -} +} \ No newline at end of file diff --git a/res/pokemon/wobbuffet/data.json b/res/pokemon/wobbuffet/data.json index d8a267d97d..09e001d2b7 100644 --- a/res/pokemon/wobbuffet/data.json +++ b/res/pokemon/wobbuffet/data.json @@ -8,10 +8,7 @@ "special_attack": 33, "special_defense": 58 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 45, "base_exp_reward": 177, "ev_yields": { @@ -30,34 +27,27 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_AMORPHOUS", - "EGG_GROUP_AMORPHOUS" - ], - "abilities": [ - "ABILITY_SHADOW_TAG", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_AMORPHOUS", "EGG_GROUP_AMORPHOUS" ], + "abilities": [ "ABILITY_SHADOW_TAG", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_COUNTER", - "MOVE_MIRROR_COAT", - "MOVE_SAFEGUARD", - "MOVE_DESTINY_BOND" - ] - }, - "tutor": [] + "by_level": [ + [ 1, "MOVE_COUNTER" ], + [ 1, "MOVE_MIRROR_COAT" ], + [ 1, "MOVE_SAFEGUARD" ], + [ 1, "MOVE_DESTINY_BOND" ] + ], + "by_tm": [ ], + "by_tutor": [ ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 13, @@ -72,7 +62,7 @@ "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émon" + "category": "Patient Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/wooper/data.json b/res/pokemon/wooper/data.json index 198daa9136..fc3046a4bf 100644 --- a/res/pokemon/wooper/data.json +++ b/res/pokemon/wooper/data.json @@ -8,10 +8,7 @@ "special_attack": 25, "special_defense": 25 }, - "types": [ - "TYPE_WATER", - "TYPE_GROUND" - ], + "types": [ "TYPE_WATER", "TYPE_GROUND" ], "catch_rate": 255, "base_exp_reward": 52, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_WATER_1", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_DAMP", - "ABILITY_WATER_ABSORB" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_WATER_GUN" ], + [ 1, "MOVE_TAIL_WHIP" ], + [ 5, "MOVE_MUD_SPORT" ], + [ 9, "MOVE_MUD_SHOT" ], + [ 15, "MOVE_SLAM" ], + [ 19, "MOVE_MUD_BOMB" ], + [ 23, "MOVE_AMNESIA" ], + [ 29, "MOVE_YAWN" ], + [ 33, "MOVE_EARTHQUAKE" ], + [ 37, "MOVE_RAIN_DANCE" ], + [ 43, "MOVE_MIST" ], + [ 43, "MOVE_HAZE" ], + [ 47, "MOVE_MUDDY_WATER" ] + ], + "by_tm": [ "TM03", "TM06", "TM07", @@ -76,26 +82,7 @@ "HM06", "HM07" ], - "level_up": { - "1": [ - "MOVE_WATER_GUN", - "MOVE_TAIL_WHIP" - ], - "5": "MOVE_MUD_SPORT", - "9": "MOVE_MUD_SHOT", - "15": "MOVE_SLAM", - "19": "MOVE_MUD_BOMB", - "23": "MOVE_AMNESIA", - "29": "MOVE_YAWN", - "33": "MOVE_EARTHQUAKE", - "37": "MOVE_RAIN_DANCE", - "43": [ - "MOVE_MIST", - "MOVE_HAZE" - ], - "47": "MOVE_MUDDY_WATER" - }, - "tutor": [ + "by_tutor": [ "MOVE_DIVE", "MOVE_MUD_SLAP", "MOVE_ICY_WIND", @@ -115,8 +102,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 4, @@ -131,7 +118,7 @@ "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émon" + "category": "Water Fish Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", @@ -140,4 +127,4 @@ "rarity": 30, "unused": 2051 } -} +} \ No newline at end of file diff --git a/res/pokemon/wormadam/data.json b/res/pokemon/wormadam/data.json index 9a1ea6ab2a..c5f34f175d 100644 --- a/res/pokemon/wormadam/data.json +++ b/res/pokemon/wormadam/data.json @@ -8,10 +8,7 @@ "special_attack": 79, "special_defense": 105 }, - "types": [ - "TYPE_BUG", - "TYPE_GRASS" - ], + "types": [ "TYPE_BUG", "TYPE_GRASS" ], "catch_rate": 45, "base_exp_reward": 159, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_ANTICIPATION", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 10, "MOVE_PROTECT" ], + [ 15, "MOVE_BUG_BITE" ], + [ 20, "MOVE_HIDDEN_POWER" ], + [ 23, "MOVE_CONFUSION" ], + [ 26, "MOVE_RAZOR_LEAF" ], + [ 29, "MOVE_GROWTH" ], + [ 32, "MOVE_PSYBEAM" ], + [ 35, "MOVE_CAPTIVATE" ], + [ 38, "MOVE_FLAIL" ], + [ 41, "MOVE_ATTRACT" ], + [ 44, "MOVE_PSYCHIC" ], + [ 47, "MOVE_LEAF_STORM" ] + ], + "by_tm": [ "TM06", "TM09", "TM10", @@ -79,22 +85,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "10": "MOVE_PROTECT", - "15": "MOVE_BUG_BITE", - "20": "MOVE_HIDDEN_POWER", - "23": "MOVE_CONFUSION", - "26": "MOVE_RAZOR_LEAF", - "29": "MOVE_GROWTH", - "32": "MOVE_PSYBEAM", - "35": "MOVE_CAPTIVATE", - "38": "MOVE_FLAIL", - "41": "MOVE_ATTRACT", - "44": "MOVE_PSYCHIC", - "47": "MOVE_LEAF_STORM" - }, - "tutor": [ + "by_tutor": [ "MOVE_SNORE", "MOVE_ENDEAVOR", "MOVE_SYNTHESIS", @@ -104,9 +95,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 5, @@ -121,7 +113,7 @@ "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émon" + "category": "Bagworm Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/wormadam/forms/sandy/data.json b/res/pokemon/wormadam/forms/sandy/data.json index b7f097d4c1..75f1c652fa 100644 --- a/res/pokemon/wormadam/forms/sandy/data.json +++ b/res/pokemon/wormadam/forms/sandy/data.json @@ -8,10 +8,7 @@ "special_attack": 59, "special_defense": 85 }, - "types": [ - "TYPE_BUG", - "TYPE_GROUND" - ], + "types": [ "TYPE_BUG", "TYPE_GROUND" ], "catch_rate": 45, "base_exp_reward": 159, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_ANTICIPATION", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 10, "MOVE_PROTECT" ], + [ 15, "MOVE_BUG_BITE" ], + [ 20, "MOVE_HIDDEN_POWER" ], + [ 23, "MOVE_CONFUSION" ], + [ 26, "MOVE_ROCK_BLAST" ], + [ 29, "MOVE_HARDEN" ], + [ 32, "MOVE_PSYBEAM" ], + [ 35, "MOVE_CAPTIVATE" ], + [ 38, "MOVE_FLAIL" ], + [ 41, "MOVE_ATTRACT" ], + [ 44, "MOVE_PSYCHIC" ], + [ 47, "MOVE_FISSURE" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -78,22 +84,7 @@ "TM87", "TM90" ], - "level_up": { - "1": "MOVE_TACKLE", - "10": "MOVE_PROTECT", - "15": "MOVE_BUG_BITE", - "20": "MOVE_HIDDEN_POWER", - "23": "MOVE_CONFUSION", - "26": "MOVE_ROCK_BLAST", - "29": "MOVE_HARDEN", - "32": "MOVE_PSYBEAM", - "35": "MOVE_CAPTIVATE", - "38": "MOVE_FLAIL", - "41": "MOVE_ATTRACT", - "44": "MOVE_PSYCHIC", - "47": "MOVE_FISSURE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_ROLLOUT", "MOVE_SNORE", @@ -103,5 +94,6 @@ "MOVE_SUCKER_PUNCH", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/wormadam/forms/trash/data.json b/res/pokemon/wormadam/forms/trash/data.json index 92dc5565a7..39129c1625 100644 --- a/res/pokemon/wormadam/forms/trash/data.json +++ b/res/pokemon/wormadam/forms/trash/data.json @@ -8,10 +8,7 @@ "special_attack": 69, "special_defense": 95 }, - "types": [ - "TYPE_BUG", - "TYPE_STEEL" - ], + "types": [ "TYPE_BUG", "TYPE_STEEL" ], "catch_rate": 45, "base_exp_reward": 159, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_ANTICIPATION", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_ANTICIPATION", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GRAY", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 10, "MOVE_PROTECT" ], + [ 15, "MOVE_BUG_BITE" ], + [ 20, "MOVE_HIDDEN_POWER" ], + [ 23, "MOVE_CONFUSION" ], + [ 26, "MOVE_MIRROR_SHOT" ], + [ 29, "MOVE_METAL_SOUND" ], + [ 32, "MOVE_PSYBEAM" ], + [ 35, "MOVE_CAPTIVATE" ], + [ 38, "MOVE_FLAIL" ], + [ 41, "MOVE_ATTRACT" ], + [ 44, "MOVE_PSYCHIC" ], + [ 47, "MOVE_IRON_HEAD" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -77,22 +83,7 @@ "TM90", "TM91" ], - "level_up": { - "1": "MOVE_TACKLE", - "10": "MOVE_PROTECT", - "15": "MOVE_BUG_BITE", - "20": "MOVE_HIDDEN_POWER", - "23": "MOVE_CONFUSION", - "26": "MOVE_MIRROR_SHOT", - "29": "MOVE_METAL_SOUND", - "32": "MOVE_PSYBEAM", - "35": "MOVE_CAPTIVATE", - "38": "MOVE_FLAIL", - "41": "MOVE_ATTRACT", - "44": "MOVE_PSYCHIC", - "47": "MOVE_IRON_HEAD" - }, - "tutor": [ + "by_tutor": [ "MOVE_IRON_HEAD", "MOVE_SNORE", "MOVE_ENDEAVOR", @@ -103,5 +94,6 @@ "MOVE_SUCKER_PUNCH", "MOVE_UPROAR" ] - } + }, + "evolutions": [ ] } \ No newline at end of file diff --git a/res/pokemon/wurmple/data.json b/res/pokemon/wurmple/data.json index 94cf20d3a3..fbee5425c6 100644 --- a/res/pokemon/wurmple/data.json +++ b/res/pokemon/wurmple/data.json @@ -8,10 +8,7 @@ "special_attack": 20, "special_defense": 30 }, - "types": [ - "TYPE_BUG", - "TYPE_BUG" - ], + "types": [ "TYPE_BUG", "TYPE_BUG" ], "catch_rate": 255, "base_exp_reward": 54, "ev_yields": { @@ -30,32 +27,22 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SHIELD_DUST", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_BUG", "EGG_GROUP_BUG" ], + "abilities": [ "ABILITY_SHIELD_DUST", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_RED", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_STRING_SHOT" - ], - "5": "MOVE_POISON_STING", - "15": "MOVE_BUG_BITE" - }, - "tutor": [ - "MOVE_SNORE" - ] + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_STRING_SHOT" ], + [ 5, "MOVE_POISON_STING" ], + [ 15, "MOVE_BUG_BITE" ] + ], + "by_tm": [ ], + "by_tutor": [ "MOVE_SNORE" ] }, "evolutions": [ [ @@ -70,8 +57,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 3, @@ -85,8 +72,8 @@ "pokemon_pos_f": 27, "trainer_pos_m": 9, "pokemon_pos_m": 27, - "entry_text": "Often targeted by bird Pokémon,\nit desperately resists by releasing\npoison from its tail spikes.", - "category": "Worm Pokémon" + "entry_text": "Often targeted by bird Pok\u00e9mon,\nit desperately resists by releasing\npoison from its tail spikes.", + "category": "Worm Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/wynaut/data.json b/res/pokemon/wynaut/data.json index f4638e09ac..ec3bba742d 100644 --- a/res/pokemon/wynaut/data.json +++ b/res/pokemon/wynaut/data.json @@ -8,10 +8,7 @@ "special_attack": 23, "special_defense": 48 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_PSYCHIC" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_PSYCHIC" ], "catch_rate": 125, "base_exp_reward": 44, "ev_yields": { @@ -30,35 +27,25 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_SHADOW_TAG", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_SHADOW_TAG", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BLUE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [], - "level_up": { - "1": [ - "MOVE_SPLASH", - "MOVE_CHARM", - "MOVE_ENCORE" - ], - "15": [ - "MOVE_COUNTER", - "MOVE_MIRROR_COAT", - "MOVE_SAFEGUARD", - "MOVE_DESTINY_BOND" - ] - }, - "tutor": [] + "by_level": [ + [ 1, "MOVE_SPLASH" ], + [ 1, "MOVE_CHARM" ], + [ 1, "MOVE_ENCORE" ], + [ 15, "MOVE_COUNTER" ], + [ 15, "MOVE_MIRROR_COAT" ], + [ 15, "MOVE_SAFEGUARD" ], + [ 15, "MOVE_DESTINY_BOND" ] + ], + "by_tm": [ ], + "by_tutor": [ ] }, "evolutions": [ [ @@ -68,8 +55,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 6, @@ -84,7 +71,7 @@ "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émon" + "category": "Bright Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -93,4 +80,4 @@ "rarity": 10, "unused": 2570 } -} +} \ No newline at end of file diff --git a/res/pokemon/xatu/data.json b/res/pokemon/xatu/data.json index cf3d06c366..d5c9af3971 100644 --- a/res/pokemon/xatu/data.json +++ b/res/pokemon/xatu/data.json @@ -8,10 +8,7 @@ "special_attack": 95, "special_defense": 70 }, - "types": [ - "TYPE_PSYCHIC", - "TYPE_FLYING" - ], + "types": [ "TYPE_PSYCHIC", "TYPE_FLYING" ], "catch_rate": 75, "base_exp_reward": 171, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_SYNCHRONIZE", - "ABILITY_EARLY_BIRD" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_SYNCHRONIZE", "ABILITY_EARLY_BIRD" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_GREEN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_LEER" ], + [ 6, "MOVE_NIGHT_SHADE" ], + [ 9, "MOVE_TELEPORT" ], + [ 12, "MOVE_LUCKY_CHANT" ], + [ 17, "MOVE_MIRACLE_EYE" ], + [ 20, "MOVE_ME_FIRST" ], + [ 23, "MOVE_CONFUSE_RAY" ], + [ 27, "MOVE_TAILWIND" ], + [ 30, "MOVE_WISH" ], + [ 37, "MOVE_PSYCHO_SHIFT" ], + [ 42, "MOVE_FUTURE_SIGHT" ], + [ 47, "MOVE_OMINOUS_WIND" ], + [ 54, "MOVE_POWER_SWAP" ], + [ 54, "MOVE_GUARD_SWAP" ], + [ 59, "MOVE_PSYCHIC" ] + ], + "by_tm": [ "TM04", "TM06", "TM10", @@ -89,29 +98,7 @@ "HM02", "HM05" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_LEER" - ], - "6": "MOVE_NIGHT_SHADE", - "9": "MOVE_TELEPORT", - "12": "MOVE_LUCKY_CHANT", - "17": "MOVE_MIRACLE_EYE", - "20": "MOVE_ME_FIRST", - "23": "MOVE_CONFUSE_RAY", - "27": "MOVE_TAILWIND", - "30": "MOVE_WISH", - "37": "MOVE_PSYCHO_SHIFT", - "42": "MOVE_FUTURE_SIGHT", - "47": "MOVE_OMINOUS_WIND", - "54": [ - "MOVE_POWER_SWAP", - "MOVE_GUARD_SWAP" - ], - "59": "MOVE_PSYCHIC" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -124,9 +111,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 15, @@ -140,8 +128,8 @@ "pokemon_pos_f": 4, "trainer_pos_m": 9, "pokemon_pos_m": 4, - "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" + "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" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", diff --git a/res/pokemon/yanma/data.json b/res/pokemon/yanma/data.json index 72c07045dd..4e3b715460 100644 --- a/res/pokemon/yanma/data.json +++ b/res/pokemon/yanma/data.json @@ -8,10 +8,7 @@ "special_attack": 75, "special_defense": 45 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 75, "base_exp_reward": 147, "ev_yields": { @@ -30,21 +27,33 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SPEED_BOOST", - "ABILITY_COMPOUND_EYES" - ], - "great_marsh_flee_rate": 120, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_FORESIGHT" ], + [ 6, "MOVE_QUICK_ATTACK" ], + [ 11, "MOVE_DOUBLE_TEAM" ], + [ 14, "MOVE_SONIC_BOOM" ], + [ 17, "MOVE_DETECT" ], + [ 22, "MOVE_SUPERSONIC" ], + [ 27, "MOVE_UPROAR" ], + [ 30, "MOVE_PURSUIT" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 38, "MOVE_HYPNOSIS" ], + [ 43, "MOVE_WING_ATTACK" ], + [ 46, "MOVE_SCREECH" ], + [ 49, "MOVE_U_TURN" ], + [ 54, "MOVE_AIR_SLASH" ], + [ 57, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -76,27 +85,7 @@ "TM90", "HM05" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_FORESIGHT" - ], - "6": "MOVE_QUICK_ATTACK", - "11": "MOVE_DOUBLE_TEAM", - "14": "MOVE_SONIC_BOOM", - "17": "MOVE_DETECT", - "22": "MOVE_SUPERSONIC", - "27": "MOVE_UPROAR", - "30": "MOVE_PURSUIT", - "33": "MOVE_ANCIENT_POWER", - "38": "MOVE_HYPNOSIS", - "43": "MOVE_WING_ATTACK", - "46": "MOVE_SCREECH", - "49": "MOVE_U_TURN", - "54": "MOVE_AIR_SLASH", - "57": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -114,8 +103,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_SMALL" + "has": true, + "size": "FOOTPRINT_SMALL" }, "pokedex_data": { "height": 12, @@ -130,7 +119,7 @@ "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émon" + "category": "Clear Wing Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -139,4 +128,4 @@ "rarity": 10, "unused": 4356 } -} +} \ No newline at end of file diff --git a/res/pokemon/yanmega/data.json b/res/pokemon/yanmega/data.json index bd123bba16..1d17762ba2 100644 --- a/res/pokemon/yanmega/data.json +++ b/res/pokemon/yanmega/data.json @@ -8,10 +8,7 @@ "special_attack": 116, "special_defense": 56 }, - "types": [ - "TYPE_BUG", - "TYPE_FLYING" - ], + "types": [ "TYPE_BUG", "TYPE_FLYING" ], "catch_rate": 30, "base_exp_reward": 198, "ev_yields": { @@ -30,21 +27,37 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_BUG", - "EGG_GROUP_BUG" - ], - "abilities": [ - "ABILITY_SPEED_BOOST", - "ABILITY_TINTED_LENS" - ], - "great_marsh_flee_rate": 0, + "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_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_NIGHT_SLASH" ], + [ 1, "MOVE_BUG_BITE" ], + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_FORESIGHT" ], + [ 1, "MOVE_QUICK_ATTACK" ], + [ 1, "MOVE_DOUBLE_TEAM" ], + [ 6, "MOVE_QUICK_ATTACK" ], + [ 11, "MOVE_DOUBLE_TEAM" ], + [ 14, "MOVE_SONIC_BOOM" ], + [ 17, "MOVE_DETECT" ], + [ 22, "MOVE_SUPERSONIC" ], + [ 27, "MOVE_UPROAR" ], + [ 30, "MOVE_PURSUIT" ], + [ 33, "MOVE_ANCIENT_POWER" ], + [ 38, "MOVE_FEINT" ], + [ 43, "MOVE_SLASH" ], + [ 46, "MOVE_SCREECH" ], + [ 49, "MOVE_U_TURN" ], + [ 54, "MOVE_AIR_SLASH" ], + [ 57, "MOVE_BUG_BUZZ" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,31 +92,7 @@ "TM90", "HM05" ], - "level_up": { - "1": [ - "MOVE_NIGHT_SLASH", - "MOVE_BUG_BITE", - "MOVE_TACKLE", - "MOVE_FORESIGHT", - "MOVE_QUICK_ATTACK", - "MOVE_DOUBLE_TEAM" - ], - "6": "MOVE_QUICK_ATTACK", - "11": "MOVE_DOUBLE_TEAM", - "14": "MOVE_SONIC_BOOM", - "17": "MOVE_DETECT", - "22": "MOVE_SUPERSONIC", - "27": "MOVE_UPROAR", - "30": "MOVE_PURSUIT", - "33": "MOVE_ANCIENT_POWER", - "38": "MOVE_FEINT", - "43": "MOVE_SLASH", - "46": "MOVE_SCREECH", - "49": "MOVE_U_TURN", - "54": "MOVE_AIR_SLASH", - "57": "MOVE_BUG_BUZZ" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -114,9 +103,10 @@ "MOVE_UPROAR" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 19, @@ -131,7 +121,7 @@ "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émon" + "category": "Ogre Darner Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/zangoose/data.json b/res/pokemon/zangoose/data.json index 6fd56b0a08..4774ea5eae 100644 --- a/res/pokemon/zangoose/data.json +++ b/res/pokemon/zangoose/data.json @@ -8,10 +8,7 @@ "special_attack": 60, "special_defense": 60 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 90, "base_exp_reward": 165, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 20, "base_friendship": 70, "exp_rate": "EXP_RATE_ERRATIC", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_IMMUNITY", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_IMMUNITY", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_WHITE", - "flip_sprite": true + "flip": true }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_SCRATCH" ], + [ 1, "MOVE_LEER" ], + [ 5, "MOVE_QUICK_ATTACK" ], + [ 9, "MOVE_SWORDS_DANCE" ], + [ 14, "MOVE_FURY_CUTTER" ], + [ 18, "MOVE_SLASH" ], + [ 22, "MOVE_PURSUIT" ], + [ 27, "MOVE_EMBARGO" ], + [ 31, "MOVE_CRUSH_CLAW" ], + [ 35, "MOVE_TAUNT" ], + [ 40, "MOVE_DETECT" ], + [ 44, "MOVE_FALSE_SWIPE" ], + [ 48, "MOVE_X_SCISSOR" ], + [ 53, "MOVE_CLOSE_COMBAT" ] + ], + "by_tm": [ "TM01", "TM03", "TM05", @@ -97,25 +104,7 @@ "HM06", "HM08" ], - "level_up": { - "1": [ - "MOVE_SCRATCH", - "MOVE_LEER" - ], - "5": "MOVE_QUICK_ATTACK", - "9": "MOVE_SWORDS_DANCE", - "14": "MOVE_FURY_CUTTER", - "18": "MOVE_SLASH", - "22": "MOVE_PURSUIT", - "27": "MOVE_EMBARGO", - "31": "MOVE_CRUSH_CLAW", - "35": "MOVE_TAUNT", - "40": "MOVE_DETECT", - "44": "MOVE_FALSE_SWIPE", - "48": "MOVE_X_SCISSOR", - "53": "MOVE_CLOSE_COMBAT" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -130,9 +119,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 13, @@ -147,7 +137,7 @@ "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émon" + "category": "Cat Ferret Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", diff --git a/res/pokemon/zapdos/data.json b/res/pokemon/zapdos/data.json index a64c0a8c6c..847035e6e4 100644 --- a/res/pokemon/zapdos/data.json +++ b/res/pokemon/zapdos/data.json @@ -8,10 +8,7 @@ "special_attack": 125, "special_defense": 90 }, - "types": [ - "TYPE_ELECTRIC", - "TYPE_FLYING" - ], + "types": [ "TYPE_ELECTRIC", "TYPE_FLYING" ], "catch_rate": 3, "base_exp_reward": 216, "ev_yields": { @@ -30,21 +27,31 @@ "hatch_cycles": 80, "base_friendship": 35, "exp_rate": "EXP_RATE_SLOW", - "egg_groups": [ - "EGG_GROUP_UNDISCOVERED", - "EGG_GROUP_UNDISCOVERED" - ], - "abilities": [ - "ABILITY_PRESSURE", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_UNDISCOVERED", "EGG_GROUP_UNDISCOVERED" ], + "abilities": [ "ABILITY_PRESSURE", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_YELLOW", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_PECK" ], + [ 1, "MOVE_THUNDER_SHOCK" ], + [ 8, "MOVE_THUNDER_WAVE" ], + [ 15, "MOVE_DETECT" ], + [ 22, "MOVE_PLUCK" ], + [ 29, "MOVE_ANCIENT_POWER" ], + [ 36, "MOVE_CHARGE" ], + [ 43, "MOVE_AGILITY" ], + [ 50, "MOVE_DISCHARGE" ], + [ 57, "MOVE_ROOST" ], + [ 64, "MOVE_LIGHT_SCREEN" ], + [ 71, "MOVE_DRILL_PECK" ], + [ 78, "MOVE_THUNDER" ], + [ 85, "MOVE_RAIN_DANCE" ] + ], + "by_tm": [ "TM05", "TM06", "TM10", @@ -81,25 +88,7 @@ "HM05", "HM06" ], - "level_up": { - "1": [ - "MOVE_PECK", - "MOVE_THUNDER_SHOCK" - ], - "8": "MOVE_THUNDER_WAVE", - "15": "MOVE_DETECT", - "22": "MOVE_PLUCK", - "29": "MOVE_ANCIENT_POWER", - "36": "MOVE_CHARGE", - "43": "MOVE_AGILITY", - "50": "MOVE_DISCHARGE", - "57": "MOVE_ROOST", - "64": "MOVE_LIGHT_SCREEN", - "71": "MOVE_DRILL_PECK", - "78": "MOVE_THUNDER", - "85": "MOVE_RAIN_DANCE" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_OMINOUS_WIND", "MOVE_SNORE", @@ -111,9 +100,10 @@ "MOVE_SWIFT" ] }, + "evolutions": [ ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 16, @@ -127,8 +117,8 @@ "pokemon_pos_f": 0, "trainer_pos_m": 5, "pokemon_pos_m": 0, - "entry_text": "A legendary Pokémon that is said\nto live in thunderclouds. It freely\ncontrols lightning bolts.", - "category": "Electric Pokémon" + "entry_text": "A legendary Pok\u00e9mon that is said\nto live in thunderclouds. It freely\ncontrols lightning bolts.", + "category": "Electric Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", diff --git a/res/pokemon/zigzagoon/data.json b/res/pokemon/zigzagoon/data.json index 5f003bde66..4ef4b5e628 100644 --- a/res/pokemon/zigzagoon/data.json +++ b/res/pokemon/zigzagoon/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 41 }, - "types": [ - "TYPE_NORMAL", - "TYPE_NORMAL" - ], + "types": [ "TYPE_NORMAL", "TYPE_NORMAL" ], "catch_rate": 255, "base_exp_reward": 60, "ev_yields": { @@ -30,21 +27,30 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FIELD", - "EGG_GROUP_FIELD" - ], - "abilities": [ - "ABILITY_PICKUP", - "ABILITY_GLUTTONY" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FIELD", "EGG_GROUP_FIELD" ], + "abilities": [ "ABILITY_PICKUP", "ABILITY_GLUTTONY" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_BROWN", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_TACKLE" ], + [ 1, "MOVE_GROWL" ], + [ 5, "MOVE_TAIL_WHIP" ], + [ 9, "MOVE_HEADBUTT" ], + [ 13, "MOVE_SAND_ATTACK" ], + [ 17, "MOVE_ODOR_SLEUTH" ], + [ 21, "MOVE_MUD_SPORT" ], + [ 25, "MOVE_PIN_MISSILE" ], + [ 29, "MOVE_COVET" ], + [ 33, "MOVE_FLAIL" ], + [ 37, "MOVE_REST" ], + [ 41, "MOVE_BELLY_DRUM" ], + [ 45, "MOVE_FLING" ] + ], + "by_tm": [ "TM03", "TM06", "TM10", @@ -81,24 +87,7 @@ "HM03", "HM06" ], - "level_up": { - "1": [ - "MOVE_TACKLE", - "MOVE_GROWL" - ], - "5": "MOVE_TAIL_WHIP", - "9": "MOVE_HEADBUTT", - "13": "MOVE_SAND_ATTACK", - "17": "MOVE_ODOR_SLEUTH", - "21": "MOVE_MUD_SPORT", - "25": "MOVE_PIN_MISSILE", - "29": "MOVE_COVET", - "33": "MOVE_FLAIL", - "37": "MOVE_REST", - "41": "MOVE_BELLY_DRUM", - "45": "MOVE_FLING" - }, - "tutor": [ + "by_tutor": [ "MOVE_MUD_SLAP", "MOVE_FURY_CUTTER", "MOVE_ICY_WIND", @@ -120,8 +109,8 @@ ] ], "footprint": { - "has_footprint": true, - "footprint_size": "FOOTPRINT_MEDIUM" + "has": true, + "size": "FOOTPRINT_MEDIUM" }, "pokedex_data": { "height": 4, @@ -136,7 +125,7 @@ "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émon" + "category": "TinyRaccoon Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", @@ -145,4 +134,4 @@ "rarity": 50, "unused": 1285 } -} +} \ No newline at end of file diff --git a/res/pokemon/zubat/data.json b/res/pokemon/zubat/data.json index b45cfde32f..b1469e537d 100644 --- a/res/pokemon/zubat/data.json +++ b/res/pokemon/zubat/data.json @@ -8,10 +8,7 @@ "special_attack": 30, "special_defense": 40 }, - "types": [ - "TYPE_POISON", - "TYPE_FLYING" - ], + "types": [ "TYPE_POISON", "TYPE_FLYING" ], "catch_rate": 255, "base_exp_reward": 54, "ev_yields": { @@ -30,21 +27,28 @@ "hatch_cycles": 15, "base_friendship": 70, "exp_rate": "EXP_RATE_MEDIUM_FAST", - "egg_groups": [ - "EGG_GROUP_FLYING", - "EGG_GROUP_FLYING" - ], - "abilities": [ - "ABILITY_INNER_FOCUS", - "ABILITY_NONE" - ], - "great_marsh_flee_rate": 0, + "egg_groups": [ "EGG_GROUP_FLYING", "EGG_GROUP_FLYING" ], + "abilities": [ "ABILITY_INNER_FOCUS", "ABILITY_NONE" ], + "safari_flee_rate": 0, "sprite": { "color": "MON_COLOR_PURPLE", - "flip_sprite": false + "flip": false }, "learnset": { - "tms": [ + "by_level": [ + [ 1, "MOVE_LEECH_LIFE" ], + [ 5, "MOVE_SUPERSONIC" ], + [ 9, "MOVE_ASTONISH" ], + [ 13, "MOVE_BITE" ], + [ 17, "MOVE_WING_ATTACK" ], + [ 21, "MOVE_CONFUSE_RAY" ], + [ 25, "MOVE_AIR_CUTTER" ], + [ 29, "MOVE_MEAN_LOOK" ], + [ 33, "MOVE_POISON_FANG" ], + [ 37, "MOVE_HAZE" ], + [ 41, "MOVE_AIR_SLASH" ] + ], + "by_tm": [ "TM06", "TM10", "TM11", @@ -79,20 +83,7 @@ "HM02", "HM05" ], - "level_up": { - "1": "MOVE_LEECH_LIFE", - "5": "MOVE_SUPERSONIC", - "9": "MOVE_ASTONISH", - "13": "MOVE_BITE", - "17": "MOVE_WING_ATTACK", - "21": "MOVE_CONFUSE_RAY", - "25": "MOVE_AIR_CUTTER", - "29": "MOVE_MEAN_LOOK", - "33": "MOVE_POISON_FANG", - "37": "MOVE_HAZE", - "41": "MOVE_AIR_SLASH" - }, - "tutor": [ + "by_tutor": [ "MOVE_OMINOUS_WIND", "MOVE_SNORE", "MOVE_AIR_CUTTER", @@ -111,8 +102,8 @@ ] ], "footprint": { - "has_footprint": false, - "footprint_size": "FOOTPRINT_LARGE" + "has": false, + "size": "FOOTPRINT_LARGE" }, "pokedex_data": { "height": 8, @@ -127,7 +118,7 @@ "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émon" + "category": "Bat Pok\u00e9mon" }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", @@ -136,4 +127,4 @@ "rarity": 50, "unused": 4358 } -} +} \ No newline at end of file diff --git a/tools/json2bin/pokemon_personal_data.py b/tools/json2bin/pokemon_personal_data.py index a5904113a4..fca8417fa9 100644 --- a/tools/json2bin/pokemon_personal_data.py +++ b/tools/json2bin/pokemon_personal_data.py @@ -27,7 +27,7 @@ def parse_ev_yields(ev_yields: dict, size: int, _: None) -> bytes: def parse_color(sprite: dict, size: int, _: None) -> bytes: packed = pokemon_colors.PokemonColor[sprite['color']].value - packed = packed + ((1 if sprite['flip_sprite'] else 0) << 7) + packed = packed + ((1 if sprite['flip'] else 0) << 7) return packed.to_bytes(size, 'little') SCHEMA = j2b.Parser() \ @@ -53,10 +53,10 @@ SCHEMA = j2b.Parser() \ .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('great_marsh_flee_rate', 1, j2b.parse_int) \ + .register('safari_flee_rate', 1, j2b.parse_int) \ .register('sprite', 1, parse_color) \ .pad(2) \ - .register('learnset.tms', 16, j2b.pack_flags, tm_learnset.TMLearnsetFlags) + .register('learnset.by_tm', 16, j2b.pack_flags, tm_learnset.TMLearnsetFlags) NATIONAL_DEX_COUNT = 493 diff --git a/tools/json2bin/pokemon_wotbl_data.py b/tools/json2bin/pokemon_wotbl_data.py index 6194eb2cf1..c52201c774 100644 --- a/tools/json2bin/pokemon_wotbl_data.py +++ b/tools/json2bin/pokemon_wotbl_data.py @@ -12,24 +12,18 @@ 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: dict, _size: int, _enum: None): +def parse_level_up_moves(table: list, _size: int, _enum: None): out = [] - for key, value in table.items(): - level = int(key) - level_moves = value - if isinstance(level_moves, str): - out.extend(table_line(moves.Move[level_moves].value, level)) - elif isinstance(level_moves, list): - for move in level_moves: - out.extend(table_line(moves.Move[move].value, level)) - else: - raise TypeError(f"Invalid table value {level}; expected str or list") + 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.level_up', 0, parse_level_up_moves, optional=j2b.OptionalBehavior.SKIP) \ + .register('learnset.by_level', 0, parse_level_up_moves, optional=j2b.OptionalBehavior.SKIP) \ .pad(2, 0xff) \ .align(4) diff --git a/tools/scripts/make_species_tables.py b/tools/scripts/make_species_tables.py index 01dee33ad6..3a765efadb 100644 --- a/tools/scripts/make_species_tables.py +++ b/tools/scripts/make_species_tables.py @@ -61,7 +61,7 @@ FORM_INDICES = { species_movesets = {} species_footprints = { - 0: { "has_footprint": False, "footprint_size": "FOOTPRINT_SMALL" } + 0: { "has": False, "size": "FOOTPRINT_SMALL" } } for file_path in source_dir.glob("**/data.json"): @@ -97,7 +97,7 @@ for file_path in source_dir.glob("**/data.json"): byte = byte_array[byte_index] byte_array[byte_index] = byte | (1 << bit_index) - for tutor_move in species_data["learnset"]["tutor"]: + for tutor_move in species_data["learnset"]["by_tutor"]: set_bit(moveset.index(Move[tutor_move])) species_movesets[species_id] = byte_array @@ -150,10 +150,10 @@ with open(output_path, "w") as output_file: for key, value in sorted_array: - has_footprint = "TRUE" if species_footprints[key]["has_footprint"] else "FALSE" - footprint_size = PokemonFootprintSize[species_footprints[key]["footprint_size"]].value + has_footprint = "TRUE" if species_footprints[key]["has"] else "FALSE" + footprint_size = PokemonFootprintSize[species_footprints[key]["size"]].value - output_file.write(f" {{ {has_footprint}, {footprint_size} }},\n") + output_file.write(f" {{ {has_footprint}, {footprint_size} }},\n") output_file.write("};\n") output_file.write("\n#endif\n") diff --git a/tools/scripts/migration/species_data.py b/tools/scripts/migration/species_data.py new file mode 100755 index 0000000000..14c328b802 --- /dev/null +++ b/tools/scripts/migration/species_data.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python3 + +import json +import pathlib + + +class SpeciesJSONEncoder(json.JSONEncoder): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.indentation_level = 0 + + def encode(self, o): + if isinstance(o, (list, tuple)): + if self._is_inlinable(o): + return f"[ {', '.join(json.dumps(el) for el in o)} ]" + else: + self.indentation_level += 1 + output = [f"{self.indent_str}{self.encode(el)}" for el in o] + self.indentation_level -= 1 + return f"[\n{',\n'.join(output)}\n{self.indent_str}]" + elif isinstance(o, dict): + self.indentation_level += 1 + output = [ + f"{self.indent_str}{json.dumps(k)}: {self.encode(v)}" + for k, v in o.items() + ] + self.indentation_level -= 1 + return f"{{\n{',\n'.join(output)}\n{self.indent_str}}}" + else: + return json.dumps(o) + + def _is_inlinable(self, o): + if isinstance(o, (list, tuple)): + return ( + not any(isinstance(el, (list, tuple, dict)) for el in o) + and len(o) <= 2 + and len(str(o)) - 2 <= 80 + ) + + @property + def indent_str(self) -> str: + if isinstance(self.indent, int): + return " " * (self.indentation_level * self.indent) + elif isinstance(self.indent, str): + return self.indentation_level * self.indent + else: + raise ValueError( + f"indent must be of type int or str (is: {type(self.indent)})" + ) + + def iterencode(self, o, **kwargs): + return self.encode(o) + + +def migrate(d: dict) -> dict: + o = {} + o["name"] = d["name"] + o["base_stats"] = d["base_stats"] + o["types"] = d["types"] + o["catch_rate"] = d["catch_rate"] + o["base_exp_reward"] = d["base_exp_reward"] + o["ev_yields"] = d["ev_yields"] + o["held_items"] = d["held_items"] + o["gender_ratio"] = d["gender_ratio"] + o["hatch_cycles"] = d["hatch_cycles"] + o["base_friendship"] = d["base_friendship"] + 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["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]) + 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["evolutions"] = d.get("evolutions", []) + + if "footprint" in d: + o["footprint"] = {} + o["footprint"]["has"] = d["footprint"]["has_footprint"] + o["footprint"]["size"] = d["footprint"]["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"] + + return o + + +parent = pathlib.Path("res/pokemon") +for fname in parent.rglob("**/data.json"): + try: + with open(fname, "r", encoding="utf-8") as f: + j = json.load(f) + d = migrate(j) + with open(fname, "w", encoding="utf-8") as f: + json.dump(d, f, cls=SpeciesJSONEncoder, indent=4, ensure_ascii=False) + except KeyError as e: + print(f"Error parsing {fname}") + raise e From 2c410b8046413662dbb757151bb6f226dd2c5de8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 18 Jan 2025 16:58:41 -0800 Subject: [PATCH 09/10] 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 From dcc24974714e2e9bb1ca52034ddf45a9fb079bf4 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 21 Jan 2025 21:23:33 -0800 Subject: [PATCH 10/10] Decorate calls to SpeciesData accessors with proper constants --- include/battle/ov16_0223DF00.h | 2 +- src/battle/battle_display.c | 2 +- src/battle/ov16_0223B140.c | 2 +- src/battle/ov16_0223DF00.c | 36 +++++++++++++++--------------- src/overlay005/ov5_021E622C.c | 12 +++++----- src/overlay006/ov6_02240C9C.c | 6 ++--- src/overlay006/ov6_022426AC.c | 3 ++- src/overlay019/ov19_021D0D80.c | 10 ++++----- src/overlay019/ov19_021DB8E4.c | 39 +++++++++++++++++---------------- src/overlay021/ov21_021DE668.c | 16 +++++++------- src/overlay021/ov21_021DF734.c | 2 +- src/overlay021/ov21_021E8D48.c | 16 +++++++------- src/overlay094/ov94_0223E46C.c | 4 ++-- src/overlay094/ov94_022414B8.c | 3 ++- src/overlay097/ov97_02236380.c | 24 ++++++++++---------- src/overlay104/ov104_0222DCE0.c | 8 ++++--- src/overlay104/ov104_0223A0C4.c | 7 +++--- src/unk_0204AEE8.c | 8 ++++--- 18 files changed, 104 insertions(+), 96 deletions(-) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index e7c9cf625e..3f83339648 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -192,7 +192,7 @@ u32 BattleSystem_BattleStatus(BattleSystem *battleSys); enum Time BattleSystem_Time(BattleSystem *battleSys); int ov16_0223EC04(BattleSystem *battleSys); u8 ov16_0223EC58(BattleSystem *battleSys, int param1, u8 param2); -u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2); +u16 Battle_FindEvolvingPartyMember(FieldBattleDTO *param0, int *param1, int *param2); u8 ov16_0223ED60(BattleSystem *battleSys); u8 ov16_0223ED6C(BattleSystem *battleSys); int BattleSystem_NumSafariBalls(BattleSystem *battleSys); diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 911a3de7ef..91487f581e 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -3171,7 +3171,7 @@ static void ov16_02260B04(SysTask *param0, void *param1) v3 = ov16_0223ED6C(v0->unk_00); v2 = BattleMon_Get(BattleSystem_Context(v0->unk_00), v0->unk_09, 0, NULL); - v1 = SpeciesData_GetSpeciesValue(v2, 26); + v1 = SpeciesData_GetSpeciesValue(v2, SPECIES_DATA_SAFARI_FLEE_RATE); v1 = v1 * Unk_ov16_0226F194[v3][0] / Unk_ov16_0226F194[v3][1]; if ((BattleSystem_RandNext(v0->unk_00) % 255) <= v1) { diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 0073b03b84..906ffbe776 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -263,7 +263,7 @@ BOOL Battle_Main(OverlayManager *param0, int *param1) int v3; Pokemon *v4; - v2 = ov16_0223ECC4(v0, &v1, &v3); + v2 = Battle_FindEvolvingPartyMember(v0, &v1, &v3); if (v2) { Heap_Create(3, 73, 0x30000); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index bacb2c9f9d..bc46990f2d 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -124,7 +124,7 @@ u32 ov16_0223EBEC(BattleSystem *battleSystem); enum Time BattleSystem_Time(BattleSystem *battleSys); int ov16_0223EC04(BattleSystem *battleSystem); u8 ov16_0223EC58(BattleSystem *battleSystem, int param1, u8 param2); -u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2); +u16 Battle_FindEvolvingPartyMember(FieldBattleDTO *param0, int *param1, int *param2); u8 ov16_0223ED60(BattleSystem *battleSystem); u8 ov16_0223ED6C(BattleSystem *battleSystem); int BattleSystem_NumSafariBalls(BattleSystem *battleSystem); @@ -956,35 +956,35 @@ u8 ov16_0223EC58(BattleSystem *battleSystem, int param1, u8 param2) return 0; } -u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2) +u16 Battle_FindEvolvingPartyMember(FieldBattleDTO *dto, int *outPartySlot, int *outEvoType) { - Pokemon *v0; - u16 v1; + Pokemon *mon; + u16 species = SPECIES_NONE; - v1 = 0; - - if ((param0->resultMask != BATTLE_RESULT_WIN) && (param0->resultMask != BATTLE_RESULT_CAPTURED_MON) && (param0->resultMask != BATTLE_RESULT_PLAYER_FLED)) { - return 0; + if (dto->resultMask != BATTLE_RESULT_WIN + && dto->resultMask != BATTLE_RESULT_CAPTURED_MON + && dto->resultMask != BATTLE_RESULT_PLAYER_FLED) { + return SPECIES_NONE; } - while (param0->leveledUpMonsMask) { - for (param1[0] = 0; param1[0] < 6; param1[0]++) { - if (param0->leveledUpMonsMask & FlagIndex(param1[0])) { - param0->leveledUpMonsMask &= (FlagIndex(param1[0]) ^ 0xffffffff); + while (dto->leveledUpMonsMask) { + for (*outPartySlot = 0; *outPartySlot < 6; (*outPartySlot)++) { + if (dto->leveledUpMonsMask & FlagIndex(*outPartySlot)) { + dto->leveledUpMonsMask &= (FlagIndex(*outPartySlot) ^ 0xFFFFFFFF); break; } } - if (param1[0] < 6) { - v0 = Party_GetPokemonBySlotIndex(param0->parties[0], param1[0]); - - if ((v1 = Pokemon_GetEvolutionTargetSpecies(param0->parties[0], v0, EVO_CLASS_BY_LEVEL, param0->mapEvolutionMethod, param2))) { - return v1; + if (*outPartySlot < 6) { + mon = Party_GetPokemonBySlotIndex(dto->parties[BATTLE_SIDE_PLAYER], *outPartySlot); + species = Pokemon_GetEvolutionTargetSpecies(dto->parties[BATTLE_SIDE_PLAYER], mon, EVO_CLASS_BY_LEVEL, dto->mapEvolutionMethod, outEvoType); + if (species) { + return species; } } } - return v1; + return species; } u8 ov16_0223ED60(BattleSystem *battleSystem) diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index cfd684d7a0..0604b8eb7a 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2600,7 +2600,7 @@ void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, i { u8 v0, v1, v2; u16 v3; - u8 v4 = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); + u8 hatchCycles = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); Strbuf *v5; Pokemon_InitWith(param0, param1, 1, 32, FALSE, 0, OTID_NOT_SET, 0); @@ -2609,7 +2609,7 @@ void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, i v3 = ITEM_POKE_BALL; Pokemon_SetValue(param0, MON_DATA_POKEBALL, &v3); - Pokemon_SetValue(param0, MON_DATA_FRIENDSHIP, &v4); + Pokemon_SetValue(param0, MON_DATA_FRIENDSHIP, &hatchCycles); Pokemon_SetValue(param0, MON_DATA_MET_LEVEL, &v0); if (param2) { @@ -2643,7 +2643,7 @@ void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 p u16 v1; u32 v2; Strbuf *v3; - u8 v4 = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); + u8 hatchCycles = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); v2 = sub_02026248(param2); @@ -2669,7 +2669,7 @@ void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 p v1 = ITEM_POKE_BALL; Pokemon_SetValue(param0, MON_DATA_POKEBALL, &v1); - Pokemon_SetValue(param0, MON_DATA_FRIENDSHIP, &v4); + Pokemon_SetValue(param0, MON_DATA_FRIENDSHIP, &hatchCycles); Pokemon_SetValue(param0, MON_DATA_MET_LEVEL, &v0); Pokemon_SetValue(param0, MON_DATA_FORM, ¶m4); @@ -2759,8 +2759,8 @@ static u8 ov5_021E6FF0(BoxPokemon **param0) v2[v5] = BoxPokemon_GetValue(param0[v5], MON_DATA_OT_ID, NULL); v4 = BoxPokemon_GetValue(param0[v5], MON_DATA_PERSONALITY, NULL); v3[v5] = Pokemon_GetGenderOf(v1[v5], v4); - v0[v5][0] = SpeciesData_GetSpeciesValue(v1[v5], 22); - v0[v5][1] = SpeciesData_GetSpeciesValue(v1[v5], 23); + v0[v5][0] = SpeciesData_GetSpeciesValue(v1[v5], SPECIES_DATA_EGG_GROUP_1); + v0[v5][1] = SpeciesData_GetSpeciesValue(v1[v5], SPECIES_DATA_EGG_GROUP_2); } if ((v0[0][0] == 15) || (v0[1][0] == 15)) { diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index db47593be3..5e3ecc94fa 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -1279,10 +1279,10 @@ static BOOL ov6_0224219C(const EncounterSlot *param0, const u8 maxEncounters, co u8 v1 = 0; for (v2 = 0; v2 < maxEncounters; v2++) { - u8 v3 = SpeciesData_GetSpeciesValue(param0[v2].species, SPECIES_DATA_TYPE_1); - u8 v4 = SpeciesData_GetSpeciesValue(param0[v2].species, SPECIES_DATA_TYPE_2); + u8 type1 = SpeciesData_GetSpeciesValue(param0[v2].species, SPECIES_DATA_TYPE_1); + u8 type2 = SpeciesData_GetSpeciesValue(param0[v2].species, SPECIES_DATA_TYPE_2); - if (v3 == type || v4 == type) { + if (type1 == type || type2 == type) { v0[v1++] = v2; } } diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c index c5fde2f69b..b187d2bc52 100644 --- a/src/overlay006/ov6_022426AC.c +++ b/src/overlay006/ov6_022426AC.c @@ -4,6 +4,7 @@ #include #include "consts/gender.h" +#include "generated/gender_ratios.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" @@ -49,7 +50,7 @@ void GreatMarshLookout_CreateLookoutMonSprite(GreatMarshLookout_SpriteResources resources->unk_1CC = 0; int gender; - u8 genderRatio = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_PERSONAL_GENDER); + u8 genderRatio = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_GENDER_RATIO); switch (genderRatio) { case GENDER_RATIO_MALE_ONLY: diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 695c6fc2bb..43afcd07cb 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -3953,21 +3953,21 @@ static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, U { UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); BOOL v1 = BoxPokemon_EnterDecryptionContext(param1); - SpeciesData *v2; + SpeciesData *speciesData; v0->unk_00 = param1; v0->unk_04 = BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL); v0->unk_06 = BoxPokemon_GetValue(param1, MON_DATA_HELD_ITEM, NULL); v0->unk_08 = sub_0207A294(sub_0207A274(param2->unk_11C), v0->unk_04); v0->unk_0F = BoxPokemon_GetValue(param1, MON_DATA_EGG_EXISTS, NULL); - v2 = SpeciesData_FromMonSpecies(v0->unk_04, 9); - v0->unk_0A = SpeciesData_GetLevelAt(v2, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_EXP, NULL)); + speciesData = SpeciesData_FromMonSpecies(v0->unk_04, 9); + v0->unk_0A = SpeciesData_GetLevelAt(speciesData, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_EXP, NULL)); v0->unk_0B = BoxPokemon_GetValue(param1, MON_DATA_MARKS, NULL); v0->unk_0C = BoxPokemon_GetValue(param1, MON_DATA_TYPE_1, NULL); v0->unk_0D = BoxPokemon_GetValue(param1, MON_DATA_TYPE_2, NULL); if ((v0->unk_0F == 0) && BoxPokemon_GetValue(param1, MON_DATA_NIDORAN_HAS_NICKNAME, NULL)) { - v0->unk_0E = SpeciesData_GetGenderOf(v2, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL)); + v0->unk_0E = SpeciesData_GetGenderOf(speciesData, v0->unk_04, BoxPokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL)); } else { v0->unk_0E = 255; } @@ -3995,7 +3995,7 @@ static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, U MessageLoader_GetStrbuf(param2->unk_198, v3, v0->unk_24); } - SpeciesData_Free(v2); + SpeciesData_Free(speciesData); BoxPokemon_ExitDecryptionContext(param1, v1); } diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 82b7eea4c6..e896992b26 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -3,6 +3,7 @@ #include #include +#include "generated/pokemon_colors.h" #include "generated/species.h" #include "struct_decls/struct_020797DC_decl.h" @@ -227,35 +228,35 @@ BOOL ov19_021DBBA0(UnkStruct_ov19_021DBA9C *param0) void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy *param4) { - const PCBoxes *v0; - BoxPokemon *v1; - u32 v2, v3, v4, v5; - u8 v6, v7; + const PCBoxes *pcBoxes; + BoxPokemon *boxMon; + u32 v2, v3, v4, species; + u8 color, v7; int v8; - v0 = ov19_021D5E90(param0->unk_0C); - v8 = sub_02079AA8(v0, param1); + pcBoxes = ov19_021D5E90(param0->unk_0C); + v8 = sub_02079AA8(pcBoxes, param1); if (v8 >= (16 + 8)) { v8 -= 8; } - v6 = 13 * 0x10 + v8; - Bitmap_FillRect8bpp(&(param0->unk_3C), 9, 10, 14, 12, v6); + color = 13 * 0x10 + v8; + Bitmap_FillRect8bpp(&(param0->unk_3C), 9, 10, 14, 12, color); for (v3 = 0, v4 = 0; v3 < 5; v3++) { for (v2 = 0; v2 < 6; v2++) { - v1 = sub_02079C9C(v0, param1, v4++); - v7 = BoxPokemon_EnterDecryptionContext(v1); - v5 = BoxPokemon_GetValue(v1, MON_DATA_SPECIES, NULL); + boxMon = sub_02079C9C(pcBoxes, param1, v4++); + v7 = BoxPokemon_EnterDecryptionContext(boxMon); + species = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, NULL); - if (v5) { - if (BoxPokemon_GetValue(v1, MON_DATA_IS_EGG, NULL) == 0) { - u16 v9 = BoxPokemon_GetValue(v1, MON_DATA_FORM, NULL); + if (species) { + if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == FALSE) { + u16 form = BoxPokemon_GetValue(boxMon, MON_DATA_FORM, NULL); - v6 = SpeciesData_GetFormValue(v5, v9, SPECIES_DATA_BODY_COLOR); + color = SpeciesData_GetFormValue(species, form, SPECIES_DATA_BODY_COLOR); } else { - v6 = (v5 != SPECIES_MANAPHY) ? 8 : 1; + color = (species != SPECIES_MANAPHY) ? MON_COLOR_WHITE : MON_COLOR_BLUE; } { @@ -272,13 +273,13 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_ 0x9, }; - v6 = 14 * 0x10 + v10[v6]; + color = 14 * 0x10 + v10[color]; } - Bitmap_FillRect8bpp(&(param0->unk_3C), 10 + v2 * 2, 11 + v3 * 2, 2, 2, v6); + Bitmap_FillRect8bpp(&(param0->unk_3C), 10 + v2 * 2, 11 + v3 * 2, 2, 2, color); } - BoxPokemon_ExitDecryptionContext(v1, v7); + BoxPokemon_ExitDecryptionContext(boxMon, v7); } } diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index b560d7f9d0..3674f021ef 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -629,13 +629,13 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7 CellActorInitParams v1; UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int species = PokedexSort_CurrentSpecies(param2->unk_04); - int v4, v5; + int type1, type2; int v6 = PokedexSort_DefaultForm(param2->unk_04, species); - v4 = SpeciesData_GetFormValue(species, v6, 6); - v5 = SpeciesData_GetFormValue(species, v6, 7); - v4 = ov21_021DF180(v4); - v5 = ov21_021DF180(v5); + type1 = SpeciesData_GetFormValue(species, v6, SPECIES_DATA_TYPE_1); + type2 = SpeciesData_GetFormValue(species, v6, SPECIES_DATA_TYPE_2); + type1 = ov21_021DF180(type1); + type2 = ov21_021DF180(type2); sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -649,13 +649,13 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7 param0->unk_00[1] = CellActorCollection_Add(&v1); - CellActor_SetAnim(param0->unk_00[1], 0 + v4); + CellActor_SetAnim(param0->unk_00[1], 0 + type1); - if (v4 != v5) { + if (type1 != type2) { v1.position.x = (220 * FX32_ONE); v1.position.y = (72 * FX32_ONE); param0->unk_00[2] = CellActorCollection_Add(&v1); - CellActor_SetAnim(param0->unk_00[2], 0 + v5); + CellActor_SetAnim(param0->unk_00[2], 0 + type2); } else { param0->unk_00[2] = NULL; } diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index a04114f531..1ced811bf8 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -798,7 +798,7 @@ static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 *param1) int v0; int v1; - v0 = SpeciesData_GetSpeciesValue(param0, 18); + v0 = SpeciesData_GetSpeciesValue(param0, SPECIES_DATA_GENDER_RATIO); if (v0 == 0) { return 1; diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index a5aba54ba6..15f6be844f 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -590,12 +590,12 @@ static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection * { CellActorInitParams v0; CellActorResourceData v1; - int v2, v3; + int type1, type2; - v2 = SpeciesData_GetSpeciesValue(param4, 6); - v3 = SpeciesData_GetSpeciesValue(param4, 7); - v2 = ov21_021DF180(v2); - v3 = ov21_021DF180(v3); + type1 = SpeciesData_GetSpeciesValue(param4, SPECIES_DATA_TYPE_1); + type2 = SpeciesData_GetSpeciesValue(param4, SPECIES_DATA_TYPE_2); + type1 = ov21_021DF180(type1); + type2 = ov21_021DF180(type2); ov21_021E93F8(param0->unk_08, param2, &v1, 2); @@ -609,13 +609,13 @@ static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection * param0->unk_00[0] = CellActorCollection_Add(&v0); - CellActor_SetAnim(param0->unk_00[0], 0 + v2); + CellActor_SetAnim(param0->unk_00[0], 0 + type1); - if (v2 != v3) { + if (type1 != type2) { v0.position.x = (220 * FX32_ONE); v0.position.y = (72 * FX32_ONE); param0->unk_00[1] = CellActorCollection_Add(&v0); - CellActor_SetAnim(param0->unk_00[1], 0 + v3); + CellActor_SetAnim(param0->unk_00[1], 0 + type2); } else { param0->unk_00[1] = NULL; } diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index d19d56b820..27e284b07f 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -419,7 +419,7 @@ static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0) break; case 1: if (param0->unk_B7A.unk_00 != 0) { - param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_B7A.unk_00, 18); + param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_B7A.unk_00, SPECIES_DATA_GENDER_RATIO); if (ov94_02241B80(¶m0->unk_B7A, param0->unk_10E4->unk_20)) { Sound_PlayEffect(1500); @@ -834,7 +834,7 @@ static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0) Window_FillTilemap(¶m0->unk_FCC[1], 0x0); ov94_02242158(¶m0->unk_FCC[1], param0->unk_B94, v0, 0, 0, TEXT_COLOR(1, 2, 0)); - param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(v0, 18); + param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(v0, SPECIES_DATA_GENDER_RATIO); ov94_02242AC4(¶m0->unk_111C, param0->unk_10E4->unk_06 + param0->unk_10E4->unk_04, param0->unk_10E4->unk_0A, param0->unk_10E4->unk_08); if (ov94_02241B80(¶m0->unk_B7A, param0->unk_10E4->unk_20)) { diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index b452fee576..0a43f57db1 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -5,6 +5,7 @@ #include #include "constants/species.h" +#include "consts/pokemon.h" #include "struct_decls/pokedexdata_decl.h" @@ -640,7 +641,7 @@ static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0) Window_Remove(¶m0->unk_F9C[1]); param0->unk_B74.unk_00 = v0; Sound_PlayEffect(1500); - param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(v0, 18); + param0->unk_10E4->unk_20 = SpeciesData_GetSpeciesValue(v0, SPECIES_DATA_GENDER_RATIO); if (ov94_02241B80(¶m0->unk_B74, param0->unk_10E4->unk_20)) { param0->unk_2C = 10; diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index defb770aa1..625a4ba22b 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -1320,33 +1320,33 @@ u32 ov97_02236E00(BoxPokemonGBA *param0) return Pokemon_GetSpeciesLevelAt(v0, v1); } -static int ov97_02236E28(BoxPokemonGBA *param0, BoxPokemon *param1) +static int ov97_02236E28(BoxPokemonGBA *boxMonGBA, BoxPokemon *boxMon) { int v0; - int v1; - u16 v2; + int ability; + u16 species; int v3; - v2 = BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL); - v3 = GetGBABoxMonData(param0, 46, NULL); - v1 = SpeciesData_GetSpeciesValue(v2, 25); + species = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, NULL); + v3 = GetGBABoxMonData(boxMonGBA, 46, NULL); + ability = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_ABILITY_2); - if (v1) { + if (ability) { for (v0 = 0; v0 < (sizeof(Unk_ov97_0223ECA0) / 2); v0++) { - if (Unk_ov97_0223ECA0[v0] == v2) { - v1 = SpeciesData_GetSpeciesValue(v2, 24); + if (Unk_ov97_0223ECA0[v0] == species) { + ability = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_ABILITY_1); break; } } if ((v0 == (sizeof(Unk_ov97_0223ECA0) / 2)) && ((v3 & 1) == 0)) { - v1 = SpeciesData_GetSpeciesValue(v2, 24); + ability = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_ABILITY_1); } } else { - v1 = SpeciesData_GetSpeciesValue(v2, 24); + ability = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_ABILITY_1); } - return v1; + return ability; } void BoxMonGBAToBoxMon(BoxPokemonGBA *param0, BoxPokemon *param1) diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 410f102510..b78f951518 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -3,6 +3,8 @@ #include #include +#include "consts/pokemon.h" + #include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/struct_0204B184.h" @@ -230,16 +232,16 @@ u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, u32 param2 param0->unk_1E_val2 = 0; param0->unk_1F = gGameLanguage; - v0 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, 25); + v0 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, SPECIES_DATA_ABILITY_2); if (v0) { if (param0->unk_10 & 1) { param0->unk_20 = v0; } else { - param0->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, 24); + param0->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, SPECIES_DATA_ABILITY_1); } } else { - param0->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, 24); + param0->unk_20 = SpeciesData_GetSpeciesValue(param0->unk_00_val1_0, SPECIES_DATA_ABILITY_1); } param0->unk_21 = v3; diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index d3d2665fb4..1e39d8e615 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -4,6 +4,7 @@ #include #include "consts/battle.h" +#include "consts/pokemon.h" #include "struct_defs/struct_0202D764.h" #include "struct_defs/struct_0204AFC4.h" @@ -883,16 +884,16 @@ static u32 ov104_0223A3A8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_s param1->unk_1E_val2 = 0; param1->unk_1F = gGameLanguage; - v0 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 25); + v0 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, SPECIES_DATA_ABILITY_2); if (v0) { if (param1->unk_10 & 1) { param1->unk_20 = v0; } else { - param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, SPECIES_DATA_ABILITY_1); } } else { - param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, SPECIES_DATA_ABILITY_1); } param1->unk_21 = v3; diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 9fc144727b..6742bfb84a 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -3,6 +3,8 @@ #include #include +#include "consts/pokemon.h" + #include "struct_decls/pokedexdata_decl.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204B184.h" @@ -378,16 +380,16 @@ static u32 sub_0204B1E8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_sub param1->unk_1E_val2 = 0; param1->unk_1F = gGameLanguage; - v0 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 25); + v0 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, SPECIES_DATA_ABILITY_2); if (v0) { if (param1->unk_10 & 1) { param1->unk_20 = v0; } else { - param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, SPECIES_DATA_ABILITY_1); } } else { - param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, 24); + param1->unk_20 = SpeciesData_GetSpeciesValue(param1->unk_00_val1_0, SPECIES_DATA_ABILITY_1); } param1->unk_21 = v3;