From 4846e2a884681599dcbd7f84cb677df6156c889c Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 14 Jan 2024 15:26:34 +0100 Subject: [PATCH] Add updated EV configs (#3993) * Add updated EV configs * Fix Misdreavus ternary --- include/config/pokemon.h | 1 + src/data/pokemon/species_info/gen_1.h | 4 ++-- src/data/pokemon/species_info/gen_2.h | 3 ++- src/data/pokemon/species_info/gen_3.h | 5 +++-- src/data/pokemon/species_info/gen_4.h | 7 ++++++- src/data/pokemon/species_info/gen_6.h | 5 +++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 7a5d5853be..dbfe24dca1 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -7,6 +7,7 @@ #define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 6, certain Pokémon have 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. // 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. diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index b5f892c06b..599d8f8654 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -5946,7 +5946,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = 80, .types = { TYPE_WATER, TYPE_PSYCHIC }, .expYield = 172, - .evYield_Defense = 2, + .evYield_Defense = (P_UPDATED_EVS >= GEN_8) ? 2 : 3, .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .height = 16, .weight = 785, @@ -8677,7 +8677,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .types = { TYPE_NORMAL, TYPE_NORMAL }, .catchRate = 30, .expYield = 608, - .evYield_HP = 3, + .evYield_HP = (P_UPDATED_EVS >= GEN_4) ? 3 : 2, .itemRare = ITEM_LUCKY_EGG, .genderRatio = MON_FEMALE, .eggCycles = 40, diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index f5af710a19..e232fbef29 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -2045,7 +2045,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .types = { TYPE_BUG, TYPE_FLYING }, .catchRate = 75, .expYield = 78, - .evYield_Speed = 1, + .evYield_Speed = (P_UPDATED_EVS >= GEN_4) ? 1 : 2, .itemRare = ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -2431,6 +2431,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 45, .expYield = 87, + .evYield_SpAttack = (P_UPDATED_EVS >= GEN_4) ? 0 : 1, .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 51ebee6f43..781c2beb49 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -3776,7 +3776,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .types = { TYPE_GRASS, TYPE_POISON }, .catchRate = 150, .expYield = 140, - .evYield_SpAttack = 2, + .evYield_SpAttack = (P_UPDATED_EVS >= GEN_4) ? 2 : 1, .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -6089,6 +6089,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .types = { TYPE_GHOST, TYPE_GHOST }, .catchRate = 190, .expYield = 59, + .evYield_Defense = (P_UPDATED_EVS >= GEN_4) ? 0 : 1, .evYield_SpDefense = 1, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), @@ -6140,7 +6141,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .catchRate = 90, .expYield = 159, .evYield_Defense = 1, - .evYield_SpDefense = 1, + .evYield_SpDefense = (P_UPDATED_EVS >= GEN_4) ? 1 : 2, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index e9c95ddd77..de8cf69f99 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -4381,7 +4381,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #define SHAYMIN_MISC_INFO \ .catchRate = 45, \ .expYield = 270, \ - .evYield_HP = 3, \ .itemCommon = ITEM_LUM_BERRY, \ .itemRare = ITEM_LUM_BERRY, \ .genderRatio = MON_GENDERLESS, \ @@ -4407,6 +4406,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .baseSpeed = 100, .baseSpAttack = 100, .baseSpDefense = 100, + .evYield_HP = 3, .types = { TYPE_GRASS, TYPE_GRASS }, .abilities = { ABILITY_NATURAL_CURE, ABILITY_NONE }, .cryId = CRY_SHAYMIN_LAND, @@ -4442,6 +4442,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .baseSpeed = 127, .baseSpAttack = 120, .baseSpDefense = 75, + #if P_UPDATED_EVS >= GEN_5 + .evYield_Speed = 3, + #else + .evYield_HP = 3, + #endif .types = { TYPE_GRASS, TYPE_FLYING }, .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, .noFlip = TRUE, diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index ca975bd991..4366c6117d 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -2065,8 +2065,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpeed = 60, .baseSpAttack = AEGISLASH_MAIN_STAT, .baseSpDefense = 50, + #if P_UPDATED_EVS >= GEN_7 .evYield_Attack = 2, .evYield_SpAttack = 1, + #else + .evYield_Defense = 2, + .evYield_SpDefense = 1, + #endif .description = COMPOUND_STRING( "Once upon a time, a king with an\n" "Aegislash reigned over the land. His\n"