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

Updates Pokémon abilities to Gen9 (#3353)

Browse Source
This commit is contained in:
Bassoonian 2023-10-01 01:35:35 +02:00 committed by GitHub
parent 70ec4c4406
commit 8a1f166f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/data/pokemon/species_info.h
View File

@ -3375,7 +3375,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, .eggGroups = { EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS},
.abilities = {ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH}, #if P_UPDATED_ABILITIES >= GEN_8
.abilities = {ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH},
#else
.abilities = {ABILITY_LEVITATE, ABILITY_NONE},
#endif
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
.noFlip = FALSE, .noFlip = FALSE,
}, },
@ -3398,7 +3402,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST, .growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, .eggGroups = { EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS},
.abilities = {ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH}, #if P_UPDATED_ABILITIES >= GEN_8
.abilities = {ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH},
#else
.abilities = {ABILITY_LEVITATE, ABILITY_NONE},
#endif
.bodyColor = BODY_COLOR_PURPLE, .bodyColor = BODY_COLOR_PURPLE,
.noFlip = TRUE, .noFlip = TRUE,
}, },
@ -7177,7 +7185,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_GRASS}, .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_GRASS},
.abilities = {ABILITY_CHLOROPHYLL, ABILITY_EARLY_BIRD, ABILITY_PICKPOCKET}, #if P_UPDATED_ABILITIES >= GEN_9
.abilities = {ABILITY_CHLOROPHYLL, ABILITY_WIND_RIDER, ABILITY_PICKPOCKET},
#else
.abilities = {ABILITY_CHLOROPHYLL, ABILITY_EARLY_BIRD, ABILITY_PICKPOCKET},
#endif
.bodyColor = BODY_COLOR_BROWN, .bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE, .noFlip = FALSE,
}, },
@ -9937,7 +9949,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD}, .eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD},
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT}, #if P_UPDATED_ABILITIES >= GEN_9
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE},
#else
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT},
#endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
}, },
@ -9959,7 +9975,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD}, .eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD},
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT}, #if P_UPDATED_ABILITIES >= GEN_9
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE},
#else
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT},
#endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
}, },
@ -9981,7 +10001,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
.friendship = STANDARD_FRIENDSHIP, .friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD}, .eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_FIELD},
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT}, #if P_UPDATED_ABILITIES >= GEN_9
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE},
#else
.abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT},
#endif
.bodyColor = BODY_COLOR_BLUE, .bodyColor = BODY_COLOR_BLUE,
.noFlip = FALSE, .noFlip = FALSE,
}, },
@ -11718,7 +11742,11 @@ const struct SpeciesInfo gSpeciesInfo[] =
#else #else
.eggGroups = { EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, .eggGroups = { EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS},
#endif #endif
.abilities = {ABILITY_STEADFAST, ABILITY_NONE, ABILITY_JUSTIFIED}, #if P_UPDATED_ABILITIES >= GEN_9
.abilities = {ABILITY_STEADFAST, ABILITY_SHARPNESS, ABILITY_JUSTIFIED},
#else
.abilities = {ABILITY_STEADFAST, ABILITY_NONE, ABILITY_JUSTIFIED},
#endif
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
}, },