Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Miscellaneous species_info Changes (#8462)

Browse Source
This commit is contained in:
amiosi 2026-01-11 12:54:43 -05:00 committed by GitHub
parent b671adf85f
commit 0870fe24c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 577 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/config/pokemon.h
View File

@ -2,12 +2,12 @@
#define GUARD_CONFIG_POKEMON_H
// Species data settings
#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type.
#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation.
#define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 6, certain Pokémon have their abilities changed.
#define P_UPDATED_TYPES GEN_LATEST // Some Pokémon have received type updates after their introduction.
#define P_UPDATED_STATS GEN_LATEST // Some Pokémon have received base stat updates after their introduction.
#define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 4, certain Pokémon have had their abilities changed.
#define P_UPDATED_EGG_GROUPS GEN_LATEST // Since Gen 8, certain Pokémon have gained new egg groups.
#define P_UPDATED_FRIENDSHIP GEN_LATEST // Since Gen 8, the base friendship of certain Pokémon was changed.
#define P_UPDATED_EVS GEN_LATEST // Some Pokémon have received EV updates after their introduction.
#define P_UPDATED_EVS GEN_LATEST // Since Gen 4, some Pokémon have received EV updates.
#define P_UPDATED_EXP_YIELDS GEN_LATEST // Since Gen 5, some Pokémon have received base Experience changes.
// Learnsets
@ -17,7 +17,7 @@
// GEN_1/2/3/4/5/6/7: Yellow, Crystal, RSE, HGSS, B2W2, ORAS, USUM learnsets respectively.
// GEN_8: Use the following priority: BDSP for Gen1-4 Pokémon, then LA for species introduced in that game, then SwSh for species present in those games. Otherwise, use GEN_7.
// GEN_9: SV For species present in those games. Otherwise use GEN_8.
#define P_EVOLUTION_LEVEL_1_LEARN GEN_LATEST // In Gen 8+, Pokémon evolving while at level 1 do not get the chance to learn their level 1 moves, while before they did.
#define P_EVOLUTION_LEVEL_1_LEARN GEN_LATEST // Since Gen 8, Pokémon evolving while at level 1 do not get the chance to learn their level 1 moves, while before they did.
// Evolution settings
#define P_FRIENDSHIP_EVO_THRESHOLD GEN_LATEST // Since Gen 8, Pokémon that evolve by friendship evolve at or above 160 friendship instead of 220.
@ -25,13 +25,13 @@
// Breeding settings
#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat.
#define P_INCENSE_BREEDING GEN_LATEST // Since Gen 9, cross-generation Baby Pokémon don't require Incense being held by the parents to be obtained via breeding.
#define P_EGG_HATCH_LEVEL GEN_LATEST // Since Gen 4, Pokémon will hatch from eggs at level 1 instead of 5.
#define P_BALL_INHERITING GEN_LATEST // Since Gen 6, Eggs from the Daycare will inherit the Poké Ball from their mother. From Gen 7 onwards, the father can pass it down as well, as long as it's of the same species as the mother.
#define P_EGG_HATCH_LEVEL GEN_LATEST // Since Gen 4, Pokémon will hatch from Eggs at level 1 instead of 5.
#define P_BALL_INHERITING GEN_LATEST // Since Gen 6, Eggs from the Day Care will inherit the Poké Ball from their mother. From Gen 7 onwards, the father can pass it down as well, as long as it's of the same species as the mother.
#define P_TM_INHERITANCE GEN_LATEST // Since Gen 6, the father no longer passes down TMs to the baby.
#define P_MOTHER_EGG_MOVE_INHERITANCE GEN_LATEST // Since Gen 6, the mother can also pass down Egg Moves.
#define P_NATURE_INHERITANCE GEN_LATEST // In Gen 3, Everstone grants Ditto and mothers a 50% chance to pass on Nature. Since Gen 4, anyone can pass on nature. Since Gen 5, the chance is 100%.
#define P_ABILITY_INHERITANCE GEN_LATEST // In B2W2, a female Pokémon has an 80% chance of passing down their ability if bred with a male. Since Gen 6, the chance is 80% for normal ability and 60% for Hidden Ability, and anyone can pass down their abilities if bred with Ditto. NOTE: BW's effect: 60% chance to pass down HA and random for normal ability has been omitted.
#define P_EGG_MOVE_TRANSFER GEN_LATEST // Starting in Gen 8, if two Pokémon of the same species are together in the Daycare, one knows an Egg Move, and the other has an empty slot, the other Pokémon will receive the Egg Move in the empty slot. In Gen 9, if a Pokémon holds a Mirror Herb, it will receive Egg Moves from the other regardless of species.
#define P_NATURE_INHERITANCE GEN_LATEST // In Gen 3, Everstone grants Ditto and mothers a 50% chance to pass on Nature. Since Gen 4, anyone can pass on a Nature. Since Gen 5, the chance is 100%.
#define P_ABILITY_INHERITANCE GEN_LATEST // In B2W2, a female Pokémon has an 80% chance of passing down their Ability if bred with a male. Since Gen 6, the chance is 80% for regular Ability and 60% for Hidden Ability, and anyone can pass down their Abilities if bred with Ditto. NOTE: BW's effect: 60% chance to pass down HA and random for regular Ability has been omitted.
#define P_EGG_MOVE_TRANSFER GEN_LATEST // Starting in Gen 8, if two Pokémon of the same species are together in the Day Care, one knows an Egg Move, and the other has an empty slot, the other Pokémon will receive the Egg Move in the empty slot. In Gen 9, if a Pokémon holds a Mirror Herb, it will receive Egg Moves from the other regardless of species.
#define P_SCATTERBUG_LINE_FORM_BREED SPECIES_SCATTERBUG_FANCY // Choose the Scatterbug form all Vivillon/Spewpa/Scatterbug will breed into, basically aligning with the "location" of the player's game.
// Species-specific settings
@ -41,8 +41,8 @@
// Species graphic settings
#define P_GENDER_DIFFERENCES TRUE // If TRUE, Pokémon will have graphical-only differences when they're female. Female *forms* such as Meowstic are not affected by this.
#define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female differences, i.e. Hippopotas and Hippowdon
#define P_ARCEUS_UNIQUE_FORM_ICONS GEN_LATEST // Since Gen 9, Arceus additionally changes its icon to reflect its current form.
#define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, more Pokémon will have custom icons for their female differences, such as Hippopotas and Hippowdon.
#define P_ARCEUS_UNIQUE_FORM_ICONS GEN_LATEST // Since Gen 9, Arceus changes its icon to reflect its current form.
#define P_FOOTPRINTS TRUE // If TRUE, Pokémon will have footprints (as was the case up to Gen 5 and in BDSP). Disabling this saves some ROM space.
#define P_TWO_FRAME_FRONT_SPRITES TRUE // In Pokémon Emerald, Pokémon front sprites always consist of two frames. This config can revert it to only use the first frame, as is the case in the other Gen 3 games.
#define P_GBA_STYLE_SPECIES_GFX FALSE // By default, Pokémon sprites use Gen 4/5's style. This config can revert them back to GBA-style. NOTE: B_ENEMY_MON_SHADOW_STYLE is disabled when using these sprites for now.
@ -55,11 +55,11 @@
#define P_EV_CAP GEN_LATEST // Since Gen 6, the max EVs per stat is 252 instead of 255.
#define P_SHOW_TERA_TYPE GEN_8 // Since Gen 9, the Tera Type is shown on the summary screen.
#define P_TM_LITERACY GEN_LATEST // Since Gen 6, TM illiterate Pokémon can learn TMs that teach moves that are in their level-up learnsets.
#define P_CAN_FORGET_HIDDEN_MOVE FALSE // If TRUE, Pokémon can forget any move, even if it is a Hidden Move.
#define P_ASK_MOVE_CONFIRMATION FALSE // If FALSE, when a player decides not to learn a Move, the game does not ask the player for confirmation.
#define P_EGG_CYCLE_LENGTH GEN_LATEST // Since Gen 8, egg cycles take half as many steps as before. Previous Gens have some varied step counts around 255.
#define P_ONLY_OBTAINABLE_SHINIES FALSE // If TRUE, Pokémon encountered in the Battle Pyramid or while catching is disabled won't be shiny.
#define P_NO_SHINIES_WITHOUT_POKEBALLS FALSE // If TRUE, Pokémon encountered when the player is out of Poké Balls won't be shiny
#define P_CAN_FORGET_HIDDEN_MOVE FALSE // If TRUE, Pokémon can forget any move, even if it is an HM.
#define P_ASK_MOVE_CONFIRMATION FALSE // If FALSE, when a player decides not to learn a move, the game does not ask the player for confirmation.
#define P_EGG_CYCLE_LENGTH GEN_LATEST // Since Gen 8, Egg cycles take half as many steps as before. Previous generations have some varied step counts around 255.
#define P_ONLY_OBTAINABLE_SHINIES FALSE // If TRUE, Pokémon encountered in the Battle Pyramid or while catching is disabled won't be Shiny.
#define P_NO_SHINIES_WITHOUT_POKEBALLS FALSE // If TRUE, Pokémon encountered when the player is out of Poké Balls won't be Shiny.
#define P_SHOW_DYNAMIC_TYPES FALSE // If TRUE, all moves with dynamic type changes will be reflected as their current type in battle/summary screens instead of just select ones like in vanilla.
// Learnset helper toggles

544
src/data/pokemon/species_info/gen_1_families.h
View File

File diff suppressed because it is too large Load Diff

124
src/data/pokemon/species_info/gen_2_families.h
View File

@ -240,13 +240,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 115,
.types = MON_TYPES(TYPE_GRASS, TYPE_FAIRY),
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 263,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 236,
#else
.expYield = 208,
#endif
.evYield_Defense = 1,
.evYield_SpDefense = 2,
.genderRatio = PERCENT_FEMALE(12.5),
@ -432,14 +426,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
{EVO_LEVEL, 36, SPECIES_TYPHLOSION_HISUI, CONDITIONS({IF_REGION, REGION_HISUI})}),
},
#if P_UPDATED_EXP_YIELDS >= GEN_8
#define TYPHLOSION_EXP_YIELD 267
#elif P_UPDATED_EXP_YIELDS >= GEN_5
#define TYPHLOSION_EXP_YIELD 240
#else
#define TYPHLOSION_EXP_YIELD 209
#endif
[SPECIES_TYPHLOSION] =
{
.baseHP = 78,
@ -450,7 +436,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 85,
.types = MON_TYPES(TYPE_FIRE),
.catchRate = 45,
.expYield = TYPHLOSION_EXP_YIELD,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 267,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 240,
#else
.expYield = 209,
#endif
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -519,7 +511,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 85,
.types = MON_TYPES(TYPE_FIRE, TYPE_GHOST),
.catchRate = 45,
.expYield = TYPHLOSION_EXP_YIELD,
.expYield = 267,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -807,13 +799,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 93,
.types = MON_TYPES(TYPE_WATER, TYPE_DRAGON),
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 265,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 239,
#else
.expYield = 210,
#endif
.evYield_Attack = 2,
.evYield_Defense = 1,
.genderRatio = PERCENT_FEMALE(12.5),
@ -1611,7 +1597,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
#endif //P_FAMILY_CHINCHOU
#if P_FAMILY_TOGEPI
#define TOGEPI_FAMILY_TYPE (P_UPDATED_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL)
#define TOGEPI_FAMILY_TYPE1 (P_UPDATED_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL)
[SPECIES_TOGEPI] =
{
@ -1621,7 +1607,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpeed = 20,
.baseSpAttack = 40,
.baseSpDefense = 65,
.types = MON_TYPES(TOGEPI_FAMILY_TYPE),
.types = MON_TYPES(TOGEPI_FAMILY_TYPE1),
.catchRate = 190,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 49 : 74,
.evYield_SpDefense = 1,
@ -1632,6 +1618,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
.abilities = { ABILITY_HUSTLE, ABILITY_SERENE_GRACE, ABILITY_SUPER_LUCK },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Togepi"),
.cryId = CRY_TOGEPI,
.natDexNum = NATIONAL_DEX_TOGEPI,
@ -1690,7 +1677,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpeed = 40,
.baseSpAttack = 80,
.baseSpDefense = 105,
.types = MON_TYPES(TOGEPI_FAMILY_TYPE, TYPE_FLYING),
.types = MON_TYPES(TOGEPI_FAMILY_TYPE1, TYPE_FLYING),
.catchRate = 75,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 142 : 114,
.evYield_SpDefense = 2,
@ -1701,6 +1688,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FAIRY),
.abilities = { ABILITY_HUSTLE, ABILITY_SERENE_GRACE, ABILITY_SUPER_LUCK },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Togetic"),
.cryId = CRY_TOGETIC,
.natDexNum = NATIONAL_DEX_TOGETIC,
@ -1761,7 +1749,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpeed = 80,
.baseSpAttack = 120,
.baseSpDefense = 115,
.types = MON_TYPES(TOGEPI_FAMILY_TYPE, TYPE_FLYING),
.types = MON_TYPES(TOGEPI_FAMILY_TYPE1, TYPE_FLYING),
.catchRate = 30,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 273,
@ -2012,6 +2000,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD),
.abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_PLUS },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Mareep"),
.cryId = CRY_MAREEP,
.natDexNum = NATIONAL_DEX_MAREEP,
@ -2136,13 +2125,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_AMPHAROS}),
},
#define AMPHAROS_DEFENSE (P_UPDATED_STATS >= GEN_6 ? 85 : 75)
[SPECIES_AMPHAROS] =
{
.baseHP = 90,
.baseAttack = 75,
.baseDefense = AMPHAROS_DEFENSE,
.baseDefense = P_UPDATED_STATS >= GEN_6 ? 85 : 75,
.baseSpeed = 55,
.baseSpAttack = 115,
.baseSpDefense = 90,
@ -2150,7 +2137,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 255,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 230,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 225,
@ -2221,7 +2208,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
{
.baseHP = 90,
.baseAttack = 95,
.baseDefense = AMPHAROS_DEFENSE + 20,
.baseDefense = 105,
.baseSpeed = 45,
.baseSpAttack = 165,
.baseSpDefense = 110,
@ -2471,6 +2458,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FAIRY),
.abilities = { ABILITY_THICK_FAT, ABILITY_HUGE_POWER, ABILITY_SAP_SIPPER },
.bodyColor = BODY_COLOR_BLUE,
.noFlip = TRUE,
.speciesName = _("Azumarill"),
.cryId = CRY_AZUMARILL,
.natDexNum = NATIONAL_DEX_AZUMARILL,
@ -3597,7 +3585,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 25,
.types = MON_TYPES(TYPE_POISON, TYPE_GROUND),
.catchRate = 255,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52,
.expYield = 42,
.evYield_HP = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
@ -5111,15 +5099,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
#endif //P_FAMILY_SNUBBULL
#if P_FAMILY_QWILFISH
#if P_UPDATED_EXP_YIELDS >= GEN_7
#define QWILFISH_EXP_YIELD 88
#elif P_UPDATED_EXP_YIELDS >= GEN_5
#define QWILFISH_EXP_YIELD 86
#else
#define QWILFISH_EXP_YIELD 100
#endif
[SPECIES_QWILFISH] =
{
.baseHP = 65,
@ -5130,7 +5109,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 55,
.types = MON_TYPES(TYPE_WATER, TYPE_POISON),
.catchRate = 45,
.expYield = QWILFISH_EXP_YIELD,
#if P_UPDATED_EXP_YIELDS >= GEN_7
.expYield = 88,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 86,
#else
.expYield = 100,
#endif
.evYield_Attack = 1,
.itemRare = ITEM_POISON_BARB,
.genderRatio = PERCENT_FEMALE(50),
@ -5200,13 +5185,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
{
.baseHP = 65,
.baseAttack = 95,
.baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75,
.baseDefense = 85,
.baseSpeed = 85,
.baseSpAttack = 55,
.baseSpDefense = 55,
.types = MON_TYPES(TYPE_DARK, TYPE_POISON),
.catchRate = 45,
.expYield = QWILFISH_EXP_YIELD,
.expYield = 88,
.evYield_Attack = 1,
.itemRare = ITEM_POISON_BARB,
.genderRatio = PERCENT_FEMALE(50),
@ -5216,6 +5201,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2),
.abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE },
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Qwilfish"),
.cryId = CRY_QWILFISH,
.natDexNum = NATIONAL_DEX_QWILFISH,
@ -5283,6 +5269,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2),
.abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE },
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Overqwil"),
.cryId = CRY_OVERQWIL,
.natDexNum = NATIONAL_DEX_OVERQWIL,
@ -5750,7 +5737,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 75,
.types = MON_TYPES(TYPE_FIGHTING, TYPE_POISON),
.catchRate = 60,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132,
.expYield = 86,
.evYield_Speed = 1,
.itemRare = ITEM_QUICK_CLAW,
.genderRatio = PERCENT_FEMALE(50),
@ -5841,6 +5828,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
.abilities = { ABILITY_PRESSURE, ABILITY_UNBURDEN, ABILITY_POISON_TOUCH },
.bodyColor = BODY_COLOR_BLUE,
.noFlip = TRUE,
.speciesName = _("Sneasler"),
.cryId = CRY_SNEASLER,
.natDexNum = NATIONAL_DEX_SNEASLER,
@ -5900,7 +5888,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.catchRate = 120,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 124,
.evYield_Attack = 1,
.itemCommon = ITEM_HONEY,
.itemRare = ITEM_HONEY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
@ -6069,6 +6057,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
.abilities = { ABILITY_GUTS, ABILITY_BULLETPROOF, ABILITY_UNNERVE },
.bodyColor = BODY_COLOR_BROWN,
.noFlip = TRUE,
.speciesName = _("Ursaluna"),
.cryId = CRY_URSALUNA,
.natDexNum = NATIONAL_DEX_URSALUNA,
@ -6123,7 +6112,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 65,
.types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL),
.catchRate = 5,
.expYield = 275,
.expYield = 278,
.evYield_SpAttack = 3,
.genderRatio = MON_MALE,
.eggCycles = 20,
@ -6132,6 +6121,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
.abilities = { ABILITY_MINDS_EYE, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_BROWN,
.noFlip = TRUE,
.speciesName = _("Ursaluna"),
.cryId = CRY_URSALUNA,
.natDexNum = NATIONAL_DEX_URSALUNA,
@ -6571,27 +6561,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
#endif //P_FAMILY_SWINUB
#if P_FAMILY_CORSOLA
#if P_UPDATED_EXP_YIELDS >= GEN_7
#define CORSOLA_EXP_YIELD 144
#elif P_UPDATED_EXP_YIELDS >= GEN_5
#define CORSOLA_EXP_YIELD 133
#else
#define CORSOLA_EXP_YIELD 113
#endif
#define CORSOLA_HP (P_UPDATED_STATS >= GEN_7 ? 65 : 55)
#define CORSOLA_DEFENSES (P_UPDATED_STATS >= GEN_7 ? 95 : 85)
[SPECIES_CORSOLA] =
{
.baseHP = CORSOLA_HP,
.baseHP = P_UPDATED_STATS >= GEN_7 ? 65 : 55,
.baseAttack = 55,
.baseDefense = CORSOLA_DEFENSES,
.baseDefense = P_UPDATED_STATS >= GEN_7 ? 95 : 85,
.baseSpeed = 35,
.baseSpAttack = 65,
.baseSpDefense = CORSOLA_DEFENSES,
.baseSpDefense = P_UPDATED_STATS >= GEN_7 ? 95 : 85,
.types = MON_TYPES(TYPE_WATER, TYPE_ROCK),
.catchRate = 60,
.expYield = CORSOLA_EXP_YIELD,
#if P_UPDATED_EXP_YIELDS >= GEN_7
.expYield = 144,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 133,
#else
.expYield = 113,
#endif
.evYield_Defense = 1,
.evYield_SpDefense = 1,
.itemRare = ITEM_LUMINOUS_MOSS,
@ -6657,15 +6643,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
#if P_GALARIAN_FORMS
[SPECIES_CORSOLA_GALAR] =
{
.baseHP = CORSOLA_HP - 5,
.baseHP = 60,
.baseAttack = 55,
.baseDefense = CORSOLA_DEFENSES + 5,
.baseDefense = 100,
.baseSpeed = 30,
.baseSpAttack = 65,
.baseSpDefense = CORSOLA_DEFENSES + 5,
.baseSpDefense = 100,
.types = MON_TYPES(TYPE_GHOST),
.catchRate = 60,
.expYield = CORSOLA_EXP_YIELD,
.expYield = 144,
.evYield_SpDefense = 1,
.genderRatio = PERCENT_FEMALE(75),
.eggCycles = 20,
@ -6741,6 +6727,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3),
.abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_PERISH_BODY },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Cursola"),
.cryId = CRY_CURSOLA,
.natDexNum = NATIONAL_DEX_CURSOLA,
@ -6969,6 +6956,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),
.abilities = { ABILITY_VITAL_SPIRIT, ABILITY_HUSTLE, ABILITY_INSOMNIA },
.bodyColor = BODY_COLOR_RED,
.noFlip = TRUE,
.speciesName = _("Delibird"),
.cryId = CRY_DELIBIRD,
.natDexNum = NATIONAL_DEX_DELIBIRD,
@ -7116,6 +7104,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1),
.abilities = { ABILITY_SWIFT_SWIM, ABILITY_WATER_ABSORB, ABILITY_WATER_VEIL },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = P_GBA_STYLE_SPECIES_GFX,
.speciesName = _("Mantine"),
.cryId = CRY_MANTINE,
.natDexNum = NATIONAL_DEX_MANTINE,
@ -7179,7 +7168,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 70,
.types = MON_TYPES(TYPE_STEEL, TYPE_FLYING),
.catchRate = 25,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 163 : 168,
.expYield = 163,
.evYield_Defense = 2,
.itemRare = ITEM_METAL_COAT,
.genderRatio = PERCENT_FEMALE(50),
@ -7250,7 +7239,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.baseSpDefense = 100,
.types = MON_TYPES(TYPE_STEEL, TYPE_FLYING),
.catchRate = 25,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 163 : 168,
.expYield = 163,
.evYield_Defense = 2,
.itemRare = ITEM_METAL_COAT,
.genderRatio = PERCENT_FEMALE(50),
@ -7838,6 +7827,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.abilities = { ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_MOODY },
#endif
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Smeargle"),
.cryId = CRY_SMEARGLE,
.natDexNum = NATIONAL_DEX_SMEARGLE,

106
src/data/pokemon/species_info/gen_3_families.h
View File

@ -924,7 +924,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpDefense = 30,
.types = MON_TYPES(TYPE_DARK),
.catchRate = 255,
#if P_UPDATED_EXP_YIELDS >= GEN_7
#if P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 56,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 44,
@ -1068,14 +1068,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
#endif //P_FAMILY_POOCHYENA
#if P_FAMILY_ZIGZAGOON
#if P_UPDATED_EXP_YIELDS >= GEN_7
#define ZIGZAGOON_EXP_YIELD 56
#elif P_UPDATED_EXP_YIELDS >= GEN_5
#define ZIGZAGOON_EXP_YIELD 48
#else
#define ZIGZAGOON_EXP_YIELD 60
#endif
[SPECIES_ZIGZAGOON] =
{
.baseHP = 38,
@ -1086,7 +1078,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpDefense = 41,
.types = MON_TYPES(TYPE_NORMAL),
.catchRate = 255,
.expYield = ZIGZAGOON_EXP_YIELD,
#if P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 56,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 48,
#else
.expYield = 60,
#endif
.evYield_Speed = 1,
.itemCommon = ITEM_POTION,
.itemRare = ITEM_REVIVE,
@ -1241,7 +1239,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpDefense = 41,
.types = MON_TYPES(TYPE_DARK, TYPE_NORMAL),
.catchRate = 255,
.expYield = ZIGZAGOON_EXP_YIELD,
.expYield = 56,
.evYield_Speed = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
@ -1308,7 +1306,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpDefense = 61,
.types = MON_TYPES(TYPE_DARK, TYPE_NORMAL),
.catchRate = 90,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128,
.expYield = 147,
.evYield_Speed = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
@ -1440,7 +1438,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpDefense = 30,
.types = MON_TYPES(TYPE_BUG),
.catchRate = 255,
#if P_UPDATED_EXP_YIELDS >= GEN_7
#if P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 56,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 39,
@ -1527,6 +1525,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG),
.abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Silcoon"),
.cryId = CRY_SILCOON,
.natDexNum = NATIONAL_DEX_SILCOON,
@ -1589,7 +1588,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 198,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 178,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 173,
@ -1698,6 +1697,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG),
.abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE,
.speciesName = _("Cascoon"),
.cryId = CRY_CASCOON,
.natDexNum = NATIONAL_DEX_CASCOON,
@ -1946,6 +1946,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_GRASS),
.abilities = { ABILITY_SWIFT_SWIM, ABILITY_RAIN_DISH, ABILITY_OWN_TEMPO },
.bodyColor = BODY_COLOR_GREEN,
.noFlip = TRUE,
.speciesName = _("Lombre"),
.cryId = CRY_LOMBRE,
.natDexNum = NATIONAL_DEX_LOMBRE,
@ -3117,7 +3118,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.catchRate = 200,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 54 : 63,
.evYield_Speed = 1,
.itemCommon = ITEM_HONEY,
.itemRare = ITEM_HONEY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = STANDARD_FRIENDSHIP,
@ -3286,6 +3287,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.abilities = { ABILITY_EFFECT_SPORE, ABILITY_NONE, ABILITY_QUICK_FEET },
#endif
.bodyColor = BODY_COLOR_BROWN,
.noFlip = TRUE,
.speciesName = _("Shroomish"),
.cryId = CRY_SHROOMISH,
.natDexNum = NATIONAL_DEX_SHROOMISH,
@ -4034,7 +4036,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 245,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 221,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 216,
@ -4703,11 +4705,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
#endif //P_FAMILY_SABLEYE
#if P_FAMILY_MAWILE
#if P_UPDATED_TYPES >= GEN_6
#define MAWILE_TYPES { TYPE_STEEL, TYPE_FAIRY }
#else
#define MAWILE_TYPES { TYPE_STEEL, TYPE_STEEL }
#endif
[SPECIES_MAWILE] =
{
@ -4717,7 +4714,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpeed = 50,
.baseSpAttack = 55,
.baseSpDefense = 55,
.types = MAWILE_TYPES,
#if P_UPDATED_TYPES >= GEN_6
.types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY),
#else
.types = MON_TYPES(TYPE_STEEL),
#endif
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 133 : 98,
.evYield_Attack = 1,
@ -4794,7 +4795,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpeed = 50,
.baseSpAttack = 55,
.baseSpDefense = 95,
.types = MAWILE_TYPES,
.types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY),
.catchRate = 45,
.expYield = 168,
.evYield_Attack = 1,
@ -6092,7 +6093,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.catchRate = 75,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 258,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 232,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 227,
@ -7271,6 +7272,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
#endif //P_FAMILY_SPINDA
#if P_FAMILY_TRAPINCH
#if P_UPDATED_EGG_GROUPS >= GEN_8
#define TRAPINCH_FAMILY_EGG_GROUPS MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON)
#else
#define TRAPINCH_FAMILY_EGG_GROUPS MON_EGG_GROUPS(EGG_GROUP_BUG)
#endif
[SPECIES_TRAPINCH] =
{
.baseHP = 45,
@ -7288,11 +7295,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW,
#if P_UPDATED_EGG_GROUPS >= GEN_8
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON),
#else
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG),
#endif
.eggGroups = TRAPINCH_FAMILY_EGG_GROUPS,
.abilities = { ABILITY_HYPER_CUTTER, ABILITY_ARENA_TRAP, ABILITY_SHEER_FORCE },
.bodyColor = BODY_COLOR_BROWN,
.speciesName = _("Trapinch"),
@ -7364,11 +7367,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW,
#if P_UPDATED_EGG_GROUPS >= GEN_8
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON),
#else
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG),
#endif
.eggGroups = TRAPINCH_FAMILY_EGG_GROUPS,
.abilities = { ABILITY_LEVITATE, ABILITY_LEVITATE, ABILITY_LEVITATE },
.bodyColor = BODY_COLOR_GREEN,
.speciesName = _("Vibrava"),
@ -7447,11 +7446,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW,
#if P_UPDATED_EGG_GROUPS >= GEN_8
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON),
#else
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG),
#endif
.eggGroups = TRAPINCH_FAMILY_EGG_GROUPS,
.abilities = { ABILITY_LEVITATE, ABILITY_LEVITATE, ABILITY_LEVITATE },
.bodyColor = BODY_COLOR_GREEN,
.speciesName = _("Flygon"),
@ -9000,6 +8995,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.abilities = { ABILITY_SWIFT_SWIM, ABILITY_NONE, ABILITY_ADAPTABILITY },
#endif
.bodyColor = BODY_COLOR_BROWN,
.noFlip = TRUE,
.speciesName = _("Feebas"),
.cryId = CRY_FEEBAS,
.natDexNum = NATIONAL_DEX_FEEBAS,
@ -9407,6 +9403,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_FORECAST, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Castform"),
.cryId = CRY_CASTFORM,
.natDexNum = NATIONAL_DEX_CASTFORM,
@ -9647,6 +9644,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.abilities = { ABILITY_INSOMNIA, ABILITY_NONE, ABILITY_CURSED_BODY },
#endif
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Banette"),
.cryId = CRY_BANETTE,
.natDexNum = NATIONAL_DEX_BANETTE,
@ -9723,6 +9721,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_PRANKSTER, ABILITY_PRANKSTER, ABILITY_PRANKSTER },
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Banette"),
.cryId = CRY_BANETTE_MEGA,
.natDexNum = NATIONAL_DEX_BANETTE,
@ -10723,7 +10722,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpDefense = 100,
.types = MON_TYPES(TYPE_ICE, TYPE_GHOST),
.catchRate = 75,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 168 : 187,
.expYield = 168,
.evYield_Speed = 2,
.genderRatio = MON_FEMALE,
.eggCycles = 20,
@ -11698,6 +11697,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL),
.abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_LIGHT_METAL },
.bodyColor = BODY_COLOR_BLUE,
.noFlip = TRUE,
.speciesName = _("Beldum"),
.cryId = CRY_BELDUM,
.natDexNum = NATIONAL_DEX_BELDUM,
@ -12841,7 +12841,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpAttack = 150,
.baseSpDefense = 90,
.types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING),
.catchRate = 45,
.catchRate = 3,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 340,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
@ -12925,7 +12925,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.baseSpAttack = 180,
.baseSpDefense = 100,
.types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING),
.catchRate = 45,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351,
.evYield_Attack = 2,
.evYield_SpAttack = 1,
@ -13115,7 +13115,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.categoryName = _("DNA"),
.height = 17,
.weight = 608,
.description = gDeoxysNormalPokedexText,
.description = COMPOUND_STRING(
"Deoxys emerged from a virus that came\n"
"from space. It is highly intelligent and\n"
"can shoot lasers from the crystalline\n"
"organ on its chest."),
.pokemonScale = 256,
.pokemonOffset = 0,
.trainerScale = 290,
@ -13191,7 +13195,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.categoryName = _("DNA"),
.height = 17,
.weight = 608,
.description = gDeoxysNormalPokedexText,
.description = COMPOUND_STRING(
"This Deoxys has transformed into its\n"
"aggressive guise. It can fool enemies\n"
"by altering its appearance."),
.pokemonScale = 256,
.pokemonOffset = 0,
.trainerScale = 290,
@ -13266,7 +13273,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.categoryName = _("DNA"),
.height = 17,
.weight = 608,
.description = gDeoxysNormalPokedexText,
.description = COMPOUND_STRING(
"When it changes form, an aurora\n"
"appears. It absorbs attacks by\n"
"altering its cellular structure."),
.pokemonScale = 256,
.pokemonOffset = 0,
.trainerScale = 290,
@ -13342,7 +13352,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.categoryName = _("DNA"),
.height = 17,
.weight = 608,
.description = gDeoxysNormalPokedexText,
.description = COMPOUND_STRING(
"A Pokémon that mutated from an\n"
"extraterrestrial virus exposed to a laser\n"
"beam. Its body is configured for superior \n"
"agility and speed."),
.pokemonScale = 256,
.pokemonOffset = 0,
.trainerScale = 290,

75
src/data/pokemon/species_info/gen_4_families.h
View File

@ -850,7 +850,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 243,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 218,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 214,
@ -2292,7 +2292,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.catchRate = 120,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 49 : 63,
.evYield_Speed = 1,
.itemRare = ITEM_HONEY,
.itemCommon = ITEM_HONEY,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 15,
.friendship = STANDARD_FRIENDSHIP,
@ -2714,6 +2714,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS),
.abilities = { ABILITY_CHLOROPHYLL, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_PINK,
.noFlip = TRUE,
.speciesName = _("Cherubi"),
.cryId = CRY_CHERUBI,
.natDexNum = NATIONAL_DEX_CHERUBI,
@ -2790,6 +2791,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS),
.abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE,
.speciesName = _("Cherrim"),
.cryId = CRY_CHERRIM,
.natDexNum = NATIONAL_DEX_CHERRIM,
@ -3189,6 +3191,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_AFTERMATH, ABILITY_UNBURDEN, ABILITY_FLARE_BOOST },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE,
.speciesName = _("Drifloon"),
.cryId = CRY_DRIFLOON,
.natDexNum = NATIONAL_DEX_DRIFLOON,
@ -3260,6 +3263,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_AFTERMATH, ABILITY_UNBURDEN, ABILITY_FLARE_BOOST },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE,
.speciesName = _("Drifblim"),
.cryId = CRY_DRIFBLIM,
.natDexNum = NATIONAL_DEX_DRIFBLIM,
@ -4060,6 +4064,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INFILTRATOR },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE,
.speciesName = _("Spiritomb"),
.cryId = CRY_SPIRITOMB,
.natDexNum = NATIONAL_DEX_SPIRITOMB,
@ -5156,6 +5161,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS),
.abilities = { ABILITY_LEVITATE, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_GREEN,
.noFlip = TRUE,
.speciesName = _("Carnivine"),
.cryId = CRY_CARNIVINE,
.natDexNum = NATIONAL_DEX_CARNIVINE,
@ -5628,6 +5634,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
#endif //P_FAMILY_SNOVER
#if P_FAMILY_ROTOM
#define ROTOM_FAMILY_TYPES { TYPE_ELECTRIC, TYPE_GHOST }
[SPECIES_ROTOM] =
{
.baseHP = 50,
@ -5636,7 +5644,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpeed = 91,
.baseSpAttack = 95,
.baseSpDefense = 77,
.types = MON_TYPES(TYPE_ELECTRIC, TYPE_GHOST),
.types = ROTOM_FAMILY_TYPES,
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 132,
.evYield_Speed = 1,
@ -5717,7 +5725,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpeed = 86,
.baseSpAttack = 105,
.baseSpDefense = 107,
#if P_UPDATED_TYPES >= GEN_5
.types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE),
#else
.types = ROTOM_FAMILY_TYPES,
#endif
.catchRate = 45,
.expYield = ROTOM_APPLIANCE_EXP_YIELD,
.evYield_Speed = 1,
@ -5788,7 +5800,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpeed = 86,
.baseSpAttack = 105,
.baseSpDefense = 107,
#if P_UPDATED_TYPES >= GEN_5
.types = MON_TYPES(TYPE_ELECTRIC, TYPE_WATER),
#else
.types = ROTOM_FAMILY_TYPES,
#endif
.catchRate = 45,
.expYield = ROTOM_APPLIANCE_EXP_YIELD,
.evYield_Speed = 1,
@ -5860,7 +5876,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpeed = 86,
.baseSpAttack = 105,
.baseSpDefense = 107,
#if P_UPDATED_TYPES >= GEN_5
.types = MON_TYPES(TYPE_ELECTRIC, TYPE_ICE),
#else
.types = ROTOM_FAMILY_TYPES,
#endif
.catchRate = 45,
.expYield = ROTOM_APPLIANCE_EXP_YIELD,
.evYield_Speed = 1,
@ -5930,7 +5950,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpeed = 86,
.baseSpAttack = 105,
.baseSpDefense = 107,
#if P_UPDATED_TYPES >= GEN_5
.types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING),
#else
.types = ROTOM_FAMILY_TYPES,
#endif
.catchRate = 45,
.expYield = ROTOM_APPLIANCE_EXP_YIELD,
.evYield_Speed = 1,
@ -6025,7 +6049,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpeed = 86,
.baseSpAttack = 105,
.baseSpDefense = 107,
#if P_UPDATED_TYPES >= GEN_5
.types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS),
#else
.types = ROTOM_FAMILY_TYPES,
#endif
.catchRate = 45,
.expYield = ROTOM_APPLIANCE_EXP_YIELD,
.evYield_Speed = 1,
@ -6335,14 +6363,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
#endif //P_FAMILY_AZELF
#if P_FAMILY_DIALGA
#if P_UPDATED_EXP_YIELDS >= GEN_8
#define DIALGA_EXP_YIELD 340
#elif P_UPDATED_EXP_YIELDS >= GEN_5
#define DIALGA_EXP_YIELD 306
#else
#define DIALGA_EXP_YIELD 220
#endif
[SPECIES_DIALGA] =
{
.baseHP = 100,
@ -6353,7 +6373,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpDefense = 100,
.types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON),
.catchRate = 3,
.expYield = DIALGA_EXP_YIELD,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 340,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 306,
#else
.expYield = 220,
#endif
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -6424,7 +6450,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpDefense = 120,
.types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON),
.catchRate = 3,
.expYield = DIALGA_EXP_YIELD,
.expYield = 340,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -6484,14 +6510,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
#endif //P_FAMILY_DIALGA
#if P_FAMILY_PALKIA
#if P_UPDATED_EXP_YIELDS >= GEN_8
#define PALKIA_EXP_YIELD 340
#elif P_UPDATED_EXP_YIELDS >= GEN_5
#define PALKIA_EXP_YIELD 306
#else
#define PALKIA_EXP_YIELD 220
#endif
[SPECIES_PALKIA] =
{
.baseHP = 90,
@ -6502,7 +6520,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpDefense = 120,
.types = MON_TYPES(TYPE_WATER, TYPE_DRAGON),
.catchRate = 3,
.expYield = PALKIA_EXP_YIELD,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 340,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 306,
#else
.expYield = 220,
#endif
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -6573,7 +6597,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpDefense = 120,
.types = MON_TYPES(TYPE_WATER, TYPE_DRAGON),
.catchRate = 3,
.expYield = PALKIA_EXP_YIELD,
.expYield = 340,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -6953,7 +6977,9 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.baseSpDefense = P_UPDATED_STATS >= GEN_9 ? 120 : 130,
.types = MON_TYPES(TYPE_PSYCHIC),
.catchRate = 3,
#if P_UPDATED_EXP_YIELDS >= GEN_8
#if P_UPDATED_EXP_YIELDS >= GEN_9
.expYield = 290,
#elif P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 300,
#elif P_UPDATED_EXP_YIELDS >= GEN_5
.expYield = 270,
@ -7206,6 +7232,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
.abilities = { ABILITY_BAD_DREAMS, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Darkrai"),
.cryId = CRY_DARKRAI,
.natDexNum = NATIONAL_DEX_DARKRAI,

66
src/data/pokemon/species_info/gen_5_families.h
View File

@ -527,7 +527,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 110,
.types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238,
.expYield = 264,
.evYield_Attack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -796,7 +796,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 65,
.types = MON_TYPES(TYPE_WATER, TYPE_DARK),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238,
.expYield = 264,
.evYield_Attack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -1151,7 +1151,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 250,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 225,
#else
.expYield = 221,
@ -2068,7 +2068,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 244,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 220,
#else
.expYield = 215,
@ -2457,7 +2457,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 258,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 232,
#else
.expYield = 227,
@ -3393,7 +3393,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 255,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 229,
#else
.expYield = 225,
@ -3755,7 +3755,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 250,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 225,
#else
.expYield = 221,
@ -3985,7 +3985,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 243,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 218,
#else
.expYield = 214,
@ -4063,13 +4063,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 99,
.types = MON_TYPES(TYPE_BUG, TYPE_POISON),
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 243,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
.expYield = 218,
#else
.expYield = 214,
#endif
.evYield_Speed = 3,
.itemRare = ITEM_POISON_BARB,
.genderRatio = PERCENT_FEMALE(50),
@ -4115,11 +4109,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
#endif //P_FAMILY_VENIPEDE
#if P_FAMILY_COTTONEE
#if P_UPDATED_TYPES >= GEN_6
#define COTTONEE_FAMILY_TYPES { TYPE_GRASS, TYPE_FAIRY }
#else
#define COTTONEE_FAMILY_TYPES { TYPE_GRASS, TYPE_GRASS }
#endif
#define COTTONEE_FAMILY_TYPE2 (P_UPDATED_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_GRASS)
[SPECIES_COTTONEE] =
{
@ -4129,7 +4119,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpeed = 66,
.baseSpAttack = 37,
.baseSpDefense = 50,
.types = COTTONEE_FAMILY_TYPES,
.types = MON_TYPES(TYPE_GRASS, COTTONEE_FAMILY_TYPE2),
.catchRate = 190,
.expYield = 56,
.evYield_Speed = 1,
@ -4205,7 +4195,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpeed = 116,
.baseSpAttack = 77,
.baseSpDefense = 75,
.types = COTTONEE_FAMILY_TYPES,
.types = MON_TYPES(TYPE_GRASS, COTTONEE_FAMILY_TYPE2),
.catchRate = 75,
.expYield = 168,
.evYield_Speed = 2,
@ -4969,7 +4959,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.catchRate = 45,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 260,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
#elif P_UPDATED_EXP_YIELDS >= GEN_6
.expYield = 234,
#else
.expYield = 229,
@ -5185,7 +5175,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 105,
.types = MON_TYPES(TYPE_FIRE, TYPE_PSYCHIC),
.catchRate = 60,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,
.expYield = 189,
.evYield_SpAttack = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
@ -5377,7 +5367,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 55,
.types = MON_TYPES(TYPE_ICE, TYPE_FIRE),
.catchRate = 60,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,
.expYield = 189,
.evYield_SpAttack = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
@ -5386,6 +5376,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
.abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE },
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Darmanitan"),
.cryId = CRY_DARMANITAN,
.natDexNum = NATIONAL_DEX_DARMANITAN,
@ -6089,6 +6080,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_WANDERING_SPIRIT, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Yamask"),
.cryId = CRY_YAMASK,
.natDexNum = NATIONAL_DEX_YAMASK,
@ -6157,6 +6149,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_WANDERING_SPIRIT, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_GRAY,
.noFlip = TRUE,
.speciesName = _("Runerigus"),
.cryId = CRY_RUNERIGUS,
.natDexNum = NATIONAL_DEX_RUNERIGUS,
@ -6928,6 +6921,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
.abilities = { ABILITY_ILLUSION, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_GRAY,
.noFlip = TRUE,
.speciesName = _("Zoroark"),
.cryId = CRY_ZOROARK,
.natDexNum = NATIONAL_DEX_ZOROARK,
@ -7065,7 +7059,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
.abilities = { ABILITY_CUTE_CHARM, ABILITY_TECHNICIAN, ABILITY_SKILL_LINK },
.bodyColor = BODY_COLOR_GRAY,
.noFlip = TRUE,
.speciesName = _("Cinccino"),
.cryId = CRY_CINCCINO,
.natDexNum = NATIONAL_DEX_CINCCINO,
@ -7868,6 +7861,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.abilities = { ABILITY_ICE_BODY, ABILITY_NONE, ABILITY_WEAK_ARMOR },
#endif
.bodyColor = BODY_COLOR_WHITE,
.noFlip = TRUE,
.speciesName = _("Vanilluxe"),
.cryId = CRY_VANILLUXE,
.natDexNum = NATIONAL_DEX_VANILLUXE,
@ -9793,7 +9787,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 90,
.types = MON_TYPES(TYPE_ELECTRIC),
.catchRate = 30,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 258 : 232,
.expYield = 258 ,
.evYield_Attack = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
@ -10215,7 +10209,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 110,
.types = MON_TYPES(TYPE_GHOST, TYPE_FIRE),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 260 : 234,
.expYield = 260,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
@ -10224,6 +10218,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR },
.bodyColor = BODY_COLOR_BLACK,
.noFlip = TRUE,
.speciesName = _("Chandelure"),
.cryId = CRY_CHANDELURE, // CRY_CHANDELURE_MEGA,
.natDexNum = NATIONAL_DEX_CHANDELURE,
@ -10914,6 +10909,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS),
.abilities = { ABILITY_MIMICRY, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_GREEN,
.noFlip = TRUE,
.speciesName = _("Stunfisk"),
.cryId = CRY_STUNFISK,
.natDexNum = NATIONAL_DEX_STUNFISK,
@ -13416,13 +13412,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 100,
.types = MON_TYPES(TYPE_DRAGON, TYPE_ICE),
.catchRate = 3,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 350,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
.expYield = 315,
#else
.expYield = 297,
#endif
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -13494,13 +13484,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
.baseSpDefense = 90,
.types = MON_TYPES(TYPE_DRAGON, TYPE_ICE),
.catchRate = 3,
#if P_UPDATED_EXP_YIELDS >= GEN_8
.expYield = 350,
#elif P_UPDATED_EXP_YIELDS >= GEN_7
.expYield = 315,
#else
.expYield = 297,
#endif
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315,
.evYield_Attack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,

67
src/data/pokemon/species_info/gen_6_families.h
View File

@ -225,7 +225,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 115,
.types = MON_TYPES(TYPE_GRASS, TYPE_FIGHTING),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,
.expYield = 265,
.evYield_Defense = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -495,7 +495,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 125,
.types = MON_TYPES(TYPE_FIRE, TYPE_PSYCHIC),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 267 : 240,
.expYield = 267,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -815,7 +815,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 71,
.types = MON_TYPES(TYPE_WATER, TYPE_DARK),
.catchRate = 45,
.expYield = 288,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 320 : 288,
.evYield_Speed = 3,
.genderRatio = MON_MALE,
.eggCycles = 20,
@ -886,7 +886,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 81,
.types = MON_TYPES(TYPE_WATER, TYPE_DARK),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,
.expYield = 265,
.evYield_Speed = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 20,
@ -1520,6 +1520,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from frigid lands.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_POLAR] =
{
VIVILLON_MISC_INFO(Polar, BODY_COLOR_BLUE, 0),
@ -1529,6 +1530,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from snowy lands.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_TUNDRA] =
{
VIVILLON_MISC_INFO(Tundra, BODY_COLOR_BLUE, 0),
@ -1538,6 +1540,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from lands of severe cold.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_CONTINENTAL] =
{
VIVILLON_MISC_INFO(Continental, BODY_COLOR_YELLOW, 2),
@ -1547,6 +1550,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from lands of vast space.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_GARDEN] =
{
VIVILLON_MISC_INFO(Garden, BODY_COLOR_GREEN, 1),
@ -1556,6 +1560,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from verdant lands.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_ELEGANT] =
{
VIVILLON_MISC_INFO(Elegant, BODY_COLOR_PURPLE, 0),
@ -1565,6 +1570,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands with distinct seasons.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_MEADOW] =
{
VIVILLON_MISC_INFO(Meadow, BODY_COLOR_PINK, 0),
@ -1574,6 +1580,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands where flowers bloom.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_MODERN] =
{
VIVILLON_MISC_INFO(Modern, BODY_COLOR_RED, 2),
@ -1583,6 +1590,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from sun-drenched lands.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_MARINE] =
{
VIVILLON_MISC_INFO(Marine, BODY_COLOR_BLUE, 0),
@ -1592,6 +1600,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands with ocean breezes.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_ARCHIPELAGO] =
{
VIVILLON_MISC_INFO(Archipelago, BODY_COLOR_BROWN, 0),
@ -1601,6 +1610,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from places with many islands.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_HIGH_PLAINS] =
{
VIVILLON_MISC_INFO(HighPlains, BODY_COLOR_BROWN, 0),
@ -1610,6 +1620,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from lands with little rain.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_SANDSTORM] =
{
VIVILLON_MISC_INFO(Sandstorm, BODY_COLOR_BROWN, 1),
@ -1619,6 +1630,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from parched lands.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_RIVER] =
{
VIVILLON_MISC_INFO(River, BODY_COLOR_BROWN, 2),
@ -1628,6 +1640,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands where large rivers flow.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_MONSOON] =
{
VIVILLON_MISC_INFO(Monsoon, BODY_COLOR_GRAY, 0),
@ -1637,6 +1650,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands with intense rainfall.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_SAVANNA] =
{
VIVILLON_MISC_INFO(Savanna, BODY_COLOR_GREEN, 0),
@ -1646,6 +1660,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands with a tropical climate.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_SUN] =
{
VIVILLON_MISC_INFO(Sun, BODY_COLOR_RED, 0),
@ -1655,6 +1670,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from lands bathed in light.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_OCEAN] =
{
VIVILLON_MISC_INFO(Ocean, BODY_COLOR_RED, 0),
@ -1664,6 +1680,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands of perpetual summer.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_JUNGLE] =
{
VIVILLON_MISC_INFO(Jungle, BODY_COLOR_GREEN, 0),
@ -1673,6 +1690,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"form is from lands of tropical rainforests.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_FANCY] =
{
VIVILLON_MISC_INFO(Fancy, BODY_COLOR_PINK, 1),
@ -1682,6 +1700,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This form is from a mysterious land.\n"
"It scatters toxic color scales in battle."),
},
[SPECIES_VIVILLON_POKEBALL] =
{
VIVILLON_MISC_INFO(PokeBall, BODY_COLOR_RED, 2),
@ -1972,6 +1991,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"begins flying around in search of a\n"
"flower it likes."),
},
[SPECIES_FLABEBE_YELLOW] =
{
FLABEBE_MISC_INFO(Yellow, YELLOW, 1),
@ -1981,6 +2001,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"within flowers. This Pokémon is\n"
"particularly fond of yellow flowers."),
},
[SPECIES_FLABEBE_ORANGE] =
{
FLABEBE_MISC_INFO(Orange, ORANGE, 0),
@ -1990,6 +2011,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"return. This Pokémon likes orange\n"
"flowers best of all."),
},
[SPECIES_FLABEBE_BLUE] =
{
FLABEBE_MISC_INFO(Blue, BLUE, 0),
@ -1999,6 +2021,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"power emanating from its flower\n"
"and bobs along lightly through the air."),
},
[SPECIES_FLABEBE_WHITE] =
{
FLABEBE_MISC_INFO(White, WHITE, 1),
@ -2080,6 +2103,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"into flowers and draw forth their\n"
"latent potential."),
},
[SPECIES_FLOETTE_YELLOW] =
{
FLOETTE_NORMAL_INFO(Yellow, YELLOW, 1),
@ -2089,6 +2113,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"This power then becomes the moves\n"
"Floette uses to protect itself."),
},
[SPECIES_FLOETTE_ORANGE] =
{
FLOETTE_NORMAL_INFO(Orange, ORANGE, 0),
@ -2098,6 +2123,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"flowers, compared to flowers of other\n"
"colors."),
},
[SPECIES_FLOETTE_BLUE] =
{
FLOETTE_NORMAL_INFO(Blue, BLUE, 0),
@ -2107,6 +2133,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"will bring them back to its territory\n"
"and care for them."),
},
[SPECIES_FLOETTE_WHITE] =
{
FLOETTE_NORMAL_INFO(White, WHITE, 1),
@ -2116,6 +2143,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"without mercy. This Floette takes\n"
"particularly good care of white flowers."),
},
[SPECIES_FLOETTE_ETERNAL] =
{
FLOETTE_MISC_INFO(Eternal, ETERNAL, 0),
@ -2211,6 +2239,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"draws forth the power of the red\n"
"flowers around its neck."),
},
[SPECIES_FLORGES_YELLOW] =
{
FLORGES_MISC_INFO(Yellow, 1),
@ -2220,6 +2249,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"ruthlessly punishes anyone who\n"
"tramples on flowering plants."),
},
[SPECIES_FLORGES_ORANGE] =
{
FLORGES_MISC_INFO(Orange, 0),
@ -2229,6 +2259,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"care for their castles' exquisite\n"
"gardens."),
},
[SPECIES_FLORGES_BLUE] =
{
FLORGES_MISC_INFO(Blue, 0),
@ -2237,6 +2268,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
"expensive in the past, so paintings\n"
"of blue Florges are highly valuable."),
},
[SPECIES_FLORGES_WHITE] =
{
FLORGES_MISC_INFO(White, 0),
@ -5118,6 +5150,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON),
.abilities = { ABILITY_SAP_SIPPER, ABILITY_SHELL_ARMOR, ABILITY_GOOEY },
.bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE,
.speciesName = _("Sliggoo"),
.cryId = CRY_SLIGGOO,
.natDexNum = NATIONAL_DEX_SLIGGOO,
@ -5177,7 +5210,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 150,
.types = MON_TYPES(TYPE_DRAGON, TYPE_STEEL),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,
.expYield = 300,
.evYield_SpDefense = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
@ -6198,6 +6231,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
#endif //P_FAMILY_BERGMITE
#if P_FAMILY_NOIBAT
#if P_UPDATED_EGG_GROUPS >= GEN_8
#define NOIBAT_EGG_GROUPS MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON)
#else
#define NOIBAT_EGG_GROUPS MON_EGG_GROUPS(EGG_GROUP_FLYING)
#endif
[SPECIES_NOIBAT] =
{
.baseHP = 40,
@ -6214,11 +6253,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST,
#if P_UPDATED_EGG_GROUPS >= GEN_8
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON),
#else
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
#endif
.eggGroups = NOIBAT_EGG_GROUPS,
.abilities = { ABILITY_FRISK, ABILITY_INFILTRATOR, ABILITY_TELEPATHY },
.bodyColor = BODY_COLOR_PURPLE,
.speciesName = _("Noibat"),
@ -6293,11 +6328,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST,
#if P_UPDATED_EGG_GROUPS >= GEN_8
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON),
#else
.eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
#endif
.eggGroups = NOIBAT_EGG_GROUPS,
.abilities = { ABILITY_FRISK, ABILITY_INFILTRATOR, ABILITY_TELEPATHY },
.bodyColor = BODY_COLOR_PURPLE,
.speciesName = _("Noivern"),
@ -6617,6 +6648,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.formSpeciesIdTable = sZygardeFormSpeciesIdTable,
.formChangeTable = sZygarde50AuraBreakFormChangeTable,
},
[SPECIES_ZYGARDE_50_POWER_CONSTRUCT] =
{
.baseHP = 108,
@ -6681,6 +6713,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.formSpeciesIdTable = sZygardeFormSpeciesIdTable,
.formChangeTable = sZygarde50PowerConstructFormChangeTable,
},
[SPECIES_ZYGARDE_10_AURA_BREAK] =
{
.baseHP = 54,
@ -6895,7 +6928,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 85,
.types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND),
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 354 : 319,
.expYield = 354,
.evYield_HP = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -7026,7 +7059,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.baseSpDefense = 110,
.types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY),
.catchRate = 3,
.expYield = 315,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315,
.evYield_Defense = 1,
.evYield_SpDefense = 2,
.genderRatio = MON_GENDERLESS,

68
src/data/pokemon/species_info/gen_7_families.h
View File

@ -219,7 +219,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpDefense = 95,
.types = MON_TYPES(TYPE_GRASS, TYPE_FIGHTING),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,
.expYield = 265,
.evYield_Attack = 3,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 15,
@ -677,7 +677,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.catchRate = 255,
.expYield = 53,
.evYield_Attack = 1,
.itemRare = ITEM_ORAN_BERRY,
.itemCommon = ITEM_ORAN_BERRY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = STANDARD_FRIENDSHIP,
@ -817,7 +817,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 218,
.evYield_Attack = 3,
.itemRare = ITEM_RAWST_BERRY,
.itemCommon = ITEM_SITRUS_BERRY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = STANDARD_FRIENDSHIP,
@ -1273,7 +1273,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpDefense = 75,
.types = MON_TYPES(TYPE_BUG, TYPE_ELECTRIC),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 225,
.expYield = 225,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
@ -1751,7 +1751,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.catchRate = 190,
.expYield = 61,
.evYield_Speed = 1,
.itemRare = ITEM_HONEY,
.itemCommon = ITEM_HONEY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
@ -1852,7 +1852,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.catchRate = 75,
.expYield = 162,
.evYield_Speed = 2,
.itemRare = ITEM_HONEY,
.itemCommon = ITEM_HONEY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
@ -4374,7 +4374,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpDefense = 95, \
.types = MON_TYPES(type), \
.catchRate = 3, \
.expYield = 257, \
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 285 : 257, \
.evYield_HP = 3, \
.genderRatio = MON_GENDERLESS, \
.eggCycles = 120, \
@ -4456,7 +4456,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.expYield = 154, \
.evYield_Defense = 1, \
.evYield_SpDefense = 1, \
.itemRare = ITEM_STAR_PIECE, \
.genderRatio = MON_GENDERLESS, \
.eggCycles = 25, \
.friendship = STANDARD_FRIENDSHIP, \
@ -4479,7 +4478,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.teachableLearnset = sMiniorTeachableLearnset, \
.formSpeciesIdTable = sMiniorFormSpeciesIdTable
#define MINIOR_METEOR_SPECIES_INFO(Form) \
#define MINIOR_METEOR_SPECIES_INFO(Form, heldItem) \
{ \
.baseHP = 60, \
.baseAttack = 60, \
@ -4487,6 +4486,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpeed = 60, \
.baseSpAttack = 60, \
.baseSpDefense = 100, \
.itemCommon = heldItem, \
.weight = 400, \
.description = gMiniorMeteorPokedexText, \
.frontPic = gMonFrontPic_MiniorMeteor, \
@ -4518,7 +4518,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
MINIOR_MISC_INFO(BODY_COLOR_BROWN), \
}
#define MINIOR_CORE_SPECIES_INFO(Form, color, iconPal) \
#define MINIOR_CORE_SPECIES_INFO(Form, color, iconPal, heldItem)\
{ \
.baseHP = 60, \
.baseAttack = 100, \
@ -4526,6 +4526,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpeed = 120, \
.baseSpAttack = 100, \
.baseSpDefense = 60, \
.itemCommon = heldItem, \
.weight = 3, \
.description = gMiniorCorePokedexText, \
.frontPic = gMonFrontPic_MiniorCore, \
@ -4548,20 +4549,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
MINIOR_MISC_INFO(color), \
}
[SPECIES_MINIOR_METEOR_RED] = MINIOR_METEOR_SPECIES_INFO(Red),
[SPECIES_MINIOR_METEOR_ORANGE] = MINIOR_METEOR_SPECIES_INFO(Orange),
[SPECIES_MINIOR_METEOR_YELLOW] = MINIOR_METEOR_SPECIES_INFO(Yellow),
[SPECIES_MINIOR_METEOR_GREEN] = MINIOR_METEOR_SPECIES_INFO(Green),
[SPECIES_MINIOR_METEOR_BLUE] = MINIOR_METEOR_SPECIES_INFO(Blue),
[SPECIES_MINIOR_METEOR_INDIGO] = MINIOR_METEOR_SPECIES_INFO(Indigo),
[SPECIES_MINIOR_METEOR_VIOLET] = MINIOR_METEOR_SPECIES_INFO(Violet),
[SPECIES_MINIOR_CORE_RED] = MINIOR_CORE_SPECIES_INFO(Red, BODY_COLOR_RED, 0),
[SPECIES_MINIOR_CORE_ORANGE] = MINIOR_CORE_SPECIES_INFO(Orange, BODY_COLOR_RED, 0),
[SPECIES_MINIOR_CORE_YELLOW] = MINIOR_CORE_SPECIES_INFO(Yellow, BODY_COLOR_YELLOW, 0),
[SPECIES_MINIOR_CORE_GREEN] = MINIOR_CORE_SPECIES_INFO(Green, BODY_COLOR_GREEN, 1),
[SPECIES_MINIOR_CORE_BLUE] = MINIOR_CORE_SPECIES_INFO(Blue, BODY_COLOR_BLUE, 0),
[SPECIES_MINIOR_CORE_INDIGO] = MINIOR_CORE_SPECIES_INFO(Indigo, BODY_COLOR_BLUE, 0),
[SPECIES_MINIOR_CORE_VIOLET] = MINIOR_CORE_SPECIES_INFO(Violet, BODY_COLOR_PURPLE, 2),
[SPECIES_MINIOR_METEOR_RED] = MINIOR_METEOR_SPECIES_INFO(Red, ITEM_HARD_STONE),
[SPECIES_MINIOR_METEOR_ORANGE] = MINIOR_METEOR_SPECIES_INFO(Orange, ITEM_HARD_STONE),
[SPECIES_MINIOR_METEOR_YELLOW] = MINIOR_METEOR_SPECIES_INFO(Yellow, ITEM_FLOAT_STONE),
[SPECIES_MINIOR_METEOR_GREEN] = MINIOR_METEOR_SPECIES_INFO(Green, ITEM_FLOAT_STONE),
[SPECIES_MINIOR_METEOR_BLUE] = MINIOR_METEOR_SPECIES_INFO(Blue, ITEM_HARD_STONE),
[SPECIES_MINIOR_METEOR_INDIGO] = MINIOR_METEOR_SPECIES_INFO(Indigo, ITEM_HARD_STONE),
[SPECIES_MINIOR_METEOR_VIOLET] = MINIOR_METEOR_SPECIES_INFO(Violet, ITEM_FLOAT_STONE),
[SPECIES_MINIOR_CORE_RED] = MINIOR_CORE_SPECIES_INFO(Red, BODY_COLOR_RED, 0, ITEM_HARD_STONE),
[SPECIES_MINIOR_CORE_ORANGE] = MINIOR_CORE_SPECIES_INFO(Orange, BODY_COLOR_RED, 0, ITEM_HARD_STONE),
[SPECIES_MINIOR_CORE_YELLOW] = MINIOR_CORE_SPECIES_INFO(Yellow, BODY_COLOR_YELLOW, 0, ITEM_FLOAT_STONE),
[SPECIES_MINIOR_CORE_GREEN] = MINIOR_CORE_SPECIES_INFO(Green, BODY_COLOR_GREEN, 1, ITEM_FLOAT_STONE),
[SPECIES_MINIOR_CORE_BLUE] = MINIOR_CORE_SPECIES_INFO(Blue, BODY_COLOR_BLUE, 0, ITEM_HARD_STONE),
[SPECIES_MINIOR_CORE_INDIGO] = MINIOR_CORE_SPECIES_INFO(Indigo, BODY_COLOR_BLUE, 0, ITEM_HARD_STONE),
[SPECIES_MINIOR_CORE_VIOLET] = MINIOR_CORE_SPECIES_INFO(Violet, BODY_COLOR_PURPLE, 2, ITEM_FLOAT_STONE),
#endif //P_FAMILY_MINIOR
#if P_FAMILY_KOMALA
@ -5541,7 +5542,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpDefense = 105,
.types = MON_TYPES(TYPE_DRAGON, TYPE_FIGHTING),
.catchRate = 45,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,
.expYield = 270,
.evYield_Defense = 3,
.itemCommon = ITEM_RAZOR_CLAW,
.genderRatio = PERCENT_FEMALE(50),
@ -5906,7 +5907,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 29,
.baseSpDefense = 31,
.types = MON_TYPES(TYPE_PSYCHIC),
.catchRate = 45,
.catchRate = 3,
.expYield = 40,
.evYield_HP = 1,
.genderRatio = MON_GENDERLESS,
@ -5975,7 +5976,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 29,
.baseSpDefense = 131,
.types = MON_TYPES(TYPE_PSYCHIC),
.catchRate = 45,
.catchRate = 3,
.expYield = 140,
.evYield_Defense = 1,
.evYield_SpDefense = 1,
@ -6046,7 +6047,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 113,
.baseSpDefense = 89,
.types = MON_TYPES(TYPE_PSYCHIC, TYPE_STEEL),
.catchRate = 45,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306,
.evYield_Attack = 3,
.genderRatio = MON_GENDERLESS,
@ -6112,7 +6113,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 137,
.baseSpDefense = 107,
.types = MON_TYPES(TYPE_PSYCHIC, TYPE_GHOST),
.catchRate = 45,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
@ -6655,7 +6656,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 127,
.baseSpDefense = 89,
.types = MON_TYPES(TYPE_PSYCHIC),
.catchRate = 255,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,
.evYield_Attack = 1,
.evYield_SpAttack = 2,
@ -6726,7 +6727,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 113,
.baseSpDefense = 109,
.types = MON_TYPES(TYPE_PSYCHIC, TYPE_STEEL),
.catchRate = 255,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306,
.evYield_Attack = 3,
.genderRatio = MON_GENDERLESS,
@ -6796,7 +6797,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 157,
.baseSpDefense = 127,
.types = MON_TYPES(TYPE_PSYCHIC, TYPE_GHOST),
.catchRate = 255,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
@ -6868,7 +6869,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.baseSpAttack = 167,
.baseSpDefense = 97,
.types = MON_TYPES(TYPE_PSYCHIC, TYPE_DRAGON),
.catchRate = 255,
.catchRate = 3,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 377 : 339,
.evYield_Attack = 1,
.evYield_Speed = 1,
@ -7005,6 +7006,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.teachableLearnset = sMagearnaTeachableLearnset,
.formSpeciesIdTable = sMagearnaFormSpeciesIdTable,
},
[SPECIES_MAGEARNA_ORIGINAL] =
{
.baseHP = 80,

9
src/data/pokemon/species_info/gen_8_families.h
View File

@ -6804,7 +6804,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.baseSpDefense = 115,
.types = MON_TYPES(TYPE_FAIRY),
.catchRate = 10,
.expYield = 335,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_9) ? 330 : 335,
.evYield_Speed = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -6871,7 +6871,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.baseSpDefense = 115,
.types = MON_TYPES(TYPE_FAIRY, TYPE_STEEL),
.catchRate = 10,
.expYield = 360,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_9) ? 350 : 360,
.evYield_Speed = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -6941,7 +6941,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.baseSpDefense = 115,
.types = MON_TYPES(TYPE_FIGHTING),
.catchRate = 10,
.expYield = 335,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_9) ? 330 : 335,
.evYield_Speed = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -7009,7 +7009,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.baseSpDefense = P_UPDATED_STATS >= GEN_9 ? 140 : 145,
.types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL),
.catchRate = 10,
.expYield = 360,
.expYield = (P_UPDATED_EXP_YIELDS >= GEN_9) ? 350 : 360,
.evYield_Speed = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
@ -7591,6 +7591,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.teachableLearnset = sZarudeTeachableLearnset,
.formSpeciesIdTable = sZarudeFormSpeciesIdTable,
},
[SPECIES_ZARUDE_DADA] =
{
.baseHP = 105,

3
src/data/pokemon/species_info/gen_9_families.h
View File

@ -1364,6 +1364,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.teachableLearnset = sMausholdTeachableLearnset,
.formSpeciesIdTable = sMausholdFormSpeciesIdTable,
},
[SPECIES_MAUSHOLD_FOUR] =
{
.baseHP = 74,
@ -7203,6 +7204,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.evolutions = EVOLUTION({EVO_ITEM, ITEM_UNREMARKABLE_TEACUP, SPECIES_SINISTCHA_UNREMARKABLE}),
.formSpeciesIdTable = sPoltchageistFormSpeciesIdTable,
},
[SPECIES_POLTCHAGEIST_ARTISAN] =
{
.baseHP = 40,
@ -7333,6 +7335,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.teachableLearnset = sSinistchaTeachableLearnset,
.formSpeciesIdTable = sSinistchaFormSpeciesIdTable,
},
[SPECIES_SINISTCHA_MASTERPIECE] =
{
.baseHP = 71,

7
src/data/pokemon/species_info/shared_dex_text.h
View File

@ -43,13 +43,6 @@ const u8 gUnownPokedexText[] = _(
"it is a mystery as to which came first,\n"
"the ancient writings or the various Unown.");
// Gen 3 families
const u8 gDeoxysNormalPokedexText[] = _(
"Deoxys emerged from a virus that came\n"
"from space. It is highly intelligent and\n"
"can shoot lasers from the crystalline\n"
"organ on its chest.");
// Gen 4 families
const u8 gMothimPokedexText[] = _(
"It does not keep a nest. While it\n"