From 925384eedc6bd39bdb428ad54384b0223a3d0ef9 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 30 Aug 2022 12:26:53 -0400 Subject: [PATCH] =?UTF-8?q?Generations=20of=20Pok=C3=A9mon=20can=20now=20b?= =?UTF-8?q?e=20disabled=20individually?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/constants/pokedex.h | 41 ++-- include/constants/pokemon_config.h | 10 +- include/graphics.h | 182 +++++++++--------- sound/cry_tables.inc | 68 +++---- sound/direct_sound_data.inc | 26 +-- src/data/graphics/pokemon.h | 180 ++++++++--------- src/data/pokemon/base_stats.h | 34 ++-- src/data/pokemon/egg_moves.h | 12 +- src/data/pokemon/evolution.h | 60 +++--- src/data/pokemon/form_change_table_pointers.h | 10 +- src/data/pokemon/form_change_tables.h | 10 +- .../pokemon/form_species_table_pointers.h | 37 ++-- src/data/pokemon/form_species_tables.h | 23 +-- src/data/pokemon/level_up_learnset_pointers.h | 34 ++-- src/data/pokemon/level_up_learnsets.h | 28 +-- src/data/pokemon/pokedex_entries.h | 10 +- src/data/pokemon/pokedex_text.h | 10 +- .../pokemon/teachable_learnset_pointers.h | 34 ++-- src/data/pokemon/teachable_learnsets.h | 26 +-- .../pokemon_graphics/back_pic_coordinates.h | 34 ++-- src/data/pokemon_graphics/back_pic_table.h | 42 ++-- src/data/pokemon_graphics/footprint_table.h | 10 +- src/data/pokemon_graphics/front_pic_anims.h | 102 +++++----- .../pokemon_graphics/front_pic_coordinates.h | 34 ++-- src/data/pokemon_graphics/front_pic_table.h | 42 ++-- src/data/pokemon_graphics/palette_table.h | 42 ++-- .../pokemon_graphics/shiny_palette_table.h | 42 ++-- src/data/text/species_names.h | 34 ++-- src/pokemon.c | 66 +++---- src/pokemon_icon.c | 60 +++--- 30 files changed, 681 insertions(+), 662 deletions(-) diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 93306a7c3..39c09c312 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -2,7 +2,8 @@ #define GUARD_CONSTANTS_POKEDEX_H #include "constants/pokemon_config.h" -// National Pokedex order. Gen 4+ mon are not disabled by P_NEW_POKEMON to keep pokedex_orders.h clean. +// National Pokedex order. +// These constants are NOT disabled by P_GEN_X_POKEMON to keep pokedex_orders.h clean. enum { NATIONAL_DEX_NONE, // Kanto @@ -923,19 +924,21 @@ enum { #define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI -#if P_NEW_POKEMON >= GEN_8 -#define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS -#elif P_NEW_POKEMON >= GEN_7 -#define NATIONAL_DEX_COUNT NATIONAL_DEX_MELMETAL -#elif P_NEW_POKEMON >= GEN_6 -#define NATIONAL_DEX_COUNT NATIONAL_DEX_VOLCANION -#elif P_NEW_POKEMON >= GEN_5 -#define NATIONAL_DEX_COUNT NATIONAL_DEX_GENESECT -#elif P_NEW_POKEMON >= GEN_4 -#define NATIONAL_DEX_COUNT NATIONAL_DEX_ARCEUS + +#if P_GEN_8_POKEMON == TRUE + #define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS +#elif P_GEN_7_POKEMON == TRUE + #define NATIONAL_DEX_COUNT NATIONAL_DEX_MELMETAL +#elif P_GEN_6_POKEMON == TRUE + #define NATIONAL_DEX_COUNT NATIONAL_DEX_VOLCANION +#elif P_GEN_5_POKEMON == TRUE + #define NATIONAL_DEX_COUNT NATIONAL_DEX_GENESECT +#elif P_GEN_4_POKEMON == TRUE + #define NATIONAL_DEX_COUNT NATIONAL_DEX_ARCEUS #else -#define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS + #define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS #endif + #define POKEMON_SLOTS_NUMBER (NATIONAL_DEX_COUNT + 1) // Hoenn Pokedex order @@ -972,7 +975,7 @@ enum { HOENN_DEX_RALTS, HOENN_DEX_KIRLIA, HOENN_DEX_GARDEVOIR, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_GALLADE, #endif HOENN_DEX_SURSKIT, @@ -1004,7 +1007,7 @@ enum { HOENN_DEX_GRAVELER, HOENN_DEX_GOLEM, HOENN_DEX_NOSEPASS, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_PROBOPASS, #endif HOENN_DEX_SKITTY, @@ -1030,7 +1033,7 @@ enum { HOENN_DEX_MINUN, HOENN_DEX_MAGNEMITE, HOENN_DEX_MAGNETON, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_MAGNEZONE, #endif HOENN_DEX_VOLTORB, @@ -1043,7 +1046,7 @@ enum { HOENN_DEX_BELLOSSOM, HOENN_DEX_DODUO, HOENN_DEX_DODRIO, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_BUDEW, HOENN_DEX_ROSELIA, HOENN_DEX_ROSERADE, @@ -1105,7 +1108,7 @@ enum { HOENN_DEX_BANETTE, HOENN_DEX_DUSKULL, HOENN_DEX_DUSCLOPS, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_DUSKNOIR, HOENN_DEX_TROPIUS, HOENN_DEX_CHINGLING, @@ -1132,12 +1135,12 @@ enum { HOENN_DEX_HERACROSS, HOENN_DEX_RHYHORN, HOENN_DEX_RHYDON, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_RHYPERIOR, #endif HOENN_DEX_SNORUNT, HOENN_DEX_GLALIE, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_DEX_FROSLASS, #endif HOENN_DEX_SPHEAL, diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 830975500..4826a7c46 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -19,7 +19,15 @@ #define P_KADABRA_EVERSTONE GEN_8 // Since Gen 4, Kadabra can evolve even when holding an Everstone. #define P_NIDORAN_M_DITTO_BREED GEN_8 // 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_NEW_POKEMON GEN_8 // Changing this will disable Pokémon added past the Generation set here. Eg: Setting it to GEN_4 will ignore all Gen5+ mon. All forms of a mon are kept. Eg: GEN_3 will have all Pikachu Forms. +// 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. +#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) +#define P_GEN_8_POKEMON TRUE // Generation 8 Pokémon (SwSh, BDSP, LA) #define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen. diff --git a/include/graphics.h b/include/graphics.h index d41318c06..a55832da7 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -454,7 +454,7 @@ extern const u32 gMonFrontPic_Groudon[]; extern const u32 gMonFrontPic_Rayquaza[]; extern const u32 gMonFrontPic_Jirachi[]; extern const u32 gMonFrontPic_Deoxys[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonFrontPic_Turtwig[]; extern const u32 gMonFrontPic_Grotle[]; extern const u32 gMonFrontPic_Torterra[]; @@ -572,7 +572,7 @@ extern const u32 gMonFrontPic_Darkrai[]; extern const u32 gMonFrontPic_Shaymin[]; extern const u32 gMonFrontPic_Arceus[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_Victini[]; extern const u32 gMonFrontPic_Snivy[]; extern const u32 gMonFrontPic_Servine[]; @@ -733,7 +733,7 @@ extern const u32 gMonFrontPic_Keldeo[]; extern const u32 gMonFrontPic_Meloetta[]; extern const u32 gMonFrontPic_Genesect[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonFrontPic_Chespin[]; extern const u32 gMonFrontPic_Quilladin[]; extern const u32 gMonFrontPic_Chesnaught[]; @@ -808,7 +808,7 @@ extern const u32 gMonFrontPic_Diancie[]; extern const u32 gMonFrontPic_Hoopa[]; extern const u32 gMonFrontPic_Volcanion[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonFrontPic_Rowlet[]; extern const u32 gMonFrontPic_Dartrix[]; extern const u32 gMonFrontPic_Decidueye[]; @@ -898,7 +898,7 @@ extern const u32 gMonFrontPic_Zeraora[]; extern const u32 gMonFrontPic_Meltan[]; extern const u32 gMonFrontPic_Melmetal[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonFrontPic_Grookey[]; extern const u32 gMonFrontPic_Thwackey[]; extern const u32 gMonFrontPic_Rillaboom[]; @@ -1037,17 +1037,17 @@ extern const u32 gMonFrontPic_SalamenceMega[]; extern const u32 gMonFrontPic_MetagrossMega[]; extern const u32 gMonFrontPic_LatiasMega[]; extern const u32 gMonFrontPic_LatiosMega[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonFrontPic_LopunnyMega[]; extern const u32 gMonFrontPic_GarchompMega[]; extern const u32 gMonFrontPic_LucarioMega[]; extern const u32 gMonFrontPic_AbomasnowMega[]; extern const u32 gMonFrontPic_GalladeMega[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_AudinoMega[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonFrontPic_DiancieMega[]; #endif extern const u32 gMonFrontPic_RayquazaMega[]; @@ -1086,7 +1086,7 @@ extern const u32 gMonFrontPic_SlowkingGalarian[]; extern const u32 gMonFrontPic_CorsolaGalarian[]; extern const u32 gMonFrontPic_ZigzagoonGalarian[]; extern const u32 gMonFrontPic_LinooneGalarian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_DarumakaGalarian[]; extern const u32 gMonFrontPic_DarmanitanGalarian[]; extern const u32 gMonFrontPic_YamaskGalarian[]; @@ -1099,19 +1099,19 @@ extern const u32 gMonFrontPic_ElectrodeHisuian[]; extern const u32 gMonFrontPic_TyphlosionHisuian[]; extern const u32 gMonFrontPic_QwilfishHisuian[]; extern const u32 gMonFrontPic_SneaselHisuian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //extern const u32 gMonFrontPic_SamurottHisuian[]; extern const u32 gMonFrontPic_LilligantHisuian[]; extern const u32 gMonFrontPic_ZoruaHisuian[]; extern const u32 gMonFrontPic_ZoroarkHisuian[]; extern const u32 gMonFrontPic_BraviaryHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonFrontPic_SliggooHisuian[]; extern const u32 gMonFrontPic_GoodraHisuian[]; extern const u32 gMonFrontPic_AvaluggHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //extern const u32 gMonFrontPic_DecidueyeHisuian[]; #endif extern const u32 gMonFrontPic_PikachuCosplay[]; @@ -1162,7 +1162,7 @@ extern const u32 gMonFrontPic_CastformSnowy[]; extern const u32 gMonFrontPic_DeoxysAttack[]; extern const u32 gMonFrontPic_DeoxysDefense[]; extern const u32 gMonFrontPic_DeoxysSpeed[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonFrontPic_BurmySandyCloak[]; extern const u32 gMonFrontPic_BurmyTrashCloak[]; extern const u32 gMonFrontPic_WormadamSandyCloak[]; @@ -1180,7 +1180,7 @@ extern const u32 gMonFrontPic_PalkiaOrigin[]; extern const u32 gMonFrontPic_GiratinaOrigin[]; extern const u32 gMonFrontPic_ShayminSky[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_BasculinBlueStriped[]; extern const u32 gMonFrontPic_BasculinWhiteStriped[]; extern const u32 gMonFrontPic_DarmanitanZenMode[]; @@ -1192,13 +1192,13 @@ extern const u32 gMonFrontPic_TornadusTherian[]; extern const u32 gMonFrontPic_ThundurusTherian[]; extern const u32 gMonFrontPic_LandorusTherian[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonFrontPic_KyuremWhite[]; extern const u32 gMonFrontPic_KyuremBlack[]; extern const u32 gMonFrontPic_KeldeoResolute[]; extern const u32 gMonFrontPic_MeloettaPirouette[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonFrontPic_GreninjaAsh[]; extern const u32 gMonFrontPic_VivillonPolar[]; extern const u32 gMonFrontPic_VivillonTundra[]; @@ -1242,7 +1242,7 @@ extern const u32 gMonFrontPic_Zygarde10[]; extern const u32 gMonFrontPic_ZygardeComplete[]; extern const u32 gMonFrontPic_HoopaUnbound[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonFrontPic_OricorioPomPom[]; extern const u32 gMonFrontPic_OricorioPau[]; extern const u32 gMonFrontPic_OricorioSensu[]; @@ -1256,7 +1256,7 @@ extern const u32 gMonFrontPic_NecrozmaDawnWings[]; extern const u32 gMonFrontPic_NecrozmaUltra[]; extern const u32 gMonFrontPic_MagearnaOriginalColor[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonFrontPic_CramorantGulping[]; extern const u32 gMonFrontPic_CramorantGorging[]; extern const u32 gMonFrontPic_ToxtricityLowKey[]; @@ -1671,7 +1671,7 @@ extern const u32 gMonBackPic_Groudon[]; extern const u32 gMonBackPic_Rayquaza[]; extern const u32 gMonBackPic_Jirachi[]; extern const u32 gMonBackPic_Deoxys[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonBackPic_Turtwig[]; extern const u32 gMonBackPic_Grotle[]; extern const u32 gMonBackPic_Torterra[]; @@ -1788,7 +1788,7 @@ extern const u32 gMonBackPic_Darkrai[]; extern const u32 gMonBackPic_Shaymin[]; extern const u32 gMonBackPic_Arceus[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonBackPic_Victini[]; extern const u32 gMonBackPic_Snivy[]; extern const u32 gMonBackPic_Servine[]; @@ -1949,7 +1949,7 @@ extern const u32 gMonBackPic_Keldeo[]; extern const u32 gMonBackPic_Meloetta[]; extern const u32 gMonBackPic_Genesect[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonBackPic_Chespin[]; extern const u32 gMonBackPic_Quilladin[]; extern const u32 gMonBackPic_Chesnaught[]; @@ -2024,7 +2024,7 @@ extern const u32 gMonBackPic_Diancie[]; extern const u32 gMonBackPic_Hoopa[]; extern const u32 gMonBackPic_Volcanion[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonBackPic_Rowlet[]; extern const u32 gMonBackPic_Dartrix[]; extern const u32 gMonBackPic_Decidueye[]; @@ -2114,7 +2114,7 @@ extern const u32 gMonBackPic_Zeraora[]; extern const u32 gMonBackPic_Meltan[]; extern const u32 gMonBackPic_Melmetal[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonBackPic_Grookey[]; extern const u32 gMonBackPic_Thwackey[]; extern const u32 gMonBackPic_Rillaboom[]; @@ -2253,17 +2253,17 @@ extern const u32 gMonBackPic_SalamenceMega[]; extern const u32 gMonBackPic_MetagrossMega[]; extern const u32 gMonBackPic_LatiasMega[]; extern const u32 gMonBackPic_LatiosMega[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonBackPic_LopunnyMega[]; extern const u32 gMonBackPic_GarchompMega[]; extern const u32 gMonBackPic_LucarioMega[]; extern const u32 gMonBackPic_AbomasnowMega[]; extern const u32 gMonBackPic_GalladeMega[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonBackPic_AudinoMega[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonBackPic_DiancieMega[]; #endif extern const u32 gMonBackPic_RayquazaMega[]; @@ -2302,7 +2302,7 @@ extern const u32 gMonBackPic_SlowkingGalarian[]; extern const u32 gMonBackPic_CorsolaGalarian[]; extern const u32 gMonBackPic_ZigzagoonGalarian[]; extern const u32 gMonBackPic_LinooneGalarian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonBackPic_DarumakaGalarian[]; extern const u32 gMonBackPic_DarmanitanGalarian[]; extern const u32 gMonBackPic_YamaskGalarian[]; @@ -2315,19 +2315,19 @@ extern const u32 gMonBackPic_ElectrodeHisuian[]; extern const u32 gMonBackPic_TyphlosionHisuian[]; extern const u32 gMonBackPic_QwilfishHisuian[]; extern const u32 gMonBackPic_SneaselHisuian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //extern const u32 gMonBackPic_SamurottHisuian[]; extern const u32 gMonBackPic_LilligantHisuian[]; extern const u32 gMonBackPic_ZoruaHisuian[]; extern const u32 gMonBackPic_ZoroarkHisuian[]; extern const u32 gMonBackPic_BraviaryHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonBackPic_SliggooHisuian[]; extern const u32 gMonBackPic_GoodraHisuian[]; extern const u32 gMonBackPic_AvaluggHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //extern const u32 gMonBackPic_DecidueyeHisuian[]; #endif extern const u32 gMonBackPic_PikachuCosplay[]; @@ -2378,7 +2378,7 @@ extern const u32 gMonBackPic_CastformSnowy[]; extern const u32 gMonBackPic_DeoxysAttack[]; extern const u32 gMonBackPic_DeoxysDefense[]; extern const u32 gMonBackPic_DeoxysSpeed[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonBackPic_BurmySandyCloak[]; extern const u32 gMonBackPic_BurmyTrashCloak[]; extern const u32 gMonBackPic_WormadamSandyCloak[]; @@ -2396,7 +2396,7 @@ extern const u32 gMonBackPic_PalkiaOrigin[]; extern const u32 gMonBackPic_GiratinaOrigin[]; extern const u32 gMonBackPic_ShayminSky[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonBackPic_BasculinBlueStriped[]; extern const u32 gMonBackPic_BasculinWhiteStriped[]; extern const u32 gMonBackPic_DarmanitanZenMode[]; @@ -2412,7 +2412,7 @@ extern const u32 gMonBackPic_KyuremBlack[]; extern const u32 gMonBackPic_KeldeoResolute[]; extern const u32 gMonBackPic_MeloettaPirouette[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonBackPic_GreninjaAsh[]; extern const u32 gMonBackPic_VivillonPolar[]; extern const u32 gMonBackPic_VivillonTundra[]; @@ -2456,7 +2456,7 @@ extern const u32 gMonBackPic_Zygarde10[]; extern const u32 gMonBackPic_ZygardeComplete[]; extern const u32 gMonBackPic_HoopaUnbound[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonBackPic_OricorioPomPom[]; extern const u32 gMonBackPic_OricorioPau[]; extern const u32 gMonBackPic_OricorioSensu[]; @@ -2470,7 +2470,7 @@ extern const u32 gMonBackPic_NecrozmaDawnWings[]; extern const u32 gMonBackPic_NecrozmaUltra[]; extern const u32 gMonBackPic_MagearnaOriginalColor[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonBackPic_CramorantGulping[]; extern const u32 gMonBackPic_CramorantGorging[]; extern const u32 gMonBackPic_ToxtricityLowKey[]; @@ -2883,7 +2883,7 @@ extern const u32 gMonPalette_Groudon[]; extern const u32 gMonPalette_Rayquaza[]; extern const u32 gMonPalette_Jirachi[]; extern const u32 gMonPalette_Deoxys[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonPalette_Turtwig[]; extern const u32 gMonPalette_Grotle[]; extern const u32 gMonPalette_Torterra[]; @@ -2994,7 +2994,7 @@ extern const u32 gMonPalette_Darkrai[]; extern const u32 gMonPalette_Shaymin[]; extern const u32 gMonPalette_Arceus[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonPalette_Victini[]; extern const u32 gMonPalette_Snivy[]; extern const u32 gMonPalette_Servine[]; @@ -3155,7 +3155,7 @@ extern const u32 gMonPalette_Keldeo[]; extern const u32 gMonPalette_Meloetta[]; extern const u32 gMonPalette_Genesect[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonPalette_Chespin[]; extern const u32 gMonPalette_Quilladin[]; extern const u32 gMonPalette_Chesnaught[]; @@ -3230,7 +3230,7 @@ extern const u32 gMonPalette_Diancie[]; extern const u32 gMonPalette_Hoopa[]; extern const u32 gMonPalette_Volcanion[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonPalette_Rowlet[]; extern const u32 gMonPalette_Dartrix[]; extern const u32 gMonPalette_Decidueye[]; @@ -3320,7 +3320,7 @@ extern const u32 gMonPalette_Zeraora[]; extern const u32 gMonPalette_Meltan[]; extern const u32 gMonPalette_Melmetal[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonPalette_Grookey[]; extern const u32 gMonPalette_Thwackey[]; extern const u32 gMonPalette_Rillaboom[]; @@ -3459,17 +3459,17 @@ extern const u32 gMonPalette_SalamenceMega[]; extern const u32 gMonPalette_MetagrossMega[]; extern const u32 gMonPalette_LatiasMega[]; extern const u32 gMonPalette_LatiosMega[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonPalette_LopunnyMega[]; extern const u32 gMonPalette_GarchompMega[]; extern const u32 gMonPalette_LucarioMega[]; extern const u32 gMonPalette_AbomasnowMega[]; extern const u32 gMonPalette_GalladeMega[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonPalette_AudinoMega[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonPalette_DiancieMega[]; #endif extern const u32 gMonPalette_RayquazaMega[]; @@ -3508,7 +3508,7 @@ extern const u32 gMonPalette_SlowkingGalarian[]; extern const u32 gMonPalette_CorsolaGalarian[]; extern const u32 gMonPalette_ZigzagoonGalarian[]; extern const u32 gMonPalette_LinooneGalarian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonPalette_DarumakaGalarian[]; extern const u32 gMonPalette_DarmanitanGalarian[]; extern const u32 gMonPalette_YamaskGalarian[]; @@ -3521,19 +3521,19 @@ extern const u32 gMonPalette_ElectrodeHisuian[]; extern const u32 gMonPalette_TyphlosionHisuian[]; extern const u32 gMonPalette_QwilfishHisuian[]; extern const u32 gMonPalette_SneaselHisuian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //extern const u32 gMonPalette_SamurottHisuian[]; extern const u32 gMonPalette_LilligantHisuian[]; extern const u32 gMonPalette_ZoruaHisuian[]; extern const u32 gMonPalette_ZoroarkHisuian[]; extern const u32 gMonPalette_BraviaryHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonPalette_SliggooHisuian[]; extern const u32 gMonPalette_GoodraHisuian[]; extern const u32 gMonPalette_AvaluggHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //extern const u32 gMonPalette_DecidueyeHisuian[]; #endif extern const u32 gMonPalette_PikachuCosplay[]; @@ -3557,7 +3557,7 @@ extern const u32 gMonPalette_CastformSnowy[]; extern const u32 gMonPalette_DeoxysAttack[]; extern const u32 gMonPalette_DeoxysDefense[]; extern const u32 gMonPalette_DeoxysSpeed[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonPalette_BurmySandyCloak[]; extern const u32 gMonPalette_BurmyTrashCloak[]; extern const u32 gMonPalette_WormadamSandyCloak[]; @@ -3592,7 +3592,7 @@ extern const u32 gMonPalette_ArceusDragon[]; extern const u32 gMonPalette_ArceusDark[]; extern const u32 gMonPalette_ArceusFairy[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonPalette_BasculinBlueStriped[]; extern const u32 gMonPalette_BasculinWhiteStriped[]; extern const u32 gMonPalette_DarmanitanZenMode[]; @@ -3615,7 +3615,7 @@ extern const u32 gMonPalette_GenesectShockDrive[]; extern const u32 gMonPalette_GenesectBurnDrive[]; extern const u32 gMonPalette_GenesectChillDrive[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonPalette_GreninjaAsh[]; extern const u32 gMonPalette_VivillonPolar[]; extern const u32 gMonPalette_VivillonTundra[]; @@ -3665,7 +3665,7 @@ extern const u32 gMonPalette_Zygarde10[]; extern const u32 gMonPalette_ZygardeComplete[]; extern const u32 gMonPalette_HoopaUnbound[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonPalette_OricorioPomPom[]; extern const u32 gMonPalette_OricorioPau[]; extern const u32 gMonPalette_OricorioSensu[]; @@ -3702,7 +3702,7 @@ extern const u32 gMonPalette_NecrozmaDawnWings[]; extern const u32 gMonPalette_NecrozmaUltra[]; extern const u32 gMonPalette_MagearnaOriginalColor[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonPalette_CramorantGulping[]; extern const u32 gMonPalette_CramorantGorging[]; extern const u32 gMonPalette_ToxtricityLowKey[]; @@ -4116,7 +4116,7 @@ extern const u32 gMonShinyPalette_Groudon[]; extern const u32 gMonShinyPalette_Rayquaza[]; extern const u32 gMonShinyPalette_Jirachi[]; extern const u32 gMonShinyPalette_Deoxys[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonShinyPalette_Turtwig[]; extern const u32 gMonShinyPalette_Grotle[]; extern const u32 gMonShinyPalette_Torterra[]; @@ -4228,7 +4228,7 @@ extern const u32 gMonShinyPalette_Darkrai[]; extern const u32 gMonShinyPalette_Shaymin[]; extern const u32 gMonShinyPalette_Arceus[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonShinyPalette_Victini[]; extern const u32 gMonShinyPalette_Snivy[]; extern const u32 gMonShinyPalette_Servine[]; @@ -4389,7 +4389,7 @@ extern const u32 gMonShinyPalette_Keldeo[]; extern const u32 gMonShinyPalette_Meloetta[]; extern const u32 gMonShinyPalette_Genesect[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonShinyPalette_Chespin[]; extern const u32 gMonShinyPalette_Quilladin[]; extern const u32 gMonShinyPalette_Chesnaught[]; @@ -4464,7 +4464,7 @@ extern const u32 gMonShinyPalette_Diancie[]; extern const u32 gMonShinyPalette_Hoopa[]; extern const u32 gMonShinyPalette_Volcanion[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonShinyPalette_Rowlet[]; extern const u32 gMonShinyPalette_Dartrix[]; extern const u32 gMonShinyPalette_Decidueye[]; @@ -4554,7 +4554,7 @@ extern const u32 gMonShinyPalette_Zeraora[]; extern const u32 gMonShinyPalette_Meltan[]; extern const u32 gMonShinyPalette_Melmetal[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonShinyPalette_Grookey[]; extern const u32 gMonShinyPalette_Thwackey[]; extern const u32 gMonShinyPalette_Rillaboom[]; @@ -4693,17 +4693,17 @@ extern const u32 gMonShinyPalette_SalamenceMega[]; extern const u32 gMonShinyPalette_MetagrossMega[]; extern const u32 gMonShinyPalette_LatiasMega[]; extern const u32 gMonShinyPalette_LatiosMega[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonShinyPalette_LopunnyMega[]; extern const u32 gMonShinyPalette_GarchompMega[]; extern const u32 gMonShinyPalette_LucarioMega[]; extern const u32 gMonShinyPalette_AbomasnowMega[]; extern const u32 gMonShinyPalette_GalladeMega[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonShinyPalette_AudinoMega[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonShinyPalette_DiancieMega[]; #endif extern const u32 gMonShinyPalette_RayquazaMega[]; @@ -4742,7 +4742,7 @@ extern const u32 gMonShinyPalette_SlowkingGalarian[]; extern const u32 gMonShinyPalette_CorsolaGalarian[]; extern const u32 gMonShinyPalette_ZigzagoonGalarian[]; extern const u32 gMonShinyPalette_LinooneGalarian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonShinyPalette_DarumakaGalarian[]; extern const u32 gMonShinyPalette_DarmanitanGalarian[]; extern const u32 gMonShinyPalette_YamaskGalarian[]; @@ -4755,19 +4755,19 @@ extern const u32 gMonShinyPalette_ElectrodeHisuian[]; extern const u32 gMonShinyPalette_TyphlosionHisuian[]; extern const u32 gMonShinyPalette_QwilfishHisuian[]; extern const u32 gMonShinyPalette_SneaselHisuian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //extern const u32 gMonShinyPalette_SamurottHisuian[]; extern const u32 gMonShinyPalette_LilligantHisuian[]; extern const u32 gMonShinyPalette_ZoruaHisuian[]; extern const u32 gMonShinyPalette_ZoroarkHisuian[]; extern const u32 gMonShinyPalette_BraviaryHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonShinyPalette_SliggooHisuian[]; extern const u32 gMonShinyPalette_GoodraHisuian[]; extern const u32 gMonShinyPalette_AvaluggHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //extern const u32 gMonShinyPalette_DecidueyeHisuian[]; #endif extern const u32 gMonShinyPalette_PikachuCosplay[]; @@ -4791,7 +4791,7 @@ extern const u32 gMonShinyPalette_CastformSnowy[]; extern const u32 gMonShinyPalette_DeoxysAttack[]; extern const u32 gMonShinyPalette_DeoxysDefense[]; extern const u32 gMonShinyPalette_DeoxysSpeed[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u32 gMonShinyPalette_BurmySandyCloak[]; extern const u32 gMonShinyPalette_BurmyTrashCloak[]; extern const u32 gMonShinyPalette_WormadamSandyCloak[]; @@ -4826,7 +4826,7 @@ extern const u32 gMonShinyPalette_ArceusDragon[]; extern const u32 gMonShinyPalette_ArceusDark[]; extern const u32 gMonShinyPalette_ArceusFairy[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u32 gMonShinyPalette_BasculinBlueStriped[]; extern const u32 gMonShinyPalette_BasculinWhiteStriped[]; extern const u32 gMonShinyPalette_DarmanitanZenMode[]; @@ -4849,7 +4849,7 @@ extern const u32 gMonShinyPalette_GenesectShockDrive[]; extern const u32 gMonShinyPalette_GenesectBurnDrive[]; extern const u32 gMonShinyPalette_GenesectChillDrive[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u32 gMonShinyPalette_GreninjaAsh[]; extern const u32 gMonShinyPalette_VivillonPolar[]; extern const u32 gMonShinyPalette_VivillonTundra[]; @@ -4899,7 +4899,7 @@ extern const u32 gMonShinyPalette_Zygarde10[]; extern const u32 gMonShinyPalette_ZygardeComplete[]; extern const u32 gMonShinyPalette_HoopaUnbound[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u32 gMonShinyPalette_OricorioPomPom[]; extern const u32 gMonShinyPalette_OricorioPau[]; extern const u32 gMonShinyPalette_OricorioSensu[]; @@ -4930,7 +4930,7 @@ extern const u32 gMonShinyPalette_NecrozmaDawnWings[]; extern const u32 gMonShinyPalette_NecrozmaUltra[]; extern const u32 gMonShinyPalette_MagearnaOriginalColor[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u32 gMonShinyPalette_CramorantGulping[]; extern const u32 gMonShinyPalette_CramorantGorging[]; extern const u32 gMonShinyPalette_ToxtricityLowKey[]; @@ -5342,7 +5342,7 @@ extern const u8 gMonIcon_Groudon[]; extern const u8 gMonIcon_Rayquaza[]; extern const u8 gMonIcon_Jirachi[]; extern const u8 gMonIcon_Deoxys[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u8 gMonIcon_Turtwig[]; extern const u8 gMonIcon_Grotle[]; extern const u8 gMonIcon_Torterra[]; @@ -5451,7 +5451,7 @@ extern const u8 gMonIcon_Darkrai[]; extern const u8 gMonIcon_Shaymin[]; extern const u8 gMonIcon_Arceus[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u8 gMonIcon_Victini[]; extern const u8 gMonIcon_Snivy[]; extern const u8 gMonIcon_Servine[]; @@ -5612,7 +5612,7 @@ extern const u8 gMonIcon_Keldeo[]; extern const u8 gMonIcon_Meloetta[]; extern const u8 gMonIcon_Genesect[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u8 gMonIcon_Chespin[]; extern const u8 gMonIcon_Quilladin[]; extern const u8 gMonIcon_Chesnaught[]; @@ -5687,7 +5687,7 @@ extern const u8 gMonIcon_Diancie[]; extern const u8 gMonIcon_Hoopa[]; extern const u8 gMonIcon_Volcanion[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u8 gMonIcon_Rowlet[]; extern const u8 gMonIcon_Dartrix[]; extern const u8 gMonIcon_Decidueye[]; @@ -5777,7 +5777,7 @@ extern const u8 gMonIcon_Zeraora[]; extern const u8 gMonIcon_Meltan[]; extern const u8 gMonIcon_Melmetal[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u8 gMonIcon_Grookey[]; extern const u8 gMonIcon_Thwackey[]; extern const u8 gMonIcon_Rillaboom[]; @@ -5916,17 +5916,17 @@ extern const u8 gMonIcon_SalamenceMega[]; extern const u8 gMonIcon_MetagrossMega[]; extern const u8 gMonIcon_LatiasMega[]; extern const u8 gMonIcon_LatiosMega[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u8 gMonIcon_LopunnyMega[]; extern const u8 gMonIcon_GarchompMega[]; extern const u8 gMonIcon_LucarioMega[]; extern const u8 gMonIcon_AbomasnowMega[]; extern const u8 gMonIcon_GalladeMega[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u8 gMonIcon_AudinoMega[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u8 gMonIcon_DiancieMega[]; #endif extern const u8 gMonIcon_RayquazaMega[]; @@ -5965,7 +5965,7 @@ extern const u8 gMonIcon_SlowkingGalarian[]; extern const u8 gMonIcon_CorsolaGalarian[]; extern const u8 gMonIcon_ZigzagoonGalarian[]; extern const u8 gMonIcon_LinooneGalarian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u8 gMonIcon_DarumakaGalarian[]; extern const u8 gMonIcon_DarmanitanGalarian[]; extern const u8 gMonIcon_YamaskGalarian[]; @@ -5978,19 +5978,19 @@ extern const u8 gMonIcon_ElectrodeHisuian[]; extern const u8 gMonIcon_TyphlosionHisuian[]; extern const u8 gMonIcon_QwilfishHisuian[]; extern const u8 gMonIcon_SneaselHisuian[]; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u8 gMonIcon_SamurottHisuian[]; extern const u8 gMonIcon_LilligantHisuian[]; extern const u8 gMonIcon_ZoruaHisuian[]; extern const u8 gMonIcon_ZoroarkHisuian[]; extern const u8 gMonIcon_BraviaryHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u8 gMonIcon_SliggooHisuian[]; extern const u8 gMonIcon_GoodraHisuian[]; extern const u8 gMonIcon_AvaluggHisuian[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u8 gMonIcon_DecidueyeHisuian[]; #endif extern const u8 gMonIcon_PikachuCosplay[]; @@ -6040,7 +6040,7 @@ extern const u8 gMonIcon_CastformSnowy[]; extern const u8 gMonIcon_DeoxysAttack[]; extern const u8 gMonIcon_DeoxysDefense[]; extern const u8 gMonIcon_DeoxysSpeed[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u8 gMonIcon_BurmySandyCloak[]; extern const u8 gMonIcon_BurmyTrashCloak[]; extern const u8 gMonIcon_WormadamSandyCloak[]; @@ -6058,7 +6058,7 @@ extern const u8 gMonIcon_PalkiaOrigin[]; extern const u8 gMonIcon_GiratinaOrigin[]; extern const u8 gMonIcon_ShayminSky[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u8 gMonIcon_BasculinBlueStriped[]; extern const u8 gMonIcon_BasculinWhiteStriped[]; extern const u8 gMonIcon_DarmanitanZenMode[]; @@ -6077,7 +6077,7 @@ extern const u8 gMonIcon_KyuremBlack[]; extern const u8 gMonIcon_KeldeoResolute[]; extern const u8 gMonIcon_MeloettaPirouette[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u8 gMonIcon_GreninjaAsh[]; extern const u8 gMonIcon_VivillonPolar[]; extern const u8 gMonIcon_VivillonTundra[]; @@ -6127,7 +6127,7 @@ extern const u8 gMonIcon_Zygarde10[]; extern const u8 gMonIcon_ZygardeComplete[]; extern const u8 gMonIcon_HoopaUnbound[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u8 gMonIcon_OricorioPomPom[]; extern const u8 gMonIcon_OricorioPau[]; extern const u8 gMonIcon_OricorioSensu[]; @@ -6147,7 +6147,7 @@ extern const u8 gMonIcon_NecrozmaDawnWings[]; extern const u8 gMonIcon_NecrozmaUltra[]; extern const u8 gMonIcon_MagearnaOriginalColor[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u8 gMonIcon_CramorantGulping[]; extern const u8 gMonIcon_CramorantGorging[]; extern const u8 gMonIcon_ToxtricityLowKey[]; @@ -6559,7 +6559,7 @@ extern const u8 gMonFootprint_Latios[]; extern const u8 gMonFootprint_Jirachi[]; extern const u8 gMonFootprint_Deoxys[]; extern const u8 gMonFootprint_Chimecho[]; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE extern const u8 gMonFootprint_Turtwig[]; extern const u8 gMonFootprint_Grotle[]; extern const u8 gMonFootprint_Torterra[]; @@ -6668,7 +6668,7 @@ extern const u8 gMonFootprint_Darkrai[]; extern const u8 gMonFootprint_Shaymin[]; extern const u8 gMonFootprint_Arceus[]; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE extern const u8 gMonFootprint_Victini[]; extern const u8 gMonFootprint_Snivy[]; extern const u8 gMonFootprint_Servine[]; @@ -6826,7 +6826,7 @@ extern const u8 gMonFootprint_Keldeo[]; extern const u8 gMonFootprint_Meloetta[]; extern const u8 gMonFootprint_Genesect[]; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE extern const u8 gMonFootprint_Chespin[]; extern const u8 gMonFootprint_Quilladin[]; extern const u8 gMonFootprint_Chesnaught[]; @@ -6900,7 +6900,7 @@ extern const u8 gMonFootprint_Diancie[]; extern const u8 gMonFootprint_Hoopa[]; extern const u8 gMonFootprint_Volcanion[]; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE extern const u8 gMonFootprint_Rowlet[]; extern const u8 gMonFootprint_Dartrix[]; extern const u8 gMonFootprint_Decidueye[]; @@ -6990,7 +6990,7 @@ extern const u8 gMonFootprint_Zeraora[]; extern const u8 gMonFootprint_Meltan[]; extern const u8 gMonFootprint_Melmetal[]; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE extern const u8 gMonFootprint_Grookey[]; extern const u8 gMonFootprint_Thwackey[]; extern const u8 gMonFootprint_Rillaboom[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index b0a030c43..b2eef2d02 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -386,7 +386,7 @@ gCryTable:: cry Cry_Rayquaza cry Cry_Jirachi cry Cry_Deoxys -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE cry Cry_Turtwig cry Cry_Grotle cry Cry_Torterra @@ -603,7 +603,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry Cry_Victini cry Cry_Snivy cry Cry_Servine @@ -918,7 +918,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE cry Cry_Chespin cry Cry_Quilladin cry Cry_Chesnaught @@ -1065,7 +1065,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE cry Cry_Rowlet cry Cry_Dartrix cry Cry_Decidueye @@ -1244,7 +1244,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_8 +.if P_GEN_8_POKEMON == TRUE cry Cry_Grookey cry Cry_Thwackey cry Cry_Rillaboom @@ -1480,7 +1480,7 @@ gCryTable:: cry Cry_MetagrossMega cry Cry_LatiasMega cry Cry_LatiosMega -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE cry Cry_LopunnyMega cry Cry_GarchompMega cry Cry_LucarioMega @@ -1493,12 +1493,12 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry Cry_AudinoMega .else cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE cry Cry_DiancieMega .else cry Cry_Unown @@ -1542,7 +1542,7 @@ gCryTable:: cry Cry_Corsola cry Cry_Zigzagoon cry Cry_Linoone -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry Cry_Darumaka cry Cry_Darmanitan cry Cry_Yamask @@ -1561,7 +1561,7 @@ gCryTable:: cry Cry_Typhlosion cry Cry_Qwilfish cry Cry_Sneasel -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry Cry_Samurott cry Cry_Lilligant cry Cry_Zorua @@ -1574,7 +1574,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE cry Cry_Sliggoo cry Cry_Goodra cry Cry_Avalugg @@ -1583,7 +1583,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE cry Cry_Decidueye .else cry Cry_Unown @@ -1643,7 +1643,7 @@ gCryTable:: cry Cry_Deoxys cry Cry_Deoxys cry Cry_Deoxys -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE @ Burmy cry Cry_Burmy cry Cry_Burmy @@ -1730,7 +1730,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE @ Basculin cry Cry_Basculin cry Cry_Basculin @@ -1793,7 +1793,7 @@ gCryTable:: cry Cry_Unown cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE @ Greninja cry Cry_Greninja cry Cry_Greninja @@ -1936,7 +1936,7 @@ gCryTable:: @ Hoopa cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE @ Oricorio cry Cry_OricorioPomPom cry Cry_OricorioPau @@ -2041,7 +2041,7 @@ gCryTable:: @ Magearna cry Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_8 +.if P_GEN_8_POKEMON == TRUE @ Cramorant cry Cry_Cramorant cry Cry_Cramorant @@ -2507,7 +2507,7 @@ gCryTable_Reverse:: cry_reverse Cry_Rayquaza cry_reverse Cry_Jirachi cry_reverse Cry_Deoxys -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE cry_reverse Cry_Turtwig cry_reverse Cry_Grotle cry_reverse Cry_Torterra @@ -2724,7 +2724,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry_reverse Cry_Victini cry_reverse Cry_Snivy cry_reverse Cry_Servine @@ -3039,7 +3039,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE cry_reverse Cry_Chespin cry_reverse Cry_Quilladin cry_reverse Cry_Chesnaught @@ -3186,7 +3186,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE cry_reverse Cry_Rowlet cry_reverse Cry_Dartrix cry_reverse Cry_Decidueye @@ -3365,7 +3365,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_8 +.if P_GEN_8_POKEMON == TRUE cry_reverse Cry_Grookey cry_reverse Cry_Thwackey cry_reverse Cry_Rillaboom @@ -3601,7 +3601,7 @@ gCryTable_Reverse:: cry_reverse Cry_MetagrossMega cry_reverse Cry_LatiasMega cry_reverse Cry_LatiosMega -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE cry_reverse Cry_LopunnyMega cry_reverse Cry_GarchompMega cry_reverse Cry_LucarioMega @@ -3614,12 +3614,12 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry_reverse Cry_AudinoMega .else cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE cry_reverse Cry_DiancieMega .else cry_reverse Cry_Unown @@ -3663,7 +3663,7 @@ gCryTable_Reverse:: cry_reverse Cry_Corsola cry_reverse Cry_Zigzagoon cry_reverse Cry_Linoone -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry_reverse Cry_Darumaka cry_reverse Cry_Darmanitan cry_reverse Cry_Yamask @@ -3682,7 +3682,7 @@ gCryTable_Reverse:: cry_reverse Cry_Typhlosion cry_reverse Cry_Qwilfish cry_reverse Cry_Sneasel -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE cry_reverse Cry_Samurott cry_reverse Cry_Lilligant cry_reverse Cry_Zorua @@ -3695,7 +3695,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE cry_reverse Cry_Sliggoo cry_reverse Cry_Goodra cry_reverse Cry_Avalugg @@ -3704,7 +3704,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE cry_reverse Cry_Decidueye .else cry_reverse Cry_Unown @@ -3764,7 +3764,7 @@ gCryTable_Reverse:: cry_reverse Cry_Deoxys cry_reverse Cry_Deoxys cry_reverse Cry_Deoxys -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE @ Burmy cry_reverse Cry_Burmy cry_reverse Cry_Burmy @@ -3842,7 +3842,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE @ Basculin cry_reverse Cry_Basculin cry_reverse Cry_Basculin @@ -3898,7 +3898,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE @ Greninja cry_reverse Cry_Greninja cry_reverse Cry_Greninja @@ -4028,7 +4028,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE @ Oricorio cry_reverse Cry_OricorioPomPom cry_reverse Cry_OricorioPau @@ -4124,7 +4124,7 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -.if P_NEW_POKEMON >= GEN_8 +.if P_GEN_8_POKEMON == TRUE @ Cramorant cry_reverse Cry_Cramorant cry_reverse Cry_Cramorant diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index b4f6ded82..b518fe16a 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1930,7 +1930,7 @@ Cry_Jirachi:: Cry_Deoxys:: .incbin "sound/direct_sound_samples/cries/deoxys.bin" -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE .align 2 Cry_Turtwig:: .incbin "sound/direct_sound_samples/cries/turtwig.bin" @@ -2360,7 +2360,7 @@ Cry_Arceus:: .incbin "sound/direct_sound_samples/cries/arceus.bin" .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE .align 2 Cry_Victini:: .incbin "sound/direct_sound_samples/cries/victini.bin" @@ -2986,7 +2986,7 @@ Cry_Genesect:: .incbin "sound/direct_sound_samples/cries/genesect.bin" .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE .align 2 Cry_Chespin:: .incbin "sound/direct_sound_samples/cries/chespin.bin" @@ -3276,7 +3276,7 @@ Cry_Volcanion:: .incbin "sound/direct_sound_samples/cries/volcanion.bin" .endif -.if P_NEW_POKEMON >= GEN_7 +.if P_GEN_7_POKEMON == TRUE .align 2 Cry_Rowlet:: .incbin "sound/direct_sound_samples/cries/rowlet.bin" @@ -3630,7 +3630,7 @@ Cry_Melmetal:: .incbin "sound/direct_sound_samples/cries/melmetal.bin" .endif -.if P_NEW_POKEMON >= GEN_8 +.if P_GEN_8_POKEMON == TRUE .align 2 Cry_Grookey:: .incbin "sound/direct_sound_samples/cries/grookey.bin" @@ -4177,7 +4177,7 @@ Cry_LatiasMega:: Cry_LatiosMega:: .incbin "sound/direct_sound_samples/cries/mega_latios.bin" -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE .align 2 Cry_LopunnyMega:: .incbin "sound/direct_sound_samples/cries/mega_lopunny.bin" @@ -4199,13 +4199,13 @@ Cry_GalladeMega:: .incbin "sound/direct_sound_samples/cries/mega_gallade.bin" .endif -.if P_NEW_POKEMON >= GEN_5 +.if P_GEN_5_POKEMON == TRUE .align 2 Cry_AudinoMega:: .incbin "sound/direct_sound_samples/cries/mega_audino.bin" .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE .align 2 Cry_DiancieMega:: .incbin "sound/direct_sound_samples/cries/mega_diancie.bin" @@ -4227,13 +4227,13 @@ Cry_GroudonPrimal:: Cry_SlowpokeGalarian:: .incbin "sound/direct_sound_samples/cries/slowpoke_galarian.bin" -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_4_POKEMON == TRUE .align 2 Cry_ShayminSky:: .incbin "sound/direct_sound_samples/cries/shaymin_sky.bin" .endif -.if P_NEW_POKEMON >= GEN_4 +.if P_GEN_5_POKEMON == TRUE .align 2 Cry_TornadusTherian:: .incbin "sound/direct_sound_samples/cries/tornadus_therian.bin" @@ -4255,7 +4255,7 @@ Cry_KyuremBlack:: .incbin "sound/direct_sound_samples/cries/kyurem_black.bin" .endif -.if P_NEW_POKEMON >= GEN_6 +.if P_GEN_6_POKEMON == TRUE .align 2 Cry_FloetteEternalFlower:: .incbin "sound/direct_sound_samples/cries/floette_eternal_flower.bin" @@ -4279,7 +4279,9 @@ Cry_ZygardeComplete:: .align 2 Cry_HoopaUnbound:: .incbin "sound/direct_sound_samples/cries/hoopa_unbound.bin" +.endif +.if P_GEN_7_POKEMON == TRUE .align 2 Cry_OricorioPomPom:: .incbin "sound/direct_sound_samples/cries/oricorio_pom_pom.bin" @@ -4317,7 +4319,7 @@ Cry_NecrozmaUltra:: .incbin "sound/direct_sound_samples/cries/necrozma_ultra.bin" .endif -.if P_NEW_POKEMON >= GEN_8 +.if P_GEN_8_POKEMON == TRUE .align 2 Cry_ToxtricityLowKey:: .incbin "sound/direct_sound_samples/cries/toxtricity_low_key.bin" diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index b67a2f0b3..ec7f079f7 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -387,7 +387,7 @@ const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_fro const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz"); const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/anim_front.4bpp.lz"); const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/anim_front.4bpp.lz"); @@ -505,7 +505,7 @@ const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/anim_fro const u32 gMonFrontPic_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/anim_front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonFrontPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/anim_front.4bpp.lz"); const u32 gMonFrontPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/anim_front.4bpp.lz"); const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/anim_front.4bpp.lz"); @@ -666,7 +666,7 @@ const u32 gMonFrontPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front const u32 gMonFrontPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz"); const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/anim_front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonFrontPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/anim_front.4bpp.lz"); const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/anim_front.4bpp.lz"); @@ -741,7 +741,7 @@ const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/anim_fro const u32 gMonFrontPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz"); const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/anim_front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/front.4bpp.lz"); const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/front.4bpp.lz"); const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/front.4bpp.lz"); @@ -831,7 +831,7 @@ const u32 gMonFrontPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/front.4b const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/front.4bpp.lz"); const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_8_POKEMON == TRUE const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/front.4bpp.lz"); const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz"); const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); @@ -970,17 +970,17 @@ const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/ const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/front.4bpp.lz"); const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz"); const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/front.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/front.4bpp.lz"); const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/front.4bpp.lz"); const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/front.4bpp.lz"); const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/front.4bpp.lz"); const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/front.4bpp.lz"); #endif const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/front.4bpp.lz"); @@ -1019,7 +1019,7 @@ const u32 gMonFrontPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowkin const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/front.4bpp.lz"); const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz"); const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/front.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/front.4bpp.lz"); const u32 gMonFrontPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz"); const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz"); @@ -1032,19 +1032,19 @@ const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electro const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); #endif const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz"); @@ -1095,7 +1095,7 @@ const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/s const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz"); const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz"); const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz"); const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz"); const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz"); @@ -1113,7 +1113,7 @@ const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/orig const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/anim_front.4bpp.lz"); const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/anim_front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/front.4bpp.lz"); const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/front.4bpp.lz"); const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz"); @@ -1129,7 +1129,7 @@ const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz"); const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/anim_front.4bpp.lz"); const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/anim_front.4bpp.lz"); const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/anim_front.4bpp.lz"); @@ -1173,7 +1173,7 @@ const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_per const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/anim_front.4bpp.lz"); const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/anim_front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); @@ -1187,7 +1187,7 @@ const u32 gMonFrontPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necroz const u32 gMonFrontPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/front.4bpp.lz"); const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/front.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/front.4bpp.lz"); const u32 gMonFrontPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/front.4bpp.lz"); const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/front.4bpp.lz"); @@ -1602,7 +1602,7 @@ const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz"); const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz"); const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz"); const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz"); const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/back.4bpp.lz"); @@ -1718,6 +1718,8 @@ const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/back.4bpp const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/back.4bpp.lz"); const u32 gMonBackPic_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/back.4bpp.lz"); const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/back.4bpp.lz"); +#endif +#if P_GEN_5_POKEMON == TRUE const u32 gMonBackPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/back.4bpp.lz"); const u32 gMonBackPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/back.4bpp.lz"); const u32 gMonBackPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/back.4bpp.lz"); @@ -1878,7 +1880,7 @@ const u32 gMonBackPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.l const u32 gMonBackPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/back.4bpp.lz"); const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonBackPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/back.4bpp.lz"); const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/back.4bpp.lz"); const u32 gMonBackPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/back.4bpp.lz"); @@ -1953,7 +1955,7 @@ const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp const u32 gMonBackPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/back.4bpp.lz"); const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonBackPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/back.4bpp.lz"); const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/back.4bpp.lz"); const u32 gMonBackPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/back.4bpp.lz"); @@ -2043,7 +2045,7 @@ const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/back.4bpp const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/back.4bpp.lz"); const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz"); const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/back.4bpp.lz"); const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); @@ -2182,17 +2184,17 @@ const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/m const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/back.4bpp.lz"); const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/back.4bpp.lz"); const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/back.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/back.4bpp.lz"); const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/back.4bpp.lz"); const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/back.4bpp.lz"); const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/back.4bpp.lz"); const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/back.4bpp.lz"); #endif const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/back.4bpp.lz"); @@ -2231,7 +2233,7 @@ const u32 gMonBackPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking const u32 gMonBackPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/back.4bpp.lz"); const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/back.4bpp.lz"); const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/back.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/back.4bpp.lz"); const u32 gMonBackPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz"); const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz"); @@ -2244,19 +2246,19 @@ const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrod const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz"); const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz"); const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz"); const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz"); const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz"); const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonBackPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/back.4bpp.lz"); const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz"); const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz"); #endif const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz"); @@ -2307,7 +2309,7 @@ const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/sn const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.lz"); const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz"); const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz"); const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz"); const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz"); @@ -2325,7 +2327,7 @@ const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origi const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/back.4bpp.lz"); const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/back.4bpp.lz"); const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/back.4bpp.lz"); const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/back.4bpp.lz"); @@ -2341,7 +2343,7 @@ const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/ const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz"); const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonBackPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/back.4bpp.lz"); const u32 gMonBackPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/back.4bpp.lz"); const u32 gMonBackPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/back.4bpp.lz"); @@ -2385,7 +2387,7 @@ const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz"); const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/back.4bpp.lz"); const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz"); const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/back.4bpp.lz"); @@ -2399,7 +2401,7 @@ const u32 gMonBackPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozm const u32 gMonBackPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/back.4bpp.lz"); const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/back.4bpp.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonBackPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/back.4bpp.lz"); const u32 gMonBackPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/back.4bpp.lz"); const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/back.4bpp.lz"); @@ -2812,7 +2814,7 @@ const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gb const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz"); const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz"); const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz"); const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz"); const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/normal.gbapal.lz"); @@ -2923,7 +2925,7 @@ const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/normal.gb const u32 gMonPalette_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/normal.gbapal.lz"); const u32 gMonPalette_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/normal.gbapal.lz"); const u32 gMonPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/normal.gbapal.lz"); const u32 gMonPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/normal.gbapal.lz"); @@ -3084,7 +3086,7 @@ const u32 gMonPalette_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbap const u32 gMonPalette_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/normal.gbapal.lz"); const u32 gMonPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/normal.gbapal.lz"); const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/normal.gbapal.lz"); const u32 gMonPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/normal.gbapal.lz"); @@ -3159,7 +3161,7 @@ const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/normal.gb const u32 gMonPalette_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/normal.gbapal.lz"); const u32 gMonPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/normal.gbapal.lz"); const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/normal.gbapal.lz"); const u32 gMonPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/normal.gbapal.lz"); @@ -3249,7 +3251,7 @@ const u32 gMonPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/normal.gb const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/normal.gbapal.lz"); const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/normal.gbapal.lz"); const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz"); const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); @@ -3388,17 +3390,17 @@ const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/m const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/normal.gbapal.lz"); const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/normal.gbapal.lz"); const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/normal.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/normal.gbapal.lz"); const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/normal.gbapal.lz"); const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/normal.gbapal.lz"); const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/normal.gbapal.lz"); const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/normal.gbapal.lz"); #endif const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/normal.gbapal.lz"); @@ -3437,7 +3439,7 @@ const u32 gMonPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking const u32 gMonPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/normal.gbapal.lz"); const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/normal.gbapal.lz"); const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/normal.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/normal.gbapal.lz"); const u32 gMonPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz"); const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz"); @@ -3450,19 +3452,19 @@ const u32 gMonPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrod const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/normal.gbapal.lz"); const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz"); const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz"); const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz"); const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz"); const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz"); const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/normal.gbapal.lz"); const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz"); const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz"); #endif const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz"); @@ -3486,7 +3488,7 @@ const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/sn const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz"); const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz"); const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/normal.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz"); const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz"); const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz"); @@ -3521,7 +3523,7 @@ const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/drago const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/normal.gbapal.lz"); const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/normal.gbapal.lz"); const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/normal.gbapal.lz"); const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz"); @@ -3544,7 +3546,7 @@ const u32 gMonPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genese const u32 gMonPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/genesect/burn_drive/normal.gbapal.lz"); const u32 gMonPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/genesect/chill_drive/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/normal.gbapal.lz"); const u32 gMonPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/normal.gbapal.lz"); const u32 gMonPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/normal.gbapal.lz"); @@ -3594,7 +3596,7 @@ const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz"); const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz"); const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/normal.gbapal.lz"); @@ -3631,7 +3633,7 @@ const u32 gMonPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozm const u32 gMonPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/normal.gbapal.lz"); const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/normal.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/normal.gbapal.lz"); const u32 gMonPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/normal.gbapal.lz"); const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/normal.gbapal.lz"); @@ -4045,7 +4047,7 @@ const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shin const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz"); const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz"); const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz"); const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/shiny.gbapal.lz"); @@ -4156,7 +4158,7 @@ const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shin const u32 gMonShinyPalette_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/shiny.gbapal.lz"); const u32 gMonShinyPalette_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonShinyPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/shiny.gbapal.lz"); const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/shiny.gbapal.lz"); const u32 gMonShinyPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/shiny.gbapal.lz"); @@ -4317,7 +4319,7 @@ const u32 gMonShinyPalette_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/shiny. const u32 gMonShinyPalette_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/shiny.gbapal.lz"); const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonShinyPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/shiny.gbapal.lz"); const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/shiny.gbapal.lz"); const u32 gMonShinyPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/shiny.gbapal.lz"); @@ -4392,7 +4394,7 @@ const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shin const u32 gMonShinyPalette_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonShinyPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/shiny.gbapal.lz"); const u32 gMonShinyPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/shiny.gbapal.lz"); @@ -4482,7 +4484,7 @@ const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shin const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny.gbapal.lz"); const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz"); const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/shiny.gbapal.lz"); const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); @@ -4621,17 +4623,17 @@ const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salame const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/shiny.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/shiny.gbapal.lz"); #endif const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/shiny.gbapal.lz"); @@ -4670,7 +4672,7 @@ const u32 gMonShinyPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slo const u32 gMonShinyPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/shiny.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz"); @@ -4683,19 +4685,19 @@ const u32 gMonShinyPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/ele const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE //const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonShinyPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE //const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz"); #endif const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz"); @@ -4719,7 +4721,7 @@ const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castfo const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/shiny.gbapal.lz"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz"); @@ -4754,7 +4756,7 @@ const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/ const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/shiny.gbapal.lz"); const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/shiny.gbapal.lz"); const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/shiny.gbapal.lz"); const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/shiny.gbapal.lz"); @@ -4777,7 +4779,7 @@ const u32 gMonShinyPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/g const u32 gMonShinyPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/genesect/burn_drive/shiny.gbapal.lz"); const u32 gMonShinyPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/genesect/chill_drive/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u32 gMonShinyPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/shiny.gbapal.lz"); const u32 gMonShinyPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/shiny.gbapal.lz"); const u32 gMonShinyPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/shiny.gbapal.lz"); @@ -4827,7 +4829,7 @@ const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10 const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz"); const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/shiny.gbapal.lz"); @@ -4858,7 +4860,7 @@ const u32 gMonShinyPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/ne const u32 gMonShinyPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/shiny.gbapal.lz"); const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/shiny.gbapal.lz"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u32 gMonShinyPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/shiny.gbapal.lz"); const u32 gMonShinyPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/shiny.gbapal.lz"); const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/shiny.gbapal.lz"); @@ -5270,7 +5272,7 @@ const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp"); const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp"); const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp"); const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp"); @@ -5379,7 +5381,7 @@ const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp"); const u8 gMonIcon_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gMonIcon_Victini[] = INCBIN_U8("graphics/pokemon/victini/icon.4bpp"); const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/icon.4bpp"); const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/servine/icon.4bpp"); @@ -5540,7 +5542,7 @@ const u8 gMonIcon_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp"); const u8 gMonIcon_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp"); const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u8 gMonIcon_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/icon.4bpp"); const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/icon.4bpp"); const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/icon.4bpp"); @@ -5615,7 +5617,7 @@ const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/icon.4bpp"); const u8 gMonIcon_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp"); const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u8 gMonIcon_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/icon.4bpp"); const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/icon.4bpp"); const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/icon.4bpp"); @@ -5705,7 +5707,7 @@ const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp"); const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp"); const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp"); const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp"); const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/icon.4bpp"); @@ -5844,17 +5846,17 @@ const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/salamence/mega/i const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/metagross/mega/icon.4bpp"); const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/latias/mega/icon.4bpp"); const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/latios/mega/icon.4bpp"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/lopunny/mega/icon.4bpp"); const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/garchomp/mega/icon.4bpp"); const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/lucario/mega/icon.4bpp"); const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/abomasnow/mega/icon.4bpp"); const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gallade/mega/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/audino/mega/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/diancie/mega/icon.4bpp"); #endif const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/rayquaza/mega/icon.4bpp"); @@ -5893,7 +5895,7 @@ const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/gala const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp"); const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp"); const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp"); const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp"); @@ -5906,19 +5908,19 @@ const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/electrode/his const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp"); const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/hisuian/icon.4bpp"); const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/sneasel/hisuian/icon.4bpp"); -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp"); const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/hisuian/icon.4bpp"); const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp"); const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/hisuian/icon.4bpp"); const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/braviary/hisuian/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp"); const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/hisuian/icon.4bpp"); const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/avalugg/hisuian/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/decidueye/hisuian/icon.4bpp"); #endif const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp"); @@ -5968,7 +5970,7 @@ const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/i const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp"); const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp"); const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp"); const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp"); const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp"); @@ -5986,7 +5988,7 @@ const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/ico const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin/icon.4bpp"); const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp"); const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/basculin/white_striped/icon.4bpp"); const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp"); @@ -6005,7 +6007,7 @@ const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/icon. const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/keldeo/resolute/icon.4bpp"); const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/meloetta/pirouette/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u8 gMonIcon_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/greninja/ash/icon.4bpp"); const u8 gMonIcon_VivillonPolar[] = INCBIN_U8("graphics/pokemon/vivillon/polar/icon.4bpp"); const u8 gMonIcon_VivillonTundra[] = INCBIN_U8("graphics/pokemon/vivillon/tundra/icon.4bpp"); @@ -6055,7 +6057,7 @@ const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/i const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp"); const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/oricorio/pom_pom/icon.4bpp"); const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp"); const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/icon.4bpp"); @@ -6075,7 +6077,7 @@ const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/necrozma/daw const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp"); const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp"); const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/icon.4bpp"); const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/toxtricity/low_key/icon.4bpp"); @@ -6487,7 +6489,7 @@ const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1 const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp"); const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp"); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp"); const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp"); const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp"); @@ -6596,7 +6598,7 @@ const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp"); const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/footprint.1bpp"); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/victini/footprint.1bpp"); const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp"); const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/servine/footprint.1bpp"); @@ -6754,7 +6756,7 @@ const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1 const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp"); const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/footprint.1bpp"); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp"); const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp"); const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/footprint.1bpp"); @@ -6828,7 +6830,7 @@ const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp"); const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/footprint.1bpp"); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/footprint.1bpp"); const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp"); const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/footprint.1bpp"); @@ -6918,7 +6920,7 @@ const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp"); const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/footprint.1bpp"); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/footprint.1bpp"); const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp"); const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp"); diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 8c93d2c60..65d63be56 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -10637,7 +10637,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = { .baseHP = 55, @@ -13218,7 +13218,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = { .baseHP = 100, @@ -17050,7 +17050,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_GENESECT] = GENESECT_BASE_STATS, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = { .baseHP = 56, @@ -18639,7 +18639,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = { .baseHP = 68, @@ -20689,7 +20689,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = { .baseHP = 50, @@ -23846,7 +23846,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = { .baseHP = 65, @@ -23971,7 +23971,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = { .baseHP = 103, @@ -23999,7 +23999,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = { .baseHP = 50, @@ -24943,7 +24943,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_GALARIAN_FORM, }, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = { .baseHP = 70, @@ -25222,7 +25222,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_HISUIAN_FORM, }, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .baseHP = 90, @@ -25350,7 +25350,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = { .baseHP = 58, @@ -25428,7 +25428,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = { .baseHP = 88, @@ -25579,7 +25579,7 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_BROWN), [SPECIES_BURMY_TRASH_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_RED), @@ -25765,7 +25765,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_ARCEUS_FAIRY] = ARCEUS_BASE_STATS(TYPE_FAIRY), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_BASCULIN_BLUE_STRIPED] = { .baseHP = 70, @@ -26058,7 +26058,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_GENESECT_CHILL_DRIVE] = GENESECT_BASE_STATS, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_GRENINJA_BATTLE_BOND] = { .baseHP = 72, @@ -26357,7 +26357,7 @@ const struct BaseStats gBaseStats[] = }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ORICORIO_POM_POM] = ORICORIO_BASE_STATS(TYPE_ELECTRIC, BODY_COLOR_YELLOW), [SPECIES_ORICORIO_PAU] = ORICORIO_BASE_STATS(TYPE_PSYCHIC, BODY_COLOR_PINK), [SPECIES_ORICORIO_SENSU] = ORICORIO_BASE_STATS(TYPE_GHOST, BODY_COLOR_PURPLE), @@ -26551,7 +26551,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_MAGEARNA_ORIGINAL_COLOR] = MAGEARNA_BASE_STATS(BODY_COLOR_RED), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_CRAMORANT_GULPING] = CRAMORANT_BASE_STATS, [SPECIES_CRAMORANT_GORGING] = CRAMORANT_BASE_STATS, diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 896332649..b6cc938b7 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -2387,7 +2387,7 @@ const u16 gEggMoves[] = { MOVE_ENDURE, MOVE_DEFENSE_CURL), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE egg_moves(TURTWIG, MOVE_WORRY_SEED, MOVE_GROWTH, @@ -2879,7 +2879,7 @@ const u16 gEggMoves[] = { MOVE_BULLET_SEED), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE egg_moves(SNIVY, MOVE_CAPTIVATE, MOVE_NATURAL_GIFT, @@ -3604,7 +3604,7 @@ const u16 gEggMoves[] = { MOVE_MAGNET_RISE), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE egg_moves(CHESPIN, MOVE_SYNTHESIS, MOVE_BELLY_DRUM, @@ -3813,7 +3813,7 @@ const u16 gEggMoves[] = { MOVE_TAILWIND), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE egg_moves(ROWLET, MOVE_CURSE, MOVE_CONFUSE_RAY, @@ -4042,7 +4042,7 @@ const u16 gEggMoves[] = { MOVE_DRAGON_BREATH), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE egg_moves(GROOKEY, MOVE_GROWTH, MOVE_HAMMER_ARM, @@ -4391,7 +4391,7 @@ const u16 gEggMoves[] = { MOVE_QUICK_GUARD, MOVE_KNOCK_OFF), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE egg_moves(DARUMAKA_GALARIAN, MOVE_FOCUS_PUNCH, MOVE_HAMMER_ARM, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 766a25cb6..4f09867a6 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -61,7 +61,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}}, [SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA}}, [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_MAGNETON] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}}, #endif @@ -80,16 +80,16 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR_ALOLAN}}, [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}, {EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK_ALOLAN}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}}, #endif [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_RHYDON] = {{EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}}, #endif [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}}, #endif [SPECIES_KANGASKHAN] = {{EVO_MEGA_EVOLUTION, ITEM_KANGASKHANITE, SPECIES_KANGASKHAN_MEGA}}, @@ -98,7 +98,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}}, [SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}}, [SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_ELECTABUZZ] = {{EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}}, [SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}}, #endif @@ -110,13 +110,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON}, {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}, - #if P_NEW_POKEMON >= GEN_4 + #if P_GEN_4_POKEMON == TRUE {EVO_SPECIFIC_MAP, MAP_PETALBURG_WOODS, SPECIES_LEAFEON}, {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON}, {EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_GLACEON}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON}, #endif - #if P_NEW_POKEMON >= GEN_6 + #if P_GEN_6_POKEMON == TRUE {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON} #endif }, @@ -143,7 +143,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}}, [SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}}, [SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TOGETIC] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}}, #endif [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, @@ -155,36 +155,36 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}}, [SPECIES_AIPOM] = {{EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}}, [SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}}, #endif [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}}, [SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}}, #endif [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_GLIGAR] = {{EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}}, #endif [SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_STEELIXITE, SPECIES_STEELIX_MEGA}}, [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, [SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_SCIZORITE, SPECIES_SCIZOR_MEGA}}, [SPECIES_HERACROSS] = {{EVO_MEGA_EVOLUTION, ITEM_HERACRONITE, SPECIES_HERACROSS_MEGA}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_SNEASEL] = {{EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}}, #endif [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_PILOSWINE] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}}, #endif [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, [SPECIES_HOUNDOOM] = {{EVO_MEGA_EVOLUTION, ITEM_HOUNDOOMINITE, SPECIES_HOUNDOOM_MEGA}}, [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}}, #endif [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, @@ -224,7 +224,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}}, [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}}, [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_NOSEPASS] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}}, #endif [SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA}}, @@ -245,7 +245,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}}, [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}}, [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}, - #if P_NEW_POKEMON >= GEN_4 + #if P_GEN_4_POKEMON == TRUE {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS} #endif }, @@ -259,7 +259,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ALTARIA] = {{EVO_MEGA_EVOLUTION, ITEM_ALTARIANITE, SPECIES_ALTARIA_MEGA}}, [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}}, [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_DUSCLOPS] = {{EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}}, [SPECIES_ROSELIA] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}}, #endif @@ -280,7 +280,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}}, [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}}, [SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}, - #if P_NEW_POKEMON >= GEN_4 + #if P_GEN_4_POKEMON == TRUE {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE} #endif }, @@ -297,7 +297,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GROUDON] = {{EVO_PRIMAL_REVERSION, ITEM_RED_ORB, SPECIES_GROUDON_PRIMAL}}, [SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_DRAGON_ASCENT, SPECIES_RAYQUAZA_MEGA}}, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Gens 4-7 [SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}}, [SPECIES_GROTLE] = {{EVO_LEVEL, 32, SPECIES_TORTERRA}}, @@ -345,7 +345,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ABOMASNOW] = {{EVO_MEGA_EVOLUTION, ITEM_ABOMASITE, SPECIES_ABOMASNOW_MEGA}}, [SPECIES_GALLADE] = {{EVO_MEGA_EVOLUTION, ITEM_GALLADITE, SPECIES_GALLADE_MEGA}}, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SNIVY] = {{EVO_LEVEL, 17, SPECIES_SERVINE}}, [SPECIES_SERVINE] = {{EVO_LEVEL, 36, SPECIES_SERPERIOR}}, [SPECIES_TEPIG] = {{EVO_LEVEL, 17, SPECIES_PIGNITE}}, @@ -422,7 +422,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ZWEILOUS] = {{EVO_LEVEL, 64, SPECIES_HYDREIGON}}, [SPECIES_LARVESTA] = {{EVO_LEVEL, 59, SPECIES_VOLCARONA}}, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = {{EVO_LEVEL, 16, SPECIES_QUILLADIN}}, [SPECIES_QUILLADIN] = {{EVO_LEVEL, 36, SPECIES_CHESNAUGHT}}, [SPECIES_FENNEKIN] = {{EVO_LEVEL, 16, SPECIES_BRAIXEN}}, @@ -460,7 +460,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}}, [SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_DIANCITE, SPECIES_DIANCIE_MEGA}}, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = {{EVO_LEVEL, 17, SPECIES_DARTRIX}}, [SPECIES_DARTRIX] = {{EVO_LEVEL, 34, SPECIES_DECIDUEYE}}, [SPECIES_LITTEN] = {{EVO_LEVEL, 17, SPECIES_TORRACAT}}, @@ -496,7 +496,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}}, [SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}}, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = {{EVO_LEVEL, 16, SPECIES_THWACKEY}}, [SPECIES_THWACKEY] = {{EVO_LEVEL, 35, SPECIES_RILLABOOM}}, [SPECIES_SCORBUNNY] = {{EVO_LEVEL, 16, SPECIES_RABOOT}}, @@ -552,13 +552,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GEODUDE_ALOLAN] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}}, [SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}}, [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}}, #endif [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}}, -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}}, [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, @@ -570,19 +570,19 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, #endif -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, [SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, [SPECIES_SHELLOS_EAST_SEA] = {{EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}}, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DEERLING_SUMMER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}}, [SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}}, [SPECIES_DEERLING_WINTER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}}, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_FLABEBE_YELLOW_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_YELLOW_FLOWER}}, [SPECIES_FLABEBE_ORANGE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_ORANGE_FLOWER}}, [SPECIES_FLABEBE_BLUE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_BLUE_FLOWER}}, @@ -595,10 +595,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PUMPKABOO_LARGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}}, [SPECIES_PUMPKABOO_SUPER] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}}, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROCKRUFF_OWN_TEMPO] = {{EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}}, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}}, #endif }; diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index f627de89e..8b593d116 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -1,6 +1,6 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = { -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_GIRATINA] = sGiratinaFormChangeTable, [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable, [SPECIES_SHAYMIN] = sShayminFormChangeTable, @@ -24,7 +24,7 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_ARCEUS_DARK] = sArceusFormChangeTable, [SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_TORNADUS] = sTornadusFormChangeTable, [SPECIES_TORNADUS_THERIAN] = sTornadusTherianFormChangeTable, [SPECIES_THUNDURUS] = sThundurusFormChangeTable, @@ -39,11 +39,11 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormChangeTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormChangeTable, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_HOOPA] = sHoopaFormChangeTable, [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundFormChangeTable, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ORICORIO] = sOricorioFormChangeTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable, [SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable, @@ -67,7 +67,7 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusTherianFormChangeTable, #endif diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 2f658faa9..6a662c35d 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -43,7 +43,7 @@ FORM_ITEM_USE_TIME: #define DAY 0 #define NIGHT 1 -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const struct FormChange sGiratinaFormChangeTable[] = { {FORM_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE}, {FORM_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB}, @@ -96,7 +96,7 @@ static const struct FormChange sArceusFormChangeTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const struct FormChange sTornadusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, @@ -147,7 +147,7 @@ static const struct FormChange sGenesectFormChangeTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const struct FormChange sHoopaFormChangeTable[] = { // {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, {FORM_CHANGE_END}, @@ -159,7 +159,7 @@ static const struct FormChange sHoopaUnboundFormChangeTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const struct FormChange sOricorioFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR}, @@ -191,7 +191,7 @@ static const struct FormChange sSilvallyFormChangeTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const struct FormChange sEnamorusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_ENAMORUS, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 6d931190b..602efea1c 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -84,7 +84,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_GROUDON] = sGroudonFormSpeciesIdTable, [SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable, [SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_BURMY] = sBurmyFormSpeciesIdTable, [SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable, [SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable, @@ -102,7 +102,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable, [SPECIES_ARCEUS] = sArceusFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable, [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable, [SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable, @@ -124,7 +124,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_MELOETTA] = sMeloettaFormSpeciesIdTable, [SPECIES_GENESECT] = sGenesectFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_GRENINJA] = sGreninjaFormSpeciesIdTable, [SPECIES_VIVILLON] = sVivillonFormSpeciesIdTable, [SPECIES_FLABEBE] = sFlabebeFormSpeciesIdTable, @@ -143,7 +143,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable, [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, @@ -155,7 +155,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable, [SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable, [SPECIES_TOXTRICITY] = sToxtricityFormSpeciesIdTable, [SPECIES_SINISTEA] = sSinisteaFormSpeciesIdTable, @@ -213,17 +213,17 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_METAGROSS_MEGA] = sMetagrossFormSpeciesIdTable, [SPECIES_LATIAS_MEGA] = sLatiasFormSpeciesIdTable, [SPECIES_LATIOS_MEGA] = sLatiosFormSpeciesIdTable, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = sLopunnyFormSpeciesIdTable, [SPECIES_GARCHOMP_MEGA] = sGarchompFormSpeciesIdTable, [SPECIES_LUCARIO_MEGA] = sLucarioFormSpeciesIdTable, [SPECIES_ABOMASNOW_MEGA] = sAbomasnowFormSpeciesIdTable, [SPECIES_GALLADE_MEGA] = sGalladeFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = sAudinoFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = sDiancieFormSpeciesIdTable, #endif // Special Mega + Primals @@ -265,7 +265,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_CORSOLA_GALARIAN] = sCorsolaFormSpeciesIdTable, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonFormSpeciesIdTable, [SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable, [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, @@ -279,19 +279,19 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable, [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable, [SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable, [SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable, [SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable, [SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable, [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable, [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, #endif // Misc Forms @@ -349,7 +349,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DEOXYS_ATTACK] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_DEFENSE] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_SPEED] = sDeoxysFormSpeciesIdTable, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable, @@ -393,7 +393,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ARCEUS_DARK] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable, @@ -412,7 +412,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TORNADUS_THERIAN] = sTornadusFormSpeciesIdTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusFormSpeciesIdTable, [SPECIES_LANDORUS_THERIAN] = sLandorusFormSpeciesIdTable, - [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, // Kyurem [SPECIES_KYUREM_WHITE] = sKyuremFormSpeciesIdTable, [SPECIES_KYUREM_BLACK] = sKyuremFormSpeciesIdTable, @@ -426,7 +425,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaFormSpeciesIdTable, [SPECIES_GRENINJA_ASH] = sGreninjaFormSpeciesIdTable, @@ -498,7 +497,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Hoopa [SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable, @@ -551,7 +550,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaFormSpeciesIdTable, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT_GORGING] = sCramorantFormSpeciesIdTable, @@ -589,5 +588,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Calyrex [SPECIES_CALYREX_ICE_RIDER] = sCalyrexFormSpeciesIdTable, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable, + // Enamorus + [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, #endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index d329dfab3..545201c5a 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -549,7 +549,7 @@ static const u16 sDeoxysFormSpeciesIdTable[] = { FORM_SPECIES_END, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const u16 sBurmyFormSpeciesIdTable[] = { SPECIES_BURMY, SPECIES_BURMY_SANDY_CLOAK, @@ -669,7 +669,7 @@ static const u16 sArceusFormSpeciesIdTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const u16 sSamurottFormSpeciesIdTable[] = { SPECIES_SAMUROTT, SPECIES_SAMUROTT_HISUIAN, @@ -773,12 +773,6 @@ static const u16 sLandorusFormSpeciesIdTable[] = { FORM_SPECIES_END, }; -static const u16 sEnamorusFormSpeciesIdTable[] = { - SPECIES_ENAMORUS, - SPECIES_ENAMORUS_THERIAN, - FORM_SPECIES_END, -}; - static const u16 sKyuremFormSpeciesIdTable[] = { SPECIES_KYUREM, SPECIES_KYUREM_WHITE, @@ -808,7 +802,7 @@ static const u16 sGenesectFormSpeciesIdTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const u16 sGreninjaFormSpeciesIdTable[] = { SPECIES_GRENINJA, SPECIES_GRENINJA_BATTLE_BOND, @@ -956,7 +950,7 @@ static const u16 sHoopaFormSpeciesIdTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const u16 sDecidueyeFormSpeciesIdTable[] = { SPECIES_DECIDUEYE, SPECIES_DECIDUEYE_HISUIAN, @@ -1051,7 +1045,7 @@ static const u16 sMagearnaFormSpeciesIdTable[] = { }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const u16 sCramorantFormSpeciesIdTable[] = { SPECIES_CRAMORANT, SPECIES_CRAMORANT_GULPING, @@ -1144,4 +1138,11 @@ static const u16 sCalyrexFormSpeciesIdTable[] = { SPECIES_CALYREX_SHADOW_RIDER, FORM_SPECIES_END, }; + +static const u16 sEnamorusFormSpeciesIdTable[] = { + SPECIES_ENAMORUS, + SPECIES_ENAMORUS_THERIAN, + FORM_SPECIES_END, +}; + #endif diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index d1659be02..0ecfa59cc 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -387,7 +387,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_JIRACHI] = sJirachiLevelUpLearnset, [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset, [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = sTurtwigLevelUpLearnset, [SPECIES_GROTLE] = sGrotleLevelUpLearnset, [SPECIES_TORTERRA] = sTorterraLevelUpLearnset, @@ -496,7 +496,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SHAYMIN] = sShayminLevelUpLearnset, [SPECIES_ARCEUS] = sArceusLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = sVictiniLevelUpLearnset, [SPECIES_SNIVY] = sSnivyLevelUpLearnset, [SPECIES_SERVINE] = sServineLevelUpLearnset, @@ -654,7 +654,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MELOETTA] = sMeloettaLevelUpLearnset, [SPECIES_GENESECT] = sGenesectLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = sChespinLevelUpLearnset, [SPECIES_QUILLADIN] = sQuilladinLevelUpLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtLevelUpLearnset, @@ -728,7 +728,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_HOOPA] = sHoopaLevelUpLearnset, [SPECIES_VOLCANION] = sVolcanionLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = sRowletLevelUpLearnset, [SPECIES_DARTRIX] = sDartrixLevelUpLearnset, [SPECIES_DECIDUEYE] = sDecidueyeLevelUpLearnset, @@ -818,7 +818,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MELTAN] = sMeltanLevelUpLearnset, [SPECIES_MELMETAL] = sMelmetalLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = sGrookeyLevelUpLearnset, [SPECIES_THWACKEY] = sThwackeyLevelUpLearnset, [SPECIES_RILLABOOM] = sRillaboomLevelUpLearnset, @@ -957,17 +957,17 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_METAGROSS_MEGA] = sMetagrossLevelUpLearnset, [SPECIES_LATIAS_MEGA] = sLatiasLevelUpLearnset, [SPECIES_LATIOS_MEGA] = sLatiosLevelUpLearnset, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = sLopunnyLevelUpLearnset, [SPECIES_GARCHOMP_MEGA] = sGarchompLevelUpLearnset, [SPECIES_LUCARIO_MEGA] = sLucarioLevelUpLearnset, [SPECIES_ABOMASNOW_MEGA] = sAbomasnowLevelUpLearnset, [SPECIES_GALLADE_MEGA] = sGalladeLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset, #endif // Special Mega + Primals @@ -1009,7 +1009,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianLevelUpLearnset, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianLevelUpLearnset, [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianLevelUpLearnset, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, @@ -1023,19 +1023,19 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset, [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset, [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset, [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset, [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset, [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset, [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset, [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset, [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, #endif // Misc Forms @@ -1093,7 +1093,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset, [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset, [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyLevelUpLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyLevelUpLearnset, @@ -1137,7 +1137,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_DARK] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, @@ -1169,7 +1169,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_GENESECT_BURN_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaLevelUpLearnset, [SPECIES_GRENINJA_ASH] = sGreninjaLevelUpLearnset, @@ -1241,7 +1241,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Hoopa [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, @@ -1294,7 +1294,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaLevelUpLearnset, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset, [SPECIES_CRAMORANT_GORGING] = sCramorantLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index a7f70b525..8f8f8f038 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -7903,7 +7903,7 @@ static const struct LevelUpMove sChimechoLevelUpLearnset[] = { LEVEL_UP_END }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const struct LevelUpMove sTurtwigLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_WITHDRAW), @@ -9993,7 +9993,7 @@ static const struct LevelUpMove sArceusLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const struct LevelUpMove sVictiniLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SEARING_SHOT), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), @@ -13254,7 +13254,7 @@ static const struct LevelUpMove sGenesectLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const struct LevelUpMove sChespinLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), @@ -14751,7 +14751,7 @@ static const struct LevelUpMove sVolcanionLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const struct LevelUpMove sRowletLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), @@ -16531,7 +16531,7 @@ static const struct LevelUpMove sMelmetalLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const struct LevelUpMove sGrookeyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -18865,7 +18865,7 @@ static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -19033,7 +19033,7 @@ static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -19105,7 +19105,7 @@ static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), //LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), @@ -19146,7 +19146,7 @@ static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), @@ -19220,7 +19220,7 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = { LEVEL_UP_END }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), @@ -19283,7 +19283,9 @@ static const struct LevelUpMove sShayminSkyLevelUpLearnset[] = { LEVEL_UP_MOVE(100, MOVE_SEED_FLARE), LEVEL_UP_END }; +#endif +#if P_GEN_5_POKEMON == TRUE static const struct LevelUpMove sKyuremWhiteLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ICY_WIND), LEVEL_UP_MOVE( 1, MOVE_DRAGON_RAGE), @@ -19323,7 +19325,7 @@ static const struct LevelUpMove sKyuremBlackLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), @@ -19394,7 +19396,7 @@ static const struct LevelUpMove sHoopaUnboundLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const struct LevelUpMove sLycanrocMidnightLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_COUNTER), LEVEL_UP_MOVE( 1, MOVE_REVERSAL), @@ -19440,7 +19442,7 @@ static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const struct LevelUpMove sToxtricityLowKeyLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_SPARK), LEVEL_UP_MOVE( 1, MOVE_SPARK), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 2ab164784..492538260 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -4644,7 +4644,7 @@ const struct PokedexEntry gPokedexEntries[] = .trainerOffset = 2, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [NATIONAL_DEX_TURTWIG] = { .categoryName = _("Tiny Leaf"), @@ -5930,7 +5930,7 @@ const struct PokedexEntry gPokedexEntries[] = }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [NATIONAL_DEX_VICTINI] = { .categoryName = _("Victory"), @@ -7804,7 +7804,7 @@ const struct PokedexEntry gPokedexEntries[] = }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [NATIONAL_DEX_CHESPIN] = { .categoryName = _("Spiny Nut"), @@ -8670,7 +8670,7 @@ const struct PokedexEntry gPokedexEntries[] = }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [NATIONAL_DEX_ROWLET] = { .categoryName = _("Grass Quill"), @@ -9728,7 +9728,7 @@ const struct PokedexEntry gPokedexEntries[] = }, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [NATIONAL_DEX_GROOKEY] = { .categoryName = _("Chimp"), diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 2eb0407e9..6048d2121 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -2320,7 +2320,7 @@ const u8 gChimechoPokedexText[] = _( "themselves using seven different and\n" "distinguishing cries."); -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE const u8 gTurtwigPokedexText[] = _( "The shell on its back is made of soil. \n" "On a very healthy Turtwig, the shell \n" @@ -2964,7 +2964,7 @@ const u8 gArceusPokedexText[] = _( "even existed."); #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE const u8 gVictiniPokedexText[] = _( "This Pokémon brings victory.\n" "It is said that Trainers with Victini\n" @@ -3902,7 +3902,7 @@ const u8 gGenesectPokedexText[] = _( "a cannon to its back."); #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE const u8 gChespinPokedexText[] = _( "The quills on its head are usually soft.\n" "When it flexes them, the points become\n" @@ -4336,7 +4336,7 @@ const u8 gVolcanionPokedexText[] = _( "humans do not tread."); #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE const u8 gRowletPokedexText[] = _( "This wary Pokémon uses photosynthesis\n" "to store up energy during the day, while\n" @@ -4859,7 +4859,7 @@ const u8 gMelmetalPokedexText[] = _( "come back to life after 3,000 years."); #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE const u8 gGrookeyPokedexText[] = _( "When it uses its special stick to strike up\n" "a beat, the sound waves produced carry\n" diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index f238684c6..28998aae1 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -387,7 +387,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_JIRACHI] = sJirachiTeachableLearnset, [SPECIES_DEOXYS] = sDeoxysTeachableLearnset, [SPECIES_CHIMECHO] = sChimechoTeachableLearnset, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = sTurtwigTeachableLearnset, [SPECIES_GROTLE] = sGrotleTeachableLearnset, [SPECIES_TORTERRA] = sTorterraTeachableLearnset, @@ -496,7 +496,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SHAYMIN] = sShayminTeachableLearnset, [SPECIES_ARCEUS] = sArceusTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = sVictiniTeachableLearnset, [SPECIES_SNIVY] = sSnivyTeachableLearnset, [SPECIES_SERVINE] = sServineTeachableLearnset, @@ -654,7 +654,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MELOETTA] = sMeloettaTeachableLearnset, [SPECIES_GENESECT] = sGenesectTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = sChespinTeachableLearnset, [SPECIES_QUILLADIN] = sQuilladinTeachableLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtTeachableLearnset, @@ -728,7 +728,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_HOOPA] = sHoopaTeachableLearnset, [SPECIES_VOLCANION] = sVolcanionTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = sRowletTeachableLearnset, [SPECIES_DARTRIX] = sDartrixTeachableLearnset, [SPECIES_DECIDUEYE] = sDecidueyeTeachableLearnset, @@ -818,7 +818,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MELTAN] = sMeltanTeachableLearnset, [SPECIES_MELMETAL] = sMelmetalTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = sGrookeyTeachableLearnset, [SPECIES_THWACKEY] = sThwackeyTeachableLearnset, [SPECIES_RILLABOOM] = sRillaboomTeachableLearnset, @@ -957,17 +957,17 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_METAGROSS_MEGA] = sMetagrossTeachableLearnset, [SPECIES_LATIAS_MEGA] = sLatiasTeachableLearnset, [SPECIES_LATIOS_MEGA] = sLatiosTeachableLearnset, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = sLopunnyTeachableLearnset, [SPECIES_GARCHOMP_MEGA] = sGarchompTeachableLearnset, [SPECIES_LUCARIO_MEGA] = sLucarioTeachableLearnset, [SPECIES_ABOMASNOW_MEGA] = sAbomasnowTeachableLearnset, [SPECIES_GALLADE_MEGA] = sGalladeTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = sAudinoTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = sDiancieTeachableLearnset, #endif // Special Mega + Primals @@ -1009,7 +1009,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianTeachableLearnset, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianTeachableLearnset, [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianTeachableLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset, @@ -1023,19 +1023,19 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianTeachableLearnset, [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianTeachableLearnset, [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianTeachableLearnset, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianTeachableLearnset, [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianTeachableLearnset, [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianTeachableLearnset, [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianTeachableLearnset, [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianTeachableLearnset, [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianTeachableLearnset, [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, #endif // Misc Forms @@ -1093,7 +1093,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackTeachableLearnset, [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseTeachableLearnset, [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedTeachableLearnset, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyTeachableLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyTeachableLearnset, @@ -1137,7 +1137,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_DARK] = sArceusTeachableLearnset, [SPECIES_ARCEUS_FAIRY] = sArceusTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinTeachableLearnset, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset, @@ -1169,7 +1169,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_GENESECT_BURN_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaTeachableLearnset, [SPECIES_GRENINJA_ASH] = sGreninjaTeachableLearnset, @@ -1241,7 +1241,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Hoopa [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioTeachableLearnset, [SPECIES_ORICORIO_PAU] = sOricorioTeachableLearnset, @@ -1294,7 +1294,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaTeachableLearnset, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING] = sCramorantTeachableLearnset, [SPECIES_CRAMORANT_GORGING] = sCramorantTeachableLearnset, diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index 8a3b89293..623647275 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -16203,7 +16203,7 @@ static const u16 sDeoxysTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const u16 sTurtwigTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BULLET_SEED, @@ -20327,7 +20327,7 @@ static const u16 sArceusTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const u16 sVictiniTeachableLearnset[] = { MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, @@ -25420,7 +25420,7 @@ static const u16 sGenesectTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const u16 sChespinTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, @@ -27831,7 +27831,7 @@ static const u16 sVolcanionTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const u16 sRowletTeachableLearnset[] = { MOVE_ATTRACT, MOVE_DOUBLE_TEAM, @@ -30215,7 +30215,7 @@ static const u16 sMelmetalTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const u16 sGrookeyTeachableLearnset[] = { MOVE_ATTRACT, MOVE_FACADE, @@ -32857,7 +32857,7 @@ static const u16 sLinooneGalarianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const u16 sDarumakaGalarianTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, @@ -32997,7 +32997,7 @@ static const u16 sSneaselHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const u16 sSamurottHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; @@ -33019,7 +33019,7 @@ static const u16 sBraviaryHisuianTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const u16 sSliggooHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; @@ -33033,7 +33033,7 @@ static const u16 sAvaluggHisuianTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const u16 sDecidueyeHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; @@ -33159,7 +33159,7 @@ static const u16 sDeoxysSpeedTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const u16 sBurmySandyCloakTeachableLearnset[] = { MOVE_HIDDEN_POWER, MOVE_PROTECT, @@ -33295,7 +33295,7 @@ static const u16 sShayminSkyTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const u16 sFloetteEternalFlowerTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, @@ -33390,7 +33390,7 @@ static const u16 sMeowsticFemaleTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const u16 sLycanrocMidnightTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, @@ -33430,7 +33430,7 @@ static const u16 sLycanrocDuskTeachableLearnset[] = { }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const u16 sToxtricityLowKeyTeachableLearnset[] = { MOVE_ATTRACT, MOVE_FACADE, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 487c49347..e21e6f32e 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1954,7 +1954,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 9, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(48, 56), @@ -2487,7 +2487,7 @@ const struct MonCoords gMonBackPicCoords[] = }, [SPECIES_ARCEUS] = ARCEUS_BACK_PIC_COORDS, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(40, 64), @@ -3265,7 +3265,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 8, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(56, 64), @@ -3627,7 +3627,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 3, }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(48, 40), @@ -4069,7 +4069,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 13, }, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = { .size = MON_COORDS_SIZE(48, 56), @@ -4752,7 +4752,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(64, 64), @@ -4779,14 +4779,14 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 3, }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 56), @@ -4976,7 +4976,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 40), .y_offset = 13, }, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), @@ -5034,7 +5034,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(56, 64), .y_offset = 3, }, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5061,7 +5061,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5078,7 +5078,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 17, }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5276,7 +5276,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { @@ -5384,7 +5384,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ARCEUS_DARK] = ARCEUS_BACK_PIC_COORDS, [SPECIES_ARCEUS_FAIRY] = ARCEUS_BACK_PIC_COORDS, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { @@ -5488,7 +5488,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 8, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = { @@ -5788,7 +5788,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM] = { @@ -6009,7 +6009,7 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 4, }, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING] = { diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 4de33b79a..398cf2875 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -387,7 +387,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi), SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys), SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig), SPECIES_SPRITE(GROTLE, gMonBackPic_Grotle), SPECIES_SPRITE(TORTERRA, gMonBackPic_Torterra), @@ -496,7 +496,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SHAYMIN, gMonBackPic_Shaymin), SPECIES_SPRITE(ARCEUS, gMonBackPic_Arceus), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(VICTINI, gMonBackPic_Victini), SPECIES_SPRITE(SNIVY, gMonBackPic_Snivy), SPECIES_SPRITE(SERVINE, gMonBackPic_Servine), @@ -654,7 +654,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MELOETTA, gMonBackPic_Meloetta), SPECIES_SPRITE(GENESECT, gMonBackPic_Genesect), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(CHESPIN, gMonBackPic_Chespin), SPECIES_SPRITE(QUILLADIN, gMonBackPic_Quilladin), SPECIES_SPRITE(CHESNAUGHT, gMonBackPic_Chesnaught), @@ -728,7 +728,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(HOOPA, gMonBackPic_Hoopa), SPECIES_SPRITE(VOLCANION, gMonBackPic_Volcanion), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SPRITE(ROWLET, gMonBackPic_Rowlet), SPECIES_SPRITE(DARTRIX, gMonBackPic_Dartrix), SPECIES_SPRITE(DECIDUEYE, gMonBackPic_Decidueye), @@ -818,7 +818,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MELTAN, gMonBackPic_Meltan), SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SPRITE(GROOKEY, gMonBackPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonBackPic_Thwackey), SPECIES_SPRITE(RILLABOOM, gMonBackPic_Rillaboom), @@ -957,17 +957,17 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(METAGROSS_MEGA, gMonBackPic_MetagrossMega), SPECIES_SPRITE(LATIAS_MEGA, gMonBackPic_LatiasMega), SPECIES_SPRITE(LATIOS_MEGA, gMonBackPic_LatiosMega), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(LOPUNNY_MEGA, gMonBackPic_LopunnyMega), SPECIES_SPRITE(GARCHOMP_MEGA, gMonBackPic_GarchompMega), SPECIES_SPRITE(LUCARIO_MEGA, gMonBackPic_LucarioMega), SPECIES_SPRITE(ABOMASNOW_MEGA, gMonBackPic_AbomasnowMega), SPECIES_SPRITE(GALLADE_MEGA, gMonBackPic_GalladeMega), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(AUDINO_MEGA, gMonBackPic_AudinoMega), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(DIANCIE_MEGA, gMonBackPic_DiancieMega), #endif @@ -1009,7 +1009,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(CORSOLA_GALARIAN, gMonBackPic_CorsolaGalarian), SPECIES_SPRITE(ZIGZAGOON_GALARIAN, gMonBackPic_ZigzagoonGalarian), SPECIES_SPRITE(LINOONE_GALARIAN, gMonBackPic_LinooneGalarian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonBackPic_DarumakaGalarian), SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonBackPic_DarmanitanGalarian), SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian), @@ -1023,19 +1023,19 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonBackPic_TyphlosionHisuian), SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_QwilfishHisuian), SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_SneaselHisuian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian), SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_LilligantHisuian), SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_ZoruaHisuian), SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_ZoroarkHisuian), SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonBackPic_BraviaryHisuian), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonBackPic_SliggooHisuian), SPECIES_SPRITE(GOODRA_HISUIAN, gMonBackPic_GoodraHisuian), SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_AvaluggHisuian), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian), #endif @@ -1092,7 +1092,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(DEOXYS_ATTACK, gMonBackPic_DeoxysAttack), SPECIES_SPRITE(DEOXYS_DEFENSE, gMonBackPic_DeoxysDefense), SPECIES_SPRITE(DEOXYS_SPEED, gMonBackPic_DeoxysSpeed), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonBackPic_BurmySandyCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonBackPic_BurmyTrashCloak), @@ -1136,7 +1136,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ARCEUS_FAIRY, gMonBackPic_Arceus), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonBackPic_BasculinBlueStriped), SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_BasculinWhiteStriped), @@ -1168,7 +1168,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(GENESECT_CHILL_DRIVE, gMonBackPic_Genesect), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(GRENINJA_BATTLE_BOND, gMonBackPic_Greninja), SPECIES_SPRITE(GRENINJA_ASH, gMonBackPic_GreninjaAsh), @@ -1240,7 +1240,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom), SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu), @@ -1293,7 +1293,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonBackPic_MagearnaOriginalColor), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SPRITE(CRAMORANT_GULPING, gMonBackPic_CramorantGulping), SPECIES_SPRITE(CRAMORANT_GORGING, gMonBackPic_CramorantGorging), @@ -1339,7 +1339,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor), @@ -1351,15 +1351,15 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF), SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF), SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF), #endif }; diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index c49471f80..2b0dd0a4f 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -387,7 +387,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_JIRACHI] = gMonFootprint_Jirachi, [SPECIES_DEOXYS] = gMonFootprint_Deoxys, [SPECIES_CHIMECHO] = gMonFootprint_Chimecho, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = gMonFootprint_Turtwig, [SPECIES_GROTLE] = gMonFootprint_Grotle, [SPECIES_TORTERRA] = gMonFootprint_Torterra, @@ -496,7 +496,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_SHAYMIN] = gMonFootprint_Shaymin, [SPECIES_ARCEUS] = gMonFootprint_Arceus, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = gMonFootprint_Victini, [SPECIES_SNIVY] = gMonFootprint_Snivy, [SPECIES_SERVINE] = gMonFootprint_Servine, @@ -654,7 +654,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_MELOETTA] = gMonFootprint_Meloetta, [SPECIES_GENESECT] = gMonFootprint_Genesect, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = gMonFootprint_Chespin, [SPECIES_QUILLADIN] = gMonFootprint_Quilladin, [SPECIES_CHESNAUGHT] = gMonFootprint_Chesnaught, @@ -728,7 +728,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_HOOPA] = gMonFootprint_Hoopa, [SPECIES_VOLCANION] = gMonFootprint_Volcanion, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = gMonFootprint_Rowlet, [SPECIES_DARTRIX] = gMonFootprint_Dartrix, [SPECIES_DECIDUEYE] = gMonFootprint_Decidueye, @@ -818,7 +818,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_MELTAN] = gMonFootprint_Meltan, [SPECIES_MELMETAL] = gMonFootprint_Melmetal, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = gMonFootprint_Grookey, [SPECIES_THWACKEY] = gMonFootprint_Thwackey, [SPECIES_RILLABOOM] = gMonFootprint_Rillaboom, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index ec0531120..6d2ab461e 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -4805,7 +4805,7 @@ static const union AnimCmd sAnim_UNOWN_QMARK_1[] = ANIMCMD_END, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const union AnimCmd sAnim_TURTWIG_1[] = { ANIMCMD_FRAME(0, 15), @@ -5768,7 +5768,7 @@ static const union AnimCmd sAnim_ARCEUS_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd sAnim_VICTINI_1[] = { ANIMCMD_FRAME(0, 30), @@ -7017,7 +7017,7 @@ static const union AnimCmd sAnim_GENESECT_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd sAnim_CHESPIN_1[] = { ANIMCMD_FRAME(0, 8), @@ -7455,7 +7455,7 @@ static const union AnimCmd sAnim_VOLCANION_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const union AnimCmd sAnim_ROWLET_1[] = { ANIMCMD_FRAME(0, 1), @@ -8001,7 +8001,7 @@ static const union AnimCmd sAnim_MELMETAL_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const union AnimCmd sAnim_GROOKEY_1[] = { ANIMCMD_FRAME(0, 1), @@ -8837,7 +8837,7 @@ static const union AnimCmd sAnim_RAYQUAZA_MEGA_1[] = ANIMCMD_END, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const union AnimCmd sAnim_LOPUNNY_MEGA_1[] = { ANIMCMD_FRAME(0, 1), @@ -8869,7 +8869,7 @@ static const union AnimCmd sAnim_GALLADE_MEGA_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd sAnim_AUDINO_MEGA_1[] = { ANIMCMD_FRAME(0, 1), @@ -8877,7 +8877,7 @@ static const union AnimCmd sAnim_AUDINO_MEGA_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd sAnim_DIANCIE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), @@ -9083,7 +9083,7 @@ static const union AnimCmd sAnim_LINOONE_GALARIAN_1[] = ANIMCMD_END, }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd sAnim_DARUMAKA_GALARIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9151,7 +9151,7 @@ static const union AnimCmd sAnim_SNEASEL_HISUIAN_1[] = ANIMCMD_END, }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd sAnim_SAMUROTT_HISUIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9183,7 +9183,7 @@ static const union AnimCmd sAnim_BRAVIARY_HISUIAN_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd sAnim_SLIGGOO_HISUIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9203,7 +9203,7 @@ static const union AnimCmd sAnim_AVALUGG_HISUIAN_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const union AnimCmd sAnim_DECIDUEYE_HISUIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9357,7 +9357,7 @@ static const union AnimCmd sAnim_DEOXYS_SPEED_2[] = ANIMCMD_END, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const union AnimCmd sAnim_SHAYMIN_SKY_1[] = { ANIMCMD_FRAME(0, 1), @@ -9383,7 +9383,7 @@ static const union AnimCmd sAnim_GIRATINA_ORIGIN_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd sAnim_DARMANITAN_ZEN_MODE_1[] = { ANIMCMD_FRAME(0, 1), @@ -9439,7 +9439,7 @@ static const union AnimCmd sAnim_MELOETTA_PIROUETTE_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd sAnim_AEGISLASH_BLADE_1[] = { ANIMCMD_FRAME(0, 1), @@ -9465,7 +9465,7 @@ static const union AnimCmd sAnim_HOOPA_UNBOUND_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const union AnimCmd sAnim_MINIOR_CORE_1[] = { ANIMCMD_FRAME(0, 1), @@ -9497,7 +9497,7 @@ static const union AnimCmd sAnim_LYCANROC_DUSK_1[] = }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const union AnimCmd sAnim_ENAMORUS_THERIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -12061,7 +12061,7 @@ static const union AnimCmd *const sAnims_UNOWN_QMARK[] = sAnim_UNOWN_QMARK_1, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const union AnimCmd *const sAnims_TURTWIG[] = { sAnim_GeneralFrame0, @@ -12735,7 +12735,7 @@ static const union AnimCmd *const sAnims_ARCEUS[] = }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd *const sAnims_VICTINI[] = { sAnim_GeneralFrame0, @@ -13673,7 +13673,7 @@ static const union AnimCmd *const sAnims_GENESECT[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd *const sAnims_CHESPIN[] = { sAnim_GeneralFrame0, @@ -14107,7 +14107,7 @@ static const union AnimCmd *const sAnims_VOLCANION[] = }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const union AnimCmd *const sAnims_ROWLET[] = { sAnim_GeneralFrame0, @@ -14637,7 +14637,7 @@ static const union AnimCmd *const sAnims_MELMETAL[] = }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const union AnimCmd *const sAnims_GROOKEY[] = { sAnim_GeneralFrame0, @@ -15473,7 +15473,7 @@ static const union AnimCmd *const sAnims_RAYQUAZA_MEGA[] = sAnim_RAYQUAZA_MEGA_1, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const union AnimCmd *const sAnims_LOPUNNY_MEGA[] = { sAnim_GeneralFrame0, @@ -15505,7 +15505,7 @@ static const union AnimCmd *const sAnims_GALLADE_MEGA[] = }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd *const sAnims_AUDINO_MEGA[] = { sAnim_GeneralFrame0, @@ -15513,7 +15513,7 @@ static const union AnimCmd *const sAnims_AUDINO_MEGA[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd *const sAnims_DIANCIE_MEGA[] = { sAnim_GeneralFrame0, @@ -15719,7 +15719,7 @@ static const union AnimCmd *const sAnims_LINOONE_GALARIAN[] = sAnim_LINOONE_GALARIAN_1, }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd *const sAnims_DARUMAKA_GALARIAN[] = { sAnim_GeneralFrame0, @@ -15787,7 +15787,7 @@ static const union AnimCmd *const sAnims_SNEASEL_HISUIAN[] = sAnim_SNEASEL_HISUIAN_1, }; -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd *const sAnims_SAMUROTT_HISUIAN[] = { sAnim_GeneralFrame0, @@ -15819,7 +15819,7 @@ static const union AnimCmd *const sAnims_BRAVIARY_HISUIAN[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd *const sAnims_SLIGGOO_HISUIAN[] = { sAnim_GeneralFrame0, @@ -15839,7 +15839,7 @@ static const union AnimCmd *const sAnims_AVALUGG_HISUIAN[] = }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const union AnimCmd *const sAnims_DECIDUEYE_HISUIAN[] = { sAnim_GeneralFrame0, @@ -15956,7 +15956,7 @@ static const union AnimCmd *const sAnims_DEOXYS_SPEED[] = sAnim_DEOXYS_SPEED_2, }; -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE static const union AnimCmd *const sAnims_DIALGA_ORIGIN[] = { sAnim_GeneralFrame0, @@ -15982,7 +15982,7 @@ static const union AnimCmd *const sAnims_SHAYMIN_SKY[] = }; #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE static const union AnimCmd *const sAnims_DARMANITAN_ZEN_MODE[] = { sAnim_GeneralFrame0, @@ -16038,7 +16038,7 @@ static const union AnimCmd *const sAnims_MELOETTA_PIROUETTE[] = }; #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE static const union AnimCmd *const sAnims_AEGISLASH_BLADE[] = { sAnim_GeneralFrame0, @@ -16064,7 +16064,7 @@ static const union AnimCmd *const sAnims_HOOPA_UNBOUND[] = }; #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE static const union AnimCmd *const sAnims_MINIOR_CORE[] = { sAnim_GeneralFrame0, @@ -16096,7 +16096,7 @@ static const union AnimCmd *const sAnims_LYCANROC_DUSK[] = }; #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE static const union AnimCmd *const sAnims_ENAMORUS_THERIAN[] = { sAnim_GeneralFrame0, @@ -16496,7 +16496,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(JIRACHI), ANIM_CMD(DEOXYS), ANIM_CMD(CHIMECHO), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE ANIM_CMD(TURTWIG), ANIM_CMD(GROTLE), ANIM_CMD(TORTERRA), @@ -16605,7 +16605,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(SHAYMIN), ANIM_CMD(ARCEUS), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE ANIM_CMD(VICTINI), ANIM_CMD(SNIVY), ANIM_CMD(SERVINE), @@ -16763,7 +16763,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(MELOETTA), ANIM_CMD(GENESECT), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE ANIM_CMD(CHESPIN), ANIM_CMD(QUILLADIN), ANIM_CMD(CHESNAUGHT), @@ -16837,7 +16837,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(HOOPA), ANIM_CMD(VOLCANION), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE ANIM_CMD(ROWLET), ANIM_CMD(DARTRIX), ANIM_CMD(DECIDUEYE), @@ -16927,7 +16927,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(MELTAN), ANIM_CMD(MELMETAL), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE ANIM_CMD(GROOKEY), ANIM_CMD(THWACKEY), ANIM_CMD(RILLABOOM), @@ -17065,17 +17065,17 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(METAGROSS_MEGA), ANIM_CMD(LATIAS_MEGA), ANIM_CMD(LATIOS_MEGA), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE ANIM_CMD(LOPUNNY_MEGA), ANIM_CMD(GARCHOMP_MEGA), ANIM_CMD(LUCARIO_MEGA), ANIM_CMD(ABOMASNOW_MEGA), ANIM_CMD(GALLADE_MEGA), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE ANIM_CMD(AUDINO_MEGA), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE ANIM_CMD(DIANCIE_MEGA), #endif ANIM_CMD(RAYQUAZA_MEGA), @@ -17114,7 +17114,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(CORSOLA_GALARIAN), ANIM_CMD(ZIGZAGOON_GALARIAN), ANIM_CMD(LINOONE_GALARIAN), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE ANIM_CMD(DARUMAKA_GALARIAN), ANIM_CMD(DARMANITAN_GALARIAN), ANIM_CMD(YAMASK_GALARIAN), @@ -17127,19 +17127,19 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(TYPHLOSION_HISUIAN), ANIM_CMD(QWILFISH_HISUIAN), ANIM_CMD(SNEASEL_HISUIAN), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE ANIM_CMD(SAMUROTT_HISUIAN), ANIM_CMD(LILLIGANT_HISUIAN), ANIM_CMD(ZORUA_HISUIAN), ANIM_CMD(ZOROARK_HISUIAN), ANIM_CMD(BRAVIARY_HISUIAN), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE ANIM_CMD(SLIGGOO_HISUIAN), ANIM_CMD(GOODRA_HISUIAN), ANIM_CMD(AVALUGG_HISUIAN), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE ANIM_CMD(DECIDUEYE_HISUIAN), #endif ANIM_CMD(PIKACHU_COSPLAY), @@ -17190,7 +17190,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DEOXYS_ATTACK), ANIM_CMD(DEOXYS_DEFENSE), ANIM_CMD(DEOXYS_SPEED), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE ANIM_CMD_FULL(BURMY_SANDY_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(BURMY_TRASH_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(WORMADAM_SANDY_CLOAK, sAnims_WORMADAM), @@ -17225,7 +17225,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(ARCEUS_DARK, sAnims_ARCEUS), ANIM_CMD_FULL(ARCEUS_FAIRY, sAnims_ARCEUS), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE ANIM_CMD_FULL(BASCULIN_BLUE_STRIPED, sAnims_BASCULIN), ANIM_CMD_FULL(BASCULIN_WHITE_STRIPED, sAnims_BASCULIN), ANIM_CMD(DARMANITAN_ZEN_MODE), @@ -17248,7 +17248,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(GENESECT_BURN_DRIVE, sAnims_GENESECT), ANIM_CMD_FULL(GENESECT_CHILL_DRIVE, sAnims_GENESECT), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE ANIM_CMD_FULL(GRENINJA_BATTLE_BOND, sAnims_GRENINJA), ANIM_CMD_FULL(GRENINJA_ASH, sAnims_GRENINJA), ANIM_CMD_FULL(VIVILLON_POLAR, sAnims_VIVILLON), @@ -17307,7 +17307,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(ZYGARDE_COMPLETE), ANIM_CMD(HOOPA_UNBOUND), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE ANIM_CMD_FULL(ORICORIO_POM_POM, sAnims_ORICORIO), ANIM_CMD_FULL(ORICORIO_PAU, sAnims_ORICORIO), ANIM_CMD_FULL(ORICORIO_SENSU, sAnims_ORICORIO), @@ -17351,7 +17351,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(NECROZMA_ULTRA, sAnims_NECROZMA), ANIM_CMD_FULL(MAGEARNA_ORIGINAL_COLOR, sAnims_MAGEARNA), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE ANIM_CMD_FULL(CRAMORANT_GULPING, sAnims_CRAMORANT), ANIM_CMD_FULL(CRAMORANT_GORGING, sAnims_CRAMORANT), ANIM_CMD_FULL(TOXTRICITY_LOW_KEY, sAnims_TOXTRICITY), diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index f508087df..b444907ca 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1939,7 +1939,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(48, 48), .y_offset = 11, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(40, 48), @@ -2476,7 +2476,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(48, 56), @@ -3258,7 +3258,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), @@ -3620,7 +3620,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(32, 40), @@ -4062,7 +4062,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 4, }, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = { .size = MON_COORDS_SIZE(40, 48), @@ -4745,7 +4745,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(56, 64), @@ -4772,14 +4772,14 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 1, }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 6, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), @@ -4969,7 +4969,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 40), .y_offset = 13, }, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), @@ -5027,7 +5027,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 56), .y_offset = 7, }, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5054,7 +5054,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), @@ -5071,7 +5071,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 5, }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5325,7 +5325,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { @@ -5501,7 +5501,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { @@ -5617,7 +5617,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = { @@ -5917,7 +5917,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM] = { @@ -6138,7 +6138,7 @@ const struct MonCoords gMonFrontPicCoords[] = .y_offset = 0, }, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING] = { diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 76fec7264..7629834ad 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -387,7 +387,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi), SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys), SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig), SPECIES_SPRITE(GROTLE, gMonFrontPic_Grotle), SPECIES_SPRITE(TORTERRA, gMonFrontPic_Torterra), @@ -496,7 +496,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SHAYMIN, gMonFrontPic_Shaymin), SPECIES_SPRITE(ARCEUS, gMonFrontPic_Arceus), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(VICTINI, gMonFrontPic_Victini), SPECIES_SPRITE(SNIVY, gMonFrontPic_Snivy), SPECIES_SPRITE(SERVINE, gMonFrontPic_Servine), @@ -654,7 +654,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MELOETTA, gMonFrontPic_Meloetta), SPECIES_SPRITE(GENESECT, gMonFrontPic_Genesect), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(CHESPIN, gMonFrontPic_Chespin), SPECIES_SPRITE(QUILLADIN, gMonFrontPic_Quilladin), SPECIES_SPRITE(CHESNAUGHT, gMonFrontPic_Chesnaught), @@ -728,7 +728,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(HOOPA, gMonFrontPic_Hoopa), SPECIES_SPRITE(VOLCANION, gMonFrontPic_Volcanion), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SPRITE(ROWLET, gMonFrontPic_Rowlet), SPECIES_SPRITE(DARTRIX, gMonFrontPic_Dartrix), SPECIES_SPRITE(DECIDUEYE, gMonFrontPic_Decidueye), @@ -818,7 +818,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MELTAN, gMonFrontPic_Meltan), SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SPRITE(GROOKEY, gMonFrontPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonFrontPic_Thwackey), SPECIES_SPRITE(RILLABOOM, gMonFrontPic_Rillaboom), @@ -956,17 +956,17 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(METAGROSS_MEGA, gMonFrontPic_MetagrossMega), SPECIES_SPRITE(LATIAS_MEGA, gMonFrontPic_LatiasMega), SPECIES_SPRITE(LATIOS_MEGA, gMonFrontPic_LatiosMega), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(LOPUNNY_MEGA, gMonFrontPic_LopunnyMega), SPECIES_SPRITE(GARCHOMP_MEGA, gMonFrontPic_GarchompMega), SPECIES_SPRITE(LUCARIO_MEGA, gMonFrontPic_LucarioMega), SPECIES_SPRITE(ABOMASNOW_MEGA, gMonFrontPic_AbomasnowMega), SPECIES_SPRITE(GALLADE_MEGA, gMonFrontPic_GalladeMega), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(AUDINO_MEGA, gMonFrontPic_AudinoMega), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(DIANCIE_MEGA, gMonFrontPic_DiancieMega), #endif @@ -1008,7 +1008,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(CORSOLA_GALARIAN, gMonFrontPic_CorsolaGalarian), SPECIES_SPRITE(ZIGZAGOON_GALARIAN, gMonFrontPic_ZigzagoonGalarian), SPECIES_SPRITE(LINOONE_GALARIAN, gMonFrontPic_LinooneGalarian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonFrontPic_DarumakaGalarian), SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonFrontPic_DarmanitanGalarian), SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian), @@ -1022,19 +1022,19 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonFrontPic_TyphlosionHisuian), SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_QwilfishHisuian), SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_SneaselHisuian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian), SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_LilligantHisuian), SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_ZoruaHisuian), SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_ZoroarkHisuian), SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonFrontPic_BraviaryHisuian), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonFrontPic_SliggooHisuian), SPECIES_SPRITE(GOODRA_HISUIAN, gMonFrontPic_GoodraHisuian), SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_AvaluggHisuian), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian), #endif @@ -1091,7 +1091,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(DEOXYS_ATTACK, gMonFrontPic_DeoxysAttack), SPECIES_SPRITE(DEOXYS_DEFENSE, gMonFrontPic_DeoxysDefense), SPECIES_SPRITE(DEOXYS_SPEED, gMonFrontPic_DeoxysSpeed), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonFrontPic_BurmySandyCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonFrontPic_BurmyTrashCloak), @@ -1135,7 +1135,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ARCEUS_FAIRY, gMonFrontPic_Arceus), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonFrontPic_BasculinBlueStriped), SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_BasculinWhiteStriped), @@ -1167,7 +1167,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(GENESECT_CHILL_DRIVE, gMonFrontPic_Genesect), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(GRENINJA_BATTLE_BOND, gMonFrontPic_Greninja), SPECIES_SPRITE(GRENINJA_ASH, gMonFrontPic_GreninjaAsh), @@ -1239,7 +1239,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom), SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu), @@ -1292,7 +1292,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonFrontPic_MagearnaOriginalColor), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SPRITE(CRAMORANT_GULPING, gMonFrontPic_CramorantGulping), SPECIES_SPRITE(CRAMORANT_GORGING, gMonFrontPic_CramorantGorging), @@ -1338,7 +1338,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF), @@ -1350,15 +1350,15 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF), SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF), #endif }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 7a5d2267c..8ef3b3231 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -387,7 +387,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(JIRACHI, gMonPalette_Jirachi), SPECIES_PAL(DEOXYS, gMonPalette_Deoxys), SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_PAL(TURTWIG, gMonPalette_Turtwig), SPECIES_PAL(GROTLE, gMonPalette_Grotle), SPECIES_PAL(TORTERRA, gMonPalette_Torterra), @@ -496,7 +496,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SHAYMIN, gMonPalette_Shaymin), SPECIES_PAL(ARCEUS, gMonPalette_Arceus), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(VICTINI, gMonPalette_Victini), SPECIES_PAL(SNIVY, gMonPalette_Snivy), SPECIES_PAL(SERVINE, gMonPalette_Servine), @@ -654,7 +654,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MELOETTA, gMonPalette_Meloetta), SPECIES_PAL(GENESECT, gMonPalette_Genesect), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_PAL(CHESPIN, gMonPalette_Chespin), SPECIES_PAL(QUILLADIN, gMonPalette_Quilladin), SPECIES_PAL(CHESNAUGHT, gMonPalette_Chesnaught), @@ -728,7 +728,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(HOOPA, gMonPalette_Hoopa), SPECIES_PAL(VOLCANION, gMonPalette_Volcanion), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_PAL(ROWLET, gMonPalette_Rowlet), SPECIES_PAL(DARTRIX, gMonPalette_Dartrix), SPECIES_PAL(DECIDUEYE, gMonPalette_Decidueye), @@ -818,7 +818,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MELTAN, gMonPalette_Meltan), SPECIES_PAL(MELMETAL, gMonPalette_Melmetal), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_PAL(GROOKEY, gMonPalette_Grookey), SPECIES_PAL(THWACKEY, gMonPalette_Thwackey), SPECIES_PAL(RILLABOOM, gMonPalette_Rillaboom), @@ -956,17 +956,17 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(METAGROSS_MEGA, gMonPalette_MetagrossMega), SPECIES_PAL(LATIAS_MEGA, gMonPalette_LatiasMega), SPECIES_PAL(LATIOS_MEGA, gMonPalette_LatiosMega), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_PAL(LOPUNNY_MEGA, gMonPalette_LopunnyMega), SPECIES_PAL(GARCHOMP_MEGA, gMonPalette_GarchompMega), SPECIES_PAL(LUCARIO_MEGA, gMonPalette_LucarioMega), SPECIES_PAL(ABOMASNOW_MEGA, gMonPalette_AbomasnowMega), SPECIES_PAL(GALLADE_MEGA, gMonPalette_GalladeMega), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(AUDINO_MEGA, gMonPalette_AudinoMega), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_PAL(DIANCIE_MEGA, gMonPalette_DiancieMega), #endif @@ -1008,7 +1008,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(CORSOLA_GALARIAN, gMonPalette_CorsolaGalarian), SPECIES_PAL(ZIGZAGOON_GALARIAN, gMonPalette_ZigzagoonGalarian), SPECIES_PAL(LINOONE_GALARIAN, gMonPalette_LinooneGalarian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(DARUMAKA_GALARIAN, gMonPalette_DarumakaGalarian), SPECIES_PAL(DARMANITAN_GALARIAN, gMonPalette_DarmanitanGalarian), SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian), @@ -1021,7 +1021,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ELECTRODE_HISUIAN, gMonPalette_ElectrodeHisuian), SPECIES_PAL(TYPHLOSION_HISUIAN, gMonPalette_TyphlosionHisuian), SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_QwilfishHisuian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian), SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian), SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian), @@ -1029,12 +1029,12 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_ZoroarkHisuian), SPECIES_PAL(BRAVIARY_HISUIAN, gMonPalette_BraviaryHisuian), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_PAL(SLIGGOO_HISUIAN, gMonPalette_SliggooHisuian), SPECIES_PAL(GOODRA_HISUIAN, gMonPalette_GoodraHisuian), SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_AvaluggHisuian), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian), #endif @@ -1092,7 +1092,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense), SPECIES_PAL(DEOXYS_SPEED, gMonPalette_DeoxysSpeed), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_PAL(BURMY_SANDY_CLOAK, gMonPalette_BurmySandyCloak), SPECIES_PAL(BURMY_TRASH_CLOAK, gMonPalette_BurmyTrashCloak), @@ -1136,7 +1136,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ARCEUS_FAIRY, gMonPalette_ArceusFairy), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(BASCULIN_BLUE_STRIPED, gMonPalette_BasculinBlueStriped), SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_BasculinWhiteStriped), @@ -1168,7 +1168,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(GENESECT_CHILL_DRIVE, gMonPalette_GenesectChillDrive), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_PAL(GRENINJA_BATTLE_BOND, gMonPalette_Greninja), SPECIES_PAL(GRENINJA_ASH, gMonPalette_GreninjaAsh), @@ -1240,7 +1240,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom), SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau), SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu), @@ -1293,7 +1293,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MAGEARNA_ORIGINAL_COLOR, gMonPalette_MagearnaOriginalColor), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(CRAMORANT_GORGING, gMonPalette_CramorantGorging), @@ -1338,7 +1338,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = const struct CompressedSpritePalette gMonPaletteTableFemale[] = { SPECIES_PAL(EEVEE, gMonPalette_Eevee), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_PAL(COMBEE, gMonPalette_Combee), SPECIES_PAL(STARLY, gMonPalette_Starly), SPECIES_PAL(STARAVIA, gMonPalette_Staravia), @@ -1350,15 +1350,15 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), SPECIES_PAL(FRILLISH, gMonPalette_FrillishF), SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_PAL(PYROAR, gMonPalette_PyroarF), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF), #endif }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 3723dc209..64a999c49 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -387,7 +387,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi), SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys), SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SHINY_PAL(TURTWIG, gMonShinyPalette_Turtwig), SPECIES_SHINY_PAL(GROTLE, gMonShinyPalette_Grotle), SPECIES_SHINY_PAL(TORTERRA, gMonShinyPalette_Torterra), @@ -496,7 +496,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SHAYMIN, gMonShinyPalette_Shaymin), SPECIES_SHINY_PAL(ARCEUS, gMonShinyPalette_Arceus), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(VICTINI, gMonShinyPalette_Victini), SPECIES_SHINY_PAL(SNIVY, gMonShinyPalette_Snivy), SPECIES_SHINY_PAL(SERVINE, gMonShinyPalette_Servine), @@ -654,7 +654,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MELOETTA, gMonShinyPalette_Meloetta), SPECIES_SHINY_PAL(GENESECT, gMonShinyPalette_Genesect), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SHINY_PAL(CHESPIN, gMonShinyPalette_Chespin), SPECIES_SHINY_PAL(QUILLADIN, gMonShinyPalette_Quilladin), SPECIES_SHINY_PAL(CHESNAUGHT, gMonShinyPalette_Chesnaught), @@ -728,7 +728,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(HOOPA, gMonShinyPalette_Hoopa), SPECIES_SHINY_PAL(VOLCANION, gMonShinyPalette_Volcanion), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SHINY_PAL(ROWLET, gMonShinyPalette_Rowlet), SPECIES_SHINY_PAL(DARTRIX, gMonShinyPalette_Dartrix), SPECIES_SHINY_PAL(DECIDUEYE, gMonShinyPalette_Decidueye), @@ -818,7 +818,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MELTAN, gMonShinyPalette_Meltan), SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SHINY_PAL(GROOKEY, gMonShinyPalette_Grookey), SPECIES_SHINY_PAL(THWACKEY, gMonShinyPalette_Thwackey), SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_Rillaboom), @@ -957,17 +957,17 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(METAGROSS_MEGA, gMonShinyPalette_MetagrossMega), SPECIES_SHINY_PAL(LATIAS_MEGA, gMonShinyPalette_LatiasMega), SPECIES_SHINY_PAL(LATIOS_MEGA, gMonShinyPalette_LatiosMega), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SHINY_PAL(LOPUNNY_MEGA, gMonShinyPalette_LopunnyMega), SPECIES_SHINY_PAL(GARCHOMP_MEGA, gMonShinyPalette_GarchompMega), SPECIES_SHINY_PAL(LUCARIO_MEGA, gMonShinyPalette_LucarioMega), SPECIES_SHINY_PAL(ABOMASNOW_MEGA, gMonShinyPalette_AbomasnowMega), SPECIES_SHINY_PAL(GALLADE_MEGA, gMonShinyPalette_GalladeMega), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(AUDINO_MEGA, gMonShinyPalette_AudinoMega), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SHINY_PAL(DIANCIE_MEGA, gMonShinyPalette_DiancieMega), #endif @@ -1009,7 +1009,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(CORSOLA_GALARIAN, gMonShinyPalette_CorsolaGalarian), SPECIES_SHINY_PAL(ZIGZAGOON_GALARIAN, gMonShinyPalette_ZigzagoonGalarian), SPECIES_SHINY_PAL(LINOONE_GALARIAN, gMonShinyPalette_LinooneGalarian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(DARUMAKA_GALARIAN, gMonShinyPalette_DarumakaGalarian), SPECIES_SHINY_PAL(DARMANITAN_GALARIAN, gMonShinyPalette_DarmanitanGalarian), SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian), @@ -1023,19 +1023,19 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(TYPHLOSION_HISUIAN, gMonShinyPalette_TyphlosionHisuian), SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_QwilfishHisuian), SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_SneaselHisuian), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_SamurottHisuian), SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_LilligantHisuian), SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_ZoruaHisuian), SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_ZoroarkHisuian), SPECIES_SHINY_PAL(BRAVIARY_HISUIAN, gMonShinyPalette_BraviaryHisuian), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SHINY_PAL(SLIGGOO_HISUIAN, gMonShinyPalette_SliggooHisuian), SPECIES_SHINY_PAL(GOODRA_HISUIAN, gMonShinyPalette_GoodraHisuian), SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_AvaluggHisuian), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian), #endif @@ -1092,7 +1092,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(DEOXYS_ATTACK, gMonShinyPalette_DeoxysAttack), SPECIES_SHINY_PAL(DEOXYS_DEFENSE, gMonShinyPalette_DeoxysDefense), SPECIES_SHINY_PAL(DEOXYS_SPEED, gMonShinyPalette_DeoxysSpeed), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SHINY_PAL(BURMY_SANDY_CLOAK, gMonShinyPalette_BurmySandyCloak), SPECIES_SHINY_PAL(BURMY_TRASH_CLOAK, gMonShinyPalette_BurmyTrashCloak), @@ -1135,7 +1135,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ARCEUS_DARK, gMonShinyPalette_ArceusDark), SPECIES_SHINY_PAL(ARCEUS_FAIRY, gMonShinyPalette_ArceusFairy), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(BASCULIN_BLUE_STRIPED, gMonShinyPalette_BasculinBlueStriped), SPECIES_SHINY_PAL(BASCULIN_WHITE_STRIPED, gMonShinyPalette_BasculinWhiteStriped), @@ -1166,7 +1166,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(GENESECT_BURN_DRIVE, gMonShinyPalette_GenesectBurnDrive), SPECIES_SHINY_PAL(GENESECT_CHILL_DRIVE, gMonShinyPalette_GenesectChillDrive), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SHINY_PAL(GRENINJA_BATTLE_BOND, gMonShinyPalette_Greninja), SPECIES_SHINY_PAL(GRENINJA_ASH, gMonShinyPalette_GreninjaAsh), @@ -1238,7 +1238,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_SHINY_PAL(ORICORIO_POM_POM, gMonShinyPalette_OricorioPomPom), SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau), SPECIES_SHINY_PAL(ORICORIO_SENSU, gMonShinyPalette_OricorioSensu), @@ -1291,7 +1291,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MAGEARNA_ORIGINAL_COLOR, gMonShinyPalette_MagearnaOriginalColor), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SHINY_PAL(CRAMORANT_GULPING, gMonShinyPalette_CramorantGulping), SPECIES_SHINY_PAL(CRAMORANT_GORGING, gMonShinyPalette_CramorantGorging), @@ -1337,7 +1337,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_SHINY_PAL(STARLY, gMonShinyPalette_Starly), SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia), SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor), @@ -1349,15 +1349,15 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF), SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF), SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF), #endif }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 4f6d700a3..ec452b31b 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -386,7 +386,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_RAYQUAZA] = _("Rayquaza"), [SPECIES_JIRACHI] = _("Jirachi"), [SPECIES_DEOXYS] = _("Deoxys"), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = _("Turtwig"), [SPECIES_GROTLE] = _("Grotle"), [SPECIES_TORTERRA] = _("Torterra"), @@ -495,7 +495,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SHAYMIN] = _("Shaymin"), [SPECIES_ARCEUS] = _("Arceus"), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = _("Victini"), [SPECIES_SNIVY] = _("Snivy"), [SPECIES_SERVINE] = _("Servine"), @@ -653,7 +653,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MELOETTA] = _("Meloetta"), [SPECIES_GENESECT] = _("Genesect"), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = _("Chespin"), [SPECIES_QUILLADIN] = _("Quilladin"), [SPECIES_CHESNAUGHT] = _("Chesnaught"), @@ -727,7 +727,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_HOOPA] = _("Hoopa"), [SPECIES_VOLCANION] = _("Volcanion"), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = _("Rowlet"), [SPECIES_DARTRIX] = _("Dartrix"), [SPECIES_DECIDUEYE] = _("Decidueye"), @@ -817,7 +817,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MELTAN] = _("Meltan"), [SPECIES_MELMETAL] = _("Melmetal"), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = _("Grookey"), [SPECIES_THWACKEY] = _("Thwackey"), [SPECIES_RILLABOOM] = _("Rillaboom"), @@ -957,17 +957,17 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_METAGROSS_MEGA] = _("Metagross"), [SPECIES_LATIAS_MEGA] = _("Latias"), [SPECIES_LATIOS_MEGA] = _("Latios"), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = _("Lopunny"), [SPECIES_GARCHOMP_MEGA] = _("Garchomp"), [SPECIES_LUCARIO_MEGA] = _("Lucario"), [SPECIES_ABOMASNOW_MEGA] = _("Abomasnow"), [SPECIES_GALLADE_MEGA] = _("Gallade"), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = _("Audino"), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = _("Diancie"), #endif // Special Mega + Primals @@ -1011,7 +1011,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CORSOLA_GALARIAN] = _("Corsola"), [SPECIES_ZIGZAGOON_GALARIAN] = _("Zigzagoon"), [SPECIES_LINOONE_GALARIAN] = _("Linoone"), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"), [SPECIES_DARMANITAN_GALARIAN] = _("Darmanitan"), [SPECIES_YAMASK_GALARIAN] = _("Yamask"), @@ -1026,19 +1026,19 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"), [SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"), [SPECIES_SNEASEL_HISUIAN] = _("Sneasel"), -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = _("Samurott"), [SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"), [SPECIES_ZORUA_HISUIAN] = _("Zorua"), [SPECIES_ZOROARK_HISUIAN] = _("Zoroark"), [SPECIES_BRAVIARY_HISUIAN] = _("Braviary"), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"), [SPECIES_GOODRA_HISUIAN] = _("Goodra"), [SPECIES_AVALUGG_HISUIAN] = _("Avalugg"), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), #endif @@ -1096,7 +1096,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DEOXYS_ATTACK] = _("Deoxys"), [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), [SPECIES_DEOXYS_SPEED] = _("Deoxys"), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"), [SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"), @@ -1140,7 +1140,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ARCEUS_DARK] = _("Arceus"), [SPECIES_ARCEUS_FAIRY] = _("Arceus"), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"), [SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"), @@ -1173,7 +1173,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"), [SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = _("Greninja"), [SPECIES_GRENINJA_ASH] = _("Greninja"), @@ -1245,7 +1245,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { // Hoopa [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), [SPECIES_ORICORIO_PAU] = _("Oricorio"), @@ -1298,7 +1298,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING] = _("Cramorant"), [SPECIES_CRAMORANT_GORGING] = _("Cramorant"), diff --git a/src/pokemon.c b/src/pokemon.c index 8e8e60b68..319198425 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -136,7 +136,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(RALTS), SPECIES_TO_HOENN(KIRLIA), SPECIES_TO_HOENN(GARDEVOIR), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(GALLADE), #endif SPECIES_TO_HOENN(SURSKIT), @@ -168,7 +168,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(GRAVELER), SPECIES_TO_HOENN(GOLEM), SPECIES_TO_HOENN(NOSEPASS), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(PROBOPASS), #endif SPECIES_TO_HOENN(SKITTY), @@ -194,7 +194,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(MINUN), SPECIES_TO_HOENN(MAGNEMITE), SPECIES_TO_HOENN(MAGNETON), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(MAGNEZONE), #endif SPECIES_TO_HOENN(VOLTORB), @@ -207,7 +207,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(BELLOSSOM), SPECIES_TO_HOENN(DODUO), SPECIES_TO_HOENN(DODRIO), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(BUDEW), SPECIES_TO_HOENN(ROSELIA), SPECIES_TO_HOENN(ROSERADE), @@ -269,7 +269,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(BANETTE), SPECIES_TO_HOENN(DUSKULL), SPECIES_TO_HOENN(DUSCLOPS), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(DUSKNOIR), SPECIES_TO_HOENN(TROPIUS), SPECIES_TO_HOENN(CHINGLING), @@ -296,12 +296,12 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(HERACROSS), SPECIES_TO_HOENN(RHYHORN), SPECIES_TO_HOENN(RHYDON), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(RHYPERIOR), #endif SPECIES_TO_HOENN(SNORUNT), SPECIES_TO_HOENN(GLALIE), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_HOENN(FROSLASS), #endif SPECIES_TO_HOENN(SPHEAL), @@ -725,7 +725,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(RAYQUAZA), SPECIES_TO_NATIONAL(JIRACHI), SPECIES_TO_NATIONAL(DEOXYS), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE SPECIES_TO_NATIONAL(TURTWIG), SPECIES_TO_NATIONAL(GROTLE), SPECIES_TO_NATIONAL(TORTERRA), @@ -834,7 +834,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SHAYMIN), SPECIES_TO_NATIONAL(ARCEUS), #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE SPECIES_TO_NATIONAL(VICTINI), SPECIES_TO_NATIONAL(SNIVY), SPECIES_TO_NATIONAL(SERVINE), @@ -992,7 +992,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MELOETTA), SPECIES_TO_NATIONAL(GENESECT), #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE SPECIES_TO_NATIONAL(CHESPIN), SPECIES_TO_NATIONAL(QUILLADIN), SPECIES_TO_NATIONAL(CHESNAUGHT), @@ -1066,7 +1066,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(HOOPA), SPECIES_TO_NATIONAL(VOLCANION), #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE SPECIES_TO_NATIONAL(ROWLET), SPECIES_TO_NATIONAL(DARTRIX), SPECIES_TO_NATIONAL(DECIDUEYE), @@ -1156,7 +1156,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MELTAN), SPECIES_TO_NATIONAL(MELMETAL), #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE SPECIES_TO_NATIONAL(GROOKEY), SPECIES_TO_NATIONAL(THWACKEY), SPECIES_TO_NATIONAL(RILLABOOM), @@ -1296,17 +1296,17 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_METAGROSS_MEGA - 1] = NATIONAL_DEX_METAGROSS, [SPECIES_LATIAS_MEGA - 1] = NATIONAL_DEX_LATIAS, [SPECIES_LATIOS_MEGA - 1] = NATIONAL_DEX_LATIOS, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA - 1] = NATIONAL_DEX_LOPUNNY, [SPECIES_GARCHOMP_MEGA - 1] = NATIONAL_DEX_GARCHOMP, [SPECIES_LUCARIO_MEGA - 1] = NATIONAL_DEX_LUCARIO, [SPECIES_ABOMASNOW_MEGA - 1] = NATIONAL_DEX_ABOMASNOW, [SPECIES_GALLADE_MEGA - 1] = NATIONAL_DEX_GALLADE, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA - 1] = NATIONAL_DEX_AUDINO, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA - 1] = NATIONAL_DEX_DIANCIE, #endif // Special Mega + Primals @@ -1348,7 +1348,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_CORSOLA_GALARIAN - 1] = NATIONAL_DEX_CORSOLA, [SPECIES_ZIGZAGOON_GALARIAN - 1] = NATIONAL_DEX_ZIGZAGOON, [SPECIES_LINOONE_GALARIAN - 1] = NATIONAL_DEX_LINOONE, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN - 1] = NATIONAL_DEX_DARUMAKA, [SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK, @@ -1362,19 +1362,19 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_TYPHLOSION_HISUIAN - 1] = NATIONAL_DEX_TYPHLOSION, [SPECIES_QWILFISH_HISUIAN - 1] = NATIONAL_DEX_QWILFISH, [SPECIES_SNEASEL_HISUIAN - 1] = NATIONAL_DEX_SNEASEL, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN - 1] = NATIONAL_DEX_SAMUROTT, [SPECIES_LILLIGANT_HISUIAN - 1] = NATIONAL_DEX_LILLIGANT, [SPECIES_ZORUA_HISUIAN - 1] = NATIONAL_DEX_ZORUA, [SPECIES_ZOROARK_HISUIAN - 1] = NATIONAL_DEX_ZOROARK, [SPECIES_BRAVIARY_HISUIAN - 1] = NATIONAL_DEX_BRAVIARY, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN - 1] = NATIONAL_DEX_SLIGGOO, [SPECIES_GOODRA_HISUIAN - 1] = NATIONAL_DEX_GOODRA, [SPECIES_AVALUGG_HISUIAN - 1] = NATIONAL_DEX_AVALUGG, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, #endif // Cosplay Pikachu @@ -1431,7 +1431,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_DEOXYS_ATTACK - 1] = NATIONAL_DEX_DEOXYS, [SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS, [SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY, [SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY, @@ -1475,7 +1475,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ARCEUS_DARK - 1] = NATIONAL_DEX_ARCEUS, [SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE // Basculin [SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, [SPECIES_BASCULIN_WHITE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, @@ -1507,7 +1507,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_GENESECT_BURN_DRIVE - 1] = NATIONAL_DEX_GENESECT, [SPECIES_GENESECT_CHILL_DRIVE - 1] = NATIONAL_DEX_GENESECT, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE // Greninja [SPECIES_GRENINJA_BATTLE_BOND - 1] = NATIONAL_DEX_GRENINJA, [SPECIES_GRENINJA_ASH - 1] = NATIONAL_DEX_GRENINJA, @@ -1579,7 +1579,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Hoopa [SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE // Oricorio [SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO, [SPECIES_ORICORIO_PAU - 1] = NATIONAL_DEX_ORICORIO, @@ -1632,7 +1632,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR - 1] = NATIONAL_DEX_MAGEARNA, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE // Cramorant [SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT, [SPECIES_CRAMORANT_GORGING - 1] = NATIONAL_DEX_CRAMORANT, @@ -1708,7 +1708,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(RALTS), HOENN_TO_NATIONAL(KIRLIA), HOENN_TO_NATIONAL(GARDEVOIR), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(GALLADE), #endif HOENN_TO_NATIONAL(SURSKIT), @@ -1740,7 +1740,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(GRAVELER), HOENN_TO_NATIONAL(GOLEM), HOENN_TO_NATIONAL(NOSEPASS), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(PROBOPASS), #endif HOENN_TO_NATIONAL(SKITTY), @@ -1766,7 +1766,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(MINUN), HOENN_TO_NATIONAL(MAGNEMITE), HOENN_TO_NATIONAL(MAGNETON), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(MAGNEZONE), #endif HOENN_TO_NATIONAL(VOLTORB), @@ -1779,7 +1779,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(BELLOSSOM), HOENN_TO_NATIONAL(DODUO), HOENN_TO_NATIONAL(DODRIO), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(BUDEW), HOENN_TO_NATIONAL(ROSELIA), HOENN_TO_NATIONAL(ROSERADE), @@ -1841,7 +1841,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(BANETTE), HOENN_TO_NATIONAL(DUSKULL), HOENN_TO_NATIONAL(DUSCLOPS), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(DUSKNOIR), HOENN_TO_NATIONAL(TROPIUS), HOENN_TO_NATIONAL(CHINGLING), @@ -1868,12 +1868,12 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(HERACROSS), HOENN_TO_NATIONAL(RHYHORN), HOENN_TO_NATIONAL(RHYDON), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(RHYPERIOR), #endif HOENN_TO_NATIONAL(SNORUNT), HOENN_TO_NATIONAL(GLALIE), -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE HOENN_TO_NATIONAL(FROSLASS), #endif HOENN_TO_NATIONAL(SPHEAL), @@ -2966,10 +2966,10 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = [SPECIES_SALAMENCE - 1] = 70, [SPECIES_KYOGRE - 1] = 60, [SPECIES_RAYQUAZA - 1] = 60, -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_TAPU_FINI - 1] = 5, #endif -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_ROTOM_FAN - 1] = 7, #endif }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index fe71f51ce..a6088607a 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -413,7 +413,7 @@ const u8 *const gMonIconTable[] = [SPECIES_JIRACHI] = gMonIcon_Jirachi, [SPECIES_DEOXYS] = gMonIcon_Deoxys, [SPECIES_CHIMECHO] = gMonIcon_Chimecho, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_TURTWIG] = gMonIcon_Turtwig, [SPECIES_GROTLE] = gMonIcon_Grotle, [SPECIES_TORTERRA] = gMonIcon_Torterra, @@ -522,7 +522,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SHAYMIN] = gMonIcon_Shaymin, [SPECIES_ARCEUS] = gMonIcon_Arceus, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = gMonIcon_Victini, [SPECIES_SNIVY] = gMonIcon_Snivy, [SPECIES_SERVINE] = gMonIcon_Servine, @@ -680,7 +680,7 @@ const u8 *const gMonIconTable[] = [SPECIES_MELOETTA] = gMonIcon_Meloetta, [SPECIES_GENESECT] = gMonIcon_Genesect, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_CHESPIN] = gMonIcon_Chespin, [SPECIES_QUILLADIN] = gMonIcon_Quilladin, [SPECIES_CHESNAUGHT] = gMonIcon_Chesnaught, @@ -754,7 +754,7 @@ const u8 *const gMonIconTable[] = [SPECIES_HOOPA] = gMonIcon_Hoopa, [SPECIES_VOLCANION] = gMonIcon_Volcanion, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ROWLET] = gMonIcon_Rowlet, [SPECIES_DARTRIX] = gMonIcon_Dartrix, [SPECIES_DECIDUEYE] = gMonIcon_Decidueye, @@ -844,7 +844,7 @@ const u8 *const gMonIconTable[] = [SPECIES_MELTAN] = gMonIcon_Meltan, [SPECIES_MELMETAL] = gMonIcon_Melmetal, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_GROOKEY] = gMonIcon_Grookey, [SPECIES_THWACKEY] = gMonIcon_Thwackey, [SPECIES_RILLABOOM] = gMonIcon_Rillaboom, @@ -982,17 +982,17 @@ const u8 *const gMonIconTable[] = [SPECIES_METAGROSS_MEGA] = gMonIcon_MetagrossMega, [SPECIES_LATIAS_MEGA] = gMonIcon_LatiasMega, [SPECIES_LATIOS_MEGA] = gMonIcon_LatiosMega, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_LOPUNNY_MEGA] = gMonIcon_LopunnyMega, [SPECIES_GARCHOMP_MEGA] = gMonIcon_GarchompMega, [SPECIES_LUCARIO_MEGA] = gMonIcon_LucarioMega, [SPECIES_ABOMASNOW_MEGA] = gMonIcon_AbomasnowMega, [SPECIES_GALLADE_MEGA] = gMonIcon_GalladeMega, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega, #endif [SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega, @@ -1031,7 +1031,7 @@ const u8 *const gMonIconTable[] = [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, @@ -1044,19 +1044,19 @@ const u8 *const gMonIconTable[] = [SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian, [SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian, [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian, [SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian, [SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian, [SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian, [SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, #endif [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, @@ -1107,7 +1107,7 @@ const u8 *const gMonIconTable[] = [SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack, [SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense, [SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak, [SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak, [SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak, @@ -1142,7 +1142,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ARCEUS_DARK] = gMonIcon_Arceus, [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, @@ -1165,7 +1165,7 @@ const u8 *const gMonIconTable[] = [SPECIES_GENESECT_BURN_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_CHILL_DRIVE] = gMonIcon_Genesect, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja, [SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh, [SPECIES_VIVILLON_POLAR] = gMonIcon_VivillonPolar, @@ -1224,7 +1224,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, @@ -1268,7 +1268,7 @@ const u8 *const gMonIconTable[] = [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, @@ -1300,7 +1300,7 @@ const u8 *const gMonIconTable[] = const u8 *const gMonIconTableFemale[] = { [SPECIES_EEVEE] = gMonIcon_Eevee, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_STARLY] = gMonIcon_Starly, [SPECIES_STARAVIA] = gMonIcon_Staravia, [SPECIES_STARAPTOR] = gMonIcon_Staraptor, @@ -1312,15 +1312,15 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, [SPECIES_FRILLISH] = gMonIcon_FrillishF, [SPECIES_JELLICENT] = gMonIcon_JellicentF, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_PYROAR] = gMonIcon_PyroarF, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_BASCULEGION] = gMonIcon_BasculegionF, #endif }; @@ -2357,7 +2357,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DEOXYS_ATTACK] = 0, [SPECIES_DEOXYS_DEFENSE] = 0, [SPECIES_DEOXYS_SPEED] = 0, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = 1, [SPECIES_BURMY_TRASH_CLOAK] = 0, [SPECIES_WORMADAM_SANDY_CLOAK] = 1, @@ -2392,7 +2392,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARCEUS_DARK] = 1, [SPECIES_ARCEUS_FAIRY] = 1, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_BASCULIN_BLUE_STRIPED] = 0, [SPECIES_BASCULIN_WHITE_STRIPED] = 0, [SPECIES_DARMANITAN_ZEN_MODE] = 0, @@ -2415,7 +2415,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_GENESECT_BURN_DRIVE] = 2, [SPECIES_GENESECT_CHILL_DRIVE] = 2, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_GRENINJA_BATTLE_BOND] = 0, [SPECIES_GRENINJA_ASH] = 0, [SPECIES_VIVILLON_POLAR] = 0, @@ -2474,7 +2474,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZYGARDE_COMPLETE] = 1, [SPECIES_HOOPA_UNBOUND] = 0, #endif -#if P_NEW_POKEMON >= GEN_7 +#if P_GEN_7_POKEMON == TRUE [SPECIES_ORICORIO_POM_POM] = 1, [SPECIES_ORICORIO_PAU] = 1, [SPECIES_ORICORIO_SENSU] = 0, @@ -2512,7 +2512,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_NECROZMA_ULTRA] = 2, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_CRAMORANT_GULPING] = 0, [SPECIES_CRAMORANT_GORGING] = 0, [SPECIES_TOXTRICITY_LOW_KEY] = 2, @@ -2544,7 +2544,7 @@ const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndicesFemale[] = { [SPECIES_EEVEE] = 2, -#if P_NEW_POKEMON >= GEN_4 +#if P_GEN_4_POKEMON == TRUE [SPECIES_STARLY] = 0, [SPECIES_STARAVIA] = 0, [SPECIES_BIDOOF] = 2, @@ -2555,15 +2555,15 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1, #endif -#if P_NEW_POKEMON >= GEN_5 +#if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = 1, [SPECIES_FRILLISH] = 1, [SPECIES_JELLICENT] = 1, #endif -#if P_NEW_POKEMON >= GEN_6 +#if P_GEN_6_POKEMON == TRUE [SPECIES_PYROAR] = 2, #endif -#if P_NEW_POKEMON >= GEN_8 +#if P_GEN_8_POKEMON == TRUE [SPECIES_BASCULEGION] = 0, #endif };