From c0c100d90d889603fc072773a9f390c1da75aced Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Mon, 30 Oct 2023 14:45:52 -0500 Subject: [PATCH] Base friendship Gen 8+ config (#3491) Co-authored-by: Eduardo Quezada D'Ottone --- include/config/pokemon.h | 1 + include/constants/pokemon.h | 6 +++++- src/data/pokemon/species_info.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 271a77add4..9c233eab0f 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -6,6 +6,7 @@ #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_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. // 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/include/constants/pokemon.h b/include/constants/pokemon.h index 49272691c6..eaba4c544b 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -191,8 +191,12 @@ #define FRIENDSHIP_200_TO_254 5 #define FRIENDSHIP_MAX 6 -// Friendship value that the majority of species use. This was changed in Generation 8 to 50. +// Friendship value that the majority of species use. +#if P_UPDATED_FRIENDSHIP >= GEN_8 +#define STANDARD_FRIENDSHIP 50 +#else #define STANDARD_FRIENDSHIP 70 +#endif #define MAX_FRIENDSHIP 255 #define MAX_SHEEN 255 diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 01bc20e46a..fe36cb5210 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -24496,7 +24496,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, - .friendship = 100, + .friendship = P_UPDATED_FRIENDSHIP >= GEN_8 ? STANDARD_FRIENDSHIP : 100, .growthRate = GROWTH_SLOW, .eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, .abilities = {ABILITY_MAGICIAN, ABILITY_NONE},