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.

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

Species Simplifier™ - Part 2 #3546

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8dabed8
Gen 1 and 2 families + fixes
AsparagusEduardo Nov 9, 2023
820d196
Updated macros of Megas that shared held item with base forms
AsparagusEduardo Nov 10, 2023
7d8d047
Gen 3 families
AsparagusEduardo Nov 11, 2023
ae9579a
Separated Latis macro
AsparagusEduardo Nov 11, 2023
176fca9
Gen 4 families
AsparagusEduardo Nov 11, 2023
a4ae532
Moved Misc Info to the top of arrays
AsparagusEduardo Nov 11, 2023
9e05f1e
Renamed FAMILY_x to P_FAMILY_x
AsparagusEduardo Nov 11, 2023
999da2d
Gen 5 families
AsparagusEduardo Nov 11, 2023
a12f2c4
Gen 6 families
AsparagusEduardo Nov 11, 2023
d3f9a55
Gen 7 families
AsparagusEduardo Nov 11, 2023
0b1e3f6
Gen 8 families
AsparagusEduardo Nov 11, 2023
095b52d
Gen 9 families
AsparagusEduardo Nov 11, 2023
e864bb6
Mega Evolutions
AsparagusEduardo Nov 11, 2023
2ac28ba
Gigantamax Form toggles
AsparagusEduardo Nov 11, 2023
9ebde45
Alolan Forms
AsparagusEduardo Nov 11, 2023
5a255b3
Galarian Forms
AsparagusEduardo Nov 11, 2023
50bdcf1
Added missing comments
AsparagusEduardo Nov 11, 2023
45cb346
Hisuian Forms
AsparagusEduardo Nov 11, 2023
ef9bc2e
Paldean Forms
AsparagusEduardo Nov 11, 2023
28eb93c
Fixed missing Paldean form flags
AsparagusEduardo Nov 12, 2023
f0d73d2
Merge branch 'upcoming' into RHH/pr/upcoming/speciesSimplifier_Part2
AsparagusEduardo Nov 12, 2023
2796414
Fixed order
AsparagusEduardo Nov 12, 2023
46bc97e
Merge branch 'upcoming' into RHH/pr/upcoming/speciesSimplifier_Part2
Bassoonian Nov 14, 2023
1b09c81
Merge branch 'upcoming' into RHH/pr/upcoming/speciesSimplifier_Part2
Bassoonian Nov 14, 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
11 changes: 8 additions & 3 deletions include/config/pokemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,19 @@
#define P_FLAG_FORCE_NO_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into NOT being Shiny.

// Modifying the latest generation WILL change the saveblock due to Dex flags and will require a new save file.
// Forms are kept based on the base species, Eg: Meowth and Persian will keep all of their forms, but Perrserker will not be available if P_GEN_8_POKEMON is set to FALSE.
// If you're disabling a generation previous to others (eg: Gen 5 but not Gen 6, 7 and 8),
// remember to update NATIONAL_DEX enum in include/constants/pokedex.h to avoid players from softlocking in the non-existant entries.
// Generations of Pokémon are defined by the first member introduced.
// Eg: If P_GEN_2_POKEMON is set to FALSE, all members of the Sneasel Family will be disabled (Sneasel + Hisuian, Weavile and Sneasler).
#define P_GEN_1_POKEMON TRUE // Generation 1 Pokémon (RGBY)
#define P_GEN_2_POKEMON TRUE // Generation 2 Pokémon (GSC)
#define P_GEN_3_POKEMON TRUE // Generation 3 Pokémon (RSE, FRLG)
#define P_GEN_4_POKEMON TRUE // Generation 4 Pokémon (DPPt, HGSS)
#define P_GEN_5_POKEMON TRUE // Generation 5 Pokémon (BW, B2W2)
#define P_GEN_6_POKEMON TRUE // Generation 6 Pokémon (XY, ORAS)
#define P_GEN_7_POKEMON TRUE // Generation 7 Pokémon (SM, USUM, LGPE)
#define P_GEN_8_POKEMON TRUE // Generation 8 Pokémon (SwSh, BDSP, LA)
#define P_GEN_9_POKEMON TRUE // Generation 9 Pokémon (SV)

// Go here if you want to disable specific families of Pokémon.
#include "config/species_families.h"

#endif // GUARD_CONFIG_POKEMON_H
Loading
Loading