Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Base friendship Gen 8+ config #3491

Merged
merged 5 commits into from
Oct 30, 2023
Merged

Base friendship Gen 8+ config #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a189745
P_STANDARD_FRIENDSHIP
kittenchilly Oct 27, 2023
58fb276
Merge remote-tracking branch 'upstream/upcoming' into standard-friend…
kittenchilly Oct 30, 2023
517d2f8
Update battle.h
kittenchilly Oct 30, 2023
5e44525
Apply suggestions from code review
kittenchilly Oct 30, 2023
547cb1a
Fixed wording
AsparagusEduardo Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/config/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 5 additions & 1 deletion include/constants/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/data/pokemon/species_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Loading