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

Update friendship evo threshold to gen 8+ with config #3376

Merged
merged 8 commits into from
Oct 22, 2023
Merged

Update friendship evo threshold to gen 8+ with config #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fd8e794
Update friendship evo threshold to gen 8+ with config
kittenchilly Oct 3, 2023
6096fcf
Update pokemon.h
kittenchilly Oct 3, 2023
e8bf01f
Update pokemon.h
kittenchilly Oct 3, 2023
1b38d5b
Merge branch 'master' into friendship
kittenchilly Oct 15, 2023
5e64955
Merge remote-tracking branch 'upstream/upcoming' into friendship
kittenchilly Oct 15, 2023
a222ad0
Merge remote-tracking branch 'upstream/upcoming' into friendship
kittenchilly Oct 16, 2023
df2a02c
Merge remote-tracking branch 'upstream/upcoming' into friendship
kittenchilly Oct 22, 2023
14abf49
Change config to be by gen
kittenchilly Oct 22, 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
3 changes: 3 additions & 0 deletions include/config/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#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.

// 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.

// 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.
Expand Down
4 changes: 4 additions & 0 deletions src/pokemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@
#define NIGHT_EVO_HOUR_BEGIN 0
#define NIGHT_EVO_HOUR_END 12

#if P_FRIENDSHIP_EVO_THRESHOLD >= GEN_9
#define FRIENDSHIP_EVO_THRESHOLD 160
#else
#define FRIENDSHIP_EVO_THRESHOLD 220
#endif

struct SpeciesItem
{
Expand Down