atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compile when disabling P_GEN_X_POKEMON

Browse source
This commit is contained in:
Eduardo Quezada 2022-10-24 14:12:54 -03:00
parent 1f6f6781ff
commit 1e4a2c1eb4
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/data/pokemon/base_form_species_table.h
View file

@ -393,6 +393,7 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
NATIONAL_DEX_TO_SPECIES(JIRACHI),
NATIONAL_DEX_TO_SPECIES(DEOXYS),
// Sinnoh
#if P_GEN_4_POKEMON == TRUE
NATIONAL_DEX_TO_SPECIES(TURTWIG),
NATIONAL_DEX_TO_SPECIES(GROTLE),
NATIONAL_DEX_TO_SPECIES(TORTERRA),
@ -500,6 +501,8 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
NATIONAL_DEX_TO_SPECIES(DARKRAI),
NATIONAL_DEX_TO_SPECIES(SHAYMIN),
NATIONAL_DEX_TO_SPECIES(ARCEUS),
#endif
#if P_GEN_5_POKEMON == TRUE
// Unova
NATIONAL_DEX_TO_SPECIES(VICTINI),
NATIONAL_DEX_TO_SPECIES(SNIVY),
@ -657,6 +660,8 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
NATIONAL_DEX_TO_SPECIES(KELDEO),
NATIONAL_DEX_TO_SPECIES(MELOETTA),
NATIONAL_DEX_TO_SPECIES(GENESECT),
#endif
#if P_GEN_6_POKEMON == TRUE
// Kalos
NATIONAL_DEX_TO_SPECIES(CHESPIN),
NATIONAL_DEX_TO_SPECIES(QUILLADIN),
@ -730,6 +735,8 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
NATIONAL_DEX_TO_SPECIES(DIANCIE),
NATIONAL_DEX_TO_SPECIES(HOOPA),
NATIONAL_DEX_TO_SPECIES(VOLCANION),
#endif
#if P_GEN_7_POKEMON == TRUE
// Alola
NATIONAL_DEX_TO_SPECIES(ROWLET),
NATIONAL_DEX_TO_SPECIES(DARTRIX),
@ -820,6 +827,8 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
// Unknown
NATIONAL_DEX_TO_SPECIES(MELTAN),
NATIONAL_DEX_TO_SPECIES(MELMETAL),
#endif
#if P_GEN_8_POKEMON == TRUE
// Galar
NATIONAL_DEX_TO_SPECIES(GROOKEY),
NATIONAL_DEX_TO_SPECIES(THWACKEY),
@ -910,6 +919,7 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
NATIONAL_DEX_TO_SPECIES(GLASTRIER),
NATIONAL_DEX_TO_SPECIES(SPECTRIER),
NATIONAL_DEX_TO_SPECIES(CALYREX),
// Hisui
NATIONAL_DEX_TO_SPECIES(WYRDEER),
NATIONAL_DEX_TO_SPECIES(KLEAVOR),
NATIONAL_DEX_TO_SPECIES(URSALUNA),
@ -917,4 +927,5 @@ const u16 gBaseFormSpeciesIdTable[NATIONAL_DEX_COUNT + 1] =
NATIONAL_DEX_TO_SPECIES(SNEASLER),
NATIONAL_DEX_TO_SPECIES(OVERQWIL),
NATIONAL_DEX_TO_SPECIES(ENAMORUS),
#endif
};

19
src/data/pokemon/pokedex_entries.h
View file

@ -6243,6 +6243,7 @@ const struct PokedexEntry gPokedexEntries[] =
const struct PokedexEntryForms gPokedexEntriesForms[] =
{
#if P_GEN_4_POKEMON == TRUE
[SPECIES_LOPUNNY_MEGA] =
{
.height = 13,
@ -6278,6 +6279,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gGalladePokedexText, // No official dex entry
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT,
},
#endif
#if P_GEN_5_POKEMON == TRUE
[SPECIES_AUDINO_MEGA] =
{
.height = 15,
@ -6285,6 +6288,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gAudinoPokedexText, // No official dex entry
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT,
},
#endif
#if P_GEN_6_POKEMON == TRUE
[SPECIES_DIANCIE_MEGA] =
{
.height = 11,
@ -6292,8 +6297,9 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDianciePokedexText, // No official dex entry
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT,
},
#endif
#if P_GEN_5_POKEMON == TRUE
[SPECIES_DARUMAKA_GALARIAN] =
{
.height = 7,
@ -6323,7 +6329,9 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDummyPokedexText,
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT,
},
#endif
#if P_GEN_4_POKEMON == TRUE
// Cherrim
[SPECIES_CHERRIM_SUNSHINE] =
{
@ -6384,6 +6392,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDummyPokedexText,
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT,
},
#endif
#if P_GEN_5_POKEMON == TRUE
// Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] =
{
@ -6446,6 +6456,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDummyPokedexText,
.flags = FLAG_FORM_DESCRIPTION ,
},
#endif
#if P_GEN_6_POKEMON == TRUE
// Meowstic
[SPECIES_MEOWSTIC_FEMALE] =
{
@ -6540,6 +6552,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDummyPokedexText,
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY,
},
#endif
#if P_GEN_7_POKEMON == TRUE
// Oricorio
[SPECIES_ORICORIO_POM_POM] =
{
@ -6797,6 +6811,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDummyPokedexText,
.flags = FLAG_FORM_DESCRIPTION ,
},
#endif
#if P_GEN_8_POKEMON == TRUE
// Cramorant
[SPECIES_CRAMORANT_GULPING] =
{
@ -6938,4 +6954,5 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
.description = gDummyPokedexText,
.flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY,
},
#endif
};