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 3 #3562

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
d2c778d
Added SpeciesInfo fields
AsparagusEduardo Nov 13, 2023
e201e69
Added missing comments
AsparagusEduardo Nov 13, 2023
2ad730f
Renamed gigantamax to isGigantamax
AsparagusEduardo Nov 13, 2023
5abf54a
Converted species flags to agbcc bit flags
AsparagusEduardo Nov 14, 2023
041f00e
Added padding after flags
AsparagusEduardo Nov 14, 2023
ac62575
Pikachu form config
AsparagusEduardo Nov 14, 2023
4c23cdc
Dex text
AsparagusEduardo Nov 15, 2023
cd834ff
Reordered Paradox flag
AsparagusEduardo Nov 15, 2023
16f83f3
Missing Pikachu ifdef comments
AsparagusEduardo Nov 15, 2023
02874a4
Moved P_GEN_x_POKEMON settings to the species_families file
AsparagusEduardo Nov 16, 2023
9589cb4
Gen 1 Dex entries
AsparagusEduardo Nov 16, 2023
9ca6f24
Renamed file to species_enabled.h
AsparagusEduardo Nov 16, 2023
390a66f
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Nov 16, 2023
c692931
Prevent Pokémon from evolving if their evolution is disabled
AsparagusEduardo Nov 16, 2023
fe1bf03
Prevent Pokémon from being affected by Eviolite if their evolution is…
AsparagusEduardo Nov 16, 2023
428fa55
Prevent Pokémon offspring if they're disabled
AsparagusEduardo Nov 16, 2023
6ada527
Corrected imprementation of evolution prevention
AsparagusEduardo Nov 16, 2023
89566cb
Cross-evo configs
AsparagusEduardo Nov 16, 2023
b538404
Gen 2 dex entries
AsparagusEduardo Nov 17, 2023
2964801
Changed cry table to use assignable IDs
AsparagusEduardo Nov 13, 2023
2769ecf
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Nov 19, 2023
167b308
Form table pointers
AsparagusEduardo Nov 23, 2023
2062bc6
Beginning support for moving data to gSpeciesInfo
AsparagusEduardo Nov 23, 2023
9c0d472
Pokédexes reads text from gSpeciesInfo
AsparagusEduardo Nov 24, 2023
ede5cc8
Reading species names from gSpeciesInfo
AsparagusEduardo Nov 24, 2023
5e9e20e
Fixed erroneous copy-paste
AsparagusEduardo Nov 24, 2023
70716b2
Moved Bulbasaur to Raichu Family data do gSpeciesinfo
AsparagusEduardo Nov 24, 2023
f609649
Added female pic sizes
AsparagusEduardo Nov 25, 2023
4248912
Macros for Front, Back, Palette and Learnsets
AsparagusEduardo Nov 25, 2023
360e605
Sandshrew to Dugtrio Families
AsparagusEduardo Nov 25, 2023
eb2cf5f
Obtains Height/Weight from gSpeciesInfo
AsparagusEduardo Nov 25, 2023
55d9c5f
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Nov 25, 2023
7858ec3
Read category from gSpeciesInfo
AsparagusEduardo Nov 25, 2023
5032365
Removed unused data from pokedex_entries.h
AsparagusEduardo Nov 25, 2023
85b4bca
Moved Gen 1 data to gSpeciesInfo
AsparagusEduardo Nov 26, 2023
e5d79aa
Moved Gen 2 data to gSpeciesInfo + fixed Ursaluna Bloodmoon not produ…
AsparagusEduardo Nov 26, 2023
00a533b
Moved Gen 3 data to gSpeciesInfo
AsparagusEduardo Nov 27, 2023
d428ad2
Moved Gen 4 data to gSpeciesInfo
AsparagusEduardo Nov 27, 2023
61a4795
HGSS dex properly shows form sprites
AsparagusEduardo Nov 27, 2023
39dbfba
Fixed data type for GetSpeciesHeight/Weight
AsparagusEduardo Nov 27, 2023
419d639
Reading Pokédex Size data from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
dcb462f
Cleaned up mon graphic decompression function
AsparagusEduardo Nov 27, 2023
d2b44c7
Reading Front Pics gSpeciesInfo
AsparagusEduardo Nov 27, 2023
0355fe2
Reading Back Pics gSpeciesInfo
AsparagusEduardo Nov 27, 2023
d2a4f88
Updated uses of GetMonSpritePalStruct to allow loading the data direc…
AsparagusEduardo Nov 27, 2023
630fd85
Reading palettes from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
6986227
Reading animation delay from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
6e382cd
Fixed Pokémon Debug Menu not reading animation delay
AsparagusEduardo Nov 27, 2023
6144820
Reading front anim Id from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
526df9b
Reading back anim Id from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
58871ee
Reading Animation Frames from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
704dd02
Reading Icon Sprites from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
a26b978
Reading Icon Palette IDs from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
a2326cd
Reading Footprints from gSpeciesInfo
AsparagusEduardo Nov 27, 2023
af35710
Reading Mon Pic sizes from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
47dae3f
Separate mon pic sizes for female mon
AsparagusEduardo Nov 28, 2023
6c2805a
Reading Level Up Learnsets from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
5557078
Reading Teachable Learnsets from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
7e5c6cc
Reading National Dex Number from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
8fddd3e
Reading Enemy Mon Elevation from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
8b95250
Reading Evolutions from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
b0fd842
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Nov 28, 2023
12848e2
Reading form table from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
489708e
Fixed button label inconsistency in pokémon debug menu
AsparagusEduardo Nov 28, 2023
4c5bd48
Reading form change table from gSpeciesInfo
AsparagusEduardo Nov 28, 2023
9b127c2
Removed need to define mon graphics in include/graphics.h
AsparagusEduardo Nov 28, 2023
23e5d9c
Reordered mon graphics by family
AsparagusEduardo Nov 28, 2023
a5b1b83
Fixed National dex number offset
AsparagusEduardo Nov 28, 2023
6456c7c
gFrontierBannedSpecies now checks IsSpeciesEnabled
AsparagusEduardo Nov 28, 2023
d260b44
Added 3 more toggles for Fusions, Primal Reversions and Ultra Burst
AsparagusEduardo Nov 28, 2023
1239755
Gen 3 & 4 family toggles for dex entries
AsparagusEduardo Nov 28, 2023
37ed39c
Fixed missing Mr. Rime data
AsparagusEduardo Nov 28, 2023
07a6870
Gen 1 dex descriptions as compound strings
AsparagusEduardo Nov 28, 2023
ea8cd06
Gen 2 dex descriptions as compound strings
AsparagusEduardo Nov 28, 2023
41c1059
Gen 3 dex descriptions as compound strings
AsparagusEduardo Nov 28, 2023
8c3fd00
Gen 4 dex descriptions as compound strings
AsparagusEduardo Nov 29, 2023
05ba16f
Fixed compile in agbcc
AsparagusEduardo Nov 29, 2023
b1565b8
Moved Gen 5 data to gSpeciesInfo
AsparagusEduardo Nov 29, 2023
3d41402
Using PLACEHOLDER_ANIM_SINGLE_FRAME when needed (same hash)
AsparagusEduardo Nov 29, 2023
09396ea
Renamed PLACEHOLDER_TWO_FRAME_ANIMATION to PLACEHOLDER_ANIM_TWO_FRAMES
AsparagusEduardo Nov 29, 2023
8554a1f
Fixed capitalization for front pic anims
AsparagusEduardo Nov 29, 2023
6e669a9
Fixed `CanEvolve`
AsparagusEduardo Nov 30, 2023
0ad56f2
Moved Gen 6 data to gSpeciesInfo
AsparagusEduardo Dec 1, 2023
1192c59
Gen 7 without macros
AsparagusEduardo Dec 1, 2023
ff80849
Gen 8 without macros
AsparagusEduardo Dec 1, 2023
c7a461c
Gen 9 without macros
AsparagusEduardo Dec 1, 2023
f284180
Fixed Gen 9 sound data
AsparagusEduardo Dec 1, 2023
d442b43
Finished moving Gen 7 data in macros (by Alex)
AsparagusEduardo Dec 2, 2023
fbc4543
Ultra Necrozma is now included in the fusion forms define
AsparagusEduardo Dec 2, 2023
f49464d
Cries are now properly excluded from the rom when disabling species
AsparagusEduardo Dec 2, 2023
0b7fe38
Removed P_GEN_x_POKEMON from form_change_tables.h
AsparagusEduardo Dec 2, 2023
d2e5495
Fixed Yanmega's cry ignoring the P_GEN_4_CROSS_EVOS setting
AsparagusEduardo Dec 2, 2023
02db8ca
Added P_NEW_EVOS_IN_REGIONAL_DEX setting
AsparagusEduardo Dec 2, 2023
adc4ce7
Automatic ASSUMPTION_FAIL when used species are disabled
AsparagusEduardo Dec 2, 2023
3c45ed3
Finished moving Gen 8 data in macros (by Alex)
AsparagusEduardo Dec 3, 2023
28521f9
Expanded Alcremie macro
AsparagusEduardo Dec 3, 2023
4782b7b
Finished moving Gen 9 data in macros (by Alex)
AsparagusEduardo Dec 3, 2023
5262dc6
Fixed missing data for Komala and Marshadow
AsparagusEduardo Dec 3, 2023
22dd135
Form species id tables use family toggles + added missing Ursaluna fo…
AsparagusEduardo Dec 3, 2023
e85b95f
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Dec 3, 2023
fd85fd9
Fixed Genesect palettes
AsparagusEduardo Dec 3, 2023
e3a22a9
Fixed Flabébé family graphics
AsparagusEduardo Dec 3, 2023
84fa25a
Fixed Minior Graphics
AsparagusEduardo Dec 3, 2023
ac582b3
Fixed missing Calyrex data
AsparagusEduardo Dec 3, 2023
4fdbcbb
Family toggles in mon graphcis (By Jasper/Bassoonian)
AsparagusEduardo Dec 4, 2023
59ff17c
Fixed missing Ogerpon data
AsparagusEduardo Dec 4, 2023
3ab7282
Ordered Level Up Learnsets (missing toggles)
AsparagusEduardo Dec 4, 2023
e21437d
Added more Minior synonyms
AsparagusEduardo Dec 4, 2023
f15fa77
Fixed enamorus order
AsparagusEduardo Dec 4, 2023
51b3088
Reordered teachable learnsets
AsparagusEduardo Dec 4, 2023
3eda43a
Removed sSpeciesXXX level up learnsets + reordered
AsparagusEduardo Dec 4, 2023
7a3b703
Removed unneeded assumes
AsparagusEduardo Dec 4, 2023
1a50e13
Removed unused extra animations
AsparagusEduardo Dec 4, 2023
12682c2
Family toggles in mon level up learnsets (By Jasper/Bassoonian)
AsparagusEduardo Dec 5, 2023
a9006f5
Fixed Phione graphics inclusion
AsparagusEduardo Dec 5, 2023
634d553
Family toggles for Teachable Learnsets
AsparagusEduardo Dec 5, 2023
34b3798
Ordered Front Pic Anims
AsparagusEduardo Dec 5, 2023
790d5b1
Family toggles for front pic animations
AsparagusEduardo Dec 5, 2023
1f8c69b
Fixed HGSS dex incorrectly showing the wrong mon when catching it
AsparagusEduardo Dec 6, 2023
3a5558f
Family toggles for Egg Moves + reodered
AsparagusEduardo Dec 6, 2023
6723315
Fixed HGSS not checking for null footprints
AsparagusEduardo Dec 6, 2023
db490a0
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Dec 7, 2023
54c3493
Review changes
AsparagusEduardo Dec 7, 2023
6b76b7a
Fixed Female difference mon not using their macros
AsparagusEduardo Dec 7, 2023
1818938
Fixed Alcremie Macro
AsparagusEduardo Dec 7, 2023
9cf8607
Fixed compile error when disabling the Bulbasaur family
AsparagusEduardo Dec 8, 2023
5cf5732
Fixed Turtwig and Chimchar family + Houndour and Mareep cries not bei…
AsparagusEduardo Dec 8, 2023
262adb1
Re-added missing Egg graphical data
AsparagusEduardo Dec 8, 2023
e9adc3c
Fixed crash during the Birch Intro when Lotad is disabled
AsparagusEduardo Dec 8, 2023
82ecfec
Renamed PALLETE to PALETTES
AsparagusEduardo Dec 8, 2023
b312498
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Dec 8, 2023
43198d2
Removed extra spacing for YOffsets
AsparagusEduardo Dec 8, 2023
c093e5b
Fixed compile when only disabling cross-gen evolutions
AsparagusEduardo Dec 8, 2023
fae70d8
Added Tera Forms define (Ogerpon and Terapagos)
AsparagusEduardo Dec 8, 2023
bd27223
Fixed Necrozma macro
AsparagusEduardo Dec 8, 2023
e787287
Removed .noFlip = FALSE
AsparagusEduardo Dec 8, 2023
7839219
Fixed dex number in summary screen for forms when nat dex is disabled
AsparagusEduardo Dec 8, 2023
9294edb
Fixed Paldean form paths
AsparagusEduardo Dec 8, 2023
3d7b2d8
Merge branch 'upcoming' into RHH/pr/upcoming/speciesSimplifier_Part3
AsparagusEduardo Dec 8, 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
File renamed without changes
File renamed without changes
File renamed without changes
15 changes: 1 addition & 14 deletions include/config/pokemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,7 @@
#define P_FLAG_FORCE_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into being Shiny.
#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.
// 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"
#include "config/species_enabled.h"

#endif // GUARD_CONFIG_POKEMON_H
Original file line number Diff line number Diff line change
@@ -1,17 +1,58 @@
#ifndef GUARD_CONFIG_SPECIES_FAMILIES_H
#define GUARD_CONFIG_SPECIES_FAMILIES_H
#ifndef GUARD_CONFIG_SPECIES_ENABLED_H
#define GUARD_CONFIG_SPECIES_ENABLED_H

// Modifying the latest generation WILL change the saveblock due to Dex flags and will require a new save file.
// Generations of Pokémon are defined by the first member introduced,
// so Pikachu depends on the Gen 1 setting despite Pichu being the lowest member of the evolution tree.
// 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)

// Setting this to TRUE will add the new evolutions to the Regional Dex.
#define P_NEW_EVOS_IN_REGIONAL_DEX TRUE

// Battle gimmick specific Forms.
#define P_MEGA_EVOLUTIONS TRUE
#define P_PRIMAL_REVERSIONS TRUE // Groudon and Kyogre only.
#define P_ULTRA_BURST_FORMS TRUE // Ultra Necrozma only.
#define P_GIGANTAMAX_FORMS TRUE
#define P_TERA_FORMS TRUE

// Fusion forms
#define P_FUSION_FORMS TRUE

// Regional Forms. Includes Regional Form evolutions, like Sirfetch'd.
#define P_REGIONAL_FORMS TRUE
#define P_ALOLAN_FORMS P_REGIONAL_FORMS
#define P_GALARIAN_FORMS P_REGIONAL_FORMS
#define P_HISUIAN_FORMS P_REGIONAL_FORMS
#define P_PALDEAN_FORMS P_REGIONAL_FORMS

#define P_MEGA_EVOLUTIONS TRUE
#define P_GIGANTAMAX_FORMS TRUE
// Big groups of forms that aren't always desired when choosing families.
#define P_PIKACHU_EXTRA_FORMS TRUE
#define P_COSPLAY_PIKACHU_FORMS P_PIKACHU_EXTRA_FORMS
#define P_CAP_PIKACHU_FORMS P_PIKACHU_EXTRA_FORMS

// To disable specific families, replace P_GEN_x_POKEMON with FALSE.
// Cross-generation evolutions. Includes pre-evolutions.
#define P_CROSS_GENERATION_EVOS TRUE
#define P_GEN_2_CROSS_EVOS P_CROSS_GENERATION_EVOS
#define P_GEN_3_CROSS_EVOS P_CROSS_GENERATION_EVOS
#define P_GEN_4_CROSS_EVOS P_CROSS_GENERATION_EVOS
//#define P_GEN_5_CROSS_EVOS // Gen 5 didn't introduce any cross-gen evos.
#define P_GEN_6_CROSS_EVOS P_CROSS_GENERATION_EVOS // Just Sylveon.
//#define P_GEN_7_CROSS_EVOS // Alolan evolutions handled by P_ALOLAN_FORMS.
#define P_GEN_8_CROSS_EVOS P_CROSS_GENERATION_EVOS // Regional evolutions handled by P_GALARIAN_FORMS and P_HISUIAN_FORMS.
#define P_GEN_9_CROSS_EVOS P_CROSS_GENERATION_EVOS // Clodsire handled by P_PALDEAN_FORMS.

// To disable specific families, replace P_GEN_x_POKEMON with FALSE.
#define P_FAMILY_BULBASAUR P_GEN_1_POKEMON
#define P_FAMILY_CHARMANDER P_GEN_1_POKEMON
#define P_FAMILY_SQUIRTLE P_GEN_1_POKEMON
Expand Down Expand Up @@ -554,4 +595,4 @@
#define P_FAMILY_FEZANDIPITI P_GEN_9_POKEMON
#define P_FAMILY_OGERPON P_GEN_9_POKEMON

#endif // GUARD_CONFIG_SPECIES_FAMILIES_H
#endif // GUARD_CONFIG_SPECIES_ENABLED_H
Loading
Loading