diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 6b6582af0..93306a7c3 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -2,7 +2,7 @@ #define GUARD_CONSTANTS_POKEDEX_H #include "constants/pokemon_config.h" -// National Pokedex order. Gen 4+ mons and forms are not disabled by P_NEW_POKEMON to keep pokedex_orders.h clean. +// National Pokedex order. Gen 4+ mon are not disabled by P_NEW_POKEMON to keep pokedex_orders.h clean. enum { NATIONAL_DEX_NONE, // Kanto @@ -923,8 +923,16 @@ enum { #define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI -#if P_NEW_POKEMON == TRUE +#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 #else #define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS #endif @@ -964,7 +972,7 @@ enum { HOENN_DEX_RALTS, HOENN_DEX_KIRLIA, HOENN_DEX_GARDEVOIR, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_GALLADE, #endif HOENN_DEX_SURSKIT, @@ -996,7 +1004,7 @@ enum { HOENN_DEX_GRAVELER, HOENN_DEX_GOLEM, HOENN_DEX_NOSEPASS, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_PROBOPASS, #endif HOENN_DEX_SKITTY, @@ -1022,7 +1030,7 @@ enum { HOENN_DEX_MINUN, HOENN_DEX_MAGNEMITE, HOENN_DEX_MAGNETON, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_MAGNEZONE, #endif HOENN_DEX_VOLTORB, @@ -1035,7 +1043,7 @@ enum { HOENN_DEX_BELLOSSOM, HOENN_DEX_DODUO, HOENN_DEX_DODRIO, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_BUDEW, HOENN_DEX_ROSELIA, HOENN_DEX_ROSERADE, @@ -1097,7 +1105,7 @@ enum { HOENN_DEX_BANETTE, HOENN_DEX_DUSKULL, HOENN_DEX_DUSCLOPS, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_DUSKNOIR, HOENN_DEX_TROPIUS, HOENN_DEX_CHINGLING, @@ -1124,12 +1132,12 @@ enum { HOENN_DEX_HERACROSS, HOENN_DEX_RHYHORN, HOENN_DEX_RHYDON, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_RHYPERIOR, #endif HOENN_DEX_SNORUNT, HOENN_DEX_GLALIE, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_DEX_FROSLASS, #endif HOENN_DEX_SPHEAL, diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 879b75564..830975500 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -19,7 +19,7 @@ #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 TRUE // Turning this to FALSE will remove all newly added Pokémon and Forms. Only Unown, Castform and Deoxys forms will remain. +#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. #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/constants/species.h b/include/constants/species.h index 976b30302..18e3138ce 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1046,7 +1046,6 @@ // Pichu #define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118 -#if P_NEW_POKEMON == TRUE // Unown #define SPECIES_UNOWN_B FORMS_START + 119 #define SPECIES_UNOWN_C FORMS_START + 120 @@ -1086,47 +1085,6 @@ #define SPECIES_DEOXYS_DEFENSE FORMS_START + 150 #define SPECIES_DEOXYS_SPEED FORMS_START + 151 -#else -// Unown -#define SPECIES_UNOWN_B FORMS_START + 1 -#define SPECIES_UNOWN_C FORMS_START + 2 -#define SPECIES_UNOWN_D FORMS_START + 3 -#define SPECIES_UNOWN_E FORMS_START + 4 -#define SPECIES_UNOWN_F FORMS_START + 5 -#define SPECIES_UNOWN_G FORMS_START + 6 -#define SPECIES_UNOWN_H FORMS_START + 7 -#define SPECIES_UNOWN_I FORMS_START + 8 -#define SPECIES_UNOWN_J FORMS_START + 9 -#define SPECIES_UNOWN_K FORMS_START + 10 -#define SPECIES_UNOWN_L FORMS_START + 11 -#define SPECIES_UNOWN_M FORMS_START + 12 -#define SPECIES_UNOWN_N FORMS_START + 13 -#define SPECIES_UNOWN_O FORMS_START + 14 -#define SPECIES_UNOWN_P FORMS_START + 15 -#define SPECIES_UNOWN_Q FORMS_START + 16 -#define SPECIES_UNOWN_R FORMS_START + 17 -#define SPECIES_UNOWN_S FORMS_START + 18 -#define SPECIES_UNOWN_T FORMS_START + 19 -#define SPECIES_UNOWN_U FORMS_START + 20 -#define SPECIES_UNOWN_V FORMS_START + 21 -#define SPECIES_UNOWN_W FORMS_START + 22 -#define SPECIES_UNOWN_X FORMS_START + 23 -#define SPECIES_UNOWN_Y FORMS_START + 24 -#define SPECIES_UNOWN_Z FORMS_START + 25 -#define SPECIES_UNOWN_EMARK FORMS_START + 26 -#define SPECIES_UNOWN_QMARK FORMS_START + 27 - -// Castform -#define SPECIES_CASTFORM_SUNNY FORMS_START + 28 -#define SPECIES_CASTFORM_RAINY FORMS_START + 29 -#define SPECIES_CASTFORM_SNOWY FORMS_START + 30 - -// Deoxys -#define SPECIES_DEOXYS_ATTACK FORMS_START + 31 -#define SPECIES_DEOXYS_DEFENSE FORMS_START + 32 -#define SPECIES_DEOXYS_SPEED FORMS_START + 33 -#endif - // Burmy #define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152 #define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153 @@ -1412,13 +1370,8 @@ #define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327 #define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328 -#if P_NEW_POKEMON == TRUE #define FORMS_START SPECIES_ENAMORUS #define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1 -#else -#define FORMS_START SPECIES_DEOXYS -#define SPECIES_EGG SPECIES_DEOXYS_SPEED + 1 -#endif #define NUM_SPECIES SPECIES_EGG diff --git a/include/graphics.h b/include/graphics.h index 65857e5e3..d41318c06 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonFrontPic_Turtwig[]; extern const u32 gMonFrontPic_Grotle[]; extern const u32 gMonFrontPic_Torterra[]; @@ -571,6 +571,8 @@ extern const u32 gMonFrontPic_Manaphy[]; extern const u32 gMonFrontPic_Darkrai[]; extern const u32 gMonFrontPic_Shaymin[]; extern const u32 gMonFrontPic_Arceus[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonFrontPic_Victini[]; extern const u32 gMonFrontPic_Snivy[]; extern const u32 gMonFrontPic_Servine[]; @@ -730,6 +732,8 @@ extern const u32 gMonFrontPic_Kyurem[]; extern const u32 gMonFrontPic_Keldeo[]; extern const u32 gMonFrontPic_Meloetta[]; extern const u32 gMonFrontPic_Genesect[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonFrontPic_Chespin[]; extern const u32 gMonFrontPic_Quilladin[]; extern const u32 gMonFrontPic_Chesnaught[]; @@ -803,6 +807,8 @@ extern const u32 gMonFrontPic_Zygarde[]; extern const u32 gMonFrontPic_Diancie[]; extern const u32 gMonFrontPic_Hoopa[]; extern const u32 gMonFrontPic_Volcanion[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonFrontPic_Rowlet[]; extern const u32 gMonFrontPic_Dartrix[]; extern const u32 gMonFrontPic_Decidueye[]; @@ -891,6 +897,8 @@ extern const u32 gMonFrontPic_Blacephalon[]; extern const u32 gMonFrontPic_Zeraora[]; extern const u32 gMonFrontPic_Meltan[]; extern const u32 gMonFrontPic_Melmetal[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonFrontPic_Grookey[]; extern const u32 gMonFrontPic_Thwackey[]; extern const u32 gMonFrontPic_Rillaboom[]; @@ -988,6 +996,7 @@ extern const u32 gMonFrontPic_Ursaluna[]; //extern const u32 gMonFrontPic_Sneasler[]; extern const u32 gMonFrontPic_Overqwil[]; //extern const u32 gMonFrontPic_Enamorus[]; +#endif extern const u32 gMonFrontPic_VenusaurMega[]; extern const u32 gMonFrontPic_CharizardMegaX[]; extern const u32 gMonFrontPic_CharizardMegaY[]; @@ -1028,13 +1037,19 @@ 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 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 extern const u32 gMonFrontPic_AudinoMega[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonFrontPic_DiancieMega[]; +#endif extern const u32 gMonFrontPic_RayquazaMega[]; extern const u32 gMonFrontPic_KyogrePrimal[]; extern const u32 gMonFrontPic_GroudonPrimal[]; @@ -1071,10 +1086,12 @@ 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 extern const u32 gMonFrontPic_DarumakaGalarian[]; extern const u32 gMonFrontPic_DarmanitanGalarian[]; extern const u32 gMonFrontPic_YamaskGalarian[]; extern const u32 gMonFrontPic_StunfiskGalarian[]; +#endif extern const u32 gMonFrontPic_GrowlitheHisuian[]; extern const u32 gMonFrontPic_ArcanineHisuian[]; extern const u32 gMonFrontPic_VoltorbHisuian[]; @@ -1082,15 +1099,21 @@ 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 //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 extern const u32 gMonFrontPic_SliggooHisuian[]; extern const u32 gMonFrontPic_GoodraHisuian[]; extern const u32 gMonFrontPic_AvaluggHisuian[]; +#endif +#if P_NEW_POKEMON >= GEN_7 //extern const u32 gMonFrontPic_DecidueyeHisuian[]; +#endif extern const u32 gMonFrontPic_PikachuCosplay[]; extern const u32 gMonFrontPic_PikachuRockStar[]; extern const u32 gMonFrontPic_PikachuBelle[]; @@ -1106,7 +1129,6 @@ extern const u32 gMonFrontPic_PikachuAlolaCap[]; extern const u32 gMonFrontPic_PikachuPartnerCap[]; extern const u32 gMonFrontPic_PikachuWorldCap[]; extern const u32 gMonFrontPic_PichuSpikyEared[]; -#endif extern const u32 gMonFrontPic_UnownB[]; extern const u32 gMonFrontPic_UnownC[]; extern const u32 gMonFrontPic_UnownD[]; @@ -1140,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonFrontPic_BurmySandyCloak[]; extern const u32 gMonFrontPic_BurmyTrashCloak[]; extern const u32 gMonFrontPic_WormadamSandyCloak[]; @@ -1157,6 +1179,8 @@ extern const u32 gMonFrontPic_DialgaOrigin[]; extern const u32 gMonFrontPic_PalkiaOrigin[]; extern const u32 gMonFrontPic_GiratinaOrigin[]; extern const u32 gMonFrontPic_ShayminSky[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonFrontPic_BasculinBlueStriped[]; extern const u32 gMonFrontPic_BasculinWhiteStriped[]; extern const u32 gMonFrontPic_DarmanitanZenMode[]; @@ -1167,11 +1191,14 @@ extern const u32 gMonFrontPic_SawsbuckWinter[]; extern const u32 gMonFrontPic_TornadusTherian[]; extern const u32 gMonFrontPic_ThundurusTherian[]; extern const u32 gMonFrontPic_LandorusTherian[]; -//extern const u32 gMonFrontPic_EnamorusTherian[]; +#endif +#if P_NEW_POKEMON >= GEN_5 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 extern const u32 gMonFrontPic_GreninjaAsh[]; extern const u32 gMonFrontPic_VivillonPolar[]; extern const u32 gMonFrontPic_VivillonTundra[]; @@ -1214,6 +1241,8 @@ extern const u32 gMonFrontPic_XerneasActive[]; extern const u32 gMonFrontPic_Zygarde10[]; extern const u32 gMonFrontPic_ZygardeComplete[]; extern const u32 gMonFrontPic_HoopaUnbound[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonFrontPic_OricorioPomPom[]; extern const u32 gMonFrontPic_OricorioPau[]; extern const u32 gMonFrontPic_OricorioSensu[]; @@ -1226,6 +1255,8 @@ extern const u32 gMonFrontPic_NecrozmaDuskMane[]; extern const u32 gMonFrontPic_NecrozmaDawnWings[]; extern const u32 gMonFrontPic_NecrozmaUltra[]; extern const u32 gMonFrontPic_MagearnaOriginalColor[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonFrontPic_CramorantGulping[]; extern const u32 gMonFrontPic_CramorantGorging[]; extern const u32 gMonFrontPic_ToxtricityLowKey[]; @@ -1247,6 +1278,7 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonFrontPic_ZarudeDada[]; extern const u32 gMonFrontPic_CalyrexIceRider[]; extern const u32 gMonFrontPic_CalyrexShadowRider[]; +//extern const u32 gMonFrontPic_EnamorusTherian[]; #endif extern const u32 gMonFrontPic_Egg[]; @@ -1639,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonBackPic_Turtwig[]; extern const u32 gMonBackPic_Grotle[]; extern const u32 gMonBackPic_Torterra[]; @@ -1755,6 +1787,8 @@ extern const u32 gMonBackPic_Manaphy[]; extern const u32 gMonBackPic_Darkrai[]; extern const u32 gMonBackPic_Shaymin[]; extern const u32 gMonBackPic_Arceus[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonBackPic_Victini[]; extern const u32 gMonBackPic_Snivy[]; extern const u32 gMonBackPic_Servine[]; @@ -1914,6 +1948,8 @@ extern const u32 gMonBackPic_Kyurem[]; extern const u32 gMonBackPic_Keldeo[]; extern const u32 gMonBackPic_Meloetta[]; extern const u32 gMonBackPic_Genesect[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonBackPic_Chespin[]; extern const u32 gMonBackPic_Quilladin[]; extern const u32 gMonBackPic_Chesnaught[]; @@ -1987,6 +2023,8 @@ extern const u32 gMonBackPic_Zygarde[]; extern const u32 gMonBackPic_Diancie[]; extern const u32 gMonBackPic_Hoopa[]; extern const u32 gMonBackPic_Volcanion[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonBackPic_Rowlet[]; extern const u32 gMonBackPic_Dartrix[]; extern const u32 gMonBackPic_Decidueye[]; @@ -2075,6 +2113,8 @@ extern const u32 gMonBackPic_Blacephalon[]; extern const u32 gMonBackPic_Zeraora[]; extern const u32 gMonBackPic_Meltan[]; extern const u32 gMonBackPic_Melmetal[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonBackPic_Grookey[]; extern const u32 gMonBackPic_Thwackey[]; extern const u32 gMonBackPic_Rillaboom[]; @@ -2172,6 +2212,7 @@ extern const u32 gMonBackPic_Ursaluna[]; //extern const u32 gMonBackPic_Sneasler[]; extern const u32 gMonBackPic_Overqwil[]; //extern const u32 gMonBackPic_Enamorus[]; +#endif extern const u32 gMonBackPic_VenusaurMega[]; extern const u32 gMonBackPic_CharizardMegaX[]; extern const u32 gMonBackPic_CharizardMegaY[]; @@ -2212,13 +2253,19 @@ 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 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 extern const u32 gMonBackPic_AudinoMega[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonBackPic_DiancieMega[]; +#endif extern const u32 gMonBackPic_RayquazaMega[]; extern const u32 gMonBackPic_KyogrePrimal[]; extern const u32 gMonBackPic_GroudonPrimal[]; @@ -2255,10 +2302,12 @@ 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 extern const u32 gMonBackPic_DarumakaGalarian[]; extern const u32 gMonBackPic_DarmanitanGalarian[]; extern const u32 gMonBackPic_YamaskGalarian[]; extern const u32 gMonBackPic_StunfiskGalarian[]; +#endif extern const u32 gMonBackPic_GrowlitheHisuian[]; extern const u32 gMonBackPic_ArcanineHisuian[]; extern const u32 gMonBackPic_VoltorbHisuian[]; @@ -2266,15 +2315,21 @@ 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 //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 extern const u32 gMonBackPic_SliggooHisuian[]; extern const u32 gMonBackPic_GoodraHisuian[]; extern const u32 gMonBackPic_AvaluggHisuian[]; +#endif +#if P_NEW_POKEMON >= GEN_7 //extern const u32 gMonBackPic_DecidueyeHisuian[]; +#endif extern const u32 gMonBackPic_PikachuCosplay[]; extern const u32 gMonBackPic_PikachuRockStar[]; extern const u32 gMonBackPic_PikachuBelle[]; @@ -2290,7 +2345,6 @@ extern const u32 gMonBackPic_PikachuAlolaCap[]; extern const u32 gMonBackPic_PikachuPartnerCap[]; extern const u32 gMonBackPic_PikachuWorldCap[]; extern const u32 gMonBackPic_PichuSpikyEared[]; -#endif extern const u32 gMonBackPic_UnownB[]; extern const u32 gMonBackPic_UnownC[]; extern const u32 gMonBackPic_UnownD[]; @@ -2324,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonBackPic_BurmySandyCloak[]; extern const u32 gMonBackPic_BurmyTrashCloak[]; extern const u32 gMonBackPic_WormadamSandyCloak[]; @@ -2341,6 +2395,8 @@ extern const u32 gMonBackPic_DialgaOrigin[]; extern const u32 gMonBackPic_PalkiaOrigin[]; extern const u32 gMonBackPic_GiratinaOrigin[]; extern const u32 gMonBackPic_ShayminSky[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonBackPic_BasculinBlueStriped[]; extern const u32 gMonBackPic_BasculinWhiteStriped[]; extern const u32 gMonBackPic_DarmanitanZenMode[]; @@ -2351,11 +2407,12 @@ extern const u32 gMonBackPic_SawsbuckWinter[]; extern const u32 gMonBackPic_TornadusTherian[]; extern const u32 gMonBackPic_ThundurusTherian[]; extern const u32 gMonBackPic_LandorusTherian[]; -//extern const u32 gMonBackPic_EnamorusTherian[]; extern const u32 gMonBackPic_KyuremWhite[]; extern const u32 gMonBackPic_KyuremBlack[]; extern const u32 gMonBackPic_KeldeoResolute[]; extern const u32 gMonBackPic_MeloettaPirouette[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonBackPic_GreninjaAsh[]; extern const u32 gMonBackPic_VivillonPolar[]; extern const u32 gMonBackPic_VivillonTundra[]; @@ -2398,6 +2455,8 @@ extern const u32 gMonBackPic_XerneasActive[]; extern const u32 gMonBackPic_Zygarde10[]; extern const u32 gMonBackPic_ZygardeComplete[]; extern const u32 gMonBackPic_HoopaUnbound[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonBackPic_OricorioPomPom[]; extern const u32 gMonBackPic_OricorioPau[]; extern const u32 gMonBackPic_OricorioSensu[]; @@ -2410,6 +2469,8 @@ extern const u32 gMonBackPic_NecrozmaDuskMane[]; extern const u32 gMonBackPic_NecrozmaDawnWings[]; extern const u32 gMonBackPic_NecrozmaUltra[]; extern const u32 gMonBackPic_MagearnaOriginalColor[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonBackPic_CramorantGulping[]; extern const u32 gMonBackPic_CramorantGorging[]; extern const u32 gMonBackPic_ToxtricityLowKey[]; @@ -2431,6 +2492,7 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonBackPic_ZarudeDada[]; extern const u32 gMonBackPic_CalyrexIceRider[]; extern const u32 gMonBackPic_CalyrexShadowRider[]; +//extern const u32 gMonBackPic_EnamorusTherian[]; #endif extern const u32 gMonPalette_CircledQuestionMark[]; @@ -2821,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonPalette_Turtwig[]; extern const u32 gMonPalette_Grotle[]; extern const u32 gMonPalette_Torterra[]; @@ -2931,6 +2993,8 @@ extern const u32 gMonPalette_Manaphy[]; extern const u32 gMonPalette_Darkrai[]; extern const u32 gMonPalette_Shaymin[]; extern const u32 gMonPalette_Arceus[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonPalette_Victini[]; extern const u32 gMonPalette_Snivy[]; extern const u32 gMonPalette_Servine[]; @@ -3090,6 +3154,8 @@ extern const u32 gMonPalette_Kyurem[]; extern const u32 gMonPalette_Keldeo[]; extern const u32 gMonPalette_Meloetta[]; extern const u32 gMonPalette_Genesect[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonPalette_Chespin[]; extern const u32 gMonPalette_Quilladin[]; extern const u32 gMonPalette_Chesnaught[]; @@ -3163,6 +3229,8 @@ extern const u32 gMonPalette_Zygarde[]; extern const u32 gMonPalette_Diancie[]; extern const u32 gMonPalette_Hoopa[]; extern const u32 gMonPalette_Volcanion[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonPalette_Rowlet[]; extern const u32 gMonPalette_Dartrix[]; extern const u32 gMonPalette_Decidueye[]; @@ -3251,6 +3319,8 @@ extern const u32 gMonPalette_Blacephalon[]; extern const u32 gMonPalette_Zeraora[]; extern const u32 gMonPalette_Meltan[]; extern const u32 gMonPalette_Melmetal[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonPalette_Grookey[]; extern const u32 gMonPalette_Thwackey[]; extern const u32 gMonPalette_Rillaboom[]; @@ -3348,6 +3418,7 @@ extern const u32 gMonPalette_Ursaluna[]; //extern const u32 gMonPalette_Sneasler[]; extern const u32 gMonPalette_Overqwil[]; //extern const u32 gMonPalette_Enamorus[]; +#endif extern const u32 gMonPalette_VenusaurMega[]; extern const u32 gMonPalette_CharizardMegaX[]; extern const u32 gMonPalette_CharizardMegaY[]; @@ -3388,13 +3459,19 @@ 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 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 extern const u32 gMonPalette_AudinoMega[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonPalette_DiancieMega[]; +#endif extern const u32 gMonPalette_RayquazaMega[]; extern const u32 gMonPalette_KyogrePrimal[]; extern const u32 gMonPalette_GroudonPrimal[]; @@ -3431,10 +3508,12 @@ 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 extern const u32 gMonPalette_DarumakaGalarian[]; extern const u32 gMonPalette_DarmanitanGalarian[]; extern const u32 gMonPalette_YamaskGalarian[]; extern const u32 gMonPalette_StunfiskGalarian[]; +#endif extern const u32 gMonPalette_GrowlitheHisuian[]; extern const u32 gMonPalette_ArcanineHisuian[]; extern const u32 gMonPalette_VoltorbHisuian[]; @@ -3442,15 +3521,21 @@ 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 //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 extern const u32 gMonPalette_SliggooHisuian[]; extern const u32 gMonPalette_GoodraHisuian[]; extern const u32 gMonPalette_AvaluggHisuian[]; +#endif +#if P_NEW_POKEMON >= GEN_7 //extern const u32 gMonPalette_DecidueyeHisuian[]; +#endif extern const u32 gMonPalette_PikachuCosplay[]; extern const u32 gMonPalette_PikachuRockStar[]; extern const u32 gMonPalette_PikachuBelle[]; @@ -3466,14 +3551,13 @@ extern const u32 gMonPalette_PikachuAlolaCap[]; extern const u32 gMonPalette_PikachuPartnerCap[]; extern const u32 gMonPalette_PikachuWorldCap[]; extern const u32 gMonPalette_PichuSpikyEared[]; -#endif extern const u32 gMonPalette_CastformSunny[]; extern const u32 gMonPalette_CastformRainy[]; extern const u32 gMonPalette_CastformSnowy[]; extern const u32 gMonPalette_DeoxysAttack[]; extern const u32 gMonPalette_DeoxysDefense[]; extern const u32 gMonPalette_DeoxysSpeed[]; -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonPalette_BurmySandyCloak[]; extern const u32 gMonPalette_BurmyTrashCloak[]; extern const u32 gMonPalette_WormadamSandyCloak[]; @@ -3507,6 +3591,8 @@ extern const u32 gMonPalette_ArceusIce[]; extern const u32 gMonPalette_ArceusDragon[]; extern const u32 gMonPalette_ArceusDark[]; extern const u32 gMonPalette_ArceusFairy[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonPalette_BasculinBlueStriped[]; extern const u32 gMonPalette_BasculinWhiteStriped[]; extern const u32 gMonPalette_DarmanitanZenMode[]; @@ -3520,7 +3606,6 @@ extern const u32 gMonPalette_SawsbuckWinter[]; extern const u32 gMonPalette_TornadusTherian[]; extern const u32 gMonPalette_ThundurusTherian[]; extern const u32 gMonPalette_LandorusTherian[]; -//extern const u32 gMonPalette_EnamorusTherian[]; extern const u32 gMonPalette_KyuremWhite[]; extern const u32 gMonPalette_KyuremBlack[]; extern const u32 gMonPalette_KeldeoResolute[]; @@ -3529,6 +3614,8 @@ extern const u32 gMonPalette_GenesectDouseDrive[]; extern const u32 gMonPalette_GenesectShockDrive[]; extern const u32 gMonPalette_GenesectBurnDrive[]; extern const u32 gMonPalette_GenesectChillDrive[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonPalette_GreninjaAsh[]; extern const u32 gMonPalette_VivillonPolar[]; extern const u32 gMonPalette_VivillonTundra[]; @@ -3577,6 +3664,8 @@ extern const u32 gMonPalette_XerneasActive[]; extern const u32 gMonPalette_Zygarde10[]; extern const u32 gMonPalette_ZygardeComplete[]; extern const u32 gMonPalette_HoopaUnbound[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonPalette_OricorioPomPom[]; extern const u32 gMonPalette_OricorioPau[]; extern const u32 gMonPalette_OricorioSensu[]; @@ -3612,6 +3701,8 @@ extern const u32 gMonPalette_NecrozmaDuskMane[]; extern const u32 gMonPalette_NecrozmaDawnWings[]; extern const u32 gMonPalette_NecrozmaUltra[]; extern const u32 gMonPalette_MagearnaOriginalColor[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonPalette_CramorantGulping[]; extern const u32 gMonPalette_CramorantGorging[]; extern const u32 gMonPalette_ToxtricityLowKey[]; @@ -3633,6 +3724,7 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonPalette_ZarudeDada[]; extern const u32 gMonPalette_CalyrexIceRider[]; extern const u32 gMonPalette_CalyrexShadowRider[]; +//extern const u32 gMonPalette_EnamorusTherian[]; #endif extern const u32 gMonPalette_Egg[]; @@ -4024,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonShinyPalette_Turtwig[]; extern const u32 gMonShinyPalette_Grotle[]; extern const u32 gMonShinyPalette_Torterra[]; @@ -4135,6 +4227,8 @@ extern const u32 gMonShinyPalette_Manaphy[]; extern const u32 gMonShinyPalette_Darkrai[]; extern const u32 gMonShinyPalette_Shaymin[]; extern const u32 gMonShinyPalette_Arceus[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonShinyPalette_Victini[]; extern const u32 gMonShinyPalette_Snivy[]; extern const u32 gMonShinyPalette_Servine[]; @@ -4294,6 +4388,8 @@ extern const u32 gMonShinyPalette_Kyurem[]; extern const u32 gMonShinyPalette_Keldeo[]; extern const u32 gMonShinyPalette_Meloetta[]; extern const u32 gMonShinyPalette_Genesect[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonShinyPalette_Chespin[]; extern const u32 gMonShinyPalette_Quilladin[]; extern const u32 gMonShinyPalette_Chesnaught[]; @@ -4367,6 +4463,8 @@ extern const u32 gMonShinyPalette_Zygarde[]; extern const u32 gMonShinyPalette_Diancie[]; extern const u32 gMonShinyPalette_Hoopa[]; extern const u32 gMonShinyPalette_Volcanion[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonShinyPalette_Rowlet[]; extern const u32 gMonShinyPalette_Dartrix[]; extern const u32 gMonShinyPalette_Decidueye[]; @@ -4455,6 +4553,8 @@ extern const u32 gMonShinyPalette_Blacephalon[]; extern const u32 gMonShinyPalette_Zeraora[]; extern const u32 gMonShinyPalette_Meltan[]; extern const u32 gMonShinyPalette_Melmetal[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonShinyPalette_Grookey[]; extern const u32 gMonShinyPalette_Thwackey[]; extern const u32 gMonShinyPalette_Rillaboom[]; @@ -4552,6 +4652,7 @@ extern const u32 gMonShinyPalette_Ursaluna[]; //extern const u32 gMonShinyPalette_Sneasler[]; extern const u32 gMonShinyPalette_Overqwil[]; //extern const u32 gMonShinyPalette_Enamorus[]; +#endif extern const u32 gMonShinyPalette_VenusaurMega[]; extern const u32 gMonShinyPalette_CharizardMegaX[]; extern const u32 gMonShinyPalette_CharizardMegaY[]; @@ -4592,13 +4693,19 @@ 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 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 extern const u32 gMonShinyPalette_AudinoMega[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonShinyPalette_DiancieMega[]; +#endif extern const u32 gMonShinyPalette_RayquazaMega[]; extern const u32 gMonShinyPalette_KyogrePrimal[]; extern const u32 gMonShinyPalette_GroudonPrimal[]; @@ -4635,10 +4742,12 @@ 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 extern const u32 gMonShinyPalette_DarumakaGalarian[]; extern const u32 gMonShinyPalette_DarmanitanGalarian[]; extern const u32 gMonShinyPalette_YamaskGalarian[]; extern const u32 gMonShinyPalette_StunfiskGalarian[]; +#endif extern const u32 gMonShinyPalette_GrowlitheHisuian[]; extern const u32 gMonShinyPalette_ArcanineHisuian[]; extern const u32 gMonShinyPalette_VoltorbHisuian[]; @@ -4646,15 +4755,21 @@ 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 //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 extern const u32 gMonShinyPalette_SliggooHisuian[]; extern const u32 gMonShinyPalette_GoodraHisuian[]; extern const u32 gMonShinyPalette_AvaluggHisuian[]; +#endif +#if P_NEW_POKEMON >= GEN_7 //extern const u32 gMonShinyPalette_DecidueyeHisuian[]; +#endif extern const u32 gMonShinyPalette_PikachuCosplay[]; extern const u32 gMonShinyPalette_PikachuRockStar[]; extern const u32 gMonShinyPalette_PikachuBelle[]; @@ -4670,14 +4785,13 @@ extern const u32 gMonShinyPalette_PikachuAlolaCap[]; extern const u32 gMonShinyPalette_PikachuPartnerCap[]; extern const u32 gMonShinyPalette_PikachuWorldCap[]; extern const u32 gMonShinyPalette_PichuSpikyEared[]; -#endif extern const u32 gMonShinyPalette_CastformSunny[]; extern const u32 gMonShinyPalette_CastformRainy[]; extern const u32 gMonShinyPalette_CastformSnowy[]; extern const u32 gMonShinyPalette_DeoxysAttack[]; extern const u32 gMonShinyPalette_DeoxysDefense[]; extern const u32 gMonShinyPalette_DeoxysSpeed[]; -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u32 gMonShinyPalette_BurmySandyCloak[]; extern const u32 gMonShinyPalette_BurmyTrashCloak[]; extern const u32 gMonShinyPalette_WormadamSandyCloak[]; @@ -4711,6 +4825,8 @@ extern const u32 gMonShinyPalette_ArceusIce[]; extern const u32 gMonShinyPalette_ArceusDragon[]; extern const u32 gMonShinyPalette_ArceusDark[]; extern const u32 gMonShinyPalette_ArceusFairy[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u32 gMonShinyPalette_BasculinBlueStriped[]; extern const u32 gMonShinyPalette_BasculinWhiteStriped[]; extern const u32 gMonShinyPalette_DarmanitanZenMode[]; @@ -4724,7 +4840,6 @@ extern const u32 gMonShinyPalette_SawsbuckWinter[]; extern const u32 gMonShinyPalette_TornadusTherian[]; extern const u32 gMonShinyPalette_ThundurusTherian[]; extern const u32 gMonShinyPalette_LandorusTherian[]; -//extern const u32 gMonShinyPalette_EnamorusTherian[]; extern const u32 gMonShinyPalette_KyuremWhite[]; extern const u32 gMonShinyPalette_KyuremBlack[]; extern const u32 gMonShinyPalette_KeldeoResolute[]; @@ -4733,6 +4848,8 @@ extern const u32 gMonShinyPalette_GenesectDouseDrive[]; extern const u32 gMonShinyPalette_GenesectShockDrive[]; extern const u32 gMonShinyPalette_GenesectBurnDrive[]; extern const u32 gMonShinyPalette_GenesectChillDrive[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u32 gMonShinyPalette_GreninjaAsh[]; extern const u32 gMonShinyPalette_VivillonPolar[]; extern const u32 gMonShinyPalette_VivillonTundra[]; @@ -4781,6 +4898,8 @@ extern const u32 gMonShinyPalette_XerneasActive[]; extern const u32 gMonShinyPalette_Zygarde10[]; extern const u32 gMonShinyPalette_ZygardeComplete[]; extern const u32 gMonShinyPalette_HoopaUnbound[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u32 gMonShinyPalette_OricorioPomPom[]; extern const u32 gMonShinyPalette_OricorioPau[]; extern const u32 gMonShinyPalette_OricorioSensu[]; @@ -4810,6 +4929,8 @@ extern const u32 gMonShinyPalette_NecrozmaDuskMane[]; extern const u32 gMonShinyPalette_NecrozmaDawnWings[]; extern const u32 gMonShinyPalette_NecrozmaUltra[]; extern const u32 gMonShinyPalette_MagearnaOriginalColor[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u32 gMonShinyPalette_CramorantGulping[]; extern const u32 gMonShinyPalette_CramorantGorging[]; extern const u32 gMonShinyPalette_ToxtricityLowKey[]; @@ -4831,6 +4952,7 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonShinyPalette_ZarudeDada[]; extern const u32 gMonShinyPalette_CalyrexIceRider[]; extern const u32 gMonShinyPalette_CalyrexShadowRider[]; +//extern const u32 gMonShinyPalette_EnamorusTherian[]; #endif extern const u8 gMonIcon_QuestionMark[]; @@ -5220,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u8 gMonIcon_Turtwig[]; extern const u8 gMonIcon_Grotle[]; extern const u8 gMonIcon_Torterra[]; @@ -5328,6 +5450,8 @@ extern const u8 gMonIcon_Manaphy[]; extern const u8 gMonIcon_Darkrai[]; extern const u8 gMonIcon_Shaymin[]; extern const u8 gMonIcon_Arceus[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u8 gMonIcon_Victini[]; extern const u8 gMonIcon_Snivy[]; extern const u8 gMonIcon_Servine[]; @@ -5487,6 +5611,8 @@ extern const u8 gMonIcon_Kyurem[]; extern const u8 gMonIcon_Keldeo[]; extern const u8 gMonIcon_Meloetta[]; extern const u8 gMonIcon_Genesect[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u8 gMonIcon_Chespin[]; extern const u8 gMonIcon_Quilladin[]; extern const u8 gMonIcon_Chesnaught[]; @@ -5560,6 +5686,8 @@ extern const u8 gMonIcon_Zygarde[]; extern const u8 gMonIcon_Diancie[]; extern const u8 gMonIcon_Hoopa[]; extern const u8 gMonIcon_Volcanion[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u8 gMonIcon_Rowlet[]; extern const u8 gMonIcon_Dartrix[]; extern const u8 gMonIcon_Decidueye[]; @@ -5648,6 +5776,8 @@ extern const u8 gMonIcon_Blacephalon[]; extern const u8 gMonIcon_Zeraora[]; extern const u8 gMonIcon_Meltan[]; extern const u8 gMonIcon_Melmetal[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u8 gMonIcon_Grookey[]; extern const u8 gMonIcon_Thwackey[]; extern const u8 gMonIcon_Rillaboom[]; @@ -5745,6 +5875,7 @@ extern const u8 gMonIcon_BasculegionF[]; extern const u8 gMonIcon_Sneasler[]; extern const u8 gMonIcon_Overqwil[]; extern const u8 gMonIcon_Enamorus[]; +#endif extern const u8 gMonIcon_VenusaurMega[]; extern const u8 gMonIcon_CharizardMegaX[]; extern const u8 gMonIcon_CharizardMegaY[]; @@ -5785,13 +5916,19 @@ 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 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 extern const u8 gMonIcon_AudinoMega[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u8 gMonIcon_DiancieMega[]; +#endif extern const u8 gMonIcon_RayquazaMega[]; extern const u8 gMonIcon_KyogrePrimal[]; extern const u8 gMonIcon_GroudonPrimal[]; @@ -5828,10 +5965,12 @@ 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 extern const u8 gMonIcon_DarumakaGalarian[]; extern const u8 gMonIcon_DarmanitanGalarian[]; extern const u8 gMonIcon_YamaskGalarian[]; extern const u8 gMonIcon_StunfiskGalarian[]; +#endif extern const u8 gMonIcon_GrowlitheHisuian[]; extern const u8 gMonIcon_ArcanineHisuian[]; extern const u8 gMonIcon_VoltorbHisuian[]; @@ -5839,15 +5978,21 @@ 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 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 extern const u8 gMonIcon_SliggooHisuian[]; extern const u8 gMonIcon_GoodraHisuian[]; extern const u8 gMonIcon_AvaluggHisuian[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u8 gMonIcon_DecidueyeHisuian[]; +#endif extern const u8 gMonIcon_PikachuCosplay[]; extern const u8 gMonIcon_PikachuRockStar[]; extern const u8 gMonIcon_PikachuBelle[]; @@ -5862,7 +6007,6 @@ extern const u8 gMonIcon_PikachuKalosCap[]; extern const u8 gMonIcon_PikachuAlolaCap[]; extern const u8 gMonIcon_PikachuPartnerCap[]; extern const u8 gMonIcon_PichuSpikyEared[]; -#endif extern const u8 gMonIcon_UnownB[]; extern const u8 gMonIcon_UnownC[]; extern const u8 gMonIcon_UnownD[]; @@ -5896,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u8 gMonIcon_BurmySandyCloak[]; extern const u8 gMonIcon_BurmyTrashCloak[]; extern const u8 gMonIcon_WormadamSandyCloak[]; @@ -5913,6 +6057,8 @@ extern const u8 gMonIcon_DialgaOrigin[]; extern const u8 gMonIcon_PalkiaOrigin[]; extern const u8 gMonIcon_GiratinaOrigin[]; extern const u8 gMonIcon_ShayminSky[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u8 gMonIcon_BasculinBlueStriped[]; extern const u8 gMonIcon_BasculinWhiteStriped[]; extern const u8 gMonIcon_DarmanitanZenMode[]; @@ -5926,11 +6072,12 @@ extern const u8 gMonIcon_SawsbuckWinter[]; extern const u8 gMonIcon_TornadusTherian[]; extern const u8 gMonIcon_ThundurusTherian[]; extern const u8 gMonIcon_LandorusTherian[]; -extern const u8 gMonIcon_EnamorusTherian[]; extern const u8 gMonIcon_KyuremWhite[]; extern const u8 gMonIcon_KyuremBlack[]; extern const u8 gMonIcon_KeldeoResolute[]; extern const u8 gMonIcon_MeloettaPirouette[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u8 gMonIcon_GreninjaAsh[]; extern const u8 gMonIcon_VivillonPolar[]; extern const u8 gMonIcon_VivillonTundra[]; @@ -5979,6 +6126,8 @@ extern const u8 gMonIcon_XerneasActive[]; extern const u8 gMonIcon_Zygarde10[]; extern const u8 gMonIcon_ZygardeComplete[]; extern const u8 gMonIcon_HoopaUnbound[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u8 gMonIcon_OricorioPomPom[]; extern const u8 gMonIcon_OricorioPau[]; extern const u8 gMonIcon_OricorioSensu[]; @@ -5997,6 +6146,8 @@ extern const u8 gMonIcon_NecrozmaDuskMane[]; extern const u8 gMonIcon_NecrozmaDawnWings[]; extern const u8 gMonIcon_NecrozmaUltra[]; extern const u8 gMonIcon_MagearnaOriginalColor[]; +#endif +#if P_NEW_POKEMON >= GEN_8 extern const u8 gMonIcon_CramorantGulping[]; extern const u8 gMonIcon_CramorantGorging[]; extern const u8 gMonIcon_ToxtricityLowKey[]; @@ -6017,6 +6168,7 @@ extern const u8 gMonIcon_EternatusEternamax[]; extern const u8 gMonIcon_ZarudeDada[]; extern const u8 gMonIcon_CalyrexIceRider[]; extern const u8 gMonIcon_CalyrexShadowRider[]; +extern const u8 gMonIcon_EnamorusTherian[]; #endif extern const u8 gMonIcon_Egg[]; @@ -6407,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 extern const u8 gMonFootprint_Turtwig[]; extern const u8 gMonFootprint_Grotle[]; extern const u8 gMonFootprint_Torterra[]; @@ -6515,6 +6667,8 @@ extern const u8 gMonFootprint_Manaphy[]; extern const u8 gMonFootprint_Darkrai[]; extern const u8 gMonFootprint_Shaymin[]; extern const u8 gMonFootprint_Arceus[]; +#endif +#if P_NEW_POKEMON >= GEN_5 extern const u8 gMonFootprint_Victini[]; extern const u8 gMonFootprint_Snivy[]; extern const u8 gMonFootprint_Servine[]; @@ -6671,6 +6825,8 @@ extern const u8 gMonFootprint_Kyurem[]; extern const u8 gMonFootprint_Keldeo[]; extern const u8 gMonFootprint_Meloetta[]; extern const u8 gMonFootprint_Genesect[]; +#endif +#if P_NEW_POKEMON >= GEN_6 extern const u8 gMonFootprint_Chespin[]; extern const u8 gMonFootprint_Quilladin[]; extern const u8 gMonFootprint_Chesnaught[]; @@ -6743,6 +6899,8 @@ extern const u8 gMonFootprint_Zygarde[]; extern const u8 gMonFootprint_Diancie[]; extern const u8 gMonFootprint_Hoopa[]; extern const u8 gMonFootprint_Volcanion[]; +#endif +#if P_NEW_POKEMON >= GEN_7 extern const u8 gMonFootprint_Rowlet[]; extern const u8 gMonFootprint_Dartrix[]; extern const u8 gMonFootprint_Decidueye[]; @@ -6831,6 +6989,8 @@ extern const u8 gMonFootprint_Blacephalon[]; extern const u8 gMonFootprint_Zeraora[]; extern const u8 gMonFootprint_Meltan[]; extern const u8 gMonFootprint_Melmetal[]; +#endif +#if P_NEW_POKEMON >= GEN_8 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 30eef3327..b0a030c43 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 == TRUE +.if P_NEW_POKEMON >= GEN_4 cry Cry_Turtwig cry Cry_Grotle cry Cry_Torterra @@ -494,6 +494,116 @@ gCryTable:: cry Cry_Darkrai cry Cry_Shaymin cry Cry_Arceus +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_5 cry Cry_Victini cry Cry_Snivy cry Cry_Servine @@ -650,6 +760,165 @@ gCryTable:: cry Cry_Keldeo cry Cry_Meloetta cry Cry_Genesect +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 cry Cry_Chespin cry Cry_Quilladin cry Cry_Chesnaught @@ -722,6 +991,81 @@ gCryTable:: cry Cry_Diancie cry Cry_Hoopa cry Cry_Volcanion +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_7 cry Cry_Rowlet cry Cry_Dartrix cry Cry_Decidueye @@ -810,6 +1154,97 @@ gCryTable:: cry Cry_Zeraora cry Cry_Meltan cry Cry_Melmetal +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_8 cry Cry_Grookey cry Cry_Thwackey cry Cry_Rillaboom @@ -899,13 +1334,111 @@ gCryTable:: cry Cry_Glastrier cry Cry_Spectrier cry Cry_Calyrex - cry Cry_Bulbasaur //Cry_Wyrdeer - cry Cry_Bulbasaur //Cry_Kleavor - cry Cry_Bulbasaur //Cry_Ursaluna - cry Cry_Bulbasaur //Cry_Basculegion - cry Cry_Bulbasaur //Cry_Sneasler - cry Cry_Bulbasaur //Cry_Overqwil - cry Cry_Bulbasaur //Cry_Enamorus + cry Cry_Unown //Cry_Wyrdeer + cry Cry_Unown //Cry_Kleavor + cry Cry_Unown //Cry_Ursaluna + cry Cry_Unown //Cry_Basculegion + cry Cry_Unown //Cry_Sneasler + cry Cry_Unown //Cry_Overqwil + cry Cry_Unown //Cry_Enamorus +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif @ Megas cry Cry_VenusaurMega cry Cry_CharizardMegaX @@ -947,13 +1480,29 @@ gCryTable:: cry Cry_MetagrossMega cry Cry_LatiasMega cry Cry_LatiosMega +.if P_NEW_POKEMON >= GEN_4 cry Cry_LopunnyMega cry Cry_GarchompMega cry Cry_LucarioMega cry Cry_AbomasnowMega cry Cry_GalladeMega +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_5 cry Cry_AudinoMega +.else + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 cry Cry_DiancieMega +.else + cry Cry_Unown +.endif @ Special Mega + Primals cry Cry_RayquazaMega cry Cry_KyogrePrimal @@ -993,10 +1542,17 @@ gCryTable:: cry Cry_Corsola cry Cry_Zigzagoon cry Cry_Linoone +.if P_NEW_POKEMON >= GEN_5 cry Cry_Darumaka cry Cry_Darmanitan cry Cry_Yamask cry Cry_Stunfisk +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif @ Hisuian Forms cry Cry_Growlithe cry Cry_Arcanine @@ -1005,15 +1561,33 @@ gCryTable:: cry Cry_Typhlosion cry Cry_Qwilfish cry Cry_Sneasel +.if P_NEW_POKEMON >= GEN_5 cry Cry_Samurott cry Cry_Lilligant cry Cry_Zorua cry Cry_Zoroark cry Cry_Braviary +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 cry Cry_Sliggoo cry Cry_Goodra cry Cry_Avalugg +.else + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_7 cry Cry_Decidueye +.else + cry Cry_Unown +.endif @ Misc Forms @ Cosplay Pikachu cry Cry_Pikachu @@ -1069,6 +1643,7 @@ gCryTable:: cry Cry_Deoxys cry Cry_Deoxys cry Cry_Deoxys +.if P_NEW_POKEMON >= GEN_4 @ Burmy cry Cry_Burmy cry Cry_Burmy @@ -1111,6 +1686,51 @@ gCryTable:: cry Cry_Arceus cry Cry_Arceus cry Cry_Arceus +.else + @ Burmy + cry Cry_Unown + cry Cry_Unown + @ Wormadam + cry Cry_Unown + cry Cry_Unown + @ Cherrim + cry Cry_Unown + @ Shellos + cry Cry_Unown + @ Gastrodon + cry Cry_Unown + @ Rotom + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Origin Forme + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Shaymin + cry Cry_Unown + @ Arceus + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_5 @ Basculin cry Cry_Basculin cry Cry_Basculin @@ -1141,6 +1761,39 @@ gCryTable:: cry Cry_Genesect cry Cry_Genesect cry Cry_Genesect +.else + @ Basculin + cry Cry_Unown + cry Cry_Unown + @ Darmanitan + cry Cry_Unown + cry Cry_Unown + @ Deerling + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Sawsbuck + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Therian Forms + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Kyurem + cry Cry_Unown + cry Cry_Unown + @ Keldeo + cry Cry_Unown + @ Meloetta + cry Cry_Unown + @ Genesect + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 @ Greninja cry Cry_Greninja cry Cry_Greninja @@ -1211,6 +1864,79 @@ gCryTable:: cry Cry_ZygardeComplete @ Hoopa cry Cry_HoopaUnbound +.else +@ Greninja + cry Cry_Unown + cry Cry_Unown + @ Vivillon + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Flabébé + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Floette + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Florges + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Furfrou + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Meowstic + cry Cry_Unown + @ Aegislash + cry Cry_Unown + @ Pumpkaboo + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Gourgeist + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Xerneas + cry Cry_Unown + @ Zygarde + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Hoopa + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_7 @ Oricorio cry Cry_OricorioPomPom cry Cry_OricorioPau @@ -1262,6 +1988,60 @@ gCryTable:: cry Cry_NecrozmaUltra @ Magearna cry Cry_Magearna +.else + @ Oricorio + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Rockruff + cry Cry_Unown + @ Lycanroc + cry Cry_Unown + cry Cry_Unown + @ Wishiwashi + cry Cry_Unown + @ Silvally + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Minior + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Mimikyu + cry Cry_Unown + @ Necrozma + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Magearna + cry Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_8 @ Cramorant cry Cry_Cramorant cry Cry_Cramorant @@ -1300,7 +2080,16 @@ gCryTable:: cry Cry_CalyrexIceRider cry Cry_CalyrexShadowRider .else - @ Unown + @ Cramorant + cry Cry_Unown + cry Cry_Unown + @ Toxtricity + cry Cry_Unown + @ Sinistea + cry Cry_Unown + @ Polteageist + cry Cry_Unown + @ Alcremie cry Cry_Unown cry Cry_Unown cry Cry_Unown @@ -1309,33 +2098,25 @@ gCryTable:: cry Cry_Unown cry Cry_Unown cry Cry_Unown + @ Eiscue + cry Cry_Unown + @ Indeedee + cry Cry_Unown + @ Morpeko + cry Cry_Unown + @ Zacian + cry Cry_Unown + @ Zamazenta + cry Cry_Unown + @ Eternatus + cry Cry_Unown + @ Urshifu + cry Cry_Unown + @ Zarude + cry Cry_Unown + @ Calyrex cry Cry_Unown cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - @ Castform - cry Cry_Castform - cry Cry_Castform - cry Cry_Castform - @ Deoxys - cry Cry_Deoxys - cry Cry_Deoxys - cry Cry_Deoxys .endif .align 2 @@ -1726,7 +2507,7 @@ gCryTable_Reverse:: cry_reverse Cry_Rayquaza cry_reverse Cry_Jirachi cry_reverse Cry_Deoxys -.if P_NEW_POKEMON == TRUE +.if P_NEW_POKEMON >= GEN_4 cry_reverse Cry_Turtwig cry_reverse Cry_Grotle cry_reverse Cry_Torterra @@ -1834,6 +2615,116 @@ gCryTable_Reverse:: cry_reverse Cry_Darkrai cry_reverse Cry_Shaymin cry_reverse Cry_Arceus +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_5 cry_reverse Cry_Victini cry_reverse Cry_Snivy cry_reverse Cry_Servine @@ -1990,6 +2881,165 @@ gCryTable_Reverse:: cry_reverse Cry_Keldeo cry_reverse Cry_Meloetta cry_reverse Cry_Genesect +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 cry_reverse Cry_Chespin cry_reverse Cry_Quilladin cry_reverse Cry_Chesnaught @@ -2062,6 +3112,81 @@ gCryTable_Reverse:: cry_reverse Cry_Diancie cry_reverse Cry_Hoopa cry_reverse Cry_Volcanion +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_7 cry_reverse Cry_Rowlet cry_reverse Cry_Dartrix cry_reverse Cry_Decidueye @@ -2150,6 +3275,97 @@ gCryTable_Reverse:: cry_reverse Cry_Zeraora cry_reverse Cry_Meltan cry_reverse Cry_Melmetal +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_8 cry_reverse Cry_Grookey cry_reverse Cry_Thwackey cry_reverse Cry_Rillaboom @@ -2239,13 +3455,111 @@ gCryTable_Reverse:: cry_reverse Cry_Glastrier cry_reverse Cry_Spectrier cry_reverse Cry_Calyrex - cry_reverse Cry_Bulbasaur //Cry_Wyrdeer - cry_reverse Cry_Bulbasaur //Cry_Kleavor - cry_reverse Cry_Bulbasaur //Cry_Ursaluna - cry_reverse Cry_Bulbasaur //Cry_Basculegion - cry_reverse Cry_Bulbasaur //Cry_Sneasler - cry_reverse Cry_Bulbasaur //Cry_Overqwil - cry_reverse Cry_Bulbasaur //Cry_Enamorus + cry_reverse Cry_Unown //Cry_Wyrdeer + cry_reverse Cry_Unown //Cry_Kleavor + cry_reverse Cry_Unown //Cry_Ursaluna + cry_reverse Cry_Unown //Cry_Basculegion + cry_reverse Cry_Unown //Cry_Sneasler + cry_reverse Cry_Unown //Cry_Overqwil + cry_reverse Cry_Unown //Cry_Enamorus +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif @ Megas cry_reverse Cry_VenusaurMega cry_reverse Cry_CharizardMegaX @@ -2287,13 +3601,29 @@ gCryTable_Reverse:: cry_reverse Cry_MetagrossMega cry_reverse Cry_LatiasMega cry_reverse Cry_LatiosMega +.if P_NEW_POKEMON >= GEN_4 cry_reverse Cry_LopunnyMega cry_reverse Cry_GarchompMega cry_reverse Cry_LucarioMega cry_reverse Cry_AbomasnowMega cry_reverse Cry_GalladeMega +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_5 cry_reverse Cry_AudinoMega +.else + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 cry_reverse Cry_DiancieMega +.else + cry_reverse Cry_Unown +.endif @ Special Mega + Primals cry_reverse Cry_RayquazaMega cry_reverse Cry_KyogrePrimal @@ -2333,10 +3663,17 @@ gCryTable_Reverse:: cry_reverse Cry_Corsola cry_reverse Cry_Zigzagoon cry_reverse Cry_Linoone +.if P_NEW_POKEMON >= GEN_5 cry_reverse Cry_Darumaka cry_reverse Cry_Darmanitan cry_reverse Cry_Yamask cry_reverse Cry_Stunfisk +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif @ Hisuian Forms cry_reverse Cry_Growlithe cry_reverse Cry_Arcanine @@ -2345,15 +3682,33 @@ gCryTable_Reverse:: cry_reverse Cry_Typhlosion cry_reverse Cry_Qwilfish cry_reverse Cry_Sneasel +.if P_NEW_POKEMON >= GEN_5 cry_reverse Cry_Samurott cry_reverse Cry_Lilligant cry_reverse Cry_Zorua cry_reverse Cry_Zoroark cry_reverse Cry_Braviary +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 cry_reverse Cry_Sliggoo cry_reverse Cry_Goodra cry_reverse Cry_Avalugg +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_7 cry_reverse Cry_Decidueye +.else + cry_reverse Cry_Unown +.endif @ Misc Forms @ Cosplay Pikachu cry_reverse Cry_Pikachu @@ -2409,6 +3764,7 @@ gCryTable_Reverse:: cry_reverse Cry_Deoxys cry_reverse Cry_Deoxys cry_reverse Cry_Deoxys +.if P_NEW_POKEMON >= GEN_4 @ Burmy cry_reverse Cry_Burmy cry_reverse Cry_Burmy @@ -2451,6 +3807,42 @@ gCryTable_Reverse:: cry_reverse Cry_Arceus cry_reverse Cry_Arceus cry_reverse Cry_Arceus +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_5 @ Basculin cry_reverse Cry_Basculin cry_reverse Cry_Basculin @@ -2482,6 +3874,31 @@ gCryTable_Reverse:: cry_reverse Cry_Genesect cry_reverse Cry_Genesect cry_reverse Cry_Genesect +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_6 @ Greninja cry_reverse Cry_Greninja cry_reverse Cry_Greninja @@ -2552,6 +3969,66 @@ gCryTable_Reverse:: cry_reverse Cry_ZygardeComplete @ Hoopa cry_reverse Cry_HoopaUnbound +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_7 @ Oricorio cry_reverse Cry_OricorioPomPom cry_reverse Cry_OricorioPau @@ -2603,6 +4080,51 @@ gCryTable_Reverse:: cry_reverse Cry_NecrozmaUltra @ Magearna cry_reverse Cry_Magearna +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif +.if P_NEW_POKEMON >= GEN_8 @ Cramorant cry_reverse Cry_Cramorant cry_reverse Cry_Cramorant @@ -2641,7 +4163,6 @@ gCryTable_Reverse:: cry_reverse Cry_CalyrexIceRider cry_reverse Cry_CalyrexShadowRider .else - @ Unown cry_reverse Cry_Unown cry_reverse Cry_Unown cry_reverse Cry_Unown @@ -2665,16 +4186,4 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - @ Castform - cry_reverse Cry_Castform - cry_reverse Cry_Castform - cry_reverse Cry_Castform - @ Deoxys - cry_reverse Cry_Deoxys - cry_reverse Cry_Deoxys - cry_reverse Cry_Deoxys .endif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 4ce03dbed..b4f6ded82 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 == TRUE +.if P_NEW_POKEMON >= GEN_4 .align 2 Cry_Turtwig:: .incbin "sound/direct_sound_samples/cries/turtwig.bin" @@ -2358,7 +2358,9 @@ Cry_Shaymin:: .align 2 Cry_Arceus:: .incbin "sound/direct_sound_samples/cries/arceus.bin" +.endif +.if P_NEW_POKEMON >= GEN_5 .align 2 Cry_Victini:: .incbin "sound/direct_sound_samples/cries/victini.bin" @@ -2982,7 +2984,9 @@ Cry_Meloetta:: .align 2 Cry_Genesect:: .incbin "sound/direct_sound_samples/cries/genesect.bin" +.endif +.if P_NEW_POKEMON >= GEN_6 .align 2 Cry_Chespin:: .incbin "sound/direct_sound_samples/cries/chespin.bin" @@ -3270,7 +3274,9 @@ Cry_Hoopa:: .align 2 Cry_Volcanion:: .incbin "sound/direct_sound_samples/cries/volcanion.bin" +.endif +.if P_NEW_POKEMON >= GEN_7 .align 2 Cry_Rowlet:: .incbin "sound/direct_sound_samples/cries/rowlet.bin" @@ -3622,7 +3628,9 @@ Cry_Meltan:: .align 2 Cry_Melmetal:: .incbin "sound/direct_sound_samples/cries/melmetal.bin" +.endif +.if P_NEW_POKEMON >= GEN_8 .align 2 Cry_Grookey:: .incbin "sound/direct_sound_samples/cries/grookey.bin" @@ -4007,6 +4015,7 @@ Cry_Overqwil:: Cry_Enamorus:: .incbin "sound/direct_sound_samples/cries/enamorus.bin" */ +.endif .align 2 Cry_VenusaurMega:: @@ -4168,6 +4177,7 @@ Cry_LatiasMega:: Cry_LatiosMega:: .incbin "sound/direct_sound_samples/cries/mega_latios.bin" +.if P_NEW_POKEMON >= GEN_4 .align 2 Cry_LopunnyMega:: .incbin "sound/direct_sound_samples/cries/mega_lopunny.bin" @@ -4187,14 +4197,19 @@ Cry_AbomasnowMega:: .align 2 Cry_GalladeMega:: .incbin "sound/direct_sound_samples/cries/mega_gallade.bin" +.endif +.if P_NEW_POKEMON >= GEN_5 .align 2 Cry_AudinoMega:: .incbin "sound/direct_sound_samples/cries/mega_audino.bin" +.endif +.if P_NEW_POKEMON >= GEN_6 .align 2 Cry_DiancieMega:: .incbin "sound/direct_sound_samples/cries/mega_diancie.bin" +.endif .align 2 Cry_RayquazaMega:: @@ -4212,10 +4227,13 @@ Cry_GroudonPrimal:: Cry_SlowpokeGalarian:: .incbin "sound/direct_sound_samples/cries/slowpoke_galarian.bin" +.if P_NEW_POKEMON >= GEN_4 .align 2 Cry_ShayminSky:: .incbin "sound/direct_sound_samples/cries/shaymin_sky.bin" +.endif +.if P_NEW_POKEMON >= GEN_4 .align 2 Cry_TornadusTherian:: .incbin "sound/direct_sound_samples/cries/tornadus_therian.bin" @@ -4227,11 +4245,6 @@ Cry_ThundurusTherian:: .align 2 Cry_LandorusTherian:: .incbin "sound/direct_sound_samples/cries/landorus_therian.bin" -/* - .align 2 -Cry_EnamorusTherian:: - .incbin "sound/direct_sound_samples/cries/enamorus_therian.bin" -*/ .align 2 Cry_KyuremWhite:: @@ -4240,7 +4253,9 @@ Cry_KyuremWhite:: .align 2 Cry_KyuremBlack:: .incbin "sound/direct_sound_samples/cries/kyurem_black.bin" +.endif +.if P_NEW_POKEMON >= GEN_6 .align 2 Cry_FloetteEternalFlower:: .incbin "sound/direct_sound_samples/cries/floette_eternal_flower.bin" @@ -4300,7 +4315,9 @@ Cry_NecrozmaDawnWings:: .align 2 Cry_NecrozmaUltra:: .incbin "sound/direct_sound_samples/cries/necrozma_ultra.bin" +.endif +.if P_NEW_POKEMON >= GEN_8 .align 2 Cry_ToxtricityLowKey:: .incbin "sound/direct_sound_samples/cries/toxtricity_low_key.bin" @@ -4340,6 +4357,12 @@ Cry_CalyrexIceRider:: .align 2 Cry_CalyrexShadowRider:: .incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin" + +/* + .align 2 +Cry_EnamorusTherian:: + .incbin "sound/direct_sound_samples/cries/enamorus_therian.bin" +*/ .endif .align 2 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index afb9ecd9a..b67a2f0b3 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -504,6 +504,8 @@ const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/anim_fro const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/anim_front.4bpp.lz"); 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 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"); @@ -663,6 +665,8 @@ const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front const u32 gMonFrontPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front.4bpp.lz"); 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 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"); @@ -736,6 +740,8 @@ const u32 gMonFrontPic_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/anim_fro const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/anim_front.4bpp.lz"); 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 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"); @@ -824,6 +830,8 @@ const u32 gMonFrontPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/ const u32 gMonFrontPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/front.4bpp.lz"); 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 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"); @@ -921,6 +929,7 @@ const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front. //const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz"); //const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); +#endif const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz"); const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz"); const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/front.4bpp.lz"); @@ -961,13 +970,19 @@ 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 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 const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz"); +#endif +#if P_NEW_POKEMON >= GEN_6 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"); const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz"); const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/front.4bpp.lz"); @@ -1004,10 +1019,12 @@ 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 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"); const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz"); +#endif const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz"); @@ -1015,15 +1032,21 @@ 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 //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 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 //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"); const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz"); const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/front.4bpp.lz"); @@ -1039,7 +1062,6 @@ const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/ const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/front.4bpp.lz"); const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/front.4bpp.lz"); const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/front.4bpp.lz"); -#endif const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/anim_front.4bpp.lz"); const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/anim_front.4bpp.lz"); const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/anim_front.4bpp.lz"); @@ -1073,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -1090,6 +1112,8 @@ const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/orig const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/front.4bpp.lz"); 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 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"); @@ -1100,11 +1124,12 @@ const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/ const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/anim_front.4bpp.lz"); const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/anim_front.4bpp.lz"); const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/anim_front.4bpp.lz"); -//const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz"); const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/anim_front.4bpp.lz"); 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 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"); @@ -1147,6 +1172,8 @@ const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/ac const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/anim_front.4bpp.lz"); 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 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"); @@ -1159,6 +1186,8 @@ const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozm const u32 gMonFrontPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/front.4bpp.lz"); 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 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"); @@ -1180,6 +1209,7 @@ const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/ const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz"); const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz"); +//const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); #endif const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); @@ -1572,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -1847,6 +1877,8 @@ const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/back.4bpp.l const u32 gMonBackPic_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz"); 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 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"); @@ -1920,6 +1952,8 @@ const u32 gMonBackPic_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/back.4bpp const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp.lz"); 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 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"); @@ -2008,6 +2042,8 @@ const u32 gMonBackPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/b const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/back.4bpp.lz"); 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 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"); @@ -2105,6 +2141,7 @@ const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4b //const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz"); const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz"); //const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); +#endif const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz"); const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz"); const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/back.4bpp.lz"); @@ -2145,13 +2182,19 @@ 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 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 const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/back.4bpp.lz"); +#endif +#if P_NEW_POKEMON >= GEN_6 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"); const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/back.4bpp.lz"); const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/back.4bpp.lz"); @@ -2188,10 +2231,12 @@ 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 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"); const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/back.4bpp.lz"); +#endif const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/back.4bpp.lz"); const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz"); const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/back.4bpp.lz"); @@ -2199,15 +2244,21 @@ 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 //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 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 //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"); const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz"); const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/back.4bpp.lz"); @@ -2223,7 +2274,6 @@ const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/a const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/back.4bpp.lz"); const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/back.4bpp.lz"); const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/back.4bpp.lz"); -#endif const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/back.4bpp.lz"); const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz"); const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/back.4bpp.lz"); @@ -2257,7 +2307,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -2274,6 +2324,8 @@ const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origi const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/back.4bpp.lz"); 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 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"); @@ -2284,11 +2336,12 @@ const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/w const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/back.4bpp.lz"); const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/back.4bpp.lz"); const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/back.4bpp.lz"); -//const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/back.4bpp.lz"); const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/back.4bpp.lz"); 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 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"); @@ -2331,6 +2384,8 @@ const u32 gMonBackPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/act const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/back.4bpp.lz"); 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 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"); @@ -2343,6 +2398,8 @@ const u32 gMonBackPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma const u32 gMonBackPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/back.4bpp.lz"); 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 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"); @@ -2364,6 +2421,7 @@ const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz"); const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz"); const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz"); +//const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); #endif const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz"); @@ -2754,7 +2812,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -2864,6 +2922,8 @@ const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/normal.gb const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/normal.gbapal.lz"); 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 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"); @@ -3023,6 +3083,8 @@ const u32 gMonPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/normal.gbap const u32 gMonPalette_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbapal.lz"); 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 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"); @@ -3096,6 +3158,8 @@ const u32 gMonPalette_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/normal.gb const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/normal.gbapal.lz"); 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 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"); @@ -3184,6 +3248,8 @@ const u32 gMonPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/n const u32 gMonPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/normal.gbapal.lz"); 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 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"); @@ -3281,6 +3347,7 @@ const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal. //const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz"); const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz"); //const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); +#endif const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz"); const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz"); const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/normal.gbapal.lz"); @@ -3321,13 +3388,19 @@ 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 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 const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/normal.gbapal.lz"); +#endif +#if P_NEW_POKEMON >= GEN_6 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"); const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/normal.gbapal.lz"); const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/normal.gbapal.lz"); @@ -3364,10 +3437,12 @@ 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 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"); const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/normal.gbapal.lz"); +#endif const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/normal.gbapal.lz"); const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz"); const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/normal.gbapal.lz"); @@ -3375,15 +3450,21 @@ 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 //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 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 //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"); const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz"); const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/normal.gbapal.lz"); @@ -3399,14 +3480,13 @@ const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/a const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/normal.gbapal.lz"); const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/normal.gbapal.lz"); const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/normal.gbapal.lz"); -#endif const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz"); const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/normal.gbapal.lz"); const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/normal.gbapal.lz"); 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -3440,6 +3520,8 @@ const u32 gMonPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/norm const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/normal.gbapal.lz"); 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 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"); @@ -3453,7 +3535,6 @@ const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/w const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/normal.gbapal.lz"); const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/normal.gbapal.lz"); const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/normal.gbapal.lz"); -//const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/normal.gbapal.lz"); const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/normal.gbapal.lz"); const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz"); @@ -3462,6 +3543,8 @@ const u32 gMonPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genese const u32 gMonPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genesect/shock_drive/normal.gbapal.lz"); 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 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"); @@ -3510,6 +3593,8 @@ const u32 gMonPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/act const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/normal.gbapal.lz"); 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 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"); @@ -3545,6 +3630,8 @@ const u32 gMonPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma const u32 gMonPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/normal.gbapal.lz"); 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 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"); @@ -3566,6 +3653,7 @@ const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz"); const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz"); const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz"); +//const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); #endif const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); @@ -3957,7 +4045,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -4067,6 +4155,8 @@ const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/shin const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shiny.gbapal.lz"); 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 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"); @@ -4226,6 +4316,8 @@ const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/shiny. const u32 gMonShinyPalette_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz"); 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 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"); @@ -4299,6 +4391,8 @@ const u32 gMonShinyPalette_Zygarde[] = INCBIN_U32("graphics/pokemon/zygarde/shin const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shiny.gbapal.lz"); 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 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"); @@ -4387,6 +4481,8 @@ const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacepha const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shiny.gbapal.lz"); 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 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"); @@ -4484,6 +4580,7 @@ const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/sh //const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz"); const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz"); //const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); +#endif const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/shiny.gbapal.lz"); @@ -4524,13 +4621,19 @@ 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 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 const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/shiny.gbapal.lz"); +#endif +#if P_NEW_POKEMON >= GEN_6 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"); const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/shiny.gbapal.lz"); const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/shiny.gbapal.lz"); @@ -4567,10 +4670,12 @@ 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 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"); const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/shiny.gbapal.lz"); +#endif const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/shiny.gbapal.lz"); @@ -4578,15 +4683,21 @@ 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 //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 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 //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"); const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/shiny.gbapal.lz"); @@ -4602,14 +4713,13 @@ const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pika const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/shiny.gbapal.lz"); const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/shiny.gbapal.lz"); -#endif const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/shiny.gbapal.lz"); const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/shiny.gbapal.lz"); const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/shiny.gbapal.lz"); 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -4643,6 +4753,8 @@ const u32 gMonShinyPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/shiny.gbapal.lz"); 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 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"); @@ -4656,7 +4768,6 @@ const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsb const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/shiny.gbapal.lz"); const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/shiny.gbapal.lz"); const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/shiny.gbapal.lz"); @@ -4665,6 +4776,8 @@ const u32 gMonShinyPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/g const u32 gMonShinyPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genesect/shock_drive/shiny.gbapal.lz"); 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 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"); @@ -4713,6 +4826,8 @@ const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xernea const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/shiny.gbapal.lz"); 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 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"); @@ -4742,6 +4857,8 @@ const u32 gMonShinyPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/nec const u32 gMonShinyPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/shiny.gbapal.lz"); 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 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"); @@ -4763,6 +4880,7 @@ const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/poke const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz"); const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz"); const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); #endif const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); @@ -5152,7 +5270,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -5260,6 +5378,8 @@ const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/icon.4bpp"); 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 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"); @@ -5419,6 +5539,8 @@ const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/icon.4bpp"); 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 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"); @@ -5492,6 +5614,8 @@ const u8 gMonIcon_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/icon.4bpp"); 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 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"); @@ -5580,6 +5704,8 @@ const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/icon.4 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 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"); @@ -5677,6 +5803,7 @@ const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/iconf const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp"); const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp"); const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp"); +#endif const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/venusaur/mega/icon.4bpp"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp"); const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/charizard/mega_y/icon.4bpp"); @@ -5717,13 +5844,19 @@ 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 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 const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/audino/mega/icon.4bpp"); +#endif +#if P_NEW_POKEMON >= GEN_6 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"); const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/kyogre/primal/icon.4bpp"); const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/groudon/primal/icon.4bpp"); @@ -5760,10 +5893,12 @@ 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 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"); const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp"); +#endif const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp"); const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/hisuian/icon.4bpp"); const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/voltorb/hisuian/icon.4bpp"); @@ -5771,15 +5906,21 @@ 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 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 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 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"); const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp"); const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp"); @@ -5794,7 +5935,6 @@ const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/pikachu/kalos_ const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/pikachu/alola_cap/icon.4bpp"); const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp"); const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/pichu/spiky_eared/icon.4bpp"); -#endif const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp"); const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/icon.4bpp"); const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/d/icon.4bpp"); @@ -5828,7 +5968,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -5845,6 +5985,8 @@ const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/dialga/origin/ico const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/icon.4bpp"); 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 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"); @@ -5858,11 +6000,12 @@ const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/sawsbuck/winter const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/therian/icon.4bpp"); const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/therian/icon.4bpp"); const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/landorus/therian/icon.4bpp"); -const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/white/icon.4bpp"); const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/icon.4bpp"); 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 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"); @@ -5911,6 +6054,8 @@ const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/xerneas/active/i const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/icon.4bpp"); 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 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"); @@ -5929,6 +6074,8 @@ const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/necrozma/dusk const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/necrozma/dawn_wings/icon.4bpp"); 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 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"); @@ -5949,6 +6096,7 @@ const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/e const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp"); const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp"); const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); +const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); #endif const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); @@ -6339,7 +6487,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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"); @@ -6447,6 +6595,8 @@ const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/footprint const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint.1bpp"); 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 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"); @@ -6603,6 +6753,8 @@ const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/footprint.1 const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp"); 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 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"); @@ -6675,6 +6827,8 @@ const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/footprint const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp"); 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 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"); @@ -6763,6 +6917,8 @@ const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/f const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint.1bpp"); 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 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 41b5143cf..274d3faad 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = { .baseHP = 55, @@ -13216,7 +13216,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_MYTHICAL, }, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = { .baseHP = 100, @@ -17046,7 +17048,9 @@ const struct BaseStats gBaseStats[] = }, [SPECIES_GENESECT] = GENESECT_BASE_STATS, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = { .baseHP = 56, @@ -18633,7 +18637,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_MYTHICAL, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = { .baseHP = 68, @@ -20681,7 +20687,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_MYTHICAL, }, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = { .baseHP = 50, @@ -22854,6 +22862,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_LEGENDARY, }, +#endif [SPECIES_VENUSAUR_MEGA] = { @@ -23837,6 +23846,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, +#if P_NEW_POKEMON >= GEN_4 [SPECIES_LOPUNNY_MEGA] = { .baseHP = 65, @@ -23959,7 +23969,9 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_WHITE, .noFlip = FALSE, }, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_AUDINO_MEGA] = { .baseHP = 103, @@ -23985,7 +23997,9 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_WHITE, .noFlip = FALSE, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = { .baseHP = 50, @@ -24011,6 +24025,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_MYTHICAL, }, +#endif [SPECIES_RAYQUAZA_MEGA] = { @@ -24928,6 +24943,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_GALARIAN_FORM, }, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_DARUMAKA_GALARIAN] = { .baseHP = 70, @@ -25027,6 +25043,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_GALARIAN_FORM, }, +#endif [SPECIES_GROWLITHE_HISUIAN] = { @@ -25205,6 +25222,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_HISUIAN_FORM, }, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_SAMUROTT_HISUIAN] = { .baseHP = 90, @@ -25332,7 +25350,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_HISUIAN_FORM, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_SLIGGOO_HISUIAN] = { .baseHP = 58, @@ -25410,7 +25430,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_HISUIAN_FORM, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = { .baseHP = 88, @@ -25435,6 +25457,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_HISUIAN_FORM, }, +#endif [SPECIES_PIKACHU_COSPLAY] = COSPLAY_PIKACHU_BASE_STATS(FLIP), [SPECIES_PIKACHU_ROCK_STAR] = COSPLAY_PIKACHU_BASE_STATS(FLIP), @@ -25453,7 +25476,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_PIKACHU_WORLD_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), [SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP), -#endif + [SPECIES_UNOWN_B] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_C] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_D] = UNOWN_BASE_STATS(NO_FLIP), @@ -25560,7 +25583,7 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_BURMY_SANDY_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_BROWN), [SPECIES_BURMY_TRASH_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_RED), @@ -25744,7 +25767,9 @@ const struct BaseStats gBaseStats[] = [SPECIES_ARCEUS_DRAGON] = ARCEUS_BASE_STATS(TYPE_DRAGON), [SPECIES_ARCEUS_DARK] = ARCEUS_BASE_STATS(TYPE_DARK), [SPECIES_ARCEUS_FAIRY] = ARCEUS_BASE_STATS(TYPE_FAIRY), +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_BASCULIN_BLUE_STRIPED] = { .baseHP = 70, @@ -25927,31 +25952,6 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, - [SPECIES_ENAMORUS_THERIAN] = - { - .baseHP = 74, - .baseAttack = 115, - .baseDefense = 110, - .baseSpeed = 46, - .baseSpAttack = 135, - .baseSpDefense = 100, - .type1 = TYPE_FAIRY, - .type2 = TYPE_FLYING, - .catchRate = 3, - .expYield = 270, - .evYield_SpAttack = 3, - .genderRatio = MON_FEMALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_OVERCOAT, ABILITY_NONE}, - .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, - .flags = FLAG_LEGENDARY, - }, - [SPECIES_KYUREM_WHITE] = { .baseHP = 125, @@ -26060,7 +26060,9 @@ const struct BaseStats gBaseStats[] = [SPECIES_GENESECT_SHOCK_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_BURN_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_CHILL_DRIVE] = GENESECT_BASE_STATS, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_GRENINJA_BATTLE_BOND] = { .baseHP = 72, @@ -26262,6 +26264,8 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 41, .baseSpAttack = 44, .baseSpDefense = 55, + .itemCommon = ITEM_MIRACLE_SEED, + .itemRare = ITEM_MIRACLE_SEED, PUMKPABOO_MISC_STATS, }, @@ -26295,6 +26299,8 @@ const struct BaseStats gBaseStats[] = .baseSpeed = 54, .baseSpAttack = 58, .baseSpDefense = 75, + .itemCommon = ITEM_MIRACLE_SEED, + .itemRare = ITEM_MIRACLE_SEED, GOURGEIST_MISC_STATS, }, @@ -26353,7 +26359,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = FLAG_MYTHICAL, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [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), @@ -26545,7 +26553,9 @@ const struct BaseStats gBaseStats[] = }, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = MAGEARNA_BASE_STATS(BODY_COLOR_RED), +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_CRAMORANT_GULPING] = CRAMORANT_BASE_STATS, [SPECIES_CRAMORANT_GORGING] = CRAMORANT_BASE_STATS, @@ -26763,5 +26773,30 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_BLACK, .noFlip = FALSE, }, + + [SPECIES_ENAMORUS_THERIAN] = + { + .baseHP = 74, + .baseAttack = 115, + .baseDefense = 110, + .baseSpeed = 46, + .baseSpAttack = 135, + .baseSpDefense = 100, + .type1 = TYPE_FAIRY, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 270, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_OVERCOAT, ABILITY_NONE}, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + .flags = FLAG_LEGENDARY, + }, #endif }; diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 3a5f3c332..896332649 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 egg_moves(TURTWIG, MOVE_WORRY_SEED, MOVE_GROWTH, @@ -2877,7 +2877,9 @@ const u16 gEggMoves[] = { MOVE_AVALANCHE, MOVE_NATURAL_GIFT, MOVE_BULLET_SEED), +#endif +#if P_NEW_POKEMON >= GEN_5 egg_moves(SNIVY, MOVE_CAPTIVATE, MOVE_NATURAL_GIFT, @@ -3600,7 +3602,9 @@ const u16 gEggMoves[] = { MOVE_ZEN_HEADBUTT, MOVE_MORNING_SUN, MOVE_MAGNET_RISE), +#endif +#if P_NEW_POKEMON >= GEN_6 egg_moves(CHESPIN, MOVE_SYNTHESIS, MOVE_BELLY_DRUM, @@ -3807,7 +3811,9 @@ const u16 gEggMoves[] = { MOVE_SNATCH, MOVE_OUTRAGE, MOVE_TAILWIND), +#endif +#if P_NEW_POKEMON >= GEN_7 egg_moves(ROWLET, MOVE_CURSE, MOVE_CONFUSE_RAY, @@ -4034,7 +4040,9 @@ const u16 gEggMoves[] = { MOVE_COUNTER, MOVE_REVERSAL, MOVE_DRAGON_BREATH), +#endif +#if P_NEW_POKEMON >= GEN_8 egg_moves(GROOKEY, MOVE_GROWTH, MOVE_HAMMER_ARM, @@ -4230,6 +4238,7 @@ const u16 gEggMoves[] = { MOVE_DISABLE, MOVE_DRAGON_TAIL, MOVE_SUCKER_PUNCH), +#endif egg_moves(RATTATA_ALOLAN, MOVE_COUNTER, @@ -4382,6 +4391,7 @@ const u16 gEggMoves[] = { MOVE_QUICK_GUARD, MOVE_KNOCK_OFF), +#if P_NEW_POKEMON >= GEN_5 egg_moves(DARUMAKA_GALARIAN, MOVE_FOCUS_PUNCH, MOVE_HAMMER_ARM, @@ -4404,13 +4414,13 @@ const u16 gEggMoves[] = { MOVE_COUNTER, MOVE_PAIN_SPLIT, MOVE_REFLECT_TYPE), +#endif egg_moves(INDEEDEE_FEMALE, MOVE_PSYCH_UP, MOVE_FAKE_OUT, MOVE_PSYCHO_SHIFT, MOVE_HEAL_PULSE), -#endif EGG_MOVES_TERMINATOR }; diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index bf15638f2..766a25cb6 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -61,8 +61,10 @@ 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 [SPECIES_MAGNETON] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}}, +#endif [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}}, [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}}, @@ -78,20 +80,28 @@ 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 [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 [SPECIES_RHYDON] = {{EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}}, +#endif [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}}, +#endif [SPECIES_KANGASKHAN] = {{EVO_MEGA_EVOLUTION, ITEM_KANGASKHANITE, SPECIES_KANGASKHAN_MEGA}}, [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}}, [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}}, [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 [SPECIES_ELECTABUZZ] = {{EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}}, [SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}}, +#endif [SPECIES_PINSIR] = {{EVO_MEGA_EVOLUTION, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA}}, [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}}, [SPECIES_GYARADOS] = {{EVO_MEGA_EVOLUTION, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA}}, @@ -100,11 +110,16 @@ 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 {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}, - {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON}}, + #endif + #if P_NEW_POKEMON >= GEN_6 + {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON} + #endif + }, [SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}}, [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}}, [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}}, @@ -128,7 +143,9 @@ 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 [SPECIES_TOGETIC] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}}, +#endif [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}}, [SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}}, @@ -138,26 +155,38 @@ 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 [SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}}, +#endif [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, +#if P_NEW_POKEMON >= GEN_4 [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 [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 [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 [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 [SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}}, +#endif [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}}, @@ -195,7 +224,9 @@ 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 [SPECIES_NOSEPASS] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}}, +#endif [SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA}}, [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}}, [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}}, @@ -214,7 +245,10 @@ 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}, - {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}}, + #if P_NEW_POKEMON >= GEN_4 + {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS} + #endif + }, [SPECIES_GLALIE] = {{EVO_MEGA_EVOLUTION, ITEM_GLALITITE, SPECIES_GLALIE_MEGA}}, [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}}, [SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}}, @@ -225,8 +259,10 @@ 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 [SPECIES_DUSCLOPS] = {{EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}}, [SPECIES_ROSELIA] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}}, +#endif [SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}}, [SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}}, [SPECIES_GULPIN] = {{EVO_LEVEL, 26, SPECIES_SWALOT}}, @@ -244,7 +280,10 @@ 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}, - {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE}}, + #if P_NEW_POKEMON >= GEN_4 + {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE} + #endif + }, [SPECIES_GARDEVOIR] = {{EVO_MEGA_EVOLUTION, ITEM_GARDEVOIRITE, SPECIES_GARDEVOIR_MEGA}}, [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}}, [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, @@ -258,6 +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 // Gens 4-7 [SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}}, [SPECIES_GROTLE] = {{EVO_LEVEL, 32, SPECIES_TORTERRA}}, @@ -304,6 +344,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SNOVER] = {{EVO_LEVEL, 40, SPECIES_ABOMASNOW}}, [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 [SPECIES_SNIVY] = {{EVO_LEVEL, 17, SPECIES_SERVINE}}, [SPECIES_SERVINE] = {{EVO_LEVEL, 36, SPECIES_SERPERIOR}}, [SPECIES_TEPIG] = {{EVO_LEVEL, 17, SPECIES_PIGNITE}}, @@ -379,6 +421,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DEINO] = {{EVO_LEVEL, 50, SPECIES_ZWEILOUS}}, [SPECIES_ZWEILOUS] = {{EVO_LEVEL, 64, SPECIES_HYDREIGON}}, [SPECIES_LARVESTA] = {{EVO_LEVEL, 59, SPECIES_VOLCARONA}}, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = {{EVO_LEVEL, 16, SPECIES_QUILLADIN}}, [SPECIES_QUILLADIN] = {{EVO_LEVEL, 36, SPECIES_CHESNAUGHT}}, [SPECIES_FENNEKIN] = {{EVO_LEVEL, 16, SPECIES_BRAIXEN}}, @@ -415,6 +459,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG}}, [SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}}, [SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_DIANCITE, SPECIES_DIANCIE_MEGA}}, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = {{EVO_LEVEL, 17, SPECIES_DARTRIX}}, [SPECIES_DARTRIX] = {{EVO_LEVEL, 34, SPECIES_DECIDUEYE}}, [SPECIES_LITTEN] = {{EVO_LEVEL, 17, SPECIES_TORRACAT}}, @@ -449,6 +495,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_COSMOEM] = {{EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}}, [SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}}, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = {{EVO_LEVEL, 16, SPECIES_THWACKEY}}, [SPECIES_THWACKEY] = {{EVO_LEVEL, 35, SPECIES_RILLABOOM}}, [SPECIES_SCORBUNNY] = {{EVO_LEVEL, 16, SPECIES_RABOOT}}, @@ -495,6 +543,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT}}, [SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU}, {EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, +#endif [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, [SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}}, @@ -503,10 +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 [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 [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}}, @@ -514,14 +566,23 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_LINOONE_GALARIAN] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}}, [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, [SPECIES_YAMASK_GALARIAN] = {{EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}}, +#else + [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 [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 [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 [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}}, @@ -533,6 +594,11 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PUMPKABOO_SMALL] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}}, [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 [SPECIES_ROCKRUFF_OWN_TEMPO] = {{EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}}, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}}, +#endif }; diff --git a/src/data/pokemon/evolution_old.h b/src/data/pokemon/evolution_old.h deleted file mode 100644 index 0a604defb..000000000 --- a/src/data/pokemon/evolution_old.h +++ /dev/null @@ -1,188 +0,0 @@ -const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = -{ - [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}}, - [SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR}}, - [SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON}}, - [SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD}}, - [SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE}}, - [SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE}}, - [SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD}}, - [SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE}}, - [SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA}}, - [SPECIES_KAKUNA] = {{EVO_LEVEL, 10, SPECIES_BEEDRILL}}, - [SPECIES_PIDGEY] = {{EVO_LEVEL, 18, SPECIES_PIDGEOTTO}}, - [SPECIES_PIDGEOTTO] = {{EVO_LEVEL, 36, SPECIES_PIDGEOT}}, - [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, - [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, - [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, - [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}}, - [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, - [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, - [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}}, - [SPECIES_NIDORAN_M] = {{EVO_LEVEL, 16, SPECIES_NIDORINO}}, - [SPECIES_NIDORINO] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}}, - [SPECIES_CLEFAIRY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}}, - [SPECIES_VULPIX] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}}, - [SPECIES_JIGGLYPUFF] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}}, - [SPECIES_ZUBAT] = {{EVO_LEVEL, 22, SPECIES_GOLBAT}}, - [SPECIES_GOLBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_CROBAT}}, - [SPECIES_ODDISH] = {{EVO_LEVEL, 21, SPECIES_GLOOM}}, - [SPECIES_GLOOM] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, - {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}}, - [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT}}, - [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH}}, - [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO}}, - [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN}}, - [SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK}}, - [SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE}}, - [SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}}, - [SPECIES_POLIWAG] = {{EVO_LEVEL, 25, SPECIES_POLIWHIRL}}, - [SPECIES_POLIWHIRL] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, - {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}}, - [SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA}}, - [SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM}}, - [SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE}}, - [SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP}}, - [SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL}}, - [SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}}, - [SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL}}, - [SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER}}, - [SPECIES_GRAVELER] = {{EVO_TRADE, 0, SPECIES_GOLEM}}, - [SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, - [SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO}, - {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}}, - [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, - [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, - [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}}, - [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}}, - [SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}}, - [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}}, - [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}}, - [SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}}, - [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}}, - [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}}, - [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}}, - [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}}, - [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}}, - [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, - [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, - [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, - [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}}, - [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}}, - [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}}, - [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}}, - [SPECIES_EEVEE] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, - {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON}, - {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, - {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON}, - {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}}, - [SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}}, - [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}}, - [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}}, - [SPECIES_DRATINI] = {{EVO_LEVEL, 30, SPECIES_DRAGONAIR}}, - [SPECIES_DRAGONAIR] = {{EVO_LEVEL, 55, SPECIES_DRAGONITE}}, - [SPECIES_CHIKORITA] = {{EVO_LEVEL, 16, SPECIES_BAYLEEF}}, - [SPECIES_BAYLEEF] = {{EVO_LEVEL, 32, SPECIES_MEGANIUM}}, - [SPECIES_CYNDAQUIL] = {{EVO_LEVEL, 14, SPECIES_QUILAVA}}, - [SPECIES_QUILAVA] = {{EVO_LEVEL, 36, SPECIES_TYPHLOSION}}, - [SPECIES_TOTODILE] = {{EVO_LEVEL, 18, SPECIES_CROCONAW}}, - [SPECIES_CROCONAW] = {{EVO_LEVEL, 30, SPECIES_FERALIGATR}}, - [SPECIES_SENTRET] = {{EVO_LEVEL, 15, SPECIES_FURRET}}, - [SPECIES_HOOTHOOT] = {{EVO_LEVEL, 20, SPECIES_NOCTOWL}}, - [SPECIES_LEDYBA] = {{EVO_LEVEL, 18, SPECIES_LEDIAN}}, - [SPECIES_SPINARAK] = {{EVO_LEVEL, 22, SPECIES_ARIADOS}}, - [SPECIES_CHINCHOU] = {{EVO_LEVEL, 27, SPECIES_LANTURN}}, - [SPECIES_PICHU] = {{EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}}, - [SPECIES_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}}, - [SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}}, - [SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}}, - [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, - [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}}, - [SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}}, - [SPECIES_MARILL] = {{EVO_LEVEL, 18, SPECIES_AZUMARILL}}, - [SPECIES_HOPPIP] = {{EVO_LEVEL, 18, SPECIES_SKIPLOOM}}, - [SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}}, - [SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}}, - [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, - [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}}, - [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, - [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, - [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, - [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}}, - [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, - [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, - [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}}, - [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, - {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, - {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}}, - [SPECIES_SMOOCHUM] = {{EVO_LEVEL, 30, SPECIES_JYNX}}, - [SPECIES_ELEKID] = {{EVO_LEVEL, 30, SPECIES_ELECTABUZZ}}, - [SPECIES_MAGBY] = {{EVO_LEVEL, 30, SPECIES_MAGMAR}}, - [SPECIES_LARVITAR] = {{EVO_LEVEL, 30, SPECIES_PUPITAR}}, - [SPECIES_PUPITAR] = {{EVO_LEVEL, 55, SPECIES_TYRANITAR}}, - [SPECIES_TREECKO] = {{EVO_LEVEL, 16, SPECIES_GROVYLE}}, - [SPECIES_GROVYLE] = {{EVO_LEVEL, 36, SPECIES_SCEPTILE}}, - [SPECIES_TORCHIC] = {{EVO_LEVEL, 16, SPECIES_COMBUSKEN}}, - [SPECIES_COMBUSKEN] = {{EVO_LEVEL, 36, SPECIES_BLAZIKEN}}, - [SPECIES_MUDKIP] = {{EVO_LEVEL, 16, SPECIES_MARSHTOMP}}, - [SPECIES_MARSHTOMP] = {{EVO_LEVEL, 36, SPECIES_SWAMPERT}}, - [SPECIES_POOCHYENA] = {{EVO_LEVEL, 18, SPECIES_MIGHTYENA}}, - [SPECIES_ZIGZAGOON] = {{EVO_LEVEL, 20, SPECIES_LINOONE}}, - [SPECIES_WURMPLE] = {{EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, - {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}}, - [SPECIES_SILCOON] = {{EVO_LEVEL, 10, SPECIES_BEAUTIFLY}}, - [SPECIES_CASCOON] = {{EVO_LEVEL, 10, SPECIES_DUSTOX}}, - [SPECIES_LOTAD] = {{EVO_LEVEL, 14, SPECIES_LOMBRE}}, - [SPECIES_LOMBRE] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}}, - [SPECIES_SEEDOT] = {{EVO_LEVEL, 14, SPECIES_NUZLEAF}}, - [SPECIES_NUZLEAF] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}}, - [SPECIES_NINCADA] = {{EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, - {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}}, - [SPECIES_TAILLOW] = {{EVO_LEVEL, 22, SPECIES_SWELLOW}}, - [SPECIES_SHROOMISH] = {{EVO_LEVEL, 23, SPECIES_BRELOOM}}, - [SPECIES_WINGULL] = {{EVO_LEVEL, 25, SPECIES_PELIPPER}}, - [SPECIES_SURSKIT] = {{EVO_LEVEL, 22, SPECIES_MASQUERAIN}}, - [SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}}, - [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}}, - [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}}, - [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}}, - [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}}, - [SPECIES_FEEBAS] = {{EVO_BEAUTY, 170, SPECIES_MILOTIC}, - {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}}, - [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO}}, - [SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA}}, - [SPECIES_VIBRAVA] = {{EVO_LEVEL, 45, SPECIES_FLYGON}}, - [SPECIES_MAKUHITA] = {{EVO_LEVEL, 24, SPECIES_HARIYAMA}}, - [SPECIES_ELECTRIKE] = {{EVO_LEVEL, 26, SPECIES_MANECTRIC}}, - [SPECIES_NUMEL] = {{EVO_LEVEL, 33, SPECIES_CAMERUPT}}, - [SPECIES_SPHEAL] = {{EVO_LEVEL, 32, SPECIES_SEALEO}}, - [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}}, - [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}}, - [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}}, - [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}}, - [SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}}, - [SPECIES_MEDITITE] = {{EVO_LEVEL, 37, SPECIES_MEDICHAM}}, - [SPECIES_SWABLU] = {{EVO_LEVEL, 35, SPECIES_ALTARIA}}, - [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}}, - [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}}, - [SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}}, - [SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}}, - [SPECIES_GULPIN] = {{EVO_LEVEL, 26, SPECIES_SWALOT}}, - [SPECIES_WHISMUR] = {{EVO_LEVEL, 20, SPECIES_LOUDRED}}, - [SPECIES_LOUDRED] = {{EVO_LEVEL, 40, SPECIES_EXPLOUD}}, - [SPECIES_CLAMPERL] = {{EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, - {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}}, - [SPECIES_SHUPPET] = {{EVO_LEVEL, 37, SPECIES_BANETTE}}, - [SPECIES_ARON] = {{EVO_LEVEL, 32, SPECIES_LAIRON}}, - [SPECIES_LAIRON] = {{EVO_LEVEL, 42, SPECIES_AGGRON}}, - [SPECIES_LILEEP] = {{EVO_LEVEL, 40, SPECIES_CRADILY}}, - [SPECIES_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}}, - [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}}, - [SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}}, - [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}}, - [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, - [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}}, - [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}}, -}; diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index a324fd55a..f627de89e 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_GIRATINA] = sGiratinaFormChangeTable, [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable, [SPECIES_SHAYMIN] = sShayminFormChangeTable, @@ -23,14 +23,14 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_ARCEUS_DRAGON] = sArceusFormChangeTable, [SPECIES_ARCEUS_DARK] = sArceusFormChangeTable, [SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_TORNADUS] = sTornadusFormChangeTable, [SPECIES_TORNADUS_THERIAN] = sTornadusTherianFormChangeTable, [SPECIES_THUNDURUS] = sThundurusFormChangeTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusTherianFormChangeTable, [SPECIES_LANDORUS] = sLandorusFormChangeTable, [SPECIES_LANDORUS_THERIAN] = sLandorusTherianFormChangeTable, - [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, - [SPECIES_ENAMORUS_THERIAN] = sEnamorusTherianFormChangeTable, [SPECIES_KELDEO] = sKeldeoFormChangeTable, [SPECIES_KELDEO_RESOLUTE] = sKeldeoResoluteFormChangeTable, [SPECIES_GENESECT] = sGenesectFormChangeTable, @@ -38,8 +38,12 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormChangeTable, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormChangeTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormChangeTable, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_HOOPA] = sHoopaFormChangeTable, [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundFormChangeTable, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ORICORIO] = sOricorioFormChangeTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable, [SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable, @@ -63,4 +67,8 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, #endif +#if P_NEW_POKEMON >= GEN_8 + [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 5f8541c40..2f658faa9 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 static const struct FormChange sGiratinaFormChangeTable[] = { {FORM_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE}, {FORM_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB}, @@ -94,7 +94,9 @@ static const struct FormChange sArceusFormChangeTable[] = { {FORM_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FAIRY, ITEM_FAIRIUM_Z, ABILITY_MULTITYPE}, {FORM_CHANGE_END}, }; +#endif +#if P_NEW_POKEMON >= GEN_5 static const struct FormChange sTornadusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, @@ -125,16 +127,6 @@ static const struct FormChange sLandorusTherianFormChangeTable[] = { {FORM_CHANGE_END}, }; -static const struct FormChange sEnamorusFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_ENAMORUS, ITEM_REVEAL_GLASS}, - {FORM_CHANGE_END}, -}; - -static const struct FormChange sEnamorusTherianFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, - {FORM_CHANGE_END}, -}; - static const struct FormChange sKeldeoFormChangeTable[] = { {FORM_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED}, {FORM_CHANGE_END}, @@ -153,7 +145,9 @@ static const struct FormChange sGenesectFormChangeTable[] = { {FORM_ITEM_HOLD, SPECIES_GENESECT_CHILL_DRIVE, ITEM_CHILL_DRIVE}, {FORM_CHANGE_END}, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const struct FormChange sHoopaFormChangeTable[] = { // {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, {FORM_CHANGE_END}, @@ -163,7 +157,9 @@ static const struct FormChange sHoopaUnboundFormChangeTable[] = { {FORM_WITHDRAW, SPECIES_HOOPA}, {FORM_CHANGE_END}, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const struct FormChange sOricorioFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR}, @@ -195,5 +191,17 @@ static const struct FormChange sSilvallyFormChangeTable[] = { }; #endif +#if P_NEW_POKEMON >= GEN_8 +static const struct FormChange sEnamorusFormChangeTable[] = { + {FORM_ITEM_USE, SPECIES_ENAMORUS, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; + +static const struct FormChange sEnamorusTherianFormChangeTable[] = { + {FORM_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, + {FORM_CHANGE_END}, +}; +#endif + #undef WHEN_LEARNED #undef WHEN_FORGOTTEN diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 71a210e40..6d931190b 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -1,6 +1,5 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = { -#if P_NEW_POKEMON == TRUE [SPECIES_VENUSAUR] = sVenusaurFormSpeciesIdTable, [SPECIES_CHARIZARD] = sCharizardFormSpeciesIdTable, [SPECIES_BLASTOISE] = sBlastoiseFormSpeciesIdTable, @@ -52,9 +51,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, -#endif [SPECIES_UNOWN] = sUnownFormSpeciesIdTable, -#if P_NEW_POKEMON == TRUE [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable, [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable, [SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable, @@ -75,9 +72,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable, [SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable, [SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable, -#endif [SPECIES_CASTFORM] = sCastformFormSpeciesIdTable, -#if P_NEW_POKEMON == TRUE [SPECIES_BANETTE] = sBanetteFormSpeciesIdTable, [SPECIES_ABSOL] = sAbsolFormSpeciesIdTable, [SPECIES_GLALIE] = sGlalieFormSpeciesIdTable, @@ -88,9 +83,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable, [SPECIES_GROUDON] = sGroudonFormSpeciesIdTable, [SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable, -#endif [SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_BURMY] = sBurmyFormSpeciesIdTable, [SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable, [SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable, @@ -105,9 +99,11 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DIALGA] = sDialgaFormSpeciesIdTable, [SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable, [SPECIES_GIRATINA] = sGiratinaFormSpeciesIdTable, - [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable, [SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable, [SPECIES_ARCEUS] = sArceusFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_5 + [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable, [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable, [SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable, [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable, @@ -127,6 +123,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_KELDEO] = sKeldeoFormSpeciesIdTable, [SPECIES_MELOETTA] = sMeloettaFormSpeciesIdTable, [SPECIES_GENESECT] = sGenesectFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_GRENINJA] = sGreninjaFormSpeciesIdTable, [SPECIES_VIVILLON] = sVivillonFormSpeciesIdTable, [SPECIES_FLABEBE] = sFlabebeFormSpeciesIdTable, @@ -144,6 +142,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable, [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable, [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, @@ -154,6 +154,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_MIMIKYU] = sMimikyuFormSpeciesIdTable, [SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable, [SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable, [SPECIES_TOXTRICITY] = sToxtricityFormSpeciesIdTable, [SPECIES_SINISTEA] = sSinisteaFormSpeciesIdTable, @@ -169,6 +171,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable, [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable, +#endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable, @@ -210,13 +213,19 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_METAGROSS_MEGA] = sMetagrossFormSpeciesIdTable, [SPECIES_LATIAS_MEGA] = sLatiasFormSpeciesIdTable, [SPECIES_LATIOS_MEGA] = sLatiosFormSpeciesIdTable, +#if P_NEW_POKEMON >= GEN_4 [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 [SPECIES_AUDINO_MEGA] = sAudinoFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = sDiancieFormSpeciesIdTable, +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = sRayquazaFormSpeciesIdTable, [SPECIES_KYOGRE_PRIMAL] = sKyogreFormSpeciesIdTable, @@ -256,10 +265,12 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_CORSOLA_GALARIAN] = sCorsolaFormSpeciesIdTable, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonFormSpeciesIdTable, [SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable, [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable, +#endif //Hisuian Forms [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable, [SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable, @@ -268,15 +279,21 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable, [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable, +#if P_NEW_POKEMON >= GEN_5 [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 [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable, [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable, [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, +#endif // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, @@ -296,7 +313,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable, // Pichu [SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable, -#endif // Unown [SPECIES_UNOWN_B] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_C] = sUnownFormSpeciesIdTable, @@ -333,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable, @@ -376,6 +392,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ARCEUS_DRAGON] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_DARK] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable, @@ -407,6 +425,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaFormSpeciesIdTable, [SPECIES_GRENINJA_ASH] = sGreninjaFormSpeciesIdTable, @@ -477,6 +497,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ZYGARDE_COMPLETE] = sZygardeFormSpeciesIdTable, // Hoopa [SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable, @@ -528,6 +550,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_NECROZMA_ULTRA] = sNecrozmaFormSpeciesIdTable, // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaFormSpeciesIdTable, +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT_GORGING] = sCramorantFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 8e89a3836..d329dfab3 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1,4 +1,3 @@ -#if P_NEW_POKEMON == TRUE static const u16 sVenusaurFormSpeciesIdTable[] = { SPECIES_VENUSAUR, SPECIES_VENUSAUR_MEGA, @@ -321,7 +320,7 @@ static const u16 sSneaselFormSpeciesIdTable[] = { SPECIES_SNEASEL_HISUIAN, FORM_SPECIES_END, }; -#endif + static const u16 sUnownFormSpeciesIdTable[] = { SPECIES_UNOWN, SPECIES_UNOWN_B, @@ -354,7 +353,6 @@ static const u16 sUnownFormSpeciesIdTable[] = { FORM_SPECIES_END, }; -#if P_NEW_POKEMON == TRUE static const u16 sSteelixFormSpeciesIdTable[] = { SPECIES_STEELIX, SPECIES_STEELIX_MEGA, @@ -474,7 +472,7 @@ static const u16 sAltariaFormSpeciesIdTable[] = { SPECIES_ALTARIA_MEGA, FORM_SPECIES_END, }; -#endif + static const u16 sCastformFormSpeciesIdTable[] = { SPECIES_CASTFORM, SPECIES_CASTFORM_SUNNY, @@ -483,7 +481,6 @@ static const u16 sCastformFormSpeciesIdTable[] = { FORM_SPECIES_END, }; -#if P_NEW_POKEMON == TRUE static const u16 sBanetteFormSpeciesIdTable[] = { SPECIES_BANETTE, SPECIES_BANETTE_MEGA, @@ -543,7 +540,7 @@ static const u16 sRayquazaFormSpeciesIdTable[] = { SPECIES_RAYQUAZA_MEGA, FORM_SPECIES_END, }; -#endif + static const u16 sDeoxysFormSpeciesIdTable[] = { SPECIES_DEOXYS, SPECIES_DEOXYS_ATTACK, @@ -551,7 +548,8 @@ static const u16 sDeoxysFormSpeciesIdTable[] = { SPECIES_DEOXYS_SPEED, FORM_SPECIES_END, }; -#if P_NEW_POKEMON == TRUE + +#if P_NEW_POKEMON >= GEN_4 static const u16 sBurmyFormSpeciesIdTable[] = { SPECIES_BURMY, SPECIES_BURMY_SANDY_CLOAK, @@ -642,12 +640,6 @@ static const u16 sGiratinaFormSpeciesIdTable[] = { FORM_SPECIES_END, }; -static const u16 sSamurottFormSpeciesIdTable[] = { - SPECIES_SAMUROTT, - SPECIES_SAMUROTT_HISUIAN, - FORM_SPECIES_END, -}; - static const u16 sShayminFormSpeciesIdTable[] = { SPECIES_SHAYMIN, SPECIES_SHAYMIN_SKY, @@ -675,6 +667,14 @@ static const u16 sArceusFormSpeciesIdTable[] = { SPECIES_ARCEUS_FAIRY, FORM_SPECIES_END, }; +#endif + +#if P_NEW_POKEMON >= GEN_5 +static const u16 sSamurottFormSpeciesIdTable[] = { + SPECIES_SAMUROTT, + SPECIES_SAMUROTT_HISUIAN, + FORM_SPECIES_END, +}; static const u16 sAudinoFormSpeciesIdTable[] = { SPECIES_AUDINO, @@ -806,7 +806,9 @@ static const u16 sGenesectFormSpeciesIdTable[] = { SPECIES_GENESECT_CHILL_DRIVE, FORM_SPECIES_END, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const u16 sGreninjaFormSpeciesIdTable[] = { SPECIES_GRENINJA, SPECIES_GRENINJA_BATTLE_BOND, @@ -952,7 +954,9 @@ static const u16 sHoopaFormSpeciesIdTable[] = { SPECIES_HOOPA_UNBOUND, FORM_SPECIES_END, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const u16 sDecidueyeFormSpeciesIdTable[] = { SPECIES_DECIDUEYE, SPECIES_DECIDUEYE_HISUIAN, @@ -1045,7 +1049,9 @@ static const u16 sMagearnaFormSpeciesIdTable[] = { SPECIES_MAGEARNA_ORIGINAL_COLOR, FORM_SPECIES_END, }; +#endif +#if P_NEW_POKEMON >= GEN_8 static const u16 sCramorantFormSpeciesIdTable[] = { SPECIES_CRAMORANT, SPECIES_CRAMORANT_GULPING, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 27c7b522f..d1659be02 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = sTurtwigLevelUpLearnset, [SPECIES_GROTLE] = sGrotleLevelUpLearnset, [SPECIES_TORTERRA] = sTorterraLevelUpLearnset, @@ -495,6 +495,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DARKRAI] = sDarkraiLevelUpLearnset, [SPECIES_SHAYMIN] = sShayminLevelUpLearnset, [SPECIES_ARCEUS] = sArceusLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = sVictiniLevelUpLearnset, [SPECIES_SNIVY] = sSnivyLevelUpLearnset, [SPECIES_SERVINE] = sServineLevelUpLearnset, @@ -651,6 +653,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_KELDEO] = sKeldeoLevelUpLearnset, [SPECIES_MELOETTA] = sMeloettaLevelUpLearnset, [SPECIES_GENESECT] = sGenesectLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = sChespinLevelUpLearnset, [SPECIES_QUILLADIN] = sQuilladinLevelUpLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtLevelUpLearnset, @@ -723,6 +727,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DIANCIE] = sDiancieLevelUpLearnset, [SPECIES_HOOPA] = sHoopaLevelUpLearnset, [SPECIES_VOLCANION] = sVolcanionLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = sRowletLevelUpLearnset, [SPECIES_DARTRIX] = sDartrixLevelUpLearnset, [SPECIES_DECIDUEYE] = sDecidueyeLevelUpLearnset, @@ -811,6 +817,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ZERAORA] = sZeraoraLevelUpLearnset, [SPECIES_MELTAN] = sMeltanLevelUpLearnset, [SPECIES_MELMETAL] = sMelmetalLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = sGrookeyLevelUpLearnset, [SPECIES_THWACKEY] = sThwackeyLevelUpLearnset, [SPECIES_RILLABOOM] = sRillaboomLevelUpLearnset, @@ -907,6 +915,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SNEASLER] = sSneaslerLevelUpLearnset, [SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset, [SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset, +#endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, [SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset, @@ -948,13 +957,19 @@ 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 [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 [SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset, +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = sRayquazaLevelUpLearnset, [SPECIES_KYOGRE_PRIMAL] = sKyogreLevelUpLearnset, @@ -994,10 +1009,12 @@ 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 [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset, +#endif // Hisuian Forms [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset, [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset, @@ -1006,15 +1023,21 @@ 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 [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 [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset, [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset, [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, +#endif // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, @@ -1034,7 +1057,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset, // Pichu [SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset, -#endif // Unown [SPECIES_UNOWN_B] = sUnownLevelUpLearnset, [SPECIES_UNOWN_C] = sUnownLevelUpLearnset, @@ -1071,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyLevelUpLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyLevelUpLearnset, @@ -1114,6 +1136,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_DRAGON] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_DARK] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, @@ -1132,7 +1156,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset, [SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset, [SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset, - [SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset, // Kyurem [SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset, [SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset, @@ -1145,6 +1168,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaLevelUpLearnset, [SPECIES_GRENINJA_ASH] = sGreninjaLevelUpLearnset, @@ -1215,6 +1240,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset, // Hoopa [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, @@ -1266,6 +1293,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_NECROZMA_ULTRA] = sNecrozmaLevelUpLearnset, // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaLevelUpLearnset, +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset, [SPECIES_CRAMORANT_GORGING] = sCramorantLevelUpLearnset, @@ -1303,5 +1332,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Calyrex [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset, + // Enamorus + [SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset, #endif }; diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index a8c696f1f..a7f70b525 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 static const struct LevelUpMove sTurtwigLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_WITHDRAW), @@ -9991,7 +9991,9 @@ static const struct LevelUpMove sArceusLevelUpLearnset[] = { LEVEL_UP_MOVE(100, MOVE_JUDGMENT), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_5 static const struct LevelUpMove sVictiniLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SEARING_SHOT), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), @@ -13250,7 +13252,9 @@ static const struct LevelUpMove sGenesectLevelUpLearnset[] = { LEVEL_UP_MOVE(77, MOVE_SELF_DESTRUCT), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const struct LevelUpMove sChespinLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), @@ -14745,7 +14749,9 @@ static const struct LevelUpMove sVolcanionLevelUpLearnset[] = { LEVEL_UP_MOVE(85, MOVE_STEAM_ERUPTION), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const struct LevelUpMove sRowletLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), @@ -16523,6 +16529,9 @@ static const struct LevelUpMove sMelmetalLevelUpLearnset[] = { LEVEL_UP_MOVE( 90, MOVE_HYPER_BEAM), LEVEL_UP_END }; +#endif + +#if P_NEW_POKEMON >= GEN_8 static const struct LevelUpMove sGrookeyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -18177,6 +18186,7 @@ static const struct LevelUpMove sEnamorusLevelUpLearnset[] = { //LEVEL_UP_MOVE( 1, MOVE_SPRINGTIDE_STORM), LEVEL_UP_END }; +#endif static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -18855,6 +18865,7 @@ static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { LEVEL_UP_END }; +#if P_NEW_POKEMON >= GEN_5 static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -18931,6 +18942,7 @@ static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { LEVEL_UP_MOVE(55, MOVE_FISSURE), LEVEL_UP_END }; +#endif static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -19021,6 +19033,7 @@ static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { LEVEL_UP_END }; +#if P_NEW_POKEMON >= GEN_5 static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -19090,7 +19103,9 @@ static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { //LEVEL_UP_MOVE(52, MOVE_HURRICANE), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), //LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), @@ -19129,7 +19144,9 @@ static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), @@ -19203,7 +19220,7 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = { LEVEL_UP_END }; -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), @@ -19304,7 +19321,9 @@ static const struct LevelUpMove sKyuremBlackLevelUpLearnset[] = { LEVEL_UP_MOVE(92, MOVE_HYPER_VOICE), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), @@ -19373,7 +19392,9 @@ static const struct LevelUpMove sHoopaUnboundLevelUpLearnset[] = { LEVEL_UP_MOVE(85, MOVE_HYPERSPACE_FURY), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const struct LevelUpMove sLycanrocMidnightLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_COUNTER), LEVEL_UP_MOVE( 1, MOVE_REVERSAL), @@ -19417,7 +19438,9 @@ static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = { LEVEL_UP_MOVE(48, MOVE_STONE_EDGE), LEVEL_UP_END }; +#endif +#if P_NEW_POKEMON >= GEN_8 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 38bbdb5a8..2ab164784 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [NATIONAL_DEX_TURTWIG] = { .categoryName = _("Tiny Leaf"), @@ -5928,7 +5928,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_5 [NATIONAL_DEX_VICTINI] = { .categoryName = _("Victory"), @@ -7800,7 +7802,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [NATIONAL_DEX_CHESPIN] = { .categoryName = _("Spiny Nut"), @@ -8664,7 +8668,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [NATIONAL_DEX_ROWLET] = { .categoryName = _("Grass Quill"), @@ -9720,7 +9726,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 387, .trainerOffset = 2, }, +#endif +#if P_NEW_POKEMON >= GEN_8 [NATIONAL_DEX_GROOKEY] = { .categoryName = _("Chimp"), diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index bf3293203..2eb0407e9 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 const u8 gTurtwigPokedexText[] = _( "The shell on its back is made of soil. \n" "On a very healthy Turtwig, the shell \n" @@ -2962,7 +2962,9 @@ const u8 gArceusPokedexText[] = _( "emerged from an egg and shaped all there\n" "is in this world, before the universe\n" "even existed."); +#endif +#if P_NEW_POKEMON >= GEN_5 const u8 gVictiniPokedexText[] = _( "This Pokémon brings victory.\n" "It is said that Trainers with Victini\n" @@ -3898,7 +3900,9 @@ const u8 gGenesectPokedexText[] = _( "feared as the strongest of hunters.\n" "Team Plasma altered it and attached\n" "a cannon to its back."); +#endif +#if P_NEW_POKEMON >= GEN_6 const u8 gChespinPokedexText[] = _( "The quills on its head are usually soft.\n" "When it flexes them, the points become\n" @@ -4330,7 +4334,9 @@ const u8 gVolcanionPokedexText[] = _( "on its back and disappears into the dense\n" "fog. It's said to live in mountains where\n" "humans do not tread."); +#endif +#if P_NEW_POKEMON >= GEN_7 const u8 gRowletPokedexText[] = _( "This wary Pokémon uses photosynthesis\n" "to store up energy during the day, while\n" @@ -4851,7 +4857,9 @@ const u8 gMelmetalPokedexText[] = _( "Revered long ago for its capacity to create\n" "iron from nothing, for some reason it has\n" "come back to life after 3,000 years."); +#endif +#if P_NEW_POKEMON >= GEN_8 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 7727cde82..f238684c6 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = sTurtwigTeachableLearnset, [SPECIES_GROTLE] = sGrotleTeachableLearnset, [SPECIES_TORTERRA] = sTorterraTeachableLearnset, @@ -495,6 +495,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DARKRAI] = sDarkraiTeachableLearnset, [SPECIES_SHAYMIN] = sShayminTeachableLearnset, [SPECIES_ARCEUS] = sArceusTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = sVictiniTeachableLearnset, [SPECIES_SNIVY] = sSnivyTeachableLearnset, [SPECIES_SERVINE] = sServineTeachableLearnset, @@ -651,6 +653,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_KELDEO] = sKeldeoTeachableLearnset, [SPECIES_MELOETTA] = sMeloettaTeachableLearnset, [SPECIES_GENESECT] = sGenesectTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = sChespinTeachableLearnset, [SPECIES_QUILLADIN] = sQuilladinTeachableLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtTeachableLearnset, @@ -723,6 +727,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DIANCIE] = sDiancieTeachableLearnset, [SPECIES_HOOPA] = sHoopaTeachableLearnset, [SPECIES_VOLCANION] = sVolcanionTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = sRowletTeachableLearnset, [SPECIES_DARTRIX] = sDartrixTeachableLearnset, [SPECIES_DECIDUEYE] = sDecidueyeTeachableLearnset, @@ -811,6 +817,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ZERAORA] = sZeraoraTeachableLearnset, [SPECIES_MELTAN] = sMeltanTeachableLearnset, [SPECIES_MELMETAL] = sMelmetalTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = sGrookeyTeachableLearnset, [SPECIES_THWACKEY] = sThwackeyTeachableLearnset, [SPECIES_RILLABOOM] = sRillaboomTeachableLearnset, @@ -907,6 +915,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SNEASLER] = sSneaslerTeachableLearnset, [SPECIES_OVERQWIL] = sOverqwilTeachableLearnset, [SPECIES_ENAMORUS] = sEnamorusTeachableLearnset, +#endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset, [SPECIES_CHARIZARD_MEGA_X] = sCharizardTeachableLearnset, @@ -948,13 +957,19 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_METAGROSS_MEGA] = sMetagrossTeachableLearnset, [SPECIES_LATIAS_MEGA] = sLatiasTeachableLearnset, [SPECIES_LATIOS_MEGA] = sLatiosTeachableLearnset, +#if P_NEW_POKEMON >= GEN_4 [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 [SPECIES_AUDINO_MEGA] = sAudinoTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = sDiancieTeachableLearnset, +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = sRayquazaTeachableLearnset, [SPECIES_KYOGRE_PRIMAL] = sKyogreTeachableLearnset, @@ -994,10 +1009,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianTeachableLearnset, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianTeachableLearnset, [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianTeachableLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianTeachableLearnset, +#endif // Hisuian Forms [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianTeachableLearnset, [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianTeachableLearnset, @@ -1006,15 +1023,21 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianTeachableLearnset, [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianTeachableLearnset, [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianTeachableLearnset, +#if P_NEW_POKEMON >= GEN_5 [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 [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianTeachableLearnset, [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianTeachableLearnset, [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, +#endif // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, @@ -1034,7 +1057,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_PIKACHU_WORLD_CAP] = sPikachuTeachableLearnset, // Pichu [SPECIES_PICHU_SPIKY_EARED] = sPichuTeachableLearnset, -#endif // Unown [SPECIES_UNOWN_B] = sUnownTeachableLearnset, [SPECIES_UNOWN_C] = sUnownTeachableLearnset, @@ -1071,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyTeachableLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyTeachableLearnset, @@ -1114,6 +1136,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_DRAGON] = sArceusTeachableLearnset, [SPECIES_ARCEUS_DARK] = sArceusTeachableLearnset, [SPECIES_ARCEUS_FAIRY] = sArceusTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinTeachableLearnset, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset, @@ -1132,7 +1156,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_TORNADUS_THERIAN] = sTornadusTeachableLearnset, [SPECIES_THUNDURUS_THERIAN] = sThundurusTeachableLearnset, [SPECIES_LANDORUS_THERIAN] = sLandorusTeachableLearnset, - [SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset, // Kyurem [SPECIES_KYUREM_WHITE] = sKyuremTeachableLearnset, [SPECIES_KYUREM_BLACK] = sKyuremTeachableLearnset, @@ -1145,6 +1168,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaTeachableLearnset, [SPECIES_GRENINJA_ASH] = sGreninjaTeachableLearnset, @@ -1215,6 +1240,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ZYGARDE_COMPLETE] = sZygardeTeachableLearnset, // Hoopa [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioTeachableLearnset, [SPECIES_ORICORIO_PAU] = sOricorioTeachableLearnset, @@ -1266,6 +1293,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_NECROZMA_ULTRA] = sNecrozmaTeachableLearnset, // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaTeachableLearnset, +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING] = sCramorantTeachableLearnset, [SPECIES_CRAMORANT_GORGING] = sCramorantTeachableLearnset, @@ -1303,5 +1332,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Calyrex [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderTeachableLearnset, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset, + // Enamorus + [SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset, #endif }; diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index 30405b044..8a3b89293 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -16203,8 +16203,7 @@ static const u16 sDeoxysTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -#if P_NEW_POKEMON == TRUE - +#if P_NEW_POKEMON >= GEN_4 static const u16 sTurtwigTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BULLET_SEED, @@ -20326,7 +20325,9 @@ static const u16 sArceusTeachableLearnset[] = { MOVE_THUNDER_WAVE, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_5 static const u16 sVictiniTeachableLearnset[] = { MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, @@ -25417,7 +25418,9 @@ static const u16 sGenesectTeachableLearnset[] = { MOVE_THUNDER_WAVE, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const u16 sChespinTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, @@ -27826,7 +27829,9 @@ static const u16 sVolcanionTeachableLearnset[] = { MOVE_SWAGGER, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const u16 sRowletTeachableLearnset[] = { MOVE_ATTRACT, MOVE_DOUBLE_TEAM, @@ -30208,7 +30213,9 @@ static const u16 sMelmetalTeachableLearnset[] = { MOVE_HIDDEN_POWER, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_8 static const u16 sGrookeyTeachableLearnset[] = { MOVE_ATTRACT, MOVE_FACADE, @@ -32120,6 +32127,7 @@ static const u16 sOverqwilTeachableLearnset[] = { static const u16 sEnamorusTeachableLearnset[] = { MOVE_UNAVAILABLE, }; +#endif static const u16 sRattataAlolanTeachableLearnset[] = { MOVE_BLIZZARD, @@ -32849,6 +32857,7 @@ static const u16 sLinooneGalarianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; +#if P_NEW_POKEMON >= GEN_5 static const u16 sDarumakaGalarianTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, @@ -32958,6 +32967,7 @@ static const u16 sStunfiskGalarianTeachableLearnset[] = { MOVE_THUNDER_WAVE, MOVE_UNAVAILABLE, }; +#endif static const u16 sGrowlitheHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, @@ -32987,6 +32997,7 @@ static const u16 sSneaselHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; +#if P_NEW_POKEMON >= GEN_5 static const u16 sSamurottHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; @@ -33006,7 +33017,9 @@ static const u16 sZoroarkHisuianTeachableLearnset[] = { static const u16 sBraviaryHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const u16 sSliggooHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; @@ -33018,11 +33031,12 @@ static const u16 sGoodraHisuianTeachableLearnset[] = { static const u16 sAvaluggHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const u16 sDecidueyeHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; - #endif static const u16 sDeoxysAttackTeachableLearnset[] = { @@ -33145,8 +33159,7 @@ static const u16 sDeoxysSpeedTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -#if P_NEW_POKEMON == TRUE - +#if P_NEW_POKEMON >= GEN_4 static const u16 sBurmySandyCloakTeachableLearnset[] = { MOVE_HIDDEN_POWER, MOVE_PROTECT, @@ -33280,7 +33293,9 @@ static const u16 sShayminSkyTeachableLearnset[] = { MOVE_TOXIC, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const u16 sFloetteEternalFlowerTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, @@ -33373,7 +33388,9 @@ static const u16 sMeowsticFemaleTeachableLearnset[] = { MOVE_THUNDER_WAVE, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const u16 sLycanrocMidnightTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, @@ -33411,7 +33428,9 @@ static const u16 sLycanrocDuskTeachableLearnset[] = { MOVE_TOXIC, MOVE_UNAVAILABLE, }; +#endif +#if P_NEW_POKEMON >= GEN_8 static const u16 sToxtricityLowKeyTeachableLearnset[] = { MOVE_ATTRACT, MOVE_FACADE, @@ -33552,5 +33571,4 @@ static const u16 sCalyrexShadowRiderTeachableLearnset[] = { MOVE_SWIFT, MOVE_UNAVAILABLE, }; - #endif diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index e04afe339..487c49347 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1,3 +1,22 @@ + +#define PIKACHU_BACK_PIC_COORDS \ +{ \ + .size = MON_COORDS_SIZE(64, 56), \ + .y_offset = 4, \ +} + +#define ARCEUS_BACK_PIC_COORDS \ +{ \ + .size = MON_COORDS_SIZE(64, 64), \ + .y_offset = 3, \ +} + +#define DEERLING_BACK_PIC_COORDS \ +{ \ + .size = MON_COORDS_SIZE(48, 56), \ + .y_offset = 9, \ +} + // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame // the sprite's non-transparent pixels actually are. // .size is the dimensions of this drawn pixel area. @@ -129,11 +148,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, - [SPECIES_PIKACHU] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, + [SPECIES_PIKACHU] = PIKACHU_BACK_PIC_COORDS, [SPECIES_RAICHU] = { .size = MON_COORDS_SIZE(64, 56), @@ -1939,7 +1954,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 9, }, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(48, 56), @@ -2470,11 +2485,9 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(56, 40), .y_offset = 15, }, - [SPECIES_ARCEUS] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, + [SPECIES_ARCEUS] = ARCEUS_BACK_PIC_COORDS, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(40, 64), @@ -2930,11 +2943,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 6, }, - [SPECIES_DEERLING] = - { - .size = MON_COORDS_SIZE(48, 56), - .y_offset = 9, - }, + [SPECIES_DEERLING] = DEERLING_BACK_PIC_COORDS, [SPECIES_SAWSBUCK] = { .size = MON_COORDS_SIZE(48, 64), @@ -3255,6 +3264,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 48), .y_offset = 8, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(56, 64), @@ -3615,6 +3626,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 3, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(48, 40), @@ -4055,6 +4068,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 40), .y_offset = 13, }, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = { .size = MON_COORDS_SIZE(48, 56), @@ -4535,6 +4550,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif // Megas [SPECIES_VENUSAUR_MEGA] = { @@ -4736,6 +4752,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, +#if P_NEW_POKEMON >= GEN_4 [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(64, 64), @@ -4761,16 +4778,21 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 3, }, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5, }, +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = { @@ -4954,6 +4976,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 40), .y_offset = 13, }, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(56, 48), @@ -4974,6 +4997,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 24), .y_offset = 23, }, +#endif // Hisuian Forms [SPECIES_GROWLITHE_HISUIAN] = { @@ -5010,6 +5034,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(56, 64), .y_offset = 3, }, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5035,6 +5060,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5050,91 +5077,37 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 32), .y_offset = 17, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif // Misc Forms // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_ROCK_STAR] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_BELLE] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_POP_STAR] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_PH_D] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_LIBRE] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, + [SPECIES_PIKACHU_COSPLAY] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_ROCK_STAR] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_BELLE] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_POP_STAR] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_PH_D] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_LIBRE] = PIKACHU_BACK_PIC_COORDS, // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_HOENN_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_SINNOH_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_UNOVA_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_KALOS_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_ALOLA_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_PARTNER_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, - [SPECIES_PIKACHU_WORLD_CAP] = - { - .size = MON_COORDS_SIZE(64, 56), - .y_offset = 4, - }, + [SPECIES_PIKACHU_ORIGINAL_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_HOENN_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_SINNOH_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_UNOVA_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_KALOS_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_ALOLA_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_PARTNER_CAP] = PIKACHU_BACK_PIC_COORDS, + [SPECIES_PIKACHU_WORLD_CAP] = PIKACHU_BACK_PIC_COORDS, // Pichu [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 8, }, -#endif // Unown [SPECIES_UNOWN_B] = { @@ -5303,7 +5276,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { @@ -5393,91 +5366,25 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 2, }, // Arceus - [SPECIES_ARCEUS_FIGHTING] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_FLYING] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_POISON] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_GROUND] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_ROCK] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_BUG] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_GHOST] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_STEEL] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_FIRE] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_WATER] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_GRASS] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_ELECTRIC] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_PSYCHIC] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_ICE] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_DRAGON] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_DARK] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, - [SPECIES_ARCEUS_FAIRY] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 3, - }, + [SPECIES_ARCEUS_FIGHTING] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_FLYING] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_POISON] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_GROUND] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_ROCK] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_BUG] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_GHOST] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_STEEL] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_FIRE] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_WATER] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_GRASS] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_ELECTRIC] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_PSYCHIC] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_ICE] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_DRAGON] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_DARK] = ARCEUS_BACK_PIC_COORDS, + [SPECIES_ARCEUS_FAIRY] = ARCEUS_BACK_PIC_COORDS, +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { @@ -5501,21 +5408,9 @@ const struct MonCoords gMonBackPicCoords[] = .y_offset = 1, }, // Deerling - [SPECIES_DEERLING_SUMMER] = - { - .size = MON_COORDS_SIZE(48, 56), - .y_offset = 9, - }, - [SPECIES_DEERLING_AUTUMN] = - { - .size = MON_COORDS_SIZE(48, 56), - .y_offset = 9, - }, - [SPECIES_DEERLING_WINTER] = - { - .size = MON_COORDS_SIZE(48, 56), - .y_offset = 9, - }, + [SPECIES_DEERLING_SUMMER] = DEERLING_BACK_PIC_COORDS, + [SPECIES_DEERLING_AUTUMN] = DEERLING_BACK_PIC_COORDS, + [SPECIES_DEERLING_WINTER] = DEERLING_BACK_PIC_COORDS, // Sawsbuck [SPECIES_SAWSBUCK_SUMMER] = { @@ -5548,11 +5443,6 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 7, }, - [SPECIES_ENAMORUS_THERIAN] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 0, - }, // Kyurem [SPECIES_KYUREM_WHITE] = { @@ -5597,6 +5487,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 48), .y_offset = 8, }, +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = { @@ -5895,6 +5787,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM] = { @@ -6114,6 +6008,8 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 4, }, +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING] = { @@ -6243,6 +6139,11 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 7, }, + [SPECIES_ENAMORUS_THERIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, #endif // Egg [SPECIES_EGG] = diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 30a711fc4..4de33b79a 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig), SPECIES_SPRITE(GROTLE, gMonBackPic_Grotle), SPECIES_SPRITE(TORTERRA, gMonBackPic_Torterra), @@ -495,6 +495,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(DARKRAI, gMonBackPic_Darkrai), SPECIES_SPRITE(SHAYMIN, gMonBackPic_Shaymin), SPECIES_SPRITE(ARCEUS, gMonBackPic_Arceus), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SPRITE(VICTINI, gMonBackPic_Victini), SPECIES_SPRITE(SNIVY, gMonBackPic_Snivy), SPECIES_SPRITE(SERVINE, gMonBackPic_Servine), @@ -651,6 +653,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(KELDEO, gMonBackPic_Keldeo), SPECIES_SPRITE(MELOETTA, gMonBackPic_Meloetta), SPECIES_SPRITE(GENESECT, gMonBackPic_Genesect), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(CHESPIN, gMonBackPic_Chespin), SPECIES_SPRITE(QUILLADIN, gMonBackPic_Quilladin), SPECIES_SPRITE(CHESNAUGHT, gMonBackPic_Chesnaught), @@ -723,6 +727,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(DIANCIE, gMonBackPic_Diancie), SPECIES_SPRITE(HOOPA, gMonBackPic_Hoopa), SPECIES_SPRITE(VOLCANION, gMonBackPic_Volcanion), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_SPRITE(ROWLET, gMonBackPic_Rowlet), SPECIES_SPRITE(DARTRIX, gMonBackPic_Dartrix), SPECIES_SPRITE(DECIDUEYE, gMonBackPic_Decidueye), @@ -811,6 +817,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ZERAORA, gMonBackPic_Zeraora), SPECIES_SPRITE(MELTAN, gMonBackPic_Meltan), SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SPRITE(GROOKEY, gMonBackPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonBackPic_Thwackey), SPECIES_SPRITE(RILLABOOM, gMonBackPic_Rillaboom), @@ -907,6 +915,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler), SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil), SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus), +#endif SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonBackPic_CharizardMegaX), @@ -948,13 +957,19 @@ 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 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 SPECIES_SPRITE(AUDINO_MEGA, gMonBackPic_AudinoMega), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(DIANCIE_MEGA, gMonBackPic_DiancieMega), +#endif SPECIES_SPRITE(RAYQUAZA_MEGA, gMonBackPic_RayquazaMega), SPECIES_SPRITE(KYOGRE_PRIMAL, gMonBackPic_KyogrePrimal), @@ -994,10 +1009,12 @@ 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 SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonBackPic_DarumakaGalarian), SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonBackPic_DarmanitanGalarian), SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonBackPic_StunfiskGalarian), +#endif SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonBackPic_GrowlitheHisuian), SPECIES_SPRITE(ARCANINE_HISUIAN, gMonBackPic_ArcanineHisuian), @@ -1006,15 +1023,21 @@ 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 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 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 SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian), +#endif SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonBackPic_PikachuRockStar), @@ -1033,7 +1056,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonBackPic_PikachuWorldCap), SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonBackPic_PichuSpikyEared), -#endif + SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB), SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC), SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD), @@ -1069,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonBackPic_BurmySandyCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonBackPic_BurmyTrashCloak), @@ -1111,7 +1134,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ARCEUS_DRAGON, gMonBackPic_Arceus), SPECIES_SPRITE(ARCEUS_DARK, gMonBackPic_Arceus), SPECIES_SPRITE(ARCEUS_FAIRY, gMonBackPic_Arceus), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonBackPic_BasculinBlueStriped), SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_BasculinWhiteStriped), @@ -1129,7 +1154,6 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(TORNADUS_THERIAN, gMonBackPic_TornadusTherian), SPECIES_SPRITE(THUNDURUS_THERIAN, gMonBackPic_ThundurusTherian), SPECIES_SPRITE(LANDORUS_THERIAN, gMonBackPic_LandorusTherian), - SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian), SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite), SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack), @@ -1142,7 +1166,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(GENESECT_SHOCK_DRIVE, gMonBackPic_Genesect), SPECIES_SPRITE(GENESECT_BURN_DRIVE, gMonBackPic_Genesect), SPECIES_SPRITE(GENESECT_CHILL_DRIVE, gMonBackPic_Genesect), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(GRENINJA_BATTLE_BOND, gMonBackPic_Greninja), SPECIES_SPRITE(GRENINJA_ASH, gMonBackPic_GreninjaAsh), @@ -1212,7 +1238,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonBackPic_ZygardeComplete), SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom), SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu), @@ -1263,7 +1291,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(NECROZMA_ULTRA, gMonBackPic_NecrozmaUltra), SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonBackPic_MagearnaOriginalColor), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SPRITE(CRAMORANT_GULPING, gMonBackPic_CramorantGulping), SPECIES_SPRITE(CRAMORANT_GORGING, gMonBackPic_CramorantGorging), @@ -1300,6 +1330,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider), SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider), + + SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; @@ -1307,7 +1339,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor), @@ -1318,10 +1350,16 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF), SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF), SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF), #endif }; diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 8499650e0..64bd433fa 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -58,7 +58,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_LATIOS] = 6, [SPECIES_JIRACHI] = 14, [SPECIES_CHIMECHO] = 16, -#if P_NEW_POKEMON == TRUE // Gen 4 [SPECIES_MOTHIM] = 10, [SPECIES_COMBEE] = 8, @@ -182,7 +181,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_VOLTORB_HISUIAN] = 1, [SPECIES_ELECTRODE_HISUIAN] = 4, [SPECIES_BRAVIARY_HISUIAN] = 3, -#endif // Other Forms [SPECIES_UNOWN_B] = 8, [SPECIES_UNOWN_C] = 8, @@ -214,7 +212,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_CASTFORM_SUNNY] = 5, [SPECIES_CASTFORM_RAINY] = 5, [SPECIES_CASTFORM_SNOWY] = 5, -#if P_NEW_POKEMON == TRUE [SPECIES_ROTOM_HEAT] = 6, [SPECIES_ROTOM_WASH] = 6, [SPECIES_ROTOM_FROST] = 6, @@ -271,5 +268,4 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_ETERNATUS_ETERNAMAX] = 13, -#endif }; diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index cacf582ca..c49471f80 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = gMonFootprint_Turtwig, [SPECIES_GROTLE] = gMonFootprint_Grotle, [SPECIES_TORTERRA] = gMonFootprint_Torterra, @@ -495,6 +495,8 @@ const u8 *const gMonFootprintTable[] = [SPECIES_DARKRAI] = gMonFootprint_Darkrai, [SPECIES_SHAYMIN] = gMonFootprint_Shaymin, [SPECIES_ARCEUS] = gMonFootprint_Arceus, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = gMonFootprint_Victini, [SPECIES_SNIVY] = gMonFootprint_Snivy, [SPECIES_SERVINE] = gMonFootprint_Servine, @@ -651,6 +653,8 @@ const u8 *const gMonFootprintTable[] = [SPECIES_KELDEO] = gMonFootprint_Keldeo, [SPECIES_MELOETTA] = gMonFootprint_Meloetta, [SPECIES_GENESECT] = gMonFootprint_Genesect, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = gMonFootprint_Chespin, [SPECIES_QUILLADIN] = gMonFootprint_Quilladin, [SPECIES_CHESNAUGHT] = gMonFootprint_Chesnaught, @@ -723,6 +727,8 @@ const u8 *const gMonFootprintTable[] = [SPECIES_DIANCIE] = gMonFootprint_Diancie, [SPECIES_HOOPA] = gMonFootprint_Hoopa, [SPECIES_VOLCANION] = gMonFootprint_Volcanion, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = gMonFootprint_Rowlet, [SPECIES_DARTRIX] = gMonFootprint_Dartrix, [SPECIES_DECIDUEYE] = gMonFootprint_Decidueye, @@ -811,6 +817,8 @@ const u8 *const gMonFootprintTable[] = [SPECIES_ZERAORA] = gMonFootprint_Zeraora, [SPECIES_MELTAN] = gMonFootprint_Meltan, [SPECIES_MELMETAL] = gMonFootprint_Melmetal, +#endif +#if P_NEW_POKEMON >= GEN_8 [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 cf59f314c..ec0531120 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 static const union AnimCmd sAnim_TURTWIG_1[] = { ANIMCMD_FRAME(0, 15), @@ -5766,7 +5766,9 @@ static const union AnimCmd sAnim_ARCEUS_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_5 static const union AnimCmd sAnim_VICTINI_1[] = { ANIMCMD_FRAME(0, 30), @@ -7013,7 +7015,9 @@ static const union AnimCmd sAnim_GENESECT_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const union AnimCmd sAnim_CHESPIN_1[] = { ANIMCMD_FRAME(0, 8), @@ -7449,7 +7453,9 @@ static const union AnimCmd sAnim_VOLCANION_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const union AnimCmd sAnim_ROWLET_1[] = { ANIMCMD_FRAME(0, 1), @@ -7993,7 +7999,9 @@ static const union AnimCmd sAnim_MELMETAL_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_8 static const union AnimCmd sAnim_GROOKEY_1[] = { ANIMCMD_FRAME(0, 1), @@ -8569,6 +8577,7 @@ static const union AnimCmd sAnim_ENAMORUS_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif static const union AnimCmd sAnim_VENUSAUR_MEGA_1[] = { @@ -8828,6 +8837,7 @@ static const union AnimCmd sAnim_RAYQUAZA_MEGA_1[] = ANIMCMD_END, }; +#if P_NEW_POKEMON >= GEN_4 static const union AnimCmd sAnim_LOPUNNY_MEGA_1[] = { ANIMCMD_FRAME(0, 1), @@ -8857,18 +8867,23 @@ static const union AnimCmd sAnim_GALLADE_MEGA_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_5 static const union AnimCmd sAnim_AUDINO_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const union AnimCmd sAnim_DIANCIE_MEGA_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif static const union AnimCmd sAnim_RATTATA_ALOLAN_1[] = { @@ -9068,6 +9083,7 @@ static const union AnimCmd sAnim_LINOONE_GALARIAN_1[] = ANIMCMD_END, }; +#if P_NEW_POKEMON >= GEN_5 static const union AnimCmd sAnim_DARUMAKA_GALARIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9091,6 +9107,7 @@ static const union AnimCmd sAnim_STUNFISK_GALARIAN_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif static const union AnimCmd sAnim_GROWLITHE_HISUIAN_1[] = { @@ -9134,6 +9151,7 @@ static const union AnimCmd sAnim_SNEASEL_HISUIAN_1[] = ANIMCMD_END, }; +#if P_NEW_POKEMON >= GEN_5 static const union AnimCmd sAnim_SAMUROTT_HISUIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9163,7 +9181,9 @@ static const union AnimCmd sAnim_BRAVIARY_HISUIAN_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_6 static const union AnimCmd sAnim_SLIGGOO_HISUIAN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9181,209 +9201,16 @@ static const union AnimCmd sAnim_AVALUGG_HISUIAN_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif +#if P_NEW_POKEMON >= GEN_7 static const union AnimCmd sAnim_DECIDUEYE_HISUIAN_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -static const union AnimCmd sAnim_SHAYMIN_SKY_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DIALGA_ORIGIN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_PALKIA_ORIGIN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_GIRATINA_ORIGIN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DARMANITAN_ZEN_MODE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DARMANITAN_ZEN_MODE_GALARIAN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_TORNADUS_THERIAN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_THUNDURUS_THERIAN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LANDORUS_THERIAN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_ENAMORUS_THERIAN_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_KELDEO_RESOLUTE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_MELOETTA_PIROUETTE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_AEGISLASH_BLADE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_HOOPA_UNBOUND_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_MINIOR_CORE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_WISHIWASHI_SCHOOL_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_KYUREM_BLACK_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_KYUREM_WHITE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_MIMIKYU_BUSTED_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LYCANROC_MIDNIGHT_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LYCANROC_DUSK_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_ZYGARDE_10_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; #endif -static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; -static const union AnimCmd sAnim_DEOXYS_ATTACK_2[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DEOXYS_DEFENSE_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DEOXYS_DEFENSE_2[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DEOXYS_SPEED_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DEOXYS_SPEED_2[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(2, 20), - ANIMCMD_END, -}; - -#if P_NEW_POKEMON == TRUE static const union AnimCmd sAnim_PIKACHU_COSPLAY_1[] = { ANIMCMD_FRAME(0, 1), @@ -9473,1336 +9300,1798 @@ static const union AnimCmd sAnim_PICHU_SPIKY_EARED_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_ATTACK_2[] = +{ + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(2, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(2, 20), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_DEFENSE_1[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_DEFENSE_2[] = +{ + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(2, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(2, 20), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_SPEED_1[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_SPEED_2[] = +{ + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(2, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(2, 20), + ANIMCMD_END, +}; + +#if P_NEW_POKEMON >= GEN_4 +static const union AnimCmd sAnim_SHAYMIN_SKY_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DIALGA_ORIGIN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PALKIA_ORIGIN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_GIRATINA_ORIGIN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; #endif -static const union AnimCmd *const sAnims_NONE[] ={ +#if P_NEW_POKEMON >= GEN_5 +static const union AnimCmd sAnim_DARMANITAN_ZEN_MODE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DARMANITAN_ZEN_MODE_GALARIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_TORNADUS_THERIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_THUNDURUS_THERIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_LANDORUS_THERIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_KYUREM_BLACK_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_KYUREM_WHITE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_KELDEO_RESOLUTE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MELOETTA_PIROUETTE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; +#endif + +#if P_NEW_POKEMON >= GEN_6 +static const union AnimCmd sAnim_AEGISLASH_BLADE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ZYGARDE_10_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_HOOPA_UNBOUND_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; +#endif + +#if P_NEW_POKEMON >= GEN_7 +static const union AnimCmd sAnim_MINIOR_CORE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_WISHIWASHI_SCHOOL_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MIMIKYU_BUSTED_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_LYCANROC_MIDNIGHT_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_LYCANROC_DUSK_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; +#endif + +#if P_NEW_POKEMON >= GEN_8 +static const union AnimCmd sAnim_ENAMORUS_THERIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; +#endif + +static const union AnimCmd *const sAnims_NONE[] = +{ sAnim_GeneralFrame0, sAnim_NONE_1, }; -static const union AnimCmd *const sAnims_BULBASAUR[] ={ +static const union AnimCmd *const sAnims_BULBASAUR[] = +{ sAnim_GeneralFrame0, sAnim_BULBASAUR_1, }; -static const union AnimCmd *const sAnims_IVYSAUR[] ={ +static const union AnimCmd *const sAnims_IVYSAUR[] = +{ sAnim_GeneralFrame0, sAnim_IVYSAUR_1, }; -static const union AnimCmd *const sAnims_VENUSAUR[] ={ +static const union AnimCmd *const sAnims_VENUSAUR[] = +{ sAnim_GeneralFrame0, sAnim_VENUSAUR_1, }; -static const union AnimCmd *const sAnims_CHARMANDER[] ={ +static const union AnimCmd *const sAnims_CHARMANDER[] = +{ sAnim_GeneralFrame0, sAnim_CHARMANDER_1, }; -static const union AnimCmd *const sAnims_CHARMELEON[] ={ +static const union AnimCmd *const sAnims_CHARMELEON[] = +{ sAnim_GeneralFrame0, sAnim_CHARMELEON_1, }; -static const union AnimCmd *const sAnims_CHARIZARD[] ={ +static const union AnimCmd *const sAnims_CHARIZARD[] = +{ sAnim_GeneralFrame0, sAnim_CHARIZARD_1, }; -static const union AnimCmd *const sAnims_SQUIRTLE[] ={ +static const union AnimCmd *const sAnims_SQUIRTLE[] = +{ sAnim_GeneralFrame0, sAnim_SQUIRTLE_1, }; -static const union AnimCmd *const sAnims_WARTORTLE[] ={ +static const union AnimCmd *const sAnims_WARTORTLE[] = +{ sAnim_GeneralFrame0, sAnim_WARTORTLE_1, }; -static const union AnimCmd *const sAnims_BLASTOISE[] ={ +static const union AnimCmd *const sAnims_BLASTOISE[] = +{ sAnim_GeneralFrame0, sAnim_BLASTOISE_1, }; -static const union AnimCmd *const sAnims_CATERPIE[] ={ +static const union AnimCmd *const sAnims_CATERPIE[] = +{ sAnim_GeneralFrame0, sAnim_CATERPIE_1, }; -static const union AnimCmd *const sAnims_METAPOD[] ={ +static const union AnimCmd *const sAnims_METAPOD[] = +{ sAnim_GeneralFrame0, sAnim_METAPOD_1, }; -static const union AnimCmd *const sAnims_BUTTERFREE[] ={ +static const union AnimCmd *const sAnims_BUTTERFREE[] = +{ sAnim_GeneralFrame0, sAnim_BUTTERFREE_1, }; -static const union AnimCmd *const sAnims_WEEDLE[] ={ +static const union AnimCmd *const sAnims_WEEDLE[] = +{ sAnim_GeneralFrame0, sAnim_WEEDLE_1, }; -static const union AnimCmd *const sAnims_KAKUNA[] ={ +static const union AnimCmd *const sAnims_KAKUNA[] = +{ sAnim_GeneralFrame0, sAnim_KAKUNA_1, }; -static const union AnimCmd *const sAnims_BEEDRILL[] ={ +static const union AnimCmd *const sAnims_BEEDRILL[] = +{ sAnim_GeneralFrame0, sAnim_BEEDRILL_1, }; -static const union AnimCmd *const sAnims_PIDGEY[] ={ +static const union AnimCmd *const sAnims_PIDGEY[] = +{ sAnim_GeneralFrame0, sAnim_PIDGEY_1, }; -static const union AnimCmd *const sAnims_PIDGEOTTO[] ={ +static const union AnimCmd *const sAnims_PIDGEOTTO[] = +{ sAnim_GeneralFrame0, sAnim_PIDGEOTTO_1, }; -static const union AnimCmd *const sAnims_PIDGEOT[] ={ +static const union AnimCmd *const sAnims_PIDGEOT[] = +{ sAnim_GeneralFrame0, sAnim_PIDGEOT_1, }; -static const union AnimCmd *const sAnims_RATTATA[] ={ +static const union AnimCmd *const sAnims_RATTATA[] = +{ sAnim_GeneralFrame0, sAnim_RATTATA_1, }; -static const union AnimCmd *const sAnims_RATICATE[] ={ +static const union AnimCmd *const sAnims_RATICATE[] = +{ sAnim_GeneralFrame0, sAnim_RATICATE_1, }; -static const union AnimCmd *const sAnims_SPEAROW[] ={ +static const union AnimCmd *const sAnims_SPEAROW[] = +{ sAnim_GeneralFrame0, sAnim_SPEAROW_1, }; -static const union AnimCmd *const sAnims_FEAROW[] ={ +static const union AnimCmd *const sAnims_FEAROW[] = +{ sAnim_GeneralFrame0, sAnim_FEAROW_1, }; -static const union AnimCmd *const sAnims_EKANS[] ={ +static const union AnimCmd *const sAnims_EKANS[] = +{ sAnim_GeneralFrame0, sAnim_EKANS_1, }; -static const union AnimCmd *const sAnims_ARBOK[] ={ +static const union AnimCmd *const sAnims_ARBOK[] = +{ sAnim_GeneralFrame0, sAnim_ARBOK_1, }; -static const union AnimCmd *const sAnims_PIKACHU[] ={ +static const union AnimCmd *const sAnims_PIKACHU[] = +{ sAnim_GeneralFrame0, sAnim_PIKACHU_1, sAnim_PIKACHU_2, }; -static const union AnimCmd *const sAnims_RAICHU[] ={ +static const union AnimCmd *const sAnims_RAICHU[] = +{ sAnim_GeneralFrame0, sAnim_RAICHU_1, sAnim_RAICHU_2, }; -static const union AnimCmd *const sAnims_SANDSHREW[] ={ +static const union AnimCmd *const sAnims_SANDSHREW[] = +{ sAnim_GeneralFrame0, sAnim_SANDSHREW_1, sAnim_SANDSHREW_2, }; -static const union AnimCmd *const sAnims_SANDSLASH[] ={ +static const union AnimCmd *const sAnims_SANDSLASH[] = +{ sAnim_GeneralFrame0, sAnim_SANDSLASH_1, sAnim_SANDSLASH_2, }; -static const union AnimCmd *const sAnims_NIDORAN_F[] ={ +static const union AnimCmd *const sAnims_NIDORAN_F[] = +{ sAnim_GeneralFrame0, sAnim_NIDORAN_F_1, }; -static const union AnimCmd *const sAnims_NIDORINA[] ={ +static const union AnimCmd *const sAnims_NIDORINA[] = +{ sAnim_GeneralFrame0, sAnim_NIDORINA_1, }; -static const union AnimCmd *const sAnims_NIDOQUEEN[] ={ +static const union AnimCmd *const sAnims_NIDOQUEEN[] = +{ sAnim_GeneralFrame0, sAnim_NIDOQUEEN_1, }; -static const union AnimCmd *const sAnims_NIDORAN_M[] ={ +static const union AnimCmd *const sAnims_NIDORAN_M[] = +{ sAnim_GeneralFrame0, sAnim_NIDORAN_M_1, }; -static const union AnimCmd *const sAnims_NIDORINO[] ={ +static const union AnimCmd *const sAnims_NIDORINO[] = +{ sAnim_GeneralFrame0, sAnim_NIDORINO_1, }; -static const union AnimCmd *const sAnims_NIDOKING[] ={ +static const union AnimCmd *const sAnims_NIDOKING[] = +{ sAnim_GeneralFrame0, sAnim_NIDOKING_1, }; -static const union AnimCmd *const sAnims_CLEFAIRY[] ={ +static const union AnimCmd *const sAnims_CLEFAIRY[] = +{ sAnim_GeneralFrame0, sAnim_CLEFAIRY_1, }; -static const union AnimCmd *const sAnims_CLEFABLE[] ={ +static const union AnimCmd *const sAnims_CLEFABLE[] = +{ sAnim_GeneralFrame0, sAnim_CLEFABLE_1, }; -static const union AnimCmd *const sAnims_VULPIX[] ={ +static const union AnimCmd *const sAnims_VULPIX[] = +{ sAnim_GeneralFrame0, sAnim_VULPIX_1, sAnim_VULPIX_2, }; -static const union AnimCmd *const sAnims_NINETALES[] ={ +static const union AnimCmd *const sAnims_NINETALES[] = +{ sAnim_GeneralFrame0, sAnim_NINETALES_1, sAnim_NINETALES_2, }; -static const union AnimCmd *const sAnims_JIGGLYPUFF[] ={ +static const union AnimCmd *const sAnims_JIGGLYPUFF[] = +{ sAnim_GeneralFrame0, sAnim_JIGGLYPUFF_1, sAnim_JIGGLYPUFF_2, }; -static const union AnimCmd *const sAnims_WIGGLYTUFF[] ={ +static const union AnimCmd *const sAnims_WIGGLYTUFF[] = +{ sAnim_GeneralFrame0, sAnim_WIGGLYTUFF_1, sAnim_WIGGLYTUFF_2, }; -static const union AnimCmd *const sAnims_ZUBAT[] ={ +static const union AnimCmd *const sAnims_ZUBAT[] = +{ sAnim_GeneralFrame0, sAnim_ZUBAT_1, }; -static const union AnimCmd *const sAnims_GOLBAT[] ={ +static const union AnimCmd *const sAnims_GOLBAT[] = +{ sAnim_GeneralFrame0, sAnim_GOLBAT_1, }; -static const union AnimCmd *const sAnims_ODDISH[] ={ +static const union AnimCmd *const sAnims_ODDISH[] = +{ sAnim_GeneralFrame0, sAnim_ODDISH_1, }; -static const union AnimCmd *const sAnims_GLOOM[] ={ +static const union AnimCmd *const sAnims_GLOOM[] = +{ sAnim_GeneralFrame0, sAnim_GLOOM_1, }; -static const union AnimCmd *const sAnims_VILEPLUME[] ={ +static const union AnimCmd *const sAnims_VILEPLUME[] = +{ sAnim_GeneralFrame0, sAnim_VILEPLUME_1, }; -static const union AnimCmd *const sAnims_PARAS[] ={ +static const union AnimCmd *const sAnims_PARAS[] = +{ sAnim_GeneralFrame0, sAnim_PARAS_1, }; -static const union AnimCmd *const sAnims_PARASECT[] ={ +static const union AnimCmd *const sAnims_PARASECT[] = +{ sAnim_GeneralFrame0, sAnim_PARASECT_1, }; -static const union AnimCmd *const sAnims_VENONAT[] ={ +static const union AnimCmd *const sAnims_VENONAT[] = +{ sAnim_GeneralFrame0, sAnim_VENONAT_1, }; -static const union AnimCmd *const sAnims_VENOMOTH[] ={ +static const union AnimCmd *const sAnims_VENOMOTH[] = +{ sAnim_GeneralFrame0, sAnim_VENOMOTH_1, }; -static const union AnimCmd *const sAnims_DIGLETT[] ={ +static const union AnimCmd *const sAnims_DIGLETT[] = +{ sAnim_GeneralFrame0, sAnim_DIGLETT_1, }; -static const union AnimCmd *const sAnims_DUGTRIO[] ={ +static const union AnimCmd *const sAnims_DUGTRIO[] = +{ sAnim_GeneralFrame0, sAnim_DUGTRIO_1, }; -static const union AnimCmd *const sAnims_MEOWTH[] ={ +static const union AnimCmd *const sAnims_MEOWTH[] = +{ sAnim_GeneralFrame0, sAnim_MEOWTH_1, }; -static const union AnimCmd *const sAnims_PERSIAN[] ={ +static const union AnimCmd *const sAnims_PERSIAN[] = +{ sAnim_GeneralFrame0, sAnim_PERSIAN_1, }; -static const union AnimCmd *const sAnims_PSYDUCK[] ={ +static const union AnimCmd *const sAnims_PSYDUCK[] = +{ sAnim_GeneralFrame0, sAnim_PSYDUCK_1, sAnim_PSYDUCK_2, }; -static const union AnimCmd *const sAnims_GOLDUCK[] ={ +static const union AnimCmd *const sAnims_GOLDUCK[] = +{ sAnim_GeneralFrame0, sAnim_GOLDUCK_1, sAnim_GOLDUCK_2, }; -static const union AnimCmd *const sAnims_MANKEY[] ={ +static const union AnimCmd *const sAnims_MANKEY[] = +{ sAnim_GeneralFrame0, sAnim_MANKEY_1, }; -static const union AnimCmd *const sAnims_PRIMEAPE[] ={ +static const union AnimCmd *const sAnims_PRIMEAPE[] = +{ sAnim_GeneralFrame0, sAnim_PRIMEAPE_1, }; -static const union AnimCmd *const sAnims_GROWLITHE[] ={ +static const union AnimCmd *const sAnims_GROWLITHE[] = +{ sAnim_GeneralFrame0, sAnim_GROWLITHE_1, }; -static const union AnimCmd *const sAnims_ARCANINE[] ={ +static const union AnimCmd *const sAnims_ARCANINE[] = +{ sAnim_GeneralFrame0, sAnim_ARCANINE_1, }; -static const union AnimCmd *const sAnims_POLIWAG[] ={ +static const union AnimCmd *const sAnims_POLIWAG[] = +{ sAnim_GeneralFrame0, sAnim_POLIWAG_1, }; -static const union AnimCmd *const sAnims_POLIWHIRL[] ={ +static const union AnimCmd *const sAnims_POLIWHIRL[] = +{ sAnim_GeneralFrame0, sAnim_POLIWHIRL_1, }; -static const union AnimCmd *const sAnims_POLIWRATH[] ={ +static const union AnimCmd *const sAnims_POLIWRATH[] = +{ sAnim_GeneralFrame0, sAnim_POLIWRATH_1, }; -static const union AnimCmd *const sAnims_ABRA[] ={ +static const union AnimCmd *const sAnims_ABRA[] = +{ sAnim_GeneralFrame0, sAnim_ABRA_1, }; -static const union AnimCmd *const sAnims_KADABRA[] ={ +static const union AnimCmd *const sAnims_KADABRA[] = +{ sAnim_GeneralFrame0, sAnim_KADABRA_1, }; -static const union AnimCmd *const sAnims_ALAKAZAM[] ={ +static const union AnimCmd *const sAnims_ALAKAZAM[] = +{ sAnim_GeneralFrame0, sAnim_ALAKAZAM_1, }; -static const union AnimCmd *const sAnims_MACHOP[] ={ +static const union AnimCmd *const sAnims_MACHOP[] = +{ sAnim_GeneralFrame0, sAnim_MACHOP_1, }; -static const union AnimCmd *const sAnims_MACHOKE[] ={ +static const union AnimCmd *const sAnims_MACHOKE[] = +{ sAnim_GeneralFrame0, sAnim_MACHOKE_1, }; -static const union AnimCmd *const sAnims_MACHAMP[] ={ +static const union AnimCmd *const sAnims_MACHAMP[] = +{ sAnim_GeneralFrame0, sAnim_MACHAMP_1, }; -static const union AnimCmd *const sAnims_BELLSPROUT[] ={ +static const union AnimCmd *const sAnims_BELLSPROUT[] = +{ sAnim_GeneralFrame0, sAnim_BELLSPROUT_1, }; -static const union AnimCmd *const sAnims_WEEPINBELL[] ={ +static const union AnimCmd *const sAnims_WEEPINBELL[] = +{ sAnim_GeneralFrame0, sAnim_WEEPINBELL_1, }; -static const union AnimCmd *const sAnims_VICTREEBEL[] ={ +static const union AnimCmd *const sAnims_VICTREEBEL[] = +{ sAnim_GeneralFrame0, sAnim_VICTREEBEL_1, }; -static const union AnimCmd *const sAnims_TENTACOOL[] ={ +static const union AnimCmd *const sAnims_TENTACOOL[] = +{ sAnim_GeneralFrame0, sAnim_TENTACOOL_1, }; -static const union AnimCmd *const sAnims_TENTACRUEL[] ={ +static const union AnimCmd *const sAnims_TENTACRUEL[] = +{ sAnim_GeneralFrame0, sAnim_TENTACRUEL_1, }; -static const union AnimCmd *const sAnims_GEODUDE[] ={ +static const union AnimCmd *const sAnims_GEODUDE[] = +{ sAnim_GeneralFrame0, sAnim_GEODUDE_1, }; -static const union AnimCmd *const sAnims_GRAVELER[] ={ +static const union AnimCmd *const sAnims_GRAVELER[] = +{ sAnim_GeneralFrame0, sAnim_GRAVELER_1, }; -static const union AnimCmd *const sAnims_GOLEM[] ={ +static const union AnimCmd *const sAnims_GOLEM[] = +{ sAnim_GeneralFrame0, sAnim_GOLEM_1, }; -static const union AnimCmd *const sAnims_PONYTA[] ={ +static const union AnimCmd *const sAnims_PONYTA[] = +{ sAnim_GeneralFrame0, sAnim_PONYTA_1, }; -static const union AnimCmd *const sAnims_RAPIDASH[] ={ +static const union AnimCmd *const sAnims_RAPIDASH[] = +{ sAnim_GeneralFrame0, sAnim_RAPIDASH_1, }; -static const union AnimCmd *const sAnims_SLOWPOKE[] ={ +static const union AnimCmd *const sAnims_SLOWPOKE[] = +{ sAnim_GeneralFrame0, sAnim_SLOWPOKE_1, }; -static const union AnimCmd *const sAnims_SLOWBRO[] ={ +static const union AnimCmd *const sAnims_SLOWBRO[] = +{ sAnim_GeneralFrame0, sAnim_SLOWBRO_1, }; -static const union AnimCmd *const sAnims_MAGNEMITE[] ={ +static const union AnimCmd *const sAnims_MAGNEMITE[] = +{ sAnim_GeneralFrame0, sAnim_MAGNEMITE_1, }; -static const union AnimCmd *const sAnims_MAGNETON[] ={ +static const union AnimCmd *const sAnims_MAGNETON[] = +{ sAnim_GeneralFrame0, sAnim_MAGNETON_1, }; -static const union AnimCmd *const sAnims_FARFETCHD[] ={ +static const union AnimCmd *const sAnims_FARFETCHD[] = +{ sAnim_GeneralFrame0, sAnim_FARFETCHD_1, }; -static const union AnimCmd *const sAnims_DODUO[] ={ +static const union AnimCmd *const sAnims_DODUO[] = +{ sAnim_GeneralFrame0, sAnim_DODUO_1, }; -static const union AnimCmd *const sAnims_DODRIO[] ={ +static const union AnimCmd *const sAnims_DODRIO[] = +{ sAnim_GeneralFrame0, sAnim_DODRIO_1, }; -static const union AnimCmd *const sAnims_SEEL[] ={ +static const union AnimCmd *const sAnims_SEEL[] = +{ sAnim_GeneralFrame0, sAnim_SEEL_1, }; -static const union AnimCmd *const sAnims_DEWGONG[] ={ +static const union AnimCmd *const sAnims_DEWGONG[] = +{ sAnim_GeneralFrame0, sAnim_DEWGONG_1, }; -static const union AnimCmd *const sAnims_GRIMER[] ={ +static const union AnimCmd *const sAnims_GRIMER[] = +{ sAnim_GeneralFrame0, sAnim_GRIMER_1, sAnim_GRIMER_2, }; -static const union AnimCmd *const sAnims_MUK[] ={ +static const union AnimCmd *const sAnims_MUK[] = +{ sAnim_GeneralFrame0, sAnim_MUK_1, sAnim_MUK_2, }; -static const union AnimCmd *const sAnims_SHELLDER[] ={ +static const union AnimCmd *const sAnims_SHELLDER[] = +{ sAnim_GeneralFrame0, sAnim_SHELLDER_1, }; -static const union AnimCmd *const sAnims_CLOYSTER[] ={ +static const union AnimCmd *const sAnims_CLOYSTER[] = +{ sAnim_GeneralFrame0, sAnim_CLOYSTER_1, }; -static const union AnimCmd *const sAnims_GASTLY[] ={ +static const union AnimCmd *const sAnims_GASTLY[] = +{ sAnim_GeneralFrame0, sAnim_GASTLY_1, }; -static const union AnimCmd *const sAnims_HAUNTER[] ={ +static const union AnimCmd *const sAnims_HAUNTER[] = +{ sAnim_GeneralFrame0, sAnim_HAUNTER_1, }; -static const union AnimCmd *const sAnims_GENGAR[] ={ +static const union AnimCmd *const sAnims_GENGAR[] = +{ sAnim_GeneralFrame0, sAnim_GENGAR_1, }; -static const union AnimCmd *const sAnims_ONIX[] ={ +static const union AnimCmd *const sAnims_ONIX[] = +{ sAnim_GeneralFrame0, sAnim_ONIX_1, }; -static const union AnimCmd *const sAnims_DROWZEE[] ={ +static const union AnimCmd *const sAnims_DROWZEE[] = +{ sAnim_GeneralFrame0, sAnim_DROWZEE_1, }; -static const union AnimCmd *const sAnims_HYPNO[] ={ +static const union AnimCmd *const sAnims_HYPNO[] = +{ sAnim_GeneralFrame0, sAnim_HYPNO_1, }; -static const union AnimCmd *const sAnims_KRABBY[] ={ +static const union AnimCmd *const sAnims_KRABBY[] = +{ sAnim_GeneralFrame0, sAnim_KRABBY_1, }; -static const union AnimCmd *const sAnims_KINGLER[] ={ +static const union AnimCmd *const sAnims_KINGLER[] = +{ sAnim_GeneralFrame0, sAnim_KINGLER_1, }; -static const union AnimCmd *const sAnims_VOLTORB[] ={ +static const union AnimCmd *const sAnims_VOLTORB[] = +{ sAnim_GeneralFrame0, sAnim_VOLTORB_1, }; -static const union AnimCmd *const sAnims_ELECTRODE[] ={ +static const union AnimCmd *const sAnims_ELECTRODE[] = +{ sAnim_GeneralFrame0, sAnim_ELECTRODE_1, }; -static const union AnimCmd *const sAnims_EXEGGCUTE[] ={ +static const union AnimCmd *const sAnims_EXEGGCUTE[] = +{ sAnim_GeneralFrame0, sAnim_EXEGGCUTE_1, }; -static const union AnimCmd *const sAnims_EXEGGUTOR[] ={ +static const union AnimCmd *const sAnims_EXEGGUTOR[] = +{ sAnim_GeneralFrame0, sAnim_EXEGGUTOR_1, }; -static const union AnimCmd *const sAnims_CUBONE[] ={ +static const union AnimCmd *const sAnims_CUBONE[] = +{ sAnim_GeneralFrame0, sAnim_CUBONE_1, }; -static const union AnimCmd *const sAnims_MAROWAK[] ={ +static const union AnimCmd *const sAnims_MAROWAK[] = +{ sAnim_GeneralFrame0, sAnim_MAROWAK_1, }; -static const union AnimCmd *const sAnims_HITMONLEE[] ={ +static const union AnimCmd *const sAnims_HITMONLEE[] = +{ sAnim_GeneralFrame0, sAnim_HITMONLEE_1, }; -static const union AnimCmd *const sAnims_HITMONCHAN[] ={ +static const union AnimCmd *const sAnims_HITMONCHAN[] = +{ sAnim_GeneralFrame0, sAnim_HITMONCHAN_1, }; -static const union AnimCmd *const sAnims_LICKITUNG[] ={ +static const union AnimCmd *const sAnims_LICKITUNG[] = +{ sAnim_GeneralFrame0, sAnim_LICKITUNG_1, }; -static const union AnimCmd *const sAnims_KOFFING[] ={ +static const union AnimCmd *const sAnims_KOFFING[] = +{ sAnim_GeneralFrame0, sAnim_KOFFING_1, sAnim_KOFFING_2, }; -static const union AnimCmd *const sAnims_WEEZING[] ={ +static const union AnimCmd *const sAnims_WEEZING[] = +{ sAnim_GeneralFrame0, sAnim_WEEZING_1, sAnim_WEEZING_2, }; -static const union AnimCmd *const sAnims_RHYHORN[] ={ +static const union AnimCmd *const sAnims_RHYHORN[] = +{ sAnim_GeneralFrame0, sAnim_RHYHORN_1, sAnim_RHYHORN_2, }; -static const union AnimCmd *const sAnims_RHYDON[] ={ +static const union AnimCmd *const sAnims_RHYDON[] = +{ sAnim_GeneralFrame0, sAnim_RHYDON_1, sAnim_RHYDON_2, }; -static const union AnimCmd *const sAnims_CHANSEY[] ={ +static const union AnimCmd *const sAnims_CHANSEY[] = +{ sAnim_GeneralFrame0, sAnim_CHANSEY_1, }; -static const union AnimCmd *const sAnims_TANGELA[] ={ +static const union AnimCmd *const sAnims_TANGELA[] = +{ sAnim_GeneralFrame0, sAnim_TANGELA_1, }; -static const union AnimCmd *const sAnims_KANGASKHAN[] ={ +static const union AnimCmd *const sAnims_KANGASKHAN[] = +{ sAnim_GeneralFrame0, sAnim_KANGASKHAN_1, }; -static const union AnimCmd *const sAnims_HORSEA[] ={ +static const union AnimCmd *const sAnims_HORSEA[] = +{ sAnim_GeneralFrame0, sAnim_HORSEA_1, sAnim_HORSEA_2, }; -static const union AnimCmd *const sAnims_SEADRA[] ={ +static const union AnimCmd *const sAnims_SEADRA[] = +{ sAnim_GeneralFrame0, sAnim_SEADRA_1, sAnim_SEADRA_2, }; -static const union AnimCmd *const sAnims_GOLDEEN[] ={ +static const union AnimCmd *const sAnims_GOLDEEN[] = +{ sAnim_GeneralFrame0, sAnim_GOLDEEN_1, }; -static const union AnimCmd *const sAnims_SEAKING[] ={ +static const union AnimCmd *const sAnims_SEAKING[] = +{ sAnim_GeneralFrame0, sAnim_SEAKING_1, }; -static const union AnimCmd *const sAnims_STARYU[] ={ +static const union AnimCmd *const sAnims_STARYU[] = +{ sAnim_GeneralFrame0, sAnim_STARYU_1, sAnim_STARYU_2, }; -static const union AnimCmd *const sAnims_STARMIE[] ={ +static const union AnimCmd *const sAnims_STARMIE[] = +{ sAnim_GeneralFrame0, sAnim_STARMIE_1, sAnim_STARMIE_2, }; -static const union AnimCmd *const sAnims_MR_MIME[] ={ +static const union AnimCmd *const sAnims_MR_MIME[] = +{ sAnim_GeneralFrame0, sAnim_MR_MIME_1, }; -static const union AnimCmd *const sAnims_SCYTHER[] ={ +static const union AnimCmd *const sAnims_SCYTHER[] = +{ sAnim_GeneralFrame0, sAnim_SCYTHER_1, }; -static const union AnimCmd *const sAnims_JYNX[] ={ +static const union AnimCmd *const sAnims_JYNX[] = +{ sAnim_GeneralFrame0, sAnim_JYNX_1, }; -static const union AnimCmd *const sAnims_ELECTABUZZ[] ={ +static const union AnimCmd *const sAnims_ELECTABUZZ[] = +{ sAnim_GeneralFrame0, sAnim_ELECTABUZZ_1, }; -static const union AnimCmd *const sAnims_MAGMAR[] ={ +static const union AnimCmd *const sAnims_MAGMAR[] = +{ sAnim_GeneralFrame0, sAnim_MAGMAR_1, }; -static const union AnimCmd *const sAnims_PINSIR[] ={ +static const union AnimCmd *const sAnims_PINSIR[] = +{ sAnim_GeneralFrame0, sAnim_PINSIR_1, sAnim_PINSIR_2, }; -static const union AnimCmd *const sAnims_TAUROS[] ={ +static const union AnimCmd *const sAnims_TAUROS[] = +{ sAnim_GeneralFrame0, sAnim_TAUROS_1, }; -static const union AnimCmd *const sAnims_MAGIKARP[] ={ +static const union AnimCmd *const sAnims_MAGIKARP[] = +{ sAnim_GeneralFrame0, sAnim_MAGIKARP_1, }; -static const union AnimCmd *const sAnims_GYARADOS[] ={ +static const union AnimCmd *const sAnims_GYARADOS[] = +{ sAnim_GeneralFrame0, sAnim_GYARADOS_1, }; -static const union AnimCmd *const sAnims_LAPRAS[] ={ +static const union AnimCmd *const sAnims_LAPRAS[] = +{ sAnim_GeneralFrame0, sAnim_LAPRAS_1, }; -static const union AnimCmd *const sAnims_DITTO[] ={ +static const union AnimCmd *const sAnims_DITTO[] = +{ sAnim_GeneralFrame0, sAnim_DITTO_1, }; -static const union AnimCmd *const sAnims_EEVEE[] ={ +static const union AnimCmd *const sAnims_EEVEE[] = +{ sAnim_GeneralFrame0, sAnim_EEVEE_1, }; -static const union AnimCmd *const sAnims_VAPOREON[] ={ +static const union AnimCmd *const sAnims_VAPOREON[] = +{ sAnim_GeneralFrame0, sAnim_VAPOREON_1, }; -static const union AnimCmd *const sAnims_JOLTEON[] ={ +static const union AnimCmd *const sAnims_JOLTEON[] = +{ sAnim_GeneralFrame0, sAnim_JOLTEON_1, }; -static const union AnimCmd *const sAnims_FLAREON[] ={ +static const union AnimCmd *const sAnims_FLAREON[] = +{ sAnim_GeneralFrame0, sAnim_FLAREON_1, }; -static const union AnimCmd *const sAnims_PORYGON[] ={ +static const union AnimCmd *const sAnims_PORYGON[] = +{ sAnim_GeneralFrame0, sAnim_PORYGON_1, }; -static const union AnimCmd *const sAnims_OMANYTE[] ={ +static const union AnimCmd *const sAnims_OMANYTE[] = +{ sAnim_GeneralFrame0, sAnim_OMANYTE_1, }; -static const union AnimCmd *const sAnims_OMASTAR[] ={ +static const union AnimCmd *const sAnims_OMASTAR[] = +{ sAnim_GeneralFrame0, sAnim_OMASTAR_1, }; -static const union AnimCmd *const sAnims_KABUTO[] ={ +static const union AnimCmd *const sAnims_KABUTO[] = +{ sAnim_GeneralFrame0, sAnim_KABUTO_1, }; -static const union AnimCmd *const sAnims_KABUTOPS[] ={ +static const union AnimCmd *const sAnims_KABUTOPS[] = +{ sAnim_GeneralFrame0, sAnim_KABUTOPS_1, }; -static const union AnimCmd *const sAnims_AERODACTYL[] ={ +static const union AnimCmd *const sAnims_AERODACTYL[] = +{ sAnim_GeneralFrame0, sAnim_AERODACTYL_1, }; -static const union AnimCmd *const sAnims_SNORLAX[] ={ +static const union AnimCmd *const sAnims_SNORLAX[] = +{ sAnim_GeneralFrame0, sAnim_SNORLAX_1, }; -static const union AnimCmd *const sAnims_ARTICUNO[] ={ +static const union AnimCmd *const sAnims_ARTICUNO[] = +{ sAnim_GeneralFrame0, sAnim_ARTICUNO_1, }; -static const union AnimCmd *const sAnims_ZAPDOS[] ={ +static const union AnimCmd *const sAnims_ZAPDOS[] = +{ sAnim_GeneralFrame0, sAnim_ZAPDOS_1, }; -static const union AnimCmd *const sAnims_MOLTRES[] ={ +static const union AnimCmd *const sAnims_MOLTRES[] = +{ sAnim_GeneralFrame0, sAnim_MOLTRES_1, }; -static const union AnimCmd *const sAnims_DRATINI[] ={ +static const union AnimCmd *const sAnims_DRATINI[] = +{ sAnim_GeneralFrame0, sAnim_DRATINI_1, }; -static const union AnimCmd *const sAnims_DRAGONAIR[] ={ +static const union AnimCmd *const sAnims_DRAGONAIR[] = +{ sAnim_GeneralFrame0, sAnim_DRAGONAIR_1, }; -static const union AnimCmd *const sAnims_DRAGONITE[] ={ +static const union AnimCmd *const sAnims_DRAGONITE[] = +{ sAnim_GeneralFrame0, sAnim_DRAGONITE_1, }; -static const union AnimCmd *const sAnims_MEWTWO[] ={ +static const union AnimCmd *const sAnims_MEWTWO[] = +{ sAnim_GeneralFrame0, sAnim_MEWTWO_1, }; -static const union AnimCmd *const sAnims_MEW[] ={ +static const union AnimCmd *const sAnims_MEW[] = +{ sAnim_GeneralFrame0, sAnim_MEW_1, }; -static const union AnimCmd *const sAnims_CHIKORITA[] ={ +static const union AnimCmd *const sAnims_CHIKORITA[] = +{ sAnim_GeneralFrame0, sAnim_CHIKORITA_1, }; -static const union AnimCmd *const sAnims_BAYLEEF[] ={ +static const union AnimCmd *const sAnims_BAYLEEF[] = +{ sAnim_GeneralFrame0, sAnim_BAYLEEF_1, }; -static const union AnimCmd *const sAnims_MEGANIUM[] ={ +static const union AnimCmd *const sAnims_MEGANIUM[] = +{ sAnim_GeneralFrame0, sAnim_MEGANIUM_1, }; -static const union AnimCmd *const sAnims_CYNDAQUIL[] ={ +static const union AnimCmd *const sAnims_CYNDAQUIL[] = +{ sAnim_GeneralFrame0, sAnim_CYNDAQUIL_1, }; -static const union AnimCmd *const sAnims_QUILAVA[] ={ +static const union AnimCmd *const sAnims_QUILAVA[] = +{ sAnim_GeneralFrame0, sAnim_QUILAVA_1, }; -static const union AnimCmd *const sAnims_TYPHLOSION[] ={ +static const union AnimCmd *const sAnims_TYPHLOSION[] = +{ sAnim_GeneralFrame0, sAnim_TYPHLOSION_1, }; -static const union AnimCmd *const sAnims_TOTODILE[] ={ +static const union AnimCmd *const sAnims_TOTODILE[] = +{ sAnim_GeneralFrame0, sAnim_TOTODILE_1, }; -static const union AnimCmd *const sAnims_CROCONAW[] ={ +static const union AnimCmd *const sAnims_CROCONAW[] = +{ sAnim_GeneralFrame0, sAnim_CROCONAW_1, }; -static const union AnimCmd *const sAnims_FERALIGATR[] ={ +static const union AnimCmd *const sAnims_FERALIGATR[] = +{ sAnim_GeneralFrame0, sAnim_FERALIGATR_1, }; -static const union AnimCmd *const sAnims_SENTRET[] ={ +static const union AnimCmd *const sAnims_SENTRET[] = +{ sAnim_GeneralFrame0, sAnim_SENTRET_1, }; -static const union AnimCmd *const sAnims_FURRET[] ={ +static const union AnimCmd *const sAnims_FURRET[] = +{ sAnim_GeneralFrame0, sAnim_FURRET_1, }; -static const union AnimCmd *const sAnims_HOOTHOOT[] ={ +static const union AnimCmd *const sAnims_HOOTHOOT[] = +{ sAnim_GeneralFrame0, sAnim_HOOTHOOT_1, }; -static const union AnimCmd *const sAnims_NOCTOWL[] ={ +static const union AnimCmd *const sAnims_NOCTOWL[] = +{ sAnim_GeneralFrame0, sAnim_NOCTOWL_1, }; -static const union AnimCmd *const sAnims_LEDYBA[] ={ +static const union AnimCmd *const sAnims_LEDYBA[] = +{ sAnim_GeneralFrame0, sAnim_LEDYBA_1, }; -static const union AnimCmd *const sAnims_LEDIAN[] ={ +static const union AnimCmd *const sAnims_LEDIAN[] = +{ sAnim_GeneralFrame0, sAnim_LEDIAN_1, }; -static const union AnimCmd *const sAnims_SPINARAK[] ={ +static const union AnimCmd *const sAnims_SPINARAK[] = +{ sAnim_GeneralFrame0, sAnim_SPINARAK_1, }; -static const union AnimCmd *const sAnims_ARIADOS[] ={ +static const union AnimCmd *const sAnims_ARIADOS[] = +{ sAnim_GeneralFrame0, sAnim_ARIADOS_1, }; -static const union AnimCmd *const sAnims_CROBAT[] ={ +static const union AnimCmd *const sAnims_CROBAT[] = +{ sAnim_GeneralFrame0, sAnim_CROBAT_1, }; -static const union AnimCmd *const sAnims_CHINCHOU[] ={ +static const union AnimCmd *const sAnims_CHINCHOU[] = +{ sAnim_GeneralFrame0, sAnim_CHINCHOU_1, sAnim_CHINCHOU_2, }; -static const union AnimCmd *const sAnims_LANTURN[] ={ +static const union AnimCmd *const sAnims_LANTURN[] = +{ sAnim_GeneralFrame0, sAnim_LANTURN_1, sAnim_LANTURN_2, }; -static const union AnimCmd *const sAnims_PICHU[] ={ +static const union AnimCmd *const sAnims_PICHU[] = +{ sAnim_GeneralFrame0, sAnim_PICHU_1, sAnim_PICHU_2, }; -static const union AnimCmd *const sAnims_CLEFFA[] ={ +static const union AnimCmd *const sAnims_CLEFFA[] = +{ sAnim_GeneralFrame0, sAnim_CLEFFA_1, }; -static const union AnimCmd *const sAnims_IGGLYBUFF[] ={ +static const union AnimCmd *const sAnims_IGGLYBUFF[] = +{ sAnim_GeneralFrame0, sAnim_IGGLYBUFF_1, sAnim_IGGLYBUFF_2, }; -static const union AnimCmd *const sAnims_TOGEPI[] ={ +static const union AnimCmd *const sAnims_TOGEPI[] = +{ sAnim_GeneralFrame0, sAnim_TOGEPI_1, }; -static const union AnimCmd *const sAnims_TOGETIC[] ={ +static const union AnimCmd *const sAnims_TOGETIC[] = +{ sAnim_GeneralFrame0, sAnim_TOGETIC_1, }; -static const union AnimCmd *const sAnims_NATU[] ={ +static const union AnimCmd *const sAnims_NATU[] = +{ sAnim_GeneralFrame0, sAnim_NATU_1, sAnim_NATU_2, }; -static const union AnimCmd *const sAnims_XATU[] ={ +static const union AnimCmd *const sAnims_XATU[] = +{ sAnim_GeneralFrame0, sAnim_XATU_1, sAnim_XATU_2, }; -static const union AnimCmd *const sAnims_MAREEP[] ={ +static const union AnimCmd *const sAnims_MAREEP[] = +{ sAnim_GeneralFrame0, sAnim_MAREEP_1, }; -static const union AnimCmd *const sAnims_FLAAFFY[] ={ +static const union AnimCmd *const sAnims_FLAAFFY[] = +{ sAnim_GeneralFrame0, sAnim_FLAAFFY_1, }; -static const union AnimCmd *const sAnims_AMPHAROS[] ={ +static const union AnimCmd *const sAnims_AMPHAROS[] = +{ sAnim_GeneralFrame0, sAnim_AMPHAROS_1, }; -static const union AnimCmd *const sAnims_BELLOSSOM[] ={ +static const union AnimCmd *const sAnims_BELLOSSOM[] = +{ sAnim_GeneralFrame0, sAnim_BELLOSSOM_1, }; -static const union AnimCmd *const sAnims_MARILL[] ={ +static const union AnimCmd *const sAnims_MARILL[] = +{ sAnim_GeneralFrame0, sAnim_MARILL_1, }; -static const union AnimCmd *const sAnims_AZUMARILL[] ={ +static const union AnimCmd *const sAnims_AZUMARILL[] = +{ sAnim_GeneralFrame0, sAnim_AZUMARILL_1, }; -static const union AnimCmd *const sAnims_SUDOWOODO[] ={ +static const union AnimCmd *const sAnims_SUDOWOODO[] = +{ sAnim_GeneralFrame0, sAnim_SUDOWOODO_1, }; -static const union AnimCmd *const sAnims_POLITOED[] ={ +static const union AnimCmd *const sAnims_POLITOED[] = +{ sAnim_GeneralFrame0, sAnim_POLITOED_1, }; -static const union AnimCmd *const sAnims_HOPPIP[] ={ +static const union AnimCmd *const sAnims_HOPPIP[] = +{ sAnim_GeneralFrame0, sAnim_HOPPIP_1, }; -static const union AnimCmd *const sAnims_SKIPLOOM[] ={ +static const union AnimCmd *const sAnims_SKIPLOOM[] = +{ sAnim_GeneralFrame0, sAnim_SKIPLOOM_1, }; -static const union AnimCmd *const sAnims_JUMPLUFF[] ={ +static const union AnimCmd *const sAnims_JUMPLUFF[] = +{ sAnim_GeneralFrame0, sAnim_JUMPLUFF_1, }; -static const union AnimCmd *const sAnims_AIPOM[] ={ +static const union AnimCmd *const sAnims_AIPOM[] = +{ sAnim_GeneralFrame0, sAnim_AIPOM_1, }; -static const union AnimCmd *const sAnims_SUNKERN[] ={ +static const union AnimCmd *const sAnims_SUNKERN[] = +{ sAnim_GeneralFrame0, sAnim_SUNKERN_1, }; -static const union AnimCmd *const sAnims_SUNFLORA[] ={ +static const union AnimCmd *const sAnims_SUNFLORA[] = +{ sAnim_GeneralFrame0, sAnim_SUNFLORA_1, }; -static const union AnimCmd *const sAnims_YANMA[] ={ +static const union AnimCmd *const sAnims_YANMA[] = +{ sAnim_GeneralFrame0, sAnim_YANMA_1, }; -static const union AnimCmd *const sAnims_WOOPER[] ={ +static const union AnimCmd *const sAnims_WOOPER[] = +{ sAnim_GeneralFrame0, sAnim_WOOPER_1, }; -static const union AnimCmd *const sAnims_QUAGSIRE[] ={ +static const union AnimCmd *const sAnims_QUAGSIRE[] = +{ sAnim_GeneralFrame0, sAnim_QUAGSIRE_1, }; -static const union AnimCmd *const sAnims_ESPEON[] ={ +static const union AnimCmd *const sAnims_ESPEON[] = +{ sAnim_GeneralFrame0, sAnim_ESPEON_1, }; -static const union AnimCmd *const sAnims_UMBREON[] ={ +static const union AnimCmd *const sAnims_UMBREON[] = +{ sAnim_GeneralFrame0, sAnim_UMBREON_1, }; -static const union AnimCmd *const sAnims_MURKROW[] ={ +static const union AnimCmd *const sAnims_MURKROW[] = +{ sAnim_GeneralFrame0, sAnim_MURKROW_1, }; -static const union AnimCmd *const sAnims_SLOWKING[] ={ +static const union AnimCmd *const sAnims_SLOWKING[] = +{ sAnim_GeneralFrame0, sAnim_SLOWKING_1, }; -static const union AnimCmd *const sAnims_MISDREAVUS[] ={ +static const union AnimCmd *const sAnims_MISDREAVUS[] = +{ sAnim_GeneralFrame0, sAnim_MISDREAVUS_1, }; -static const union AnimCmd *const sAnims_UNOWN[] ={ +static const union AnimCmd *const sAnims_UNOWN[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_1, }; -static const union AnimCmd *const sAnims_WOBBUFFET[] ={ +static const union AnimCmd *const sAnims_WOBBUFFET[] = +{ sAnim_GeneralFrame0, sAnim_WOBBUFFET_1, sAnim_WOBBUFFET_2, }; -static const union AnimCmd *const sAnims_GIRAFARIG[] ={ +static const union AnimCmd *const sAnims_GIRAFARIG[] = +{ sAnim_GeneralFrame0, sAnim_GIRAFARIG_1, sAnim_GIRAFARIG_2, }; -static const union AnimCmd *const sAnims_PINECO[] ={ +static const union AnimCmd *const sAnims_PINECO[] = +{ sAnim_GeneralFrame0, sAnim_PINECO_1, }; -static const union AnimCmd *const sAnims_FORRETRESS[] ={ +static const union AnimCmd *const sAnims_FORRETRESS[] = +{ sAnim_GeneralFrame0, sAnim_FORRETRESS_1, }; -static const union AnimCmd *const sAnims_DUNSPARCE[] ={ +static const union AnimCmd *const sAnims_DUNSPARCE[] = +{ sAnim_GeneralFrame0, sAnim_DUNSPARCE_1, }; -static const union AnimCmd *const sAnims_GLIGAR[] ={ +static const union AnimCmd *const sAnims_GLIGAR[] = +{ sAnim_GeneralFrame0, sAnim_GLIGAR_1, }; -static const union AnimCmd *const sAnims_STEELIX[] ={ +static const union AnimCmd *const sAnims_STEELIX[] = +{ sAnim_GeneralFrame0, sAnim_STEELIX_1, }; -static const union AnimCmd *const sAnims_SNUBBULL[] ={ +static const union AnimCmd *const sAnims_SNUBBULL[] = +{ sAnim_GeneralFrame0, sAnim_SNUBBULL_1, }; -static const union AnimCmd *const sAnims_GRANBULL[] ={ +static const union AnimCmd *const sAnims_GRANBULL[] = +{ sAnim_GeneralFrame0, sAnim_GRANBULL_1, }; -static const union AnimCmd *const sAnims_QWILFISH[] ={ +static const union AnimCmd *const sAnims_QWILFISH[] = +{ sAnim_GeneralFrame0, sAnim_QWILFISH_1, }; -static const union AnimCmd *const sAnims_SCIZOR[] ={ +static const union AnimCmd *const sAnims_SCIZOR[] = +{ sAnim_GeneralFrame0, sAnim_SCIZOR_1, }; -static const union AnimCmd *const sAnims_SHUCKLE[] ={ +static const union AnimCmd *const sAnims_SHUCKLE[] = +{ sAnim_GeneralFrame0, sAnim_SHUCKLE_1, }; -static const union AnimCmd *const sAnims_HERACROSS[] ={ +static const union AnimCmd *const sAnims_HERACROSS[] = +{ sAnim_GeneralFrame0, sAnim_HERACROSS_1, sAnim_HERACROSS_2, }; -static const union AnimCmd *const sAnims_SNEASEL[] ={ +static const union AnimCmd *const sAnims_SNEASEL[] = +{ sAnim_GeneralFrame0, sAnim_SNEASEL_1, }; -static const union AnimCmd *const sAnims_TEDDIURSA[] ={ +static const union AnimCmd *const sAnims_TEDDIURSA[] = +{ sAnim_GeneralFrame0, sAnim_TEDDIURSA_1, }; -static const union AnimCmd *const sAnims_URSARING[] ={ +static const union AnimCmd *const sAnims_URSARING[] = +{ sAnim_GeneralFrame0, sAnim_URSARING_1, }; -static const union AnimCmd *const sAnims_SLUGMA[] ={ +static const union AnimCmd *const sAnims_SLUGMA[] = +{ sAnim_GeneralFrame0, sAnim_SLUGMA_1, sAnim_SLUGMA_2, }; -static const union AnimCmd *const sAnims_MAGCARGO[] ={ +static const union AnimCmd *const sAnims_MAGCARGO[] = +{ sAnim_GeneralFrame0, sAnim_MAGCARGO_1, sAnim_MAGCARGO_2, }; -static const union AnimCmd *const sAnims_SWINUB[] ={ +static const union AnimCmd *const sAnims_SWINUB[] = +{ sAnim_GeneralFrame0, sAnim_SWINUB_1, }; -static const union AnimCmd *const sAnims_PILOSWINE[] ={ +static const union AnimCmd *const sAnims_PILOSWINE[] = +{ sAnim_GeneralFrame0, sAnim_PILOSWINE_1, }; -static const union AnimCmd *const sAnims_CORSOLA[] ={ +static const union AnimCmd *const sAnims_CORSOLA[] = +{ sAnim_GeneralFrame0, sAnim_CORSOLA_1, sAnim_CORSOLA_2, }; -static const union AnimCmd *const sAnims_REMORAID[] ={ +static const union AnimCmd *const sAnims_REMORAID[] = +{ sAnim_GeneralFrame0, sAnim_REMORAID_1, }; -static const union AnimCmd *const sAnims_OCTILLERY[] ={ +static const union AnimCmd *const sAnims_OCTILLERY[] = +{ sAnim_GeneralFrame0, sAnim_OCTILLERY_1, }; -static const union AnimCmd *const sAnims_DELIBIRD[] ={ +static const union AnimCmd *const sAnims_DELIBIRD[] = +{ sAnim_GeneralFrame0, sAnim_DELIBIRD_1, }; -static const union AnimCmd *const sAnims_MANTINE[] ={ +static const union AnimCmd *const sAnims_MANTINE[] = +{ sAnim_GeneralFrame0, sAnim_MANTINE_1, }; -static const union AnimCmd *const sAnims_SKARMORY[] ={ +static const union AnimCmd *const sAnims_SKARMORY[] = +{ sAnim_GeneralFrame0, sAnim_SKARMORY_1, sAnim_SKARMORY_2, }; -static const union AnimCmd *const sAnims_HOUNDOUR[] ={ +static const union AnimCmd *const sAnims_HOUNDOUR[] = +{ sAnim_GeneralFrame0, sAnim_HOUNDOUR_1, }; -static const union AnimCmd *const sAnims_HOUNDOOM[] ={ +static const union AnimCmd *const sAnims_HOUNDOOM[] = +{ sAnim_GeneralFrame0, sAnim_HOUNDOOM_1, }; -static const union AnimCmd *const sAnims_KINGDRA[] ={ +static const union AnimCmd *const sAnims_KINGDRA[] = +{ sAnim_GeneralFrame0, sAnim_KINGDRA_1, sAnim_KINGDRA_2, }; -static const union AnimCmd *const sAnims_PHANPY[] ={ +static const union AnimCmd *const sAnims_PHANPY[] = +{ sAnim_GeneralFrame0, sAnim_PHANPY_1, sAnim_PHANPY_2, }; -static const union AnimCmd *const sAnims_DONPHAN[] ={ +static const union AnimCmd *const sAnims_DONPHAN[] = +{ sAnim_GeneralFrame0, sAnim_DONPHAN_1, sAnim_DONPHAN_2, }; -static const union AnimCmd *const sAnims_PORYGON2[] ={ +static const union AnimCmd *const sAnims_PORYGON2[] = +{ sAnim_GeneralFrame0, sAnim_PORYGON2_1, }; -static const union AnimCmd *const sAnims_STANTLER[] ={ +static const union AnimCmd *const sAnims_STANTLER[] = +{ sAnim_GeneralFrame0, sAnim_STANTLER_1, }; -static const union AnimCmd *const sAnims_SMEARGLE[] ={ +static const union AnimCmd *const sAnims_SMEARGLE[] = +{ sAnim_GeneralFrame0, sAnim_SMEARGLE_1, }; -static const union AnimCmd *const sAnims_TYROGUE[] ={ +static const union AnimCmd *const sAnims_TYROGUE[] = +{ sAnim_GeneralFrame0, sAnim_TYROGUE_1, }; -static const union AnimCmd *const sAnims_HITMONTOP[] ={ +static const union AnimCmd *const sAnims_HITMONTOP[] = +{ sAnim_GeneralFrame0, sAnim_HITMONTOP_1, }; -static const union AnimCmd *const sAnims_SMOOCHUM[] ={ +static const union AnimCmd *const sAnims_SMOOCHUM[] = +{ sAnim_GeneralFrame0, sAnim_SMOOCHUM_1, }; -static const union AnimCmd *const sAnims_ELEKID[] ={ +static const union AnimCmd *const sAnims_ELEKID[] = +{ sAnim_GeneralFrame0, sAnim_ELEKID_1, }; -static const union AnimCmd *const sAnims_MAGBY[] ={ +static const union AnimCmd *const sAnims_MAGBY[] = +{ sAnim_GeneralFrame0, sAnim_MAGBY_1, }; -static const union AnimCmd *const sAnims_MILTANK[] ={ +static const union AnimCmd *const sAnims_MILTANK[] = +{ sAnim_GeneralFrame0, sAnim_MILTANK_1, }; -static const union AnimCmd *const sAnims_BLISSEY[] ={ +static const union AnimCmd *const sAnims_BLISSEY[] = +{ sAnim_GeneralFrame0, sAnim_BLISSEY_1, }; -static const union AnimCmd *const sAnims_RAIKOU[] ={ +static const union AnimCmd *const sAnims_RAIKOU[] = +{ sAnim_GeneralFrame0, sAnim_RAIKOU_1, }; -static const union AnimCmd *const sAnims_ENTEI[] ={ +static const union AnimCmd *const sAnims_ENTEI[] = +{ sAnim_GeneralFrame0, sAnim_ENTEI_1, }; -static const union AnimCmd *const sAnims_SUICUNE[] ={ +static const union AnimCmd *const sAnims_SUICUNE[] = +{ sAnim_GeneralFrame0, sAnim_SUICUNE_1, }; -static const union AnimCmd *const sAnims_LARVITAR[] ={ +static const union AnimCmd *const sAnims_LARVITAR[] = +{ sAnim_GeneralFrame0, sAnim_LARVITAR_1, }; -static const union AnimCmd *const sAnims_PUPITAR[] ={ +static const union AnimCmd *const sAnims_PUPITAR[] = +{ sAnim_GeneralFrame0, sAnim_PUPITAR_1, }; -static const union AnimCmd *const sAnims_TYRANITAR[] ={ +static const union AnimCmd *const sAnims_TYRANITAR[] = +{ sAnim_GeneralFrame0, sAnim_TYRANITAR_1, }; -static const union AnimCmd *const sAnims_LUGIA[] ={ +static const union AnimCmd *const sAnims_LUGIA[] = +{ sAnim_GeneralFrame0, sAnim_LUGIA_1, }; -static const union AnimCmd *const sAnims_HO_OH[] ={ +static const union AnimCmd *const sAnims_HO_OH[] = +{ sAnim_GeneralFrame0, sAnim_HO_OH_1, }; -static const union AnimCmd *const sAnims_CELEBI[] ={ +static const union AnimCmd *const sAnims_CELEBI[] = +{ sAnim_GeneralFrame0, sAnim_CELEBI_1, }; -static const union AnimCmd *const sAnims_OLD_UNOWN_B[] ={ +static const union AnimCmd *const sAnims_OLD_UNOWN_B[] = +{ sAnim_GeneralFrame0, sAnim_OLD_UNOWN_B_1, }; -static const union AnimCmd *const sAnims_TREECKO[] ={ +static const union AnimCmd *const sAnims_TREECKO[] = +{ sAnim_GeneralFrame0, sAnim_TREECKO_1, }; -static const union AnimCmd *const sAnims_GROVYLE[] ={ +static const union AnimCmd *const sAnims_GROVYLE[] = +{ sAnim_GeneralFrame0, sAnim_GROVYLE_1, }; -static const union AnimCmd *const sAnims_SCEPTILE[] ={ +static const union AnimCmd *const sAnims_SCEPTILE[] = +{ sAnim_GeneralFrame0, sAnim_SCEPTILE_1, }; -static const union AnimCmd *const sAnims_TORCHIC[] ={ +static const union AnimCmd *const sAnims_TORCHIC[] = +{ sAnim_GeneralFrame0, sAnim_TORCHIC_1, }; -static const union AnimCmd *const sAnims_COMBUSKEN[] ={ +static const union AnimCmd *const sAnims_COMBUSKEN[] = +{ sAnim_GeneralFrame0, sAnim_COMBUSKEN_1, }; -static const union AnimCmd *const sAnims_BLAZIKEN[] ={ +static const union AnimCmd *const sAnims_BLAZIKEN[] = +{ sAnim_GeneralFrame0, sAnim_BLAZIKEN_1, sAnim_BLAZIKEN_2, @@ -10810,4154 +11099,5008 @@ static const union AnimCmd *const sAnims_BLAZIKEN[] ={ sAnim_BLAZIKEN_4, }; -static const union AnimCmd *const sAnims_MUDKIP[] ={ +static const union AnimCmd *const sAnims_MUDKIP[] = +{ sAnim_GeneralFrame0, sAnim_MUDKIP_1, }; -static const union AnimCmd *const sAnims_MARSHTOMP[] ={ +static const union AnimCmd *const sAnims_MARSHTOMP[] = +{ sAnim_GeneralFrame0, sAnim_MARSHTOMP_1, }; -static const union AnimCmd *const sAnims_SWAMPERT[] ={ +static const union AnimCmd *const sAnims_SWAMPERT[] = +{ sAnim_GeneralFrame0, sAnim_SWAMPERT_1, }; -static const union AnimCmd *const sAnims_POOCHYENA[] ={ +static const union AnimCmd *const sAnims_POOCHYENA[] = +{ sAnim_GeneralFrame0, sAnim_POOCHYENA_1, }; -static const union AnimCmd *const sAnims_MIGHTYENA[] ={ +static const union AnimCmd *const sAnims_MIGHTYENA[] = +{ sAnim_GeneralFrame0, sAnim_MIGHTYENA_1, }; -static const union AnimCmd *const sAnims_ZIGZAGOON[] ={ +static const union AnimCmd *const sAnims_ZIGZAGOON[] = +{ sAnim_GeneralFrame0, sAnim_ZIGZAGOON_1, }; -static const union AnimCmd *const sAnims_LINOONE[] ={ +static const union AnimCmd *const sAnims_LINOONE[] = +{ sAnim_GeneralFrame0, sAnim_LINOONE_1, }; -static const union AnimCmd *const sAnims_WURMPLE[] ={ +static const union AnimCmd *const sAnims_WURMPLE[] = +{ sAnim_GeneralFrame0, sAnim_WURMPLE_1, }; -static const union AnimCmd *const sAnims_SILCOON[] ={ +static const union AnimCmd *const sAnims_SILCOON[] = +{ sAnim_GeneralFrame0, sAnim_SILCOON_1, sAnim_SILCOON_2, }; -static const union AnimCmd *const sAnims_BEAUTIFLY[] ={ +static const union AnimCmd *const sAnims_BEAUTIFLY[] = +{ sAnim_GeneralFrame0, sAnim_BEAUTIFLY_1, sAnim_BEAUTIFLY_2, }; -static const union AnimCmd *const sAnims_CASCOON[] ={ +static const union AnimCmd *const sAnims_CASCOON[] = +{ sAnim_GeneralFrame0, sAnim_CASCOON_1, sAnim_CASCOON_2, }; -static const union AnimCmd *const sAnims_DUSTOX[] ={ +static const union AnimCmd *const sAnims_DUSTOX[] = +{ sAnim_GeneralFrame0, sAnim_DUSTOX_1, sAnim_DUSTOX_2, }; -static const union AnimCmd *const sAnims_LOTAD[] ={ +static const union AnimCmd *const sAnims_LOTAD[] = +{ sAnim_GeneralFrame0, sAnim_LOTAD_1, }; -static const union AnimCmd *const sAnims_LOMBRE[] ={ +static const union AnimCmd *const sAnims_LOMBRE[] = +{ sAnim_GeneralFrame0, sAnim_LOMBRE_1, }; -static const union AnimCmd *const sAnims_LUDICOLO[] ={ +static const union AnimCmd *const sAnims_LUDICOLO[] = +{ sAnim_GeneralFrame0, sAnim_LUDICOLO_1, }; -static const union AnimCmd *const sAnims_SEEDOT[] ={ +static const union AnimCmd *const sAnims_SEEDOT[] = +{ sAnim_GeneralFrame0, sAnim_SEEDOT_1, }; -static const union AnimCmd *const sAnims_NUZLEAF[] ={ +static const union AnimCmd *const sAnims_NUZLEAF[] = +{ sAnim_GeneralFrame0, sAnim_NUZLEAF_1, }; -static const union AnimCmd *const sAnims_SHIFTRY[] ={ +static const union AnimCmd *const sAnims_SHIFTRY[] = +{ sAnim_GeneralFrame0, sAnim_SHIFTRY_1, }; -static const union AnimCmd *const sAnims_NINCADA[] ={ +static const union AnimCmd *const sAnims_NINCADA[] = +{ sAnim_GeneralFrame0, sAnim_NINCADA_1, }; -static const union AnimCmd *const sAnims_NINJASK[] ={ +static const union AnimCmd *const sAnims_NINJASK[] = +{ sAnim_GeneralFrame0, sAnim_NINJASK_1, }; -static const union AnimCmd *const sAnims_SHEDINJA[] ={ +static const union AnimCmd *const sAnims_SHEDINJA[] = +{ sAnim_GeneralFrame0, sAnim_SHEDINJA_1, }; -static const union AnimCmd *const sAnims_TAILLOW[] ={ +static const union AnimCmd *const sAnims_TAILLOW[] = +{ sAnim_GeneralFrame0, sAnim_TAILLOW_1, }; -static const union AnimCmd *const sAnims_SWELLOW[] ={ +static const union AnimCmd *const sAnims_SWELLOW[] = +{ sAnim_GeneralFrame0, sAnim_SWELLOW_1, }; -static const union AnimCmd *const sAnims_SHROOMISH[] ={ +static const union AnimCmd *const sAnims_SHROOMISH[] = +{ sAnim_GeneralFrame0, sAnim_SHROOMISH_1, }; -static const union AnimCmd *const sAnims_BRELOOM[] ={ +static const union AnimCmd *const sAnims_BRELOOM[] = +{ sAnim_GeneralFrame0, sAnim_BRELOOM_1, }; -static const union AnimCmd *const sAnims_SPINDA[] ={ +static const union AnimCmd *const sAnims_SPINDA[] = +{ sAnim_GeneralFrame0, }; -static const union AnimCmd *const sAnims_WINGULL[] ={ +static const union AnimCmd *const sAnims_WINGULL[] = +{ sAnim_GeneralFrame0, sAnim_WINGULL_1, }; -static const union AnimCmd *const sAnims_PELIPPER[] ={ +static const union AnimCmd *const sAnims_PELIPPER[] = +{ sAnim_GeneralFrame0, sAnim_PELIPPER_1, }; -static const union AnimCmd *const sAnims_SURSKIT[] ={ +static const union AnimCmd *const sAnims_SURSKIT[] = +{ sAnim_GeneralFrame0, sAnim_SURSKIT_1, sAnim_SURSKIT_2, }; -static const union AnimCmd *const sAnims_MASQUERAIN[] ={ +static const union AnimCmd *const sAnims_MASQUERAIN[] = +{ sAnim_GeneralFrame0, sAnim_MASQUERAIN_1, sAnim_MASQUERAIN_2, }; -static const union AnimCmd *const sAnims_WAILMER[] ={ +static const union AnimCmd *const sAnims_WAILMER[] = +{ sAnim_GeneralFrame0, sAnim_WAILMER_1, }; -static const union AnimCmd *const sAnims_WAILORD[] ={ +static const union AnimCmd *const sAnims_WAILORD[] = +{ sAnim_GeneralFrame0, sAnim_WAILORD_1, }; -static const union AnimCmd *const sAnims_SKITTY[] ={ +static const union AnimCmd *const sAnims_SKITTY[] = +{ sAnim_GeneralFrame0, sAnim_SKITTY_1, }; -static const union AnimCmd *const sAnims_DELCATTY[] ={ +static const union AnimCmd *const sAnims_DELCATTY[] = +{ sAnim_GeneralFrame0, sAnim_DELCATTY_1, }; -static const union AnimCmd *const sAnims_KECLEON[] ={ +static const union AnimCmd *const sAnims_KECLEON[] = +{ sAnim_GeneralFrame0, sAnim_KECLEON_1, }; -static const union AnimCmd *const sAnims_BALTOY[] ={ +static const union AnimCmd *const sAnims_BALTOY[] = +{ sAnim_GeneralFrame0, sAnim_BALTOY_1, }; -static const union AnimCmd *const sAnims_CLAYDOL[] ={ +static const union AnimCmd *const sAnims_CLAYDOL[] = +{ sAnim_GeneralFrame0, sAnim_CLAYDOL_1, }; -static const union AnimCmd *const sAnims_NOSEPASS[] ={ +static const union AnimCmd *const sAnims_NOSEPASS[] = +{ sAnim_GeneralFrame0, sAnim_NOSEPASS_1, }; -static const union AnimCmd *const sAnims_TORKOAL[] ={ +static const union AnimCmd *const sAnims_TORKOAL[] = +{ sAnim_GeneralFrame0, sAnim_TORKOAL_1, }; -static const union AnimCmd *const sAnims_SABLEYE[] ={ +static const union AnimCmd *const sAnims_SABLEYE[] = +{ sAnim_GeneralFrame0, sAnim_SABLEYE_1, }; -static const union AnimCmd *const sAnims_BARBOACH[] ={ +static const union AnimCmd *const sAnims_BARBOACH[] = +{ sAnim_GeneralFrame0, sAnim_BARBOACH_1, }; -static const union AnimCmd *const sAnims_WHISCASH[] ={ +static const union AnimCmd *const sAnims_WHISCASH[] = +{ sAnim_GeneralFrame0, sAnim_WHISCASH_1, }; -static const union AnimCmd *const sAnims_LUVDISC[] ={ +static const union AnimCmd *const sAnims_LUVDISC[] = +{ sAnim_GeneralFrame0, sAnim_LUVDISC_1, }; -static const union AnimCmd *const sAnims_CORPHISH[] ={ +static const union AnimCmd *const sAnims_CORPHISH[] = +{ sAnim_GeneralFrame0, sAnim_CORPHISH_1, }; -static const union AnimCmd *const sAnims_CRAWDAUNT[] ={ +static const union AnimCmd *const sAnims_CRAWDAUNT[] = +{ sAnim_GeneralFrame0, sAnim_CRAWDAUNT_1, }; -static const union AnimCmd *const sAnims_FEEBAS[] ={ +static const union AnimCmd *const sAnims_FEEBAS[] = +{ sAnim_GeneralFrame0, sAnim_FEEBAS_1, }; -static const union AnimCmd *const sAnims_MILOTIC[] ={ +static const union AnimCmd *const sAnims_MILOTIC[] = +{ sAnim_GeneralFrame0, sAnim_MILOTIC_1, }; -static const union AnimCmd *const sAnims_CARVANHA[] ={ +static const union AnimCmd *const sAnims_CARVANHA[] = +{ sAnim_GeneralFrame0, sAnim_CARVANHA_1, }; -static const union AnimCmd *const sAnims_SHARPEDO[] ={ +static const union AnimCmd *const sAnims_SHARPEDO[] = +{ sAnim_GeneralFrame0, sAnim_SHARPEDO_1, }; -static const union AnimCmd *const sAnims_TRAPINCH[] ={ +static const union AnimCmd *const sAnims_TRAPINCH[] = +{ sAnim_GeneralFrame0, sAnim_TRAPINCH_1, }; -static const union AnimCmd *const sAnims_VIBRAVA[] ={ +static const union AnimCmd *const sAnims_VIBRAVA[] = +{ sAnim_GeneralFrame0, sAnim_VIBRAVA_1, }; -static const union AnimCmd *const sAnims_FLYGON[] ={ +static const union AnimCmd *const sAnims_FLYGON[] = +{ sAnim_GeneralFrame0, sAnim_FLYGON_1, }; -static const union AnimCmd *const sAnims_MAKUHITA[] ={ +static const union AnimCmd *const sAnims_MAKUHITA[] = +{ sAnim_GeneralFrame0, sAnim_MAKUHITA_1, }; -static const union AnimCmd *const sAnims_HARIYAMA[] ={ +static const union AnimCmd *const sAnims_HARIYAMA[] = +{ sAnim_GeneralFrame0, sAnim_HARIYAMA_1, }; -static const union AnimCmd *const sAnims_ELECTRIKE[] ={ +static const union AnimCmd *const sAnims_ELECTRIKE[] = +{ sAnim_GeneralFrame0, sAnim_ELECTRIKE_1, }; -static const union AnimCmd *const sAnims_MANECTRIC[] ={ +static const union AnimCmd *const sAnims_MANECTRIC[] = +{ sAnim_GeneralFrame0, sAnim_MANECTRIC_1, }; -static const union AnimCmd *const sAnims_NUMEL[] ={ +static const union AnimCmd *const sAnims_NUMEL[] = +{ sAnim_GeneralFrame0, sAnim_NUMEL_1, }; -static const union AnimCmd *const sAnims_CAMERUPT[] ={ +static const union AnimCmd *const sAnims_CAMERUPT[] = +{ sAnim_GeneralFrame0, sAnim_CAMERUPT_1, }; -static const union AnimCmd *const sAnims_SPHEAL[] ={ +static const union AnimCmd *const sAnims_SPHEAL[] = +{ sAnim_GeneralFrame0, sAnim_SPHEAL_1, }; -static const union AnimCmd *const sAnims_SEALEO[] ={ +static const union AnimCmd *const sAnims_SEALEO[] = +{ sAnim_GeneralFrame0, sAnim_SEALEO_1, }; -static const union AnimCmd *const sAnims_WALREIN[] ={ +static const union AnimCmd *const sAnims_WALREIN[] = +{ sAnim_GeneralFrame0, sAnim_WALREIN_1, }; -static const union AnimCmd *const sAnims_CACNEA[] ={ +static const union AnimCmd *const sAnims_CACNEA[] = +{ sAnim_GeneralFrame0, sAnim_CACNEA_1, }; -static const union AnimCmd *const sAnims_CACTURNE[] ={ +static const union AnimCmd *const sAnims_CACTURNE[] = +{ sAnim_GeneralFrame0, sAnim_CACTURNE_1, }; -static const union AnimCmd *const sAnims_SNORUNT[] ={ +static const union AnimCmd *const sAnims_SNORUNT[] = +{ sAnim_GeneralFrame0, sAnim_SNORUNT_1, }; -static const union AnimCmd *const sAnims_GLALIE[] ={ +static const union AnimCmd *const sAnims_GLALIE[] = +{ sAnim_GeneralFrame0, sAnim_GLALIE_1, }; -static const union AnimCmd *const sAnims_LUNATONE[] ={ +static const union AnimCmd *const sAnims_LUNATONE[] = +{ sAnim_GeneralFrame0, sAnim_LUNATONE_1, sAnim_LUNATONE_2, }; -static const union AnimCmd *const sAnims_SOLROCK[] ={ +static const union AnimCmd *const sAnims_SOLROCK[] = +{ sAnim_GeneralFrame0, sAnim_SOLROCK_1, sAnim_SOLROCK_2, }; -static const union AnimCmd *const sAnims_AZURILL[] ={ +static const union AnimCmd *const sAnims_AZURILL[] = +{ sAnim_GeneralFrame0, sAnim_AZURILL_1, }; -static const union AnimCmd *const sAnims_SPOINK[] ={ +static const union AnimCmd *const sAnims_SPOINK[] = +{ sAnim_GeneralFrame0, sAnim_SPOINK_1, }; -static const union AnimCmd *const sAnims_GRUMPIG[] ={ +static const union AnimCmd *const sAnims_GRUMPIG[] = +{ sAnim_GeneralFrame0, sAnim_GRUMPIG_1, }; -static const union AnimCmd *const sAnims_PLUSLE[] ={ +static const union AnimCmd *const sAnims_PLUSLE[] = +{ sAnim_GeneralFrame0, sAnim_PLUSLE_1, }; -static const union AnimCmd *const sAnims_MINUN[] ={ +static const union AnimCmd *const sAnims_MINUN[] = +{ sAnim_GeneralFrame0, sAnim_MINUN_1, }; -static const union AnimCmd *const sAnims_MAWILE[] ={ +static const union AnimCmd *const sAnims_MAWILE[] = +{ sAnim_GeneralFrame0, sAnim_MAWILE_1, }; -static const union AnimCmd *const sAnims_MEDITITE[] ={ +static const union AnimCmd *const sAnims_MEDITITE[] = +{ sAnim_GeneralFrame0, sAnim_MEDITITE_1, }; -static const union AnimCmd *const sAnims_MEDICHAM[] ={ +static const union AnimCmd *const sAnims_MEDICHAM[] = +{ sAnim_GeneralFrame0, sAnim_MEDICHAM_1, }; -static const union AnimCmd *const sAnims_SWABLU[] ={ +static const union AnimCmd *const sAnims_SWABLU[] = +{ sAnim_GeneralFrame0, sAnim_SWABLU_1, sAnim_SWABLU_2, }; -static const union AnimCmd *const sAnims_ALTARIA[] ={ +static const union AnimCmd *const sAnims_ALTARIA[] = +{ sAnim_GeneralFrame0, sAnim_ALTARIA_1, sAnim_ALTARIA_2, }; -static const union AnimCmd *const sAnims_WYNAUT[] ={ +static const union AnimCmd *const sAnims_WYNAUT[] = +{ sAnim_GeneralFrame0, sAnim_WYNAUT_1, }; -static const union AnimCmd *const sAnims_DUSKULL[] ={ +static const union AnimCmd *const sAnims_DUSKULL[] = +{ sAnim_GeneralFrame0, sAnim_DUSKULL_1, }; -static const union AnimCmd *const sAnims_DUSCLOPS[] ={ +static const union AnimCmd *const sAnims_DUSCLOPS[] = +{ sAnim_GeneralFrame0, sAnim_DUSCLOPS_1, }; -static const union AnimCmd *const sAnims_ROSELIA[] ={ +static const union AnimCmd *const sAnims_ROSELIA[] = +{ sAnim_GeneralFrame0, sAnim_ROSELIA_1, }; -static const union AnimCmd *const sAnims_SLAKOTH[] ={ +static const union AnimCmd *const sAnims_SLAKOTH[] = +{ sAnim_GeneralFrame0, sAnim_SLAKOTH_1, }; -static const union AnimCmd *const sAnims_VIGOROTH[] ={ +static const union AnimCmd *const sAnims_VIGOROTH[] = +{ sAnim_GeneralFrame0, sAnim_VIGOROTH_1, }; -static const union AnimCmd *const sAnims_SLAKING[] ={ +static const union AnimCmd *const sAnims_SLAKING[] = +{ sAnim_GeneralFrame0, sAnim_SLAKING_1, }; -static const union AnimCmd *const sAnims_GULPIN[] ={ +static const union AnimCmd *const sAnims_GULPIN[] = +{ sAnim_GeneralFrame0, sAnim_GULPIN_1, }; -static const union AnimCmd *const sAnims_SWALOT[] ={ +static const union AnimCmd *const sAnims_SWALOT[] = +{ sAnim_GeneralFrame0, sAnim_SWALOT_1, }; -static const union AnimCmd *const sAnims_TROPIUS[] ={ +static const union AnimCmd *const sAnims_TROPIUS[] = +{ sAnim_GeneralFrame0, sAnim_TROPIUS_1, }; -static const union AnimCmd *const sAnims_WHISMUR[] ={ +static const union AnimCmd *const sAnims_WHISMUR[] = +{ sAnim_GeneralFrame0, sAnim_WHISMUR_1, }; -static const union AnimCmd *const sAnims_LOUDRED[] ={ +static const union AnimCmd *const sAnims_LOUDRED[] = +{ sAnim_GeneralFrame0, sAnim_LOUDRED_1, }; -static const union AnimCmd *const sAnims_EXPLOUD[] ={ +static const union AnimCmd *const sAnims_EXPLOUD[] = +{ sAnim_GeneralFrame0, sAnim_EXPLOUD_1, }; -static const union AnimCmd *const sAnims_CLAMPERL[] ={ +static const union AnimCmd *const sAnims_CLAMPERL[] = +{ sAnim_GeneralFrame0, sAnim_CLAMPERL_1, }; -static const union AnimCmd *const sAnims_HUNTAIL[] ={ +static const union AnimCmd *const sAnims_HUNTAIL[] = +{ sAnim_GeneralFrame0, sAnim_HUNTAIL_1, }; -static const union AnimCmd *const sAnims_GOREBYSS[] ={ +static const union AnimCmd *const sAnims_GOREBYSS[] = +{ sAnim_GeneralFrame0, sAnim_GOREBYSS_1, }; -static const union AnimCmd *const sAnims_ABSOL[] ={ +static const union AnimCmd *const sAnims_ABSOL[] = +{ sAnim_GeneralFrame0, sAnim_ABSOL_1, }; -static const union AnimCmd *const sAnims_SHUPPET[] ={ +static const union AnimCmd *const sAnims_SHUPPET[] = +{ sAnim_GeneralFrame0, sAnim_SHUPPET_1, }; -static const union AnimCmd *const sAnims_BANETTE[] ={ +static const union AnimCmd *const sAnims_BANETTE[] = +{ sAnim_GeneralFrame0, sAnim_BANETTE_1, }; -static const union AnimCmd *const sAnims_SEVIPER[] ={ +static const union AnimCmd *const sAnims_SEVIPER[] = +{ sAnim_GeneralFrame0, sAnim_SEVIPER_1, }; -static const union AnimCmd *const sAnims_ZANGOOSE[] ={ +static const union AnimCmd *const sAnims_ZANGOOSE[] = +{ sAnim_GeneralFrame0, sAnim_ZANGOOSE_1, }; -static const union AnimCmd *const sAnims_RELICANTH[] ={ +static const union AnimCmd *const sAnims_RELICANTH[] = +{ sAnim_GeneralFrame0, sAnim_RELICANTH_1, }; -static const union AnimCmd *const sAnims_ARON[] ={ +static const union AnimCmd *const sAnims_ARON[] = +{ sAnim_GeneralFrame0, sAnim_ARON_1, }; -static const union AnimCmd *const sAnims_LAIRON[] ={ +static const union AnimCmd *const sAnims_LAIRON[] = +{ sAnim_GeneralFrame0, sAnim_LAIRON_1, }; -static const union AnimCmd *const sAnims_AGGRON[] ={ +static const union AnimCmd *const sAnims_AGGRON[] = +{ sAnim_GeneralFrame0, sAnim_AGGRON_1, }; -static const union AnimCmd *const sAnims_CASTFORM[] ={ +static const union AnimCmd *const sAnims_CASTFORM[] = +{ sAnim_CASTFORM_0, sAnim_CASTFORM_1, sAnim_CASTFORM_2, sAnim_CASTFORM_3, }; -static const union AnimCmd *const sAnims_VOLBEAT[] ={ +static const union AnimCmd *const sAnims_VOLBEAT[] = +{ sAnim_GeneralFrame0, sAnim_VOLBEAT_1, }; -static const union AnimCmd *const sAnims_ILLUMISE[] ={ +static const union AnimCmd *const sAnims_ILLUMISE[] = +{ sAnim_GeneralFrame0, sAnim_ILLUMISE_1, }; -static const union AnimCmd *const sAnims_LILEEP[] ={ +static const union AnimCmd *const sAnims_LILEEP[] = +{ sAnim_GeneralFrame0, sAnim_LILEEP_1, }; -static const union AnimCmd *const sAnims_CRADILY[] ={ +static const union AnimCmd *const sAnims_CRADILY[] = +{ sAnim_GeneralFrame0, sAnim_CRADILY_1, }; -static const union AnimCmd *const sAnims_ANORITH[] ={ +static const union AnimCmd *const sAnims_ANORITH[] = +{ sAnim_GeneralFrame0, sAnim_ANORITH_1, }; -static const union AnimCmd *const sAnims_ARMALDO[] ={ +static const union AnimCmd *const sAnims_ARMALDO[] = +{ sAnim_GeneralFrame0, sAnim_ARMALDO_1, }; -static const union AnimCmd *const sAnims_RALTS[] ={ +static const union AnimCmd *const sAnims_RALTS[] = +{ sAnim_GeneralFrame0, sAnim_RALTS_1, }; -static const union AnimCmd *const sAnims_KIRLIA[] ={ +static const union AnimCmd *const sAnims_KIRLIA[] = +{ sAnim_GeneralFrame0, sAnim_KIRLIA_1, }; -static const union AnimCmd *const sAnims_GARDEVOIR[] ={ +static const union AnimCmd *const sAnims_GARDEVOIR[] = +{ sAnim_GeneralFrame0, sAnim_GARDEVOIR_1, }; -static const union AnimCmd *const sAnims_BAGON[] ={ +static const union AnimCmd *const sAnims_BAGON[] = +{ sAnim_GeneralFrame0, sAnim_BAGON_1, }; -static const union AnimCmd *const sAnims_SHELGON[] ={ +static const union AnimCmd *const sAnims_SHELGON[] = +{ sAnim_GeneralFrame0, sAnim_SHELGON_1, }; -static const union AnimCmd *const sAnims_SALAMENCE[] ={ +static const union AnimCmd *const sAnims_SALAMENCE[] = +{ sAnim_GeneralFrame0, sAnim_SALAMENCE_1, }; -static const union AnimCmd *const sAnims_BELDUM[] ={ +static const union AnimCmd *const sAnims_BELDUM[] = +{ sAnim_GeneralFrame0, sAnim_BELDUM_1, }; -static const union AnimCmd *const sAnims_METANG[] ={ +static const union AnimCmd *const sAnims_METANG[] = +{ sAnim_GeneralFrame0, sAnim_METANG_1, }; -static const union AnimCmd *const sAnims_METAGROSS[] ={ +static const union AnimCmd *const sAnims_METAGROSS[] = +{ sAnim_GeneralFrame0, sAnim_METAGROSS_1, }; -static const union AnimCmd *const sAnims_REGIROCK[] ={ +static const union AnimCmd *const sAnims_REGIROCK[] = +{ sAnim_GeneralFrame0, sAnim_REGIROCK_1, sAnim_REGIROCK_2, }; -static const union AnimCmd *const sAnims_REGICE[] ={ +static const union AnimCmd *const sAnims_REGICE[] = +{ sAnim_GeneralFrame0, sAnim_REGICE_1, }; -static const union AnimCmd *const sAnims_REGISTEEL[] ={ +static const union AnimCmd *const sAnims_REGISTEEL[] = +{ sAnim_GeneralFrame0, sAnim_REGISTEEL_1, sAnim_REGISTEEL_2, }; -static const union AnimCmd *const sAnims_KYOGRE[] ={ +static const union AnimCmd *const sAnims_KYOGRE[] = +{ sAnim_GeneralFrame0, sAnim_KYOGRE_1, sAnim_KYOGRE_2, }; -static const union AnimCmd *const sAnims_GROUDON[] ={ +static const union AnimCmd *const sAnims_GROUDON[] = +{ sAnim_GeneralFrame0, sAnim_GROUDON_1, sAnim_GROUDON_2, }; -static const union AnimCmd *const sAnims_RAYQUAZA[] ={ +static const union AnimCmd *const sAnims_RAYQUAZA[] = +{ sAnim_GeneralFrame0, sAnim_RAYQUAZA_1, sAnim_RAYQUAZA_2, }; -static const union AnimCmd *const sAnims_LATIAS[] ={ +static const union AnimCmd *const sAnims_LATIAS[] = +{ sAnim_GeneralFrame0, sAnim_LATIAS_1, sAnim_LATIAS_2, }; -static const union AnimCmd *const sAnims_LATIOS[] ={ +static const union AnimCmd *const sAnims_LATIOS[] = +{ sAnim_GeneralFrame0, sAnim_LATIOS_1, sAnim_LATIOS_2, }; -static const union AnimCmd *const sAnims_JIRACHI[] ={ +static const union AnimCmd *const sAnims_JIRACHI[] = +{ sAnim_GeneralFrame0, sAnim_JIRACHI_1, sAnim_JIRACHI_2, }; -static const union AnimCmd *const sAnims_DEOXYS[] ={ +static const union AnimCmd *const sAnims_DEOXYS[] = +{ sAnim_GeneralFrame0, sAnim_DEOXYS_1, sAnim_DEOXYS_2, }; -static const union AnimCmd *const sAnims_CHIMECHO[] ={ +static const union AnimCmd *const sAnims_CHIMECHO[] = +{ sAnim_GeneralFrame0, sAnim_CHIMECHO_1, }; -static const union AnimCmd *const sAnims_EGG[] ={ +static const union AnimCmd *const sAnims_EGG[] = +{ sAnim_GeneralFrame0, sAnim_EGG_1, }; -static const union AnimCmd *const sAnims_UNOWN_B[] ={ +static const union AnimCmd *const sAnims_UNOWN_B[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_B_1, }; -static const union AnimCmd *const sAnims_UNOWN_C[] ={ +static const union AnimCmd *const sAnims_UNOWN_C[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_C_1, }; -static const union AnimCmd *const sAnims_UNOWN_D[] ={ +static const union AnimCmd *const sAnims_UNOWN_D[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_D_1, }; -static const union AnimCmd *const sAnims_UNOWN_E[] ={ +static const union AnimCmd *const sAnims_UNOWN_E[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_E_1, }; -static const union AnimCmd *const sAnims_UNOWN_F[] ={ +static const union AnimCmd *const sAnims_UNOWN_F[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_F_1, }; -static const union AnimCmd *const sAnims_UNOWN_G[] ={ +static const union AnimCmd *const sAnims_UNOWN_G[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_G_1, }; -static const union AnimCmd *const sAnims_UNOWN_H[] ={ +static const union AnimCmd *const sAnims_UNOWN_H[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_H_1, }; -static const union AnimCmd *const sAnims_UNOWN_I[] ={ +static const union AnimCmd *const sAnims_UNOWN_I[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_I_1, }; -static const union AnimCmd *const sAnims_UNOWN_J[] ={ +static const union AnimCmd *const sAnims_UNOWN_J[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_J_1, }; -static const union AnimCmd *const sAnims_UNOWN_K[] ={ +static const union AnimCmd *const sAnims_UNOWN_K[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_K_1, }; -static const union AnimCmd *const sAnims_UNOWN_L[] ={ +static const union AnimCmd *const sAnims_UNOWN_L[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_L_1, }; -static const union AnimCmd *const sAnims_UNOWN_M[] ={ +static const union AnimCmd *const sAnims_UNOWN_M[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_M_1, }; -static const union AnimCmd *const sAnims_UNOWN_N[] ={ +static const union AnimCmd *const sAnims_UNOWN_N[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_N_1, }; -static const union AnimCmd *const sAnims_UNOWN_O[] ={ +static const union AnimCmd *const sAnims_UNOWN_O[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_O_1, }; -static const union AnimCmd *const sAnims_UNOWN_P[] ={ +static const union AnimCmd *const sAnims_UNOWN_P[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_P_1, }; -static const union AnimCmd *const sAnims_UNOWN_Q[] ={ +static const union AnimCmd *const sAnims_UNOWN_Q[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_Q_1, }; -static const union AnimCmd *const sAnims_UNOWN_R[] ={ +static const union AnimCmd *const sAnims_UNOWN_R[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_R_1, }; -static const union AnimCmd *const sAnims_UNOWN_S[] ={ +static const union AnimCmd *const sAnims_UNOWN_S[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_S_1, }; -static const union AnimCmd *const sAnims_UNOWN_T[] ={ +static const union AnimCmd *const sAnims_UNOWN_T[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_T_1, }; -static const union AnimCmd *const sAnims_UNOWN_U[] ={ +static const union AnimCmd *const sAnims_UNOWN_U[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_U_1, }; -static const union AnimCmd *const sAnims_UNOWN_V[] ={ +static const union AnimCmd *const sAnims_UNOWN_V[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_V_1, }; -static const union AnimCmd *const sAnims_UNOWN_W[] ={ +static const union AnimCmd *const sAnims_UNOWN_W[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_W_1, }; -static const union AnimCmd *const sAnims_UNOWN_X[] ={ +static const union AnimCmd *const sAnims_UNOWN_X[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_X_1, }; -static const union AnimCmd *const sAnims_UNOWN_Y[] ={ +static const union AnimCmd *const sAnims_UNOWN_Y[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_Y_1, }; -static const union AnimCmd *const sAnims_UNOWN_Z[] ={ +static const union AnimCmd *const sAnims_UNOWN_Z[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_Z_1, }; -static const union AnimCmd *const sAnims_UNOWN_EMARK[] ={ +static const union AnimCmd *const sAnims_UNOWN_EMARK[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_EMARK_1, }; -static const union AnimCmd *const sAnims_UNOWN_QMARK[] ={ +static const union AnimCmd *const sAnims_UNOWN_QMARK[] = +{ sAnim_GeneralFrame0, sAnim_UNOWN_QMARK_1, }; -#if P_NEW_POKEMON == TRUE -static const union AnimCmd *const sAnims_TURTWIG[] ={ +#if P_NEW_POKEMON >= GEN_4 +static const union AnimCmd *const sAnims_TURTWIG[] = +{ sAnim_GeneralFrame0, sAnim_TURTWIG_1, }; -static const union AnimCmd *const sAnims_GROTLE[] ={ +static const union AnimCmd *const sAnims_GROTLE[] = +{ sAnim_GeneralFrame0, sAnim_GROTLE_1, }; -static const union AnimCmd *const sAnims_TORTERRA[] ={ +static const union AnimCmd *const sAnims_TORTERRA[] = +{ sAnim_GeneralFrame0, sAnim_TORTERRA_1, }; -static const union AnimCmd *const sAnims_CHIMCHAR[] ={ +static const union AnimCmd *const sAnims_CHIMCHAR[] = +{ sAnim_GeneralFrame0, sAnim_CHIMCHAR_1, }; -static const union AnimCmd *const sAnims_MONFERNO[] ={ +static const union AnimCmd *const sAnims_MONFERNO[] = +{ sAnim_GeneralFrame0, sAnim_MONFERNO_1, }; -static const union AnimCmd *const sAnims_INFERNAPE[] ={ +static const union AnimCmd *const sAnims_INFERNAPE[] = +{ sAnim_GeneralFrame0, sAnim_INFERNAPE_1, }; -static const union AnimCmd *const sAnims_PIPLUP[] ={ +static const union AnimCmd *const sAnims_PIPLUP[] = +{ sAnim_GeneralFrame0, sAnim_PIPLUP_1, }; -static const union AnimCmd *const sAnims_PRINPLUP[] ={ +static const union AnimCmd *const sAnims_PRINPLUP[] = +{ sAnim_GeneralFrame0, sAnim_PRINPLUP_1, }; -static const union AnimCmd *const sAnims_EMPOLEON[] ={ +static const union AnimCmd *const sAnims_EMPOLEON[] = +{ sAnim_GeneralFrame0, sAnim_EMPOLEON_1, }; -static const union AnimCmd *const sAnims_STARLY[] ={ +static const union AnimCmd *const sAnims_STARLY[] = +{ sAnim_GeneralFrame0, sAnim_STARLY_1, }; -static const union AnimCmd *const sAnims_STARAVIA[] ={ +static const union AnimCmd *const sAnims_STARAVIA[] = +{ sAnim_GeneralFrame0, sAnim_STARAVIA_1, }; -static const union AnimCmd *const sAnims_STARAPTOR[] ={ +static const union AnimCmd *const sAnims_STARAPTOR[] = +{ sAnim_GeneralFrame0, sAnim_STARAPTOR_1, }; -static const union AnimCmd *const sAnims_BIDOOF[] ={ +static const union AnimCmd *const sAnims_BIDOOF[] = +{ sAnim_GeneralFrame0, sAnim_BIDOOF_1, }; -static const union AnimCmd *const sAnims_BIBAREL[] ={ +static const union AnimCmd *const sAnims_BIBAREL[] = +{ sAnim_GeneralFrame0, sAnim_BIBAREL_1, }; -static const union AnimCmd *const sAnims_KRICKETOT[] ={ +static const union AnimCmd *const sAnims_KRICKETOT[] = +{ sAnim_GeneralFrame0, sAnim_KRICKETOT_1, }; -static const union AnimCmd *const sAnims_KRICKETUNE[] ={ +static const union AnimCmd *const sAnims_KRICKETUNE[] = +{ sAnim_GeneralFrame0, sAnim_KRICKETUNE_1, }; -static const union AnimCmd *const sAnims_SHINX[] ={ +static const union AnimCmd *const sAnims_SHINX[] = +{ sAnim_GeneralFrame0, sAnim_SHINX_1, }; -static const union AnimCmd *const sAnims_LUXIO[] ={ +static const union AnimCmd *const sAnims_LUXIO[] = +{ sAnim_GeneralFrame0, sAnim_LUXIO_1, }; -static const union AnimCmd *const sAnims_LUXRAY[] ={ +static const union AnimCmd *const sAnims_LUXRAY[] = +{ sAnim_GeneralFrame0, sAnim_LUXRAY_1, }; -static const union AnimCmd *const sAnims_BUDEW[] ={ +static const union AnimCmd *const sAnims_BUDEW[] = +{ sAnim_GeneralFrame0, sAnim_BUDEW_1, }; -static const union AnimCmd *const sAnims_ROSERADE[] ={ +static const union AnimCmd *const sAnims_ROSERADE[] = +{ sAnim_GeneralFrame0, sAnim_ROSERADE_1, }; -static const union AnimCmd *const sAnims_CRANIDOS[] ={ +static const union AnimCmd *const sAnims_CRANIDOS[] = +{ sAnim_GeneralFrame0, sAnim_CRANIDOS_1, }; -static const union AnimCmd *const sAnims_RAMPARDOS[] ={ +static const union AnimCmd *const sAnims_RAMPARDOS[] = +{ sAnim_GeneralFrame0, sAnim_RAMPARDOS_1, }; -static const union AnimCmd *const sAnims_SHIELDON[] ={ +static const union AnimCmd *const sAnims_SHIELDON[] = +{ sAnim_GeneralFrame0, sAnim_SHIELDON_1, }; -static const union AnimCmd *const sAnims_BASTIODON[] ={ +static const union AnimCmd *const sAnims_BASTIODON[] = +{ sAnim_GeneralFrame0, sAnim_BASTIODON_1, }; -static const union AnimCmd *const sAnims_BURMY[] ={ +static const union AnimCmd *const sAnims_BURMY[] = +{ sAnim_GeneralFrame0, sAnim_BURMY_1, }; -static const union AnimCmd *const sAnims_WORMADAM[] ={ +static const union AnimCmd *const sAnims_WORMADAM[] = +{ sAnim_GeneralFrame0, sAnim_WORMADAM_1, }; -static const union AnimCmd *const sAnims_MOTHIM[] ={ +static const union AnimCmd *const sAnims_MOTHIM[] = +{ sAnim_GeneralFrame0, sAnim_MOTHIM_1, }; -static const union AnimCmd *const sAnims_COMBEE[] ={ +static const union AnimCmd *const sAnims_COMBEE[] = +{ sAnim_GeneralFrame0, sAnim_COMBEE_1, }; -static const union AnimCmd *const sAnims_VESPIQUEN[] ={ +static const union AnimCmd *const sAnims_VESPIQUEN[] = +{ sAnim_GeneralFrame0, sAnim_VESPIQUEN_1, }; -static const union AnimCmd *const sAnims_PACHIRISU[] ={ +static const union AnimCmd *const sAnims_PACHIRISU[] = +{ sAnim_GeneralFrame0, sAnim_PACHIRISU_1, }; -static const union AnimCmd *const sAnims_BUIZEL[] ={ +static const union AnimCmd *const sAnims_BUIZEL[] = +{ sAnim_GeneralFrame0, sAnim_BUIZEL_1, }; -static const union AnimCmd *const sAnims_FLOATZEL[] ={ +static const union AnimCmd *const sAnims_FLOATZEL[] = +{ sAnim_GeneralFrame0, sAnim_FLOATZEL_1, }; -static const union AnimCmd *const sAnims_CHERUBI[] ={ +static const union AnimCmd *const sAnims_CHERUBI[] = +{ sAnim_GeneralFrame0, sAnim_CHERUBI_1, }; -static const union AnimCmd *const sAnims_CHERRIM[] ={ +static const union AnimCmd *const sAnims_CHERRIM[] = +{ sAnim_CHERRIM_NORMAL, sAnim_CHERRIM_SUN, }; -static const union AnimCmd *const sAnims_SHELLOS[] ={ +static const union AnimCmd *const sAnims_SHELLOS[] = +{ sAnim_GeneralFrame0, sAnim_SHELLOS_1, }; -static const union AnimCmd *const sAnims_GASTRODON[] ={ +static const union AnimCmd *const sAnims_GASTRODON[] = +{ sAnim_GeneralFrame0, sAnim_GASTRODON_1, }; -static const union AnimCmd *const sAnims_AMBIPOM[] ={ +static const union AnimCmd *const sAnims_AMBIPOM[] = +{ sAnim_GeneralFrame0, sAnim_AMBIPOM_1, }; -static const union AnimCmd *const sAnims_DRIFLOON[] ={ +static const union AnimCmd *const sAnims_DRIFLOON[] = +{ sAnim_GeneralFrame0, sAnim_DRIFLOON_1, }; -static const union AnimCmd *const sAnims_DRIFBLIM[] ={ +static const union AnimCmd *const sAnims_DRIFBLIM[] = +{ sAnim_GeneralFrame0, sAnim_DRIFBLIM_1, }; -static const union AnimCmd *const sAnims_BUNEARY[] ={ +static const union AnimCmd *const sAnims_BUNEARY[] = +{ sAnim_GeneralFrame0, sAnim_BUNEARY_1, }; -static const union AnimCmd *const sAnims_LOPUNNY[] ={ +static const union AnimCmd *const sAnims_LOPUNNY[] = +{ sAnim_GeneralFrame0, sAnim_LOPUNNY_1, }; -static const union AnimCmd *const sAnims_MISMAGIUS[] ={ +static const union AnimCmd *const sAnims_MISMAGIUS[] = +{ sAnim_GeneralFrame0, sAnim_MISMAGIUS_1, }; -static const union AnimCmd *const sAnims_HONCHKROW[] ={ +static const union AnimCmd *const sAnims_HONCHKROW[] = +{ sAnim_GeneralFrame0, sAnim_HONCHKROW_1, }; -static const union AnimCmd *const sAnims_GLAMEOW[] ={ +static const union AnimCmd *const sAnims_GLAMEOW[] = +{ sAnim_GeneralFrame0, sAnim_GLAMEOW_1, }; -static const union AnimCmd *const sAnims_PURUGLY[] ={ +static const union AnimCmd *const sAnims_PURUGLY[] = +{ sAnim_GeneralFrame0, sAnim_PURUGLY_1, }; -static const union AnimCmd *const sAnims_CHINGLING[] ={ +static const union AnimCmd *const sAnims_CHINGLING[] = +{ sAnim_GeneralFrame0, sAnim_CHINGLING_1, }; -static const union AnimCmd *const sAnims_STUNKY[] ={ +static const union AnimCmd *const sAnims_STUNKY[] = +{ sAnim_GeneralFrame0, sAnim_STUNKY_1, }; -static const union AnimCmd *const sAnims_SKUNTANK[] ={ +static const union AnimCmd *const sAnims_SKUNTANK[] = +{ sAnim_GeneralFrame0, sAnim_SKUNTANK_1, }; -static const union AnimCmd *const sAnims_BRONZOR[] ={ +static const union AnimCmd *const sAnims_BRONZOR[] = +{ sAnim_GeneralFrame0, sAnim_BRONZOR_1, }; -static const union AnimCmd *const sAnims_BRONZONG[] ={ +static const union AnimCmd *const sAnims_BRONZONG[] = +{ sAnim_GeneralFrame0, sAnim_BRONZONG_1, }; -static const union AnimCmd *const sAnims_BONSLY[] ={ +static const union AnimCmd *const sAnims_BONSLY[] = +{ sAnim_GeneralFrame0, sAnim_BONSLY_1, }; -static const union AnimCmd *const sAnims_MIME_JR[] ={ +static const union AnimCmd *const sAnims_MIME_JR[] = +{ sAnim_GeneralFrame0, sAnim_MIME_JR_1, }; -static const union AnimCmd *const sAnims_HAPPINY[] ={ +static const union AnimCmd *const sAnims_HAPPINY[] = +{ sAnim_GeneralFrame0, sAnim_HAPPINY_1, }; -static const union AnimCmd *const sAnims_CHATOT[] ={ +static const union AnimCmd *const sAnims_CHATOT[] = +{ sAnim_GeneralFrame0, sAnim_CHATOT_1, }; -static const union AnimCmd *const sAnims_SPIRITOMB[] ={ +static const union AnimCmd *const sAnims_SPIRITOMB[] = +{ sAnim_GeneralFrame0, sAnim_SPIRITOMB_1, }; -static const union AnimCmd *const sAnims_GIBLE[] ={ +static const union AnimCmd *const sAnims_GIBLE[] = +{ sAnim_GeneralFrame0, sAnim_GIBLE_1, }; -static const union AnimCmd *const sAnims_GABITE[] ={ +static const union AnimCmd *const sAnims_GABITE[] = +{ sAnim_GeneralFrame0, sAnim_GABITE_1, }; -static const union AnimCmd *const sAnims_GARCHOMP[] ={ +static const union AnimCmd *const sAnims_GARCHOMP[] = +{ sAnim_GeneralFrame0, sAnim_GARCHOMP_1, }; -static const union AnimCmd *const sAnims_MUNCHLAX[] ={ +static const union AnimCmd *const sAnims_MUNCHLAX[] = +{ sAnim_GeneralFrame0, sAnim_MUNCHLAX_1, }; -static const union AnimCmd *const sAnims_RIOLU[] ={ +static const union AnimCmd *const sAnims_RIOLU[] = +{ sAnim_GeneralFrame0, sAnim_RIOLU_1, }; -static const union AnimCmd *const sAnims_LUCARIO[] ={ +static const union AnimCmd *const sAnims_LUCARIO[] = +{ sAnim_GeneralFrame0, sAnim_LUCARIO_1, }; -static const union AnimCmd *const sAnims_HIPPOPOTAS[] ={ +static const union AnimCmd *const sAnims_HIPPOPOTAS[] = +{ sAnim_GeneralFrame0, sAnim_HIPPOPOTAS_1, }; -static const union AnimCmd *const sAnims_HIPPOWDON[] ={ +static const union AnimCmd *const sAnims_HIPPOWDON[] = +{ sAnim_GeneralFrame0, sAnim_HIPPOWDON_1, }; -static const union AnimCmd *const sAnims_SKORUPI[] ={ +static const union AnimCmd *const sAnims_SKORUPI[] = +{ sAnim_GeneralFrame0, sAnim_SKORUPI_1, }; -static const union AnimCmd *const sAnims_DRAPION[] ={ +static const union AnimCmd *const sAnims_DRAPION[] = +{ sAnim_GeneralFrame0, sAnim_DRAPION_1, }; -static const union AnimCmd *const sAnims_CROAGUNK[] ={ +static const union AnimCmd *const sAnims_CROAGUNK[] = +{ sAnim_GeneralFrame0, sAnim_CROAGUNK_1, }; -static const union AnimCmd *const sAnims_TOXICROAK[] ={ +static const union AnimCmd *const sAnims_TOXICROAK[] = +{ sAnim_GeneralFrame0, sAnim_TOXICROAK_1, }; -static const union AnimCmd *const sAnims_CARNIVINE[] ={ +static const union AnimCmd *const sAnims_CARNIVINE[] = +{ sAnim_GeneralFrame0, sAnim_CARNIVINE_1, }; -static const union AnimCmd *const sAnims_FINNEON[] ={ +static const union AnimCmd *const sAnims_FINNEON[] = +{ sAnim_GeneralFrame0, sAnim_FINNEON_1, }; -static const union AnimCmd *const sAnims_LUMINEON[] ={ +static const union AnimCmd *const sAnims_LUMINEON[] = +{ sAnim_GeneralFrame0, sAnim_LUMINEON_1, }; -static const union AnimCmd *const sAnims_MANTYKE[] ={ +static const union AnimCmd *const sAnims_MANTYKE[] = +{ sAnim_GeneralFrame0, sAnim_MANTYKE_1, }; -static const union AnimCmd *const sAnims_SNOVER[] ={ +static const union AnimCmd *const sAnims_SNOVER[] = +{ sAnim_GeneralFrame0, sAnim_SNOVER_1, }; -static const union AnimCmd *const sAnims_ABOMASNOW[] ={ +static const union AnimCmd *const sAnims_ABOMASNOW[] = +{ sAnim_GeneralFrame0, sAnim_ABOMASNOW_1, }; -static const union AnimCmd *const sAnims_WEAVILE[] ={ +static const union AnimCmd *const sAnims_WEAVILE[] = +{ sAnim_GeneralFrame0, sAnim_WEAVILE_1, }; -static const union AnimCmd *const sAnims_MAGNEZONE[] ={ +static const union AnimCmd *const sAnims_MAGNEZONE[] = +{ sAnim_GeneralFrame0, sAnim_MAGNEZONE_1, }; -static const union AnimCmd *const sAnims_LICKILICKY[] ={ +static const union AnimCmd *const sAnims_LICKILICKY[] = +{ sAnim_GeneralFrame0, sAnim_LICKILICKY_1, }; -static const union AnimCmd *const sAnims_RHYPERIOR[] ={ +static const union AnimCmd *const sAnims_RHYPERIOR[] = +{ sAnim_GeneralFrame0, sAnim_RHYPERIOR_1, }; -static const union AnimCmd *const sAnims_TANGROWTH[] ={ +static const union AnimCmd *const sAnims_TANGROWTH[] = +{ sAnim_GeneralFrame0, sAnim_TANGROWTH_1, }; -static const union AnimCmd *const sAnims_ELECTIVIRE[] ={ +static const union AnimCmd *const sAnims_ELECTIVIRE[] = +{ sAnim_GeneralFrame0, sAnim_ELECTIVIRE_1, }; -static const union AnimCmd *const sAnims_MAGMORTAR[] ={ +static const union AnimCmd *const sAnims_MAGMORTAR[] = +{ sAnim_GeneralFrame0, sAnim_MAGMORTAR_1, }; -static const union AnimCmd *const sAnims_TOGEKISS[] ={ +static const union AnimCmd *const sAnims_TOGEKISS[] = +{ sAnim_GeneralFrame0, sAnim_TOGEKISS_1, }; -static const union AnimCmd *const sAnims_YANMEGA[] ={ +static const union AnimCmd *const sAnims_YANMEGA[] = +{ sAnim_GeneralFrame0, sAnim_YANMEGA_1, }; -static const union AnimCmd *const sAnims_LEAFEON[] ={ +static const union AnimCmd *const sAnims_LEAFEON[] = +{ sAnim_GeneralFrame0, sAnim_LEAFEON_1, }; -static const union AnimCmd *const sAnims_GLACEON[] ={ +static const union AnimCmd *const sAnims_GLACEON[] = +{ sAnim_GeneralFrame0, sAnim_GLACEON_1, }; -static const union AnimCmd *const sAnims_GLISCOR[] ={ +static const union AnimCmd *const sAnims_GLISCOR[] = +{ sAnim_GeneralFrame0, sAnim_GLISCOR_1, }; -static const union AnimCmd *const sAnims_MAMOSWINE[] ={ +static const union AnimCmd *const sAnims_MAMOSWINE[] = +{ sAnim_GeneralFrame0, sAnim_MAMOSWINE_1, }; -static const union AnimCmd *const sAnims_PORYGON_Z[] ={ +static const union AnimCmd *const sAnims_PORYGON_Z[] = +{ sAnim_GeneralFrame0, sAnim_PORYGON_Z_1, }; -static const union AnimCmd *const sAnims_GALLADE[] ={ +static const union AnimCmd *const sAnims_GALLADE[] = +{ sAnim_GeneralFrame0, sAnim_GALLADE_1, }; -static const union AnimCmd *const sAnims_PROBOPASS[] ={ +static const union AnimCmd *const sAnims_PROBOPASS[] = +{ sAnim_GeneralFrame0, sAnim_PROBOPASS_1, }; -static const union AnimCmd *const sAnims_DUSKNOIR[] ={ +static const union AnimCmd *const sAnims_DUSKNOIR[] = +{ sAnim_GeneralFrame0, sAnim_DUSKNOIR_1, }; -static const union AnimCmd *const sAnims_FROSLASS[] ={ +static const union AnimCmd *const sAnims_FROSLASS[] = +{ sAnim_GeneralFrame0, sAnim_FROSLASS_1, }; -static const union AnimCmd *const sAnims_ROTOM[] ={ +static const union AnimCmd *const sAnims_ROTOM[] = +{ sAnim_GeneralFrame0, sAnim_ROTOM_1, }; -static const union AnimCmd *const sAnims_ROTOM_HEAT[] ={ +static const union AnimCmd *const sAnims_ROTOM_HEAT[] = +{ sAnim_GeneralFrame0, sAnim_RotomHeat_1, }; -static const union AnimCmd *const sAnims_ROTOM_FROST[] ={ +static const union AnimCmd *const sAnims_ROTOM_FROST[] = +{ sAnim_GeneralFrame0, sAnim_RotomFrost_1, }; -static const union AnimCmd *const sAnims_ROTOM_FAN[] ={ +static const union AnimCmd *const sAnims_ROTOM_FAN[] = +{ sAnim_GeneralFrame0, sAnim_RotomFan_1, }; -static const union AnimCmd *const sAnims_ROTOM_MOW[] ={ +static const union AnimCmd *const sAnims_ROTOM_MOW[] = +{ sAnim_GeneralFrame0, sAnim_RotomMow_1, }; -static const union AnimCmd *const sAnims_ROTOM_WASH[] ={ +static const union AnimCmd *const sAnims_ROTOM_WASH[] = +{ sAnim_GeneralFrame0, sAnim_RotomWash_1, }; -static const union AnimCmd *const sAnims_UXIE[] ={ +static const union AnimCmd *const sAnims_UXIE[] = +{ sAnim_GeneralFrame0, sAnim_UXIE_1, }; -static const union AnimCmd *const sAnims_MESPRIT[] ={ +static const union AnimCmd *const sAnims_MESPRIT[] = +{ sAnim_GeneralFrame0, sAnim_MESPRIT_1, }; -static const union AnimCmd *const sAnims_AZELF[] ={ +static const union AnimCmd *const sAnims_AZELF[] = +{ sAnim_GeneralFrame0, sAnim_AZELF_1, }; -static const union AnimCmd *const sAnims_DIALGA[] ={ +static const union AnimCmd *const sAnims_DIALGA[] = +{ sAnim_GeneralFrame0, sAnim_DIALGA_1, }; -static const union AnimCmd *const sAnims_PALKIA[] ={ +static const union AnimCmd *const sAnims_PALKIA[] = +{ sAnim_GeneralFrame0, sAnim_PALKIA_1, }; -static const union AnimCmd *const sAnims_HEATRAN[] ={ +static const union AnimCmd *const sAnims_HEATRAN[] = +{ sAnim_GeneralFrame0, sAnim_HEATRAN_1, }; -static const union AnimCmd *const sAnims_REGIGIGAS[] ={ +static const union AnimCmd *const sAnims_REGIGIGAS[] = +{ sAnim_GeneralFrame0, sAnim_REGIGIGAS_1, }; -static const union AnimCmd *const sAnims_GIRATINA[] ={ +static const union AnimCmd *const sAnims_GIRATINA[] = +{ sAnim_GeneralFrame0, sAnim_GIRATINA_1, }; -static const union AnimCmd *const sAnims_CRESSELIA[] ={ +static const union AnimCmd *const sAnims_CRESSELIA[] = +{ sAnim_GeneralFrame0, sAnim_CRESSELIA_1, }; -static const union AnimCmd *const sAnims_PHIONE[] ={ +static const union AnimCmd *const sAnims_PHIONE[] = +{ sAnim_GeneralFrame0, sAnim_PHIONE_1, }; -static const union AnimCmd *const sAnims_MANAPHY[] ={ +static const union AnimCmd *const sAnims_MANAPHY[] = +{ sAnim_GeneralFrame0, sAnim_MANAPHY_1, }; -static const union AnimCmd *const sAnims_DARKRAI[] ={ +static const union AnimCmd *const sAnims_DARKRAI[] = +{ sAnim_GeneralFrame0, sAnim_DARKRAI_1, }; -static const union AnimCmd *const sAnims_SHAYMIN[] ={ +static const union AnimCmd *const sAnims_SHAYMIN[] = +{ sAnim_GeneralFrame0, sAnim_SHAYMIN_1, }; -static const union AnimCmd *const sAnims_ARCEUS[] ={ +static const union AnimCmd *const sAnims_ARCEUS[] = +{ sAnim_GeneralFrame0, sAnim_ARCEUS_1, }; +#endif -static const union AnimCmd *const sAnims_VICTINI[] ={ +#if P_NEW_POKEMON >= GEN_5 +static const union AnimCmd *const sAnims_VICTINI[] = +{ sAnim_GeneralFrame0, sAnim_VICTINI_1, }; -static const union AnimCmd *const sAnims_SNIVY[] ={ +static const union AnimCmd *const sAnims_SNIVY[] = +{ sAnim_GeneralFrame0, sAnim_SNIVY_1, }; -static const union AnimCmd *const sAnims_SERVINE[] ={ +static const union AnimCmd *const sAnims_SERVINE[] = +{ sAnim_GeneralFrame0, sAnim_SERVINE_1, }; -static const union AnimCmd *const sAnims_SERPERIOR[] ={ +static const union AnimCmd *const sAnims_SERPERIOR[] = +{ sAnim_GeneralFrame0, sAnim_SERPERIOR_1, }; -static const union AnimCmd *const sAnims_TEPIG[] ={ +static const union AnimCmd *const sAnims_TEPIG[] = +{ sAnim_GeneralFrame0, sAnim_TEPIG_1, }; -static const union AnimCmd *const sAnims_PIGNITE[] ={ +static const union AnimCmd *const sAnims_PIGNITE[] = +{ sAnim_GeneralFrame0, sAnim_PIGNITE_1, }; -static const union AnimCmd *const sAnims_EMBOAR[] ={ +static const union AnimCmd *const sAnims_EMBOAR[] = +{ sAnim_GeneralFrame0, sAnim_EMBOAR_1, }; -static const union AnimCmd *const sAnims_OSHAWOTT[] ={ +static const union AnimCmd *const sAnims_OSHAWOTT[] = +{ sAnim_GeneralFrame0, sAnim_OSHAWOTT_1, }; -static const union AnimCmd *const sAnims_DEWOTT[] ={ +static const union AnimCmd *const sAnims_DEWOTT[] = +{ sAnim_GeneralFrame0, sAnim_DEWOTT_1, }; -static const union AnimCmd *const sAnims_SAMUROTT[] ={ +static const union AnimCmd *const sAnims_SAMUROTT[] = +{ sAnim_GeneralFrame0, sAnim_SAMUROTT_1, }; -static const union AnimCmd *const sAnims_PATRAT[] ={ +static const union AnimCmd *const sAnims_PATRAT[] = +{ sAnim_GeneralFrame0, sAnim_PATRAT_1, }; -static const union AnimCmd *const sAnims_WATCHOG[] ={ +static const union AnimCmd *const sAnims_WATCHOG[] = +{ sAnim_GeneralFrame0, sAnim_WATCHOG_1, }; -static const union AnimCmd *const sAnims_LILLIPUP[] ={ +static const union AnimCmd *const sAnims_LILLIPUP[] = +{ sAnim_GeneralFrame0, sAnim_LILLIPUP_1, }; -static const union AnimCmd *const sAnims_HERDIER[] ={ +static const union AnimCmd *const sAnims_HERDIER[] = +{ sAnim_GeneralFrame0, sAnim_HERDIER_1, }; -static const union AnimCmd *const sAnims_STOUTLAND[] ={ +static const union AnimCmd *const sAnims_STOUTLAND[] = +{ sAnim_GeneralFrame0, sAnim_STOUTLAND_1, }; -static const union AnimCmd *const sAnims_PURRLOIN[] ={ +static const union AnimCmd *const sAnims_PURRLOIN[] = +{ sAnim_GeneralFrame0, sAnim_PURRLOIN_1, }; -static const union AnimCmd *const sAnims_LIEPARD[] ={ +static const union AnimCmd *const sAnims_LIEPARD[] = +{ sAnim_GeneralFrame0, sAnim_LIEPARD_1, }; -static const union AnimCmd *const sAnims_PANSAGE[] ={ +static const union AnimCmd *const sAnims_PANSAGE[] = +{ sAnim_GeneralFrame0, sAnim_PANSAGE_1, }; -static const union AnimCmd *const sAnims_SIMISAGE[] ={ +static const union AnimCmd *const sAnims_SIMISAGE[] = +{ sAnim_GeneralFrame0, sAnim_SIMISAGE_1, }; -static const union AnimCmd *const sAnims_PANSEAR[] ={ +static const union AnimCmd *const sAnims_PANSEAR[] = +{ sAnim_GeneralFrame0, sAnim_PANSEAR_1, }; -static const union AnimCmd *const sAnims_SIMISEAR[] ={ +static const union AnimCmd *const sAnims_SIMISEAR[] = +{ sAnim_GeneralFrame0, sAnim_SIMISEAR_1, }; -static const union AnimCmd *const sAnims_PANPOUR[] ={ +static const union AnimCmd *const sAnims_PANPOUR[] = +{ sAnim_GeneralFrame0, sAnim_PANPOUR_1, }; -static const union AnimCmd *const sAnims_SIMIPOUR[] ={ +static const union AnimCmd *const sAnims_SIMIPOUR[] = +{ sAnim_GeneralFrame0, sAnim_SIMIPOUR_1, }; -static const union AnimCmd *const sAnims_MUNNA[] ={ +static const union AnimCmd *const sAnims_MUNNA[] = +{ sAnim_GeneralFrame0, sAnim_MUNNA_1, }; -static const union AnimCmd *const sAnims_MUSHARNA[] ={ +static const union AnimCmd *const sAnims_MUSHARNA[] = +{ sAnim_GeneralFrame0, sAnim_MUSHARNA_1, }; -static const union AnimCmd *const sAnims_PIDOVE[] ={ +static const union AnimCmd *const sAnims_PIDOVE[] = +{ sAnim_GeneralFrame0, sAnim_PIDOVE_1, }; -static const union AnimCmd *const sAnims_TRANQUILL[] ={ +static const union AnimCmd *const sAnims_TRANQUILL[] = +{ sAnim_GeneralFrame0, sAnim_TRANQUILL_1, }; -static const union AnimCmd *const sAnims_UNFEZANT[] ={ +static const union AnimCmd *const sAnims_UNFEZANT[] = +{ sAnim_GeneralFrame0, sAnim_UNFEZANT_1, }; -static const union AnimCmd *const sAnims_BLITZLE[] ={ +static const union AnimCmd *const sAnims_BLITZLE[] = +{ sAnim_GeneralFrame0, sAnim_BLITZLE_1, }; -static const union AnimCmd *const sAnims_ZEBSTRIKA[] ={ +static const union AnimCmd *const sAnims_ZEBSTRIKA[] = +{ sAnim_GeneralFrame0, sAnim_ZEBSTRIKA_1, }; -static const union AnimCmd *const sAnims_ROGGENROLA[] ={ +static const union AnimCmd *const sAnims_ROGGENROLA[] = +{ sAnim_GeneralFrame0, sAnim_ROGGENROLA_1, }; -static const union AnimCmd *const sAnims_BOLDORE[] ={ +static const union AnimCmd *const sAnims_BOLDORE[] = +{ sAnim_GeneralFrame0, sAnim_BOLDORE_1, }; -static const union AnimCmd *const sAnims_GIGALITH[] ={ +static const union AnimCmd *const sAnims_GIGALITH[] = +{ sAnim_GeneralFrame0, sAnim_GIGALITH_1, }; -static const union AnimCmd *const sAnims_WOOBAT[] ={ +static const union AnimCmd *const sAnims_WOOBAT[] = +{ sAnim_GeneralFrame0, sAnim_WOOBAT_1, }; -static const union AnimCmd *const sAnims_SWOOBAT[] ={ +static const union AnimCmd *const sAnims_SWOOBAT[] = +{ sAnim_GeneralFrame0, sAnim_SWOOBAT_1, }; -static const union AnimCmd *const sAnims_DRILBUR[] ={ +static const union AnimCmd *const sAnims_DRILBUR[] = +{ sAnim_GeneralFrame0, sAnim_DRILBUR_1, }; -static const union AnimCmd *const sAnims_EXCADRILL[] ={ +static const union AnimCmd *const sAnims_EXCADRILL[] = +{ sAnim_GeneralFrame0, sAnim_EXCADRILL_1, }; -static const union AnimCmd *const sAnims_AUDINO[] ={ +static const union AnimCmd *const sAnims_AUDINO[] = +{ sAnim_GeneralFrame0, sAnim_AUDINO_1, }; -static const union AnimCmd *const sAnims_TIMBURR[] ={ +static const union AnimCmd *const sAnims_TIMBURR[] = +{ sAnim_GeneralFrame0, sAnim_TIMBURR_1, }; -static const union AnimCmd *const sAnims_GURDURR[] ={ +static const union AnimCmd *const sAnims_GURDURR[] = +{ sAnim_GeneralFrame0, sAnim_GURDURR_1, }; -static const union AnimCmd *const sAnims_CONKELDURR[] ={ +static const union AnimCmd *const sAnims_CONKELDURR[] = +{ sAnim_GeneralFrame0, sAnim_CONKELDURR_1, }; -static const union AnimCmd *const sAnims_TYMPOLE[] ={ +static const union AnimCmd *const sAnims_TYMPOLE[] = +{ sAnim_GeneralFrame0, sAnim_TYMPOLE_1, }; -static const union AnimCmd *const sAnims_PALPITOAD[] ={ +static const union AnimCmd *const sAnims_PALPITOAD[] = +{ sAnim_GeneralFrame0, sAnim_PALPITOAD_1, }; -static const union AnimCmd *const sAnims_SEISMITOAD[] ={ +static const union AnimCmd *const sAnims_SEISMITOAD[] = +{ sAnim_GeneralFrame0, sAnim_SEISMITOAD_1, }; -static const union AnimCmd *const sAnims_THROH[] ={ +static const union AnimCmd *const sAnims_THROH[] = +{ sAnim_GeneralFrame0, sAnim_THROH_1, }; -static const union AnimCmd *const sAnims_SAWK[] ={ +static const union AnimCmd *const sAnims_SAWK[] = +{ sAnim_GeneralFrame0, sAnim_SAWK_1, }; -static const union AnimCmd *const sAnims_SEWADDLE[] ={ +static const union AnimCmd *const sAnims_SEWADDLE[] = +{ sAnim_GeneralFrame0, sAnim_SEWADDLE_1, }; -static const union AnimCmd *const sAnims_SWADLOON[] ={ +static const union AnimCmd *const sAnims_SWADLOON[] = +{ sAnim_GeneralFrame0, sAnim_SWADLOON_1, }; -static const union AnimCmd *const sAnims_LEAVANNY[] ={ +static const union AnimCmd *const sAnims_LEAVANNY[] = +{ sAnim_GeneralFrame0, sAnim_LEAVANNY_1, }; -static const union AnimCmd *const sAnims_VENIPEDE[] ={ +static const union AnimCmd *const sAnims_VENIPEDE[] = +{ sAnim_GeneralFrame0, sAnim_VENIPEDE_1, }; -static const union AnimCmd *const sAnims_WHIRLIPEDE[] ={ +static const union AnimCmd *const sAnims_WHIRLIPEDE[] = +{ sAnim_GeneralFrame0, sAnim_WHIRLIPEDE_1, }; -static const union AnimCmd *const sAnims_SCOLIPEDE[] ={ +static const union AnimCmd *const sAnims_SCOLIPEDE[] = +{ sAnim_GeneralFrame0, sAnim_SCOLIPEDE_1, }; -static const union AnimCmd *const sAnims_COTTONEE[] ={ +static const union AnimCmd *const sAnims_COTTONEE[] = +{ sAnim_GeneralFrame0, sAnim_COTTONEE_1, }; -static const union AnimCmd *const sAnims_WHIMSICOTT[] ={ +static const union AnimCmd *const sAnims_WHIMSICOTT[] = +{ sAnim_GeneralFrame0, sAnim_WHIMSICOTT_1, }; -static const union AnimCmd *const sAnims_PETILIL[] ={ +static const union AnimCmd *const sAnims_PETILIL[] = +{ sAnim_GeneralFrame0, sAnim_PETILIL_1, }; -static const union AnimCmd *const sAnims_LILLIGANT[] ={ +static const union AnimCmd *const sAnims_LILLIGANT[] = +{ sAnim_GeneralFrame0, sAnim_LILLIGANT_1, }; -static const union AnimCmd *const sAnims_BASCULIN[] ={ +static const union AnimCmd *const sAnims_BASCULIN[] = +{ sAnim_GeneralFrame0, sAnim_BASCULIN_1, }; -static const union AnimCmd *const sAnims_SANDILE[] ={ +static const union AnimCmd *const sAnims_SANDILE[] = +{ sAnim_GeneralFrame0, sAnim_SANDILE_1, }; -static const union AnimCmd *const sAnims_KROKOROK[] ={ +static const union AnimCmd *const sAnims_KROKOROK[] = +{ sAnim_GeneralFrame0, sAnim_KROKOROK_1, }; -static const union AnimCmd *const sAnims_KROOKODILE[] ={ +static const union AnimCmd *const sAnims_KROOKODILE[] = +{ sAnim_GeneralFrame0, sAnim_KROOKODILE_1, }; -static const union AnimCmd *const sAnims_DARUMAKA[] ={ +static const union AnimCmd *const sAnims_DARUMAKA[] = +{ sAnim_GeneralFrame0, sAnim_DARUMAKA_1, }; -static const union AnimCmd *const sAnims_DARMANITAN[] ={ +static const union AnimCmd *const sAnims_DARMANITAN[] = +{ sAnim_GeneralFrame0, sAnim_DARMANITAN_1, }; -static const union AnimCmd *const sAnims_MARACTUS[] ={ +static const union AnimCmd *const sAnims_MARACTUS[] = +{ sAnim_GeneralFrame0, sAnim_MARACTUS_1, }; -static const union AnimCmd *const sAnims_DWEBBLE[] ={ +static const union AnimCmd *const sAnims_DWEBBLE[] = +{ sAnim_GeneralFrame0, sAnim_DWEBBLE_1, }; -static const union AnimCmd *const sAnims_CRUSTLE[] ={ +static const union AnimCmd *const sAnims_CRUSTLE[] = +{ sAnim_GeneralFrame0, sAnim_CRUSTLE_1, }; -static const union AnimCmd *const sAnims_SCRAGGY[] ={ +static const union AnimCmd *const sAnims_SCRAGGY[] = +{ sAnim_GeneralFrame0, sAnim_SCRAGGY_1, }; -static const union AnimCmd *const sAnims_SCRAFTY[] ={ +static const union AnimCmd *const sAnims_SCRAFTY[] = +{ sAnim_GeneralFrame0, sAnim_SCRAFTY_1, }; -static const union AnimCmd *const sAnims_SIGILYPH[] ={ +static const union AnimCmd *const sAnims_SIGILYPH[] = +{ sAnim_GeneralFrame0, sAnim_SIGILYPH_1, }; -static const union AnimCmd *const sAnims_YAMASK[] ={ +static const union AnimCmd *const sAnims_YAMASK[] = +{ sAnim_GeneralFrame0, sAnim_YAMASK_1, }; -static const union AnimCmd *const sAnims_COFAGRIGUS[] ={ +static const union AnimCmd *const sAnims_COFAGRIGUS[] = +{ sAnim_GeneralFrame0, sAnim_COFAGRIGUS_1, }; -static const union AnimCmd *const sAnims_TIRTOUGA[] ={ +static const union AnimCmd *const sAnims_TIRTOUGA[] = +{ sAnim_GeneralFrame0, sAnim_TIRTOUGA_1, }; -static const union AnimCmd *const sAnims_CARRACOSTA[] ={ +static const union AnimCmd *const sAnims_CARRACOSTA[] = +{ sAnim_GeneralFrame0, sAnim_CARRACOSTA_1, }; -static const union AnimCmd *const sAnims_ARCHEN[] ={ +static const union AnimCmd *const sAnims_ARCHEN[] = +{ sAnim_GeneralFrame0, sAnim_ARCHEN_1, }; -static const union AnimCmd *const sAnims_ARCHEOPS[] ={ +static const union AnimCmd *const sAnims_ARCHEOPS[] = +{ sAnim_GeneralFrame0, sAnim_ARCHEOPS_1, }; -static const union AnimCmd *const sAnims_TRUBBISH[] ={ +static const union AnimCmd *const sAnims_TRUBBISH[] = +{ sAnim_GeneralFrame0, sAnim_TRUBBISH_1, }; -static const union AnimCmd *const sAnims_GARBODOR[] ={ +static const union AnimCmd *const sAnims_GARBODOR[] = +{ sAnim_GeneralFrame0, sAnim_GARBODOR_1, }; -static const union AnimCmd *const sAnims_ZORUA[] ={ +static const union AnimCmd *const sAnims_ZORUA[] = +{ sAnim_GeneralFrame0, sAnim_ZORUA_1, }; -static const union AnimCmd *const sAnims_ZOROARK[] ={ +static const union AnimCmd *const sAnims_ZOROARK[] = +{ sAnim_GeneralFrame0, sAnim_ZOROARK_1, }; -static const union AnimCmd *const sAnims_MINCCINO[] ={ +static const union AnimCmd *const sAnims_MINCCINO[] = +{ sAnim_GeneralFrame0, sAnim_MINCCINO_1, }; -static const union AnimCmd *const sAnims_CINCCINO[] ={ +static const union AnimCmd *const sAnims_CINCCINO[] = +{ sAnim_GeneralFrame0, sAnim_CINCCINO_1, }; -static const union AnimCmd *const sAnims_GOTHITA[] ={ +static const union AnimCmd *const sAnims_GOTHITA[] = +{ sAnim_GeneralFrame0, sAnim_GOTHITA_1, }; -static const union AnimCmd *const sAnims_GOTHORITA[] ={ +static const union AnimCmd *const sAnims_GOTHORITA[] = +{ sAnim_GeneralFrame0, sAnim_GOTHORITA_1, }; -static const union AnimCmd *const sAnims_GOTHITELLE[] ={ +static const union AnimCmd *const sAnims_GOTHITELLE[] = +{ sAnim_GeneralFrame0, sAnim_GOTHITELLE_1, }; -static const union AnimCmd *const sAnims_SOLOSIS[] ={ +static const union AnimCmd *const sAnims_SOLOSIS[] = +{ sAnim_GeneralFrame0, sAnim_SOLOSIS_1, }; -static const union AnimCmd *const sAnims_DUOSION[] ={ +static const union AnimCmd *const sAnims_DUOSION[] = +{ sAnim_GeneralFrame0, sAnim_DUOSION_1, }; -static const union AnimCmd *const sAnims_REUNICLUS[] ={ +static const union AnimCmd *const sAnims_REUNICLUS[] = +{ sAnim_GeneralFrame0, sAnim_REUNICLUS_1, }; -static const union AnimCmd *const sAnims_DUCKLETT[] ={ +static const union AnimCmd *const sAnims_DUCKLETT[] = +{ sAnim_GeneralFrame0, sAnim_DUCKLETT_1, }; -static const union AnimCmd *const sAnims_SWANNA[] ={ +static const union AnimCmd *const sAnims_SWANNA[] = +{ sAnim_GeneralFrame0, sAnim_SWANNA_1, }; -static const union AnimCmd *const sAnims_VANILLITE[] ={ +static const union AnimCmd *const sAnims_VANILLITE[] = +{ sAnim_GeneralFrame0, sAnim_VANILLITE_1, }; -static const union AnimCmd *const sAnims_VANILLISH[] ={ +static const union AnimCmd *const sAnims_VANILLISH[] = +{ sAnim_GeneralFrame0, sAnim_VANILLISH_1, }; -static const union AnimCmd *const sAnims_VANILLUXE[] ={ +static const union AnimCmd *const sAnims_VANILLUXE[] = +{ sAnim_GeneralFrame0, sAnim_VANILLUXE_1, }; -static const union AnimCmd *const sAnims_DEERLING[] ={ +static const union AnimCmd *const sAnims_DEERLING[] = +{ sAnim_GeneralFrame0, sAnim_DEERLING_1, }; -static const union AnimCmd *const sAnims_SAWSBUCK[] ={ +static const union AnimCmd *const sAnims_SAWSBUCK[] = +{ sAnim_GeneralFrame0, sAnim_SAWSBUCK_1, }; -static const union AnimCmd *const sAnims_EMOLGA[] ={ +static const union AnimCmd *const sAnims_EMOLGA[] = +{ sAnim_GeneralFrame0, sAnim_EMOLGA_1, }; -static const union AnimCmd *const sAnims_KARRABLAST[] ={ +static const union AnimCmd *const sAnims_KARRABLAST[] = +{ sAnim_GeneralFrame0, sAnim_KARRABLAST_1, }; -static const union AnimCmd *const sAnims_ESCAVALIER[] ={ +static const union AnimCmd *const sAnims_ESCAVALIER[] = +{ sAnim_GeneralFrame0, sAnim_ESCAVALIER_1, }; -static const union AnimCmd *const sAnims_FOONGUS[] ={ +static const union AnimCmd *const sAnims_FOONGUS[] = +{ sAnim_GeneralFrame0, sAnim_FOONGUS_1, }; -static const union AnimCmd *const sAnims_AMOONGUSS[] ={ +static const union AnimCmd *const sAnims_AMOONGUSS[] = +{ sAnim_GeneralFrame0, sAnim_AMOONGUSS_1, }; -static const union AnimCmd *const sAnims_FRILLISH[] ={ +static const union AnimCmd *const sAnims_FRILLISH[] = +{ sAnim_GeneralFrame0, sAnim_FRILLISH_1, }; -static const union AnimCmd *const sAnims_JELLICENT[] ={ +static const union AnimCmd *const sAnims_JELLICENT[] = +{ sAnim_GeneralFrame0, sAnim_JELLICENT_1, }; -static const union AnimCmd *const sAnims_ALOMOMOLA[] ={ +static const union AnimCmd *const sAnims_ALOMOMOLA[] = +{ sAnim_GeneralFrame0, sAnim_ALOMOMOLA_1, }; -static const union AnimCmd *const sAnims_JOLTIK[] ={ +static const union AnimCmd *const sAnims_JOLTIK[] = +{ sAnim_GeneralFrame0, sAnim_JOLTIK_1, }; -static const union AnimCmd *const sAnims_GALVANTULA[] ={ +static const union AnimCmd *const sAnims_GALVANTULA[] = +{ sAnim_GeneralFrame0, sAnim_GALVANTULA_1, }; -static const union AnimCmd *const sAnims_FERROSEED[] ={ +static const union AnimCmd *const sAnims_FERROSEED[] = +{ sAnim_GeneralFrame0, sAnim_FERROSEED_1, }; -static const union AnimCmd *const sAnims_FERROTHORN[] ={ +static const union AnimCmd *const sAnims_FERROTHORN[] = +{ sAnim_GeneralFrame0, sAnim_FERROTHORN_1, }; -static const union AnimCmd *const sAnims_KLINK[] ={ +static const union AnimCmd *const sAnims_KLINK[] = +{ sAnim_GeneralFrame0, sAnim_KLINK_1, }; -static const union AnimCmd *const sAnims_KLANG[] ={ +static const union AnimCmd *const sAnims_KLANG[] = +{ sAnim_GeneralFrame0, sAnim_KLANG_1, }; -static const union AnimCmd *const sAnims_KLINKLANG[] ={ +static const union AnimCmd *const sAnims_KLINKLANG[] = +{ sAnim_GeneralFrame0, sAnim_KLINKLANG_1, }; -static const union AnimCmd *const sAnims_TYNAMO[] ={ +static const union AnimCmd *const sAnims_TYNAMO[] = +{ sAnim_GeneralFrame0, sAnim_TYNAMO_1, }; -static const union AnimCmd *const sAnims_EELEKTRIK[] ={ +static const union AnimCmd *const sAnims_EELEKTRIK[] = +{ sAnim_GeneralFrame0, sAnim_EELEKTRIK_1, }; -static const union AnimCmd *const sAnims_EELEKTROSS[] ={ +static const union AnimCmd *const sAnims_EELEKTROSS[] = +{ sAnim_GeneralFrame0, sAnim_EELEKTROSS_1, }; -static const union AnimCmd *const sAnims_ELGYEM[] ={ +static const union AnimCmd *const sAnims_ELGYEM[] = +{ sAnim_GeneralFrame0, sAnim_ELGYEM_1, }; -static const union AnimCmd *const sAnims_BEHEEYEM[] ={ +static const union AnimCmd *const sAnims_BEHEEYEM[] = +{ sAnim_GeneralFrame0, sAnim_BEHEEYEM_1, }; -static const union AnimCmd *const sAnims_LITWICK[] ={ +static const union AnimCmd *const sAnims_LITWICK[] = +{ sAnim_GeneralFrame0, sAnim_LITWICK_1, }; -static const union AnimCmd *const sAnims_LAMPENT[] ={ +static const union AnimCmd *const sAnims_LAMPENT[] = +{ sAnim_GeneralFrame0, sAnim_LAMPENT_1, }; -static const union AnimCmd *const sAnims_CHANDELURE[] ={ +static const union AnimCmd *const sAnims_CHANDELURE[] = +{ sAnim_GeneralFrame0, sAnim_CHANDELURE_1, }; -static const union AnimCmd *const sAnims_AXEW[] ={ +static const union AnimCmd *const sAnims_AXEW[] = +{ sAnim_GeneralFrame0, sAnim_AXEW_1, }; -static const union AnimCmd *const sAnims_FRAXURE[] ={ +static const union AnimCmd *const sAnims_FRAXURE[] = +{ sAnim_GeneralFrame0, sAnim_FRAXURE_1, }; -static const union AnimCmd *const sAnims_HAXORUS[] ={ +static const union AnimCmd *const sAnims_HAXORUS[] = +{ sAnim_GeneralFrame0, sAnim_HAXORUS_1, }; -static const union AnimCmd *const sAnims_CUBCHOO[] ={ +static const union AnimCmd *const sAnims_CUBCHOO[] = +{ sAnim_GeneralFrame0, sAnim_CUBCHOO_1, }; -static const union AnimCmd *const sAnims_BEARTIC[] ={ +static const union AnimCmd *const sAnims_BEARTIC[] = +{ sAnim_GeneralFrame0, sAnim_BEARTIC_1, }; -static const union AnimCmd *const sAnims_CRYOGONAL[] ={ +static const union AnimCmd *const sAnims_CRYOGONAL[] = +{ sAnim_GeneralFrame0, sAnim_CRYOGONAL_1, }; -static const union AnimCmd *const sAnims_SHELMET[] ={ +static const union AnimCmd *const sAnims_SHELMET[] = +{ sAnim_GeneralFrame0, sAnim_SHELMET_1, }; -static const union AnimCmd *const sAnims_ACCELGOR[] ={ +static const union AnimCmd *const sAnims_ACCELGOR[] = +{ sAnim_GeneralFrame0, sAnim_ACCELGOR_1, }; -static const union AnimCmd *const sAnims_STUNFISK[] ={ +static const union AnimCmd *const sAnims_STUNFISK[] = +{ sAnim_GeneralFrame0, sAnim_STUNFISK_1, }; -static const union AnimCmd *const sAnims_MIENFOO[] ={ +static const union AnimCmd *const sAnims_MIENFOO[] = +{ sAnim_GeneralFrame0, sAnim_MIENFOO_1, }; -static const union AnimCmd *const sAnims_MIENSHAO[] ={ +static const union AnimCmd *const sAnims_MIENSHAO[] = +{ sAnim_GeneralFrame0, sAnim_MIENSHAO_1, }; -static const union AnimCmd *const sAnims_DRUDDIGON[] ={ +static const union AnimCmd *const sAnims_DRUDDIGON[] = +{ sAnim_GeneralFrame0, sAnim_DRUDDIGON_1, }; -static const union AnimCmd *const sAnims_GOLETT[] ={ +static const union AnimCmd *const sAnims_GOLETT[] = +{ sAnim_GeneralFrame0, sAnim_GOLETT_1, }; -static const union AnimCmd *const sAnims_GOLURK[] ={ +static const union AnimCmd *const sAnims_GOLURK[] = +{ sAnim_GeneralFrame0, sAnim_GOLURK_1, }; -static const union AnimCmd *const sAnims_PAWNIARD[] ={ +static const union AnimCmd *const sAnims_PAWNIARD[] = +{ sAnim_GeneralFrame0, sAnim_PAWNIARD_1, }; -static const union AnimCmd *const sAnims_BISHARP[] ={ +static const union AnimCmd *const sAnims_BISHARP[] = +{ sAnim_GeneralFrame0, sAnim_BISHARP_1, }; -static const union AnimCmd *const sAnims_BOUFFALANT[] ={ +static const union AnimCmd *const sAnims_BOUFFALANT[] = +{ sAnim_GeneralFrame0, sAnim_BOUFFALANT_1, }; -static const union AnimCmd *const sAnims_RUFFLET[] ={ +static const union AnimCmd *const sAnims_RUFFLET[] = +{ sAnim_GeneralFrame0, sAnim_RUFFLET_1, }; -static const union AnimCmd *const sAnims_BRAVIARY[] ={ +static const union AnimCmd *const sAnims_BRAVIARY[] = +{ sAnim_GeneralFrame0, sAnim_BRAVIARY_1, }; -static const union AnimCmd *const sAnims_VULLABY[] ={ +static const union AnimCmd *const sAnims_VULLABY[] = +{ sAnim_GeneralFrame0, sAnim_VULLABY_1, }; -static const union AnimCmd *const sAnims_MANDIBUZZ[] ={ +static const union AnimCmd *const sAnims_MANDIBUZZ[] = +{ sAnim_GeneralFrame0, sAnim_MANDIBUZZ_1, }; -static const union AnimCmd *const sAnims_HEATMOR[] ={ +static const union AnimCmd *const sAnims_HEATMOR[] = +{ sAnim_GeneralFrame0, sAnim_HEATMOR_1, }; -static const union AnimCmd *const sAnims_DURANT[] ={ +static const union AnimCmd *const sAnims_DURANT[] = +{ sAnim_GeneralFrame0, sAnim_DURANT_1, }; -static const union AnimCmd *const sAnims_DEINO[] ={ +static const union AnimCmd *const sAnims_DEINO[] = +{ sAnim_GeneralFrame0, sAnim_DEINO_1, }; -static const union AnimCmd *const sAnims_ZWEILOUS[] ={ +static const union AnimCmd *const sAnims_ZWEILOUS[] = +{ sAnim_GeneralFrame0, sAnim_ZWEILOUS_1, }; -static const union AnimCmd *const sAnims_HYDREIGON[] ={ +static const union AnimCmd *const sAnims_HYDREIGON[] = +{ sAnim_GeneralFrame0, sAnim_HYDREIGON_1, }; -static const union AnimCmd *const sAnims_LARVESTA[] ={ +static const union AnimCmd *const sAnims_LARVESTA[] = +{ sAnim_GeneralFrame0, sAnim_LARVESTA_1, }; -static const union AnimCmd *const sAnims_VOLCARONA[] ={ +static const union AnimCmd *const sAnims_VOLCARONA[] = +{ sAnim_GeneralFrame0, sAnim_VOLCARONA_1, }; -static const union AnimCmd *const sAnims_COBALION[] ={ +static const union AnimCmd *const sAnims_COBALION[] = +{ sAnim_GeneralFrame0, sAnim_COBALION_1, }; -static const union AnimCmd *const sAnims_TERRAKION[] ={ +static const union AnimCmd *const sAnims_TERRAKION[] = +{ sAnim_GeneralFrame0, sAnim_TERRAKION_1, }; -static const union AnimCmd *const sAnims_VIRIZION[] ={ +static const union AnimCmd *const sAnims_VIRIZION[] = +{ sAnim_GeneralFrame0, sAnim_VIRIZION_1, }; -static const union AnimCmd *const sAnims_TORNADUS[] ={ +static const union AnimCmd *const sAnims_TORNADUS[] = +{ sAnim_GeneralFrame0, sAnim_TORNADUS_1, }; -static const union AnimCmd *const sAnims_THUNDURUS[] ={ +static const union AnimCmd *const sAnims_THUNDURUS[] = +{ sAnim_GeneralFrame0, sAnim_THUNDURUS_1, }; -static const union AnimCmd *const sAnims_RESHIRAM[] ={ +static const union AnimCmd *const sAnims_RESHIRAM[] = +{ sAnim_GeneralFrame0, sAnim_RESHIRAM_1, }; -static const union AnimCmd *const sAnims_ZEKROM[] ={ +static const union AnimCmd *const sAnims_ZEKROM[] = +{ sAnim_GeneralFrame0, sAnim_ZEKROM_1, }; -static const union AnimCmd *const sAnims_LANDORUS[] ={ +static const union AnimCmd *const sAnims_LANDORUS[] = +{ sAnim_GeneralFrame0, sAnim_LANDORUS_1, }; -static const union AnimCmd *const sAnims_KYUREM[] ={ +static const union AnimCmd *const sAnims_KYUREM[] = +{ sAnim_GeneralFrame0, sAnim_KYUREM_1, }; -static const union AnimCmd *const sAnims_KELDEO[] ={ +static const union AnimCmd *const sAnims_KELDEO[] = +{ sAnim_GeneralFrame0, sAnim_KELDEO_1, }; -static const union AnimCmd *const sAnims_MELOETTA[] ={ +static const union AnimCmd *const sAnims_MELOETTA[] = +{ sAnim_GeneralFrame0, sAnim_MELOETTA_1, }; -static const union AnimCmd *const sAnims_GENESECT[] ={ +static const union AnimCmd *const sAnims_GENESECT[] = +{ sAnim_GeneralFrame0, sAnim_GENESECT_1, }; +#endif -static const union AnimCmd *const sAnims_CHESPIN[] ={ +#if P_NEW_POKEMON >= GEN_6 +static const union AnimCmd *const sAnims_CHESPIN[] = +{ sAnim_GeneralFrame0, sAnim_CHESPIN_1, }; -static const union AnimCmd *const sAnims_QUILLADIN[] ={ +static const union AnimCmd *const sAnims_QUILLADIN[] = +{ sAnim_GeneralFrame0, sAnim_QUILLADIN_1, }; -static const union AnimCmd *const sAnims_CHESNAUGHT[] ={ +static const union AnimCmd *const sAnims_CHESNAUGHT[] = +{ sAnim_GeneralFrame0, sAnim_CHESNAUGHT_1, }; -static const union AnimCmd *const sAnims_FENNEKIN[] ={ +static const union AnimCmd *const sAnims_FENNEKIN[] = +{ sAnim_GeneralFrame0, sAnim_FENNEKIN_1, }; -static const union AnimCmd *const sAnims_BRAIXEN[] ={ +static const union AnimCmd *const sAnims_BRAIXEN[] = +{ sAnim_GeneralFrame0, sAnim_BRAIXEN_1, }; -static const union AnimCmd *const sAnims_DELPHOX[] ={ +static const union AnimCmd *const sAnims_DELPHOX[] = +{ sAnim_GeneralFrame0, sAnim_DELPHOX_1, }; -static const union AnimCmd *const sAnims_FROAKIE[] ={ +static const union AnimCmd *const sAnims_FROAKIE[] = +{ sAnim_GeneralFrame0, sAnim_FROAKIE_1, }; -static const union AnimCmd *const sAnims_FROGADIER[] ={ +static const union AnimCmd *const sAnims_FROGADIER[] = +{ sAnim_GeneralFrame0, sAnim_FROGADIER_1, }; -static const union AnimCmd *const sAnims_GRENINJA[] ={ +static const union AnimCmd *const sAnims_GRENINJA[] = +{ sAnim_GeneralFrame0, sAnim_GRENINJA_1, }; -static const union AnimCmd *const sAnims_BUNNELBY[] ={ +static const union AnimCmd *const sAnims_BUNNELBY[] = +{ sAnim_GeneralFrame0, sAnim_BUNNELBY_1, }; -static const union AnimCmd *const sAnims_DIGGERSBY[] ={ +static const union AnimCmd *const sAnims_DIGGERSBY[] = +{ sAnim_GeneralFrame0, sAnim_DIGGERSBY_1, }; -static const union AnimCmd *const sAnims_FLETCHLING[] ={ +static const union AnimCmd *const sAnims_FLETCHLING[] = +{ sAnim_GeneralFrame0, sAnim_FLETCHLING_1, }; -static const union AnimCmd *const sAnims_FLETCHINDER[] ={ +static const union AnimCmd *const sAnims_FLETCHINDER[] = +{ sAnim_GeneralFrame0, sAnim_FLETCHINDER_1, }; -static const union AnimCmd *const sAnims_TALONFLAME[] ={ +static const union AnimCmd *const sAnims_TALONFLAME[] = +{ sAnim_GeneralFrame0, sAnim_TALONFLAME_1, }; -static const union AnimCmd *const sAnims_SCATTERBUG[] ={ +static const union AnimCmd *const sAnims_SCATTERBUG[] = +{ sAnim_GeneralFrame0, sAnim_SCATTERBUG_1, }; -static const union AnimCmd *const sAnims_SPEWPA[] ={ +static const union AnimCmd *const sAnims_SPEWPA[] = +{ sAnim_GeneralFrame0, sAnim_SPEWPA_1, }; -static const union AnimCmd *const sAnims_VIVILLON[] ={ +static const union AnimCmd *const sAnims_VIVILLON[] = +{ sAnim_GeneralFrame0, sAnim_VIVILLON_1, }; -static const union AnimCmd *const sAnims_LITLEO[] ={ +static const union AnimCmd *const sAnims_LITLEO[] = +{ sAnim_GeneralFrame0, sAnim_LITLEO_1, }; -static const union AnimCmd *const sAnims_PYROAR[] ={ +static const union AnimCmd *const sAnims_PYROAR[] = +{ sAnim_GeneralFrame0, sAnim_PYROAR_1, }; -static const union AnimCmd *const sAnims_FLABEBE[] ={ +static const union AnimCmd *const sAnims_FLABEBE[] = +{ sAnim_GeneralFrame0, sAnim_FLABEBE_1, }; -static const union AnimCmd *const sAnims_FLOETTE[] ={ +static const union AnimCmd *const sAnims_FLOETTE[] = +{ sAnim_GeneralFrame0, sAnim_FLOETTE_1, }; -static const union AnimCmd *const sAnims_FLORGES[] ={ +static const union AnimCmd *const sAnims_FLORGES[] = +{ sAnim_GeneralFrame0, sAnim_FLORGES_1, }; -static const union AnimCmd *const sAnims_SKIDDO[] ={ +static const union AnimCmd *const sAnims_SKIDDO[] = +{ sAnim_GeneralFrame0, sAnim_SKIDDO_1, }; -static const union AnimCmd *const sAnims_GOGOAT[] ={ +static const union AnimCmd *const sAnims_GOGOAT[] = +{ sAnim_GeneralFrame0, sAnim_GOGOAT_1, }; -static const union AnimCmd *const sAnims_PANCHAM[] ={ +static const union AnimCmd *const sAnims_PANCHAM[] = +{ sAnim_GeneralFrame0, sAnim_PANCHAM_1, }; -static const union AnimCmd *const sAnims_PANGORO[] ={ +static const union AnimCmd *const sAnims_PANGORO[] = +{ sAnim_GeneralFrame0, sAnim_PANGORO_1, }; -static const union AnimCmd *const sAnims_FURFROU[] ={ +static const union AnimCmd *const sAnims_FURFROU[] = +{ sAnim_GeneralFrame0, sAnim_FURFROU_1, }; -static const union AnimCmd *const sAnims_ESPURR[] ={ +static const union AnimCmd *const sAnims_ESPURR[] = +{ sAnim_GeneralFrame0, sAnim_ESPURR_1, }; -static const union AnimCmd *const sAnims_MEOWSTIC[] ={ +static const union AnimCmd *const sAnims_MEOWSTIC[] = +{ sAnim_GeneralFrame0, sAnim_MEOWSTIC_1, }; -static const union AnimCmd *const sAnims_HONEDGE[] ={ +static const union AnimCmd *const sAnims_HONEDGE[] = +{ sAnim_GeneralFrame0, sAnim_HONEDGE_1, }; -static const union AnimCmd *const sAnims_DOUBLADE[] ={ +static const union AnimCmd *const sAnims_DOUBLADE[] = +{ sAnim_GeneralFrame0, sAnim_DOUBLADE_1, }; -static const union AnimCmd *const sAnims_AEGISLASH[] ={ +static const union AnimCmd *const sAnims_AEGISLASH[] = +{ sAnim_GeneralFrame0, sAnim_AEGISLASH_1, }; -static const union AnimCmd *const sAnims_SPRITZEE[] ={ +static const union AnimCmd *const sAnims_SPRITZEE[] = +{ sAnim_GeneralFrame0, sAnim_SPRITZEE_1, }; -static const union AnimCmd *const sAnims_AROMATISSE[] ={ +static const union AnimCmd *const sAnims_AROMATISSE[] = +{ sAnim_GeneralFrame0, sAnim_AROMATISSE_1, }; -static const union AnimCmd *const sAnims_SWIRLIX[] ={ +static const union AnimCmd *const sAnims_SWIRLIX[] = +{ sAnim_GeneralFrame0, sAnim_SWIRLIX_1, }; -static const union AnimCmd *const sAnims_SLURPUFF[] ={ +static const union AnimCmd *const sAnims_SLURPUFF[] = +{ sAnim_GeneralFrame0, sAnim_SLURPUFF_1, }; -static const union AnimCmd *const sAnims_INKAY[] ={ +static const union AnimCmd *const sAnims_INKAY[] = +{ sAnim_GeneralFrame0, sAnim_INKAY_1, }; -static const union AnimCmd *const sAnims_MALAMAR[] ={ +static const union AnimCmd *const sAnims_MALAMAR[] = +{ sAnim_GeneralFrame0, sAnim_MALAMAR_1, }; -static const union AnimCmd *const sAnims_BINACLE[] ={ +static const union AnimCmd *const sAnims_BINACLE[] = +{ sAnim_GeneralFrame0, sAnim_BINACLE_1, }; -static const union AnimCmd *const sAnims_BARBARACLE[] ={ +static const union AnimCmd *const sAnims_BARBARACLE[] = +{ sAnim_GeneralFrame0, sAnim_BARBARACLE_1, }; -static const union AnimCmd *const sAnims_SKRELP[] ={ +static const union AnimCmd *const sAnims_SKRELP[] = +{ sAnim_GeneralFrame0, sAnim_SKRELP_1, }; -static const union AnimCmd *const sAnims_DRAGALGE[] ={ +static const union AnimCmd *const sAnims_DRAGALGE[] = +{ sAnim_GeneralFrame0, sAnim_DRAGALGE_1, }; -static const union AnimCmd *const sAnims_CLAUNCHER[] ={ +static const union AnimCmd *const sAnims_CLAUNCHER[] = +{ sAnim_GeneralFrame0, sAnim_CLAUNCHER_1, }; -static const union AnimCmd *const sAnims_CLAWITZER[] ={ +static const union AnimCmd *const sAnims_CLAWITZER[] = +{ sAnim_GeneralFrame0, sAnim_CLAWITZER_1, }; -static const union AnimCmd *const sAnims_HELIOPTILE[] ={ +static const union AnimCmd *const sAnims_HELIOPTILE[] = +{ sAnim_GeneralFrame0, sAnim_HELIOPTILE_1, }; -static const union AnimCmd *const sAnims_HELIOLISK[] ={ +static const union AnimCmd *const sAnims_HELIOLISK[] = +{ sAnim_GeneralFrame0, sAnim_HELIOLISK_1, }; -static const union AnimCmd *const sAnims_TYRUNT[] ={ +static const union AnimCmd *const sAnims_TYRUNT[] = +{ sAnim_GeneralFrame0, sAnim_TYRUNT_1, }; -static const union AnimCmd *const sAnims_TYRANTRUM[] ={ +static const union AnimCmd *const sAnims_TYRANTRUM[] = +{ sAnim_GeneralFrame0, sAnim_TYRANTRUM_1, }; -static const union AnimCmd *const sAnims_AMAURA[] ={ +static const union AnimCmd *const sAnims_AMAURA[] = +{ sAnim_GeneralFrame0, sAnim_AMAURA_1, }; -static const union AnimCmd *const sAnims_AURORUS[] ={ +static const union AnimCmd *const sAnims_AURORUS[] = +{ sAnim_GeneralFrame0, sAnim_AURORUS_1, }; -static const union AnimCmd *const sAnims_SYLVEON[] ={ +static const union AnimCmd *const sAnims_SYLVEON[] = +{ sAnim_GeneralFrame0, sAnim_SYLVEON_1, }; -static const union AnimCmd *const sAnims_HAWLUCHA[] ={ +static const union AnimCmd *const sAnims_HAWLUCHA[] = +{ sAnim_GeneralFrame0, sAnim_HAWLUCHA_1, }; -static const union AnimCmd *const sAnims_DEDENNE[] ={ +static const union AnimCmd *const sAnims_DEDENNE[] = +{ sAnim_GeneralFrame0, sAnim_DEDENNE_1, }; -static const union AnimCmd *const sAnims_CARBINK[] ={ +static const union AnimCmd *const sAnims_CARBINK[] = +{ sAnim_GeneralFrame0, sAnim_CARBINK_1, }; -static const union AnimCmd *const sAnims_GOOMY[] ={ +static const union AnimCmd *const sAnims_GOOMY[] = +{ sAnim_GeneralFrame0, sAnim_GOOMY_1, }; -static const union AnimCmd *const sAnims_SLIGGOO[] ={ +static const union AnimCmd *const sAnims_SLIGGOO[] = +{ sAnim_GeneralFrame0, sAnim_SLIGGOO_1, }; -static const union AnimCmd *const sAnims_GOODRA[] ={ +static const union AnimCmd *const sAnims_GOODRA[] = +{ sAnim_GeneralFrame0, sAnim_GOODRA_1, }; -static const union AnimCmd *const sAnims_KLEFKI[] ={ +static const union AnimCmd *const sAnims_KLEFKI[] = +{ sAnim_GeneralFrame0, sAnim_KLEFKI_1, }; -static const union AnimCmd *const sAnims_PHANTUMP[] ={ +static const union AnimCmd *const sAnims_PHANTUMP[] = +{ sAnim_GeneralFrame0, sAnim_PHANTUMP_1, }; -static const union AnimCmd *const sAnims_TREVENANT[] ={ +static const union AnimCmd *const sAnims_TREVENANT[] = +{ sAnim_GeneralFrame0, sAnim_TREVENANT_1, }; -static const union AnimCmd *const sAnims_PUMPKABOO[] ={ +static const union AnimCmd *const sAnims_PUMPKABOO[] = +{ sAnim_GeneralFrame0, sAnim_PUMPKABOO_1, }; -static const union AnimCmd *const sAnims_GOURGEIST[] ={ +static const union AnimCmd *const sAnims_GOURGEIST[] = +{ sAnim_GeneralFrame0, sAnim_GOURGEIST_1, }; -static const union AnimCmd *const sAnims_BERGMITE[] ={ +static const union AnimCmd *const sAnims_BERGMITE[] = +{ sAnim_GeneralFrame0, sAnim_BERGMITE_1, }; -static const union AnimCmd *const sAnims_AVALUGG[] ={ +static const union AnimCmd *const sAnims_AVALUGG[] = +{ sAnim_GeneralFrame0, sAnim_AVALUGG_1, }; -static const union AnimCmd *const sAnims_NOIBAT[] ={ +static const union AnimCmd *const sAnims_NOIBAT[] = +{ sAnim_GeneralFrame0, sAnim_NOIBAT_1, }; -static const union AnimCmd *const sAnims_NOIVERN[] ={ +static const union AnimCmd *const sAnims_NOIVERN[] = +{ sAnim_GeneralFrame0, sAnim_NOIVERN_1, }; -static const union AnimCmd *const sAnims_XERNEAS[] ={ +static const union AnimCmd *const sAnims_XERNEAS[] = +{ sAnim_GeneralFrame0, sAnim_XERNEAS_1, }; -static const union AnimCmd *const sAnims_YVELTAL[] ={ +static const union AnimCmd *const sAnims_YVELTAL[] = +{ sAnim_GeneralFrame0, sAnim_YVELTAL_1, }; -static const union AnimCmd *const sAnims_ZYGARDE[] ={ +static const union AnimCmd *const sAnims_ZYGARDE[] = +{ sAnim_GeneralFrame0, sAnim_ZYGARDE_1, }; -static const union AnimCmd *const sAnims_DIANCIE[] ={ +static const union AnimCmd *const sAnims_DIANCIE[] = +{ sAnim_GeneralFrame0, sAnim_DIANCIE_1, }; -static const union AnimCmd *const sAnims_HOOPA[] ={ +static const union AnimCmd *const sAnims_HOOPA[] = +{ sAnim_GeneralFrame0, sAnim_HOOPA_1, }; -static const union AnimCmd *const sAnims_VOLCANION[] ={ +static const union AnimCmd *const sAnims_VOLCANION[] = +{ sAnim_GeneralFrame0, sAnim_VOLCANION_1, }; +#endif -static const union AnimCmd *const sAnims_ROWLET[] ={ +#if P_NEW_POKEMON >= GEN_7 +static const union AnimCmd *const sAnims_ROWLET[] = +{ sAnim_GeneralFrame0, sAnim_ROWLET_1, }; -static const union AnimCmd *const sAnims_DARTRIX[] ={ +static const union AnimCmd *const sAnims_DARTRIX[] = +{ sAnim_GeneralFrame0, sAnim_DARTRIX_1, }; -static const union AnimCmd *const sAnims_DECIDUEYE[] ={ +static const union AnimCmd *const sAnims_DECIDUEYE[] = +{ sAnim_GeneralFrame0, sAnim_DECIDUEYE_1, }; -static const union AnimCmd *const sAnims_LITTEN[] ={ +static const union AnimCmd *const sAnims_LITTEN[] = +{ sAnim_GeneralFrame0, sAnim_LITTEN_1, }; -static const union AnimCmd *const sAnims_TORRACAT[] ={ +static const union AnimCmd *const sAnims_TORRACAT[] = +{ sAnim_GeneralFrame0, sAnim_TORRACAT_1, }; -static const union AnimCmd *const sAnims_INCINEROAR[] ={ +static const union AnimCmd *const sAnims_INCINEROAR[] = +{ sAnim_GeneralFrame0, sAnim_INCINEROAR_1, }; -static const union AnimCmd *const sAnims_POPPLIO[] ={ +static const union AnimCmd *const sAnims_POPPLIO[] = +{ sAnim_GeneralFrame0, sAnim_POPPLIO_1, }; -static const union AnimCmd *const sAnims_BRIONNE[] ={ +static const union AnimCmd *const sAnims_BRIONNE[] = +{ sAnim_GeneralFrame0, sAnim_BRIONNE_1, }; -static const union AnimCmd *const sAnims_PRIMARINA[] ={ +static const union AnimCmd *const sAnims_PRIMARINA[] = +{ sAnim_GeneralFrame0, sAnim_PRIMARINA_1, }; -static const union AnimCmd *const sAnims_PIKIPEK[] ={ +static const union AnimCmd *const sAnims_PIKIPEK[] = +{ sAnim_GeneralFrame0, sAnim_PIKIPEK_1, }; -static const union AnimCmd *const sAnims_TRUMBEAK[] ={ +static const union AnimCmd *const sAnims_TRUMBEAK[] = +{ sAnim_GeneralFrame0, sAnim_TRUMBEAK_1, }; -static const union AnimCmd *const sAnims_TOUCANNON[] ={ +static const union AnimCmd *const sAnims_TOUCANNON[] = +{ sAnim_GeneralFrame0, sAnim_TOUCANNON_1, }; -static const union AnimCmd *const sAnims_YUNGOOS[] ={ +static const union AnimCmd *const sAnims_YUNGOOS[] = +{ sAnim_GeneralFrame0, sAnim_YUNGOOS_1, }; -static const union AnimCmd *const sAnims_GUMSHOOS[] ={ +static const union AnimCmd *const sAnims_GUMSHOOS[] = +{ sAnim_GeneralFrame0, sAnim_GUMSHOOS_1, }; -static const union AnimCmd *const sAnims_GRUBBIN[] ={ +static const union AnimCmd *const sAnims_GRUBBIN[] = +{ sAnim_GeneralFrame0, sAnim_GRUBBIN_1, }; -static const union AnimCmd *const sAnims_CHARJABUG[] ={ +static const union AnimCmd *const sAnims_CHARJABUG[] = +{ sAnim_GeneralFrame0, sAnim_CHARJABUG_1, }; -static const union AnimCmd *const sAnims_VIKAVOLT[] ={ +static const union AnimCmd *const sAnims_VIKAVOLT[] = +{ sAnim_GeneralFrame0, sAnim_VIKAVOLT_1, }; -static const union AnimCmd *const sAnims_CRABRAWLER[] ={ +static const union AnimCmd *const sAnims_CRABRAWLER[] = +{ sAnim_GeneralFrame0, sAnim_CRABRAWLER_1, }; -static const union AnimCmd *const sAnims_CRABOMINABLE[] ={ +static const union AnimCmd *const sAnims_CRABOMINABLE[] = +{ sAnim_GeneralFrame0, sAnim_CRABOMINABLE_1, }; -static const union AnimCmd *const sAnims_ORICORIO[] ={ +static const union AnimCmd *const sAnims_ORICORIO[] = +{ sAnim_GeneralFrame0, sAnim_ORICORIO_1, }; -static const union AnimCmd *const sAnims_CUTIEFLY[] ={ +static const union AnimCmd *const sAnims_CUTIEFLY[] = +{ sAnim_GeneralFrame0, sAnim_CUTIEFLY_1, }; -static const union AnimCmd *const sAnims_RIBOMBEE[] ={ +static const union AnimCmd *const sAnims_RIBOMBEE[] = +{ sAnim_GeneralFrame0, sAnim_RIBOMBEE_1, }; -static const union AnimCmd *const sAnims_ROCKRUFF[] ={ +static const union AnimCmd *const sAnims_ROCKRUFF[] = +{ sAnim_GeneralFrame0, sAnim_ROCKRUFF_1, }; -static const union AnimCmd *const sAnims_LYCANROC[] ={ +static const union AnimCmd *const sAnims_LYCANROC[] = +{ sAnim_GeneralFrame0, sAnim_LYCANROC_1, }; -static const union AnimCmd *const sAnims_WISHIWASHI[] ={ +static const union AnimCmd *const sAnims_WISHIWASHI[] = +{ sAnim_GeneralFrame0, sAnim_WISHIWASHI_1, }; -static const union AnimCmd *const sAnims_MAREANIE[] ={ +static const union AnimCmd *const sAnims_MAREANIE[] = +{ sAnim_GeneralFrame0, sAnim_MAREANIE_1, }; -static const union AnimCmd *const sAnims_TOXAPEX[] ={ +static const union AnimCmd *const sAnims_TOXAPEX[] = +{ sAnim_GeneralFrame0, sAnim_TOXAPEX_1, }; -static const union AnimCmd *const sAnims_MUDBRAY[] ={ +static const union AnimCmd *const sAnims_MUDBRAY[] = +{ sAnim_GeneralFrame0, sAnim_MUDBRAY_1, }; -static const union AnimCmd *const sAnims_MUDSDALE[] ={ +static const union AnimCmd *const sAnims_MUDSDALE[] = +{ sAnim_GeneralFrame0, sAnim_MUDSDALE_1, }; -static const union AnimCmd *const sAnims_DEWPIDER[] ={ +static const union AnimCmd *const sAnims_DEWPIDER[] = +{ sAnim_GeneralFrame0, sAnim_DEWPIDER_1, }; -static const union AnimCmd *const sAnims_ARAQUANID[] ={ +static const union AnimCmd *const sAnims_ARAQUANID[] = +{ sAnim_GeneralFrame0, sAnim_ARAQUANID_1, }; -static const union AnimCmd *const sAnims_FOMANTIS[] ={ +static const union AnimCmd *const sAnims_FOMANTIS[] = +{ sAnim_GeneralFrame0, sAnim_FOMANTIS_1, }; -static const union AnimCmd *const sAnims_LURANTIS[] ={ +static const union AnimCmd *const sAnims_LURANTIS[] = +{ sAnim_GeneralFrame0, sAnim_LURANTIS_1, }; -static const union AnimCmd *const sAnims_MORELULL[] ={ +static const union AnimCmd *const sAnims_MORELULL[] = +{ sAnim_GeneralFrame0, sAnim_MORELULL_1, }; -static const union AnimCmd *const sAnims_SHIINOTIC[] ={ +static const union AnimCmd *const sAnims_SHIINOTIC[] = +{ sAnim_GeneralFrame0, sAnim_SHIINOTIC_1, }; -static const union AnimCmd *const sAnims_SALANDIT[] ={ +static const union AnimCmd *const sAnims_SALANDIT[] = +{ sAnim_GeneralFrame0, sAnim_SALANDIT_1, }; -static const union AnimCmd *const sAnims_SALAZZLE[] ={ +static const union AnimCmd *const sAnims_SALAZZLE[] = +{ sAnim_GeneralFrame0, sAnim_SALAZZLE_1, }; -static const union AnimCmd *const sAnims_STUFFUL[] ={ +static const union AnimCmd *const sAnims_STUFFUL[] = +{ sAnim_GeneralFrame0, sAnim_STUFFUL_1, }; -static const union AnimCmd *const sAnims_BEWEAR[] ={ +static const union AnimCmd *const sAnims_BEWEAR[] = +{ sAnim_GeneralFrame0, sAnim_BEWEAR_1, }; -static const union AnimCmd *const sAnims_BOUNSWEET[] ={ +static const union AnimCmd *const sAnims_BOUNSWEET[] = +{ sAnim_GeneralFrame0, sAnim_BOUNSWEET_1, }; -static const union AnimCmd *const sAnims_STEENEE[] ={ +static const union AnimCmd *const sAnims_STEENEE[] = +{ sAnim_GeneralFrame0, sAnim_STEENEE_1, }; -static const union AnimCmd *const sAnims_TSAREENA[] ={ +static const union AnimCmd *const sAnims_TSAREENA[] = +{ sAnim_GeneralFrame0, sAnim_TSAREENA_1, }; -static const union AnimCmd *const sAnims_COMFEY[] ={ +static const union AnimCmd *const sAnims_COMFEY[] = +{ sAnim_GeneralFrame0, sAnim_COMFEY_1, }; -static const union AnimCmd *const sAnims_ORANGURU[] ={ +static const union AnimCmd *const sAnims_ORANGURU[] = +{ sAnim_GeneralFrame0, sAnim_ORANGURU_1, }; -static const union AnimCmd *const sAnims_PASSIMIAN[] ={ +static const union AnimCmd *const sAnims_PASSIMIAN[] = +{ sAnim_GeneralFrame0, sAnim_PASSIMIAN_1, }; -static const union AnimCmd *const sAnims_WIMPOD[] ={ +static const union AnimCmd *const sAnims_WIMPOD[] = +{ sAnim_GeneralFrame0, sAnim_WIMPOD_1, }; -static const union AnimCmd *const sAnims_GOLISOPOD[] ={ +static const union AnimCmd *const sAnims_GOLISOPOD[] = +{ sAnim_GeneralFrame0, sAnim_GOLISOPOD_1, }; -static const union AnimCmd *const sAnims_SANDYGAST[] ={ +static const union AnimCmd *const sAnims_SANDYGAST[] = +{ sAnim_GeneralFrame0, sAnim_SANDYGAST_1, }; -static const union AnimCmd *const sAnims_PALOSSAND[] ={ +static const union AnimCmd *const sAnims_PALOSSAND[] = +{ sAnim_GeneralFrame0, sAnim_PALOSSAND_1, }; -static const union AnimCmd *const sAnims_PYUKUMUKU[] ={ +static const union AnimCmd *const sAnims_PYUKUMUKU[] = +{ sAnim_GeneralFrame0, sAnim_PYUKUMUKU_1, }; -static const union AnimCmd *const sAnims_TYPE_NULL[] ={ +static const union AnimCmd *const sAnims_TYPE_NULL[] = +{ sAnim_GeneralFrame0, sAnim_TYPE_NULL_1, }; -static const union AnimCmd *const sAnims_SILVALLY[] ={ +static const union AnimCmd *const sAnims_SILVALLY[] = +{ sAnim_GeneralFrame0, sAnim_SILVALLY_1, }; -static const union AnimCmd *const sAnims_MINIOR[] ={ +static const union AnimCmd *const sAnims_MINIOR[] = +{ sAnim_GeneralFrame0, sAnim_MINIOR_1, }; -static const union AnimCmd *const sAnims_KOMALA[] ={ +static const union AnimCmd *const sAnims_KOMALA[] = +{ sAnim_GeneralFrame0, sAnim_KOMALA_1, }; -static const union AnimCmd *const sAnims_TURTONATOR[] ={ +static const union AnimCmd *const sAnims_TURTONATOR[] = +{ sAnim_GeneralFrame0, sAnim_TURTONATOR_1, }; -static const union AnimCmd *const sAnims_TOGEDEMARU[] ={ +static const union AnimCmd *const sAnims_TOGEDEMARU[] = +{ sAnim_GeneralFrame0, sAnim_TOGEDEMARU_1, }; -static const union AnimCmd *const sAnims_MIMIKYU[] ={ +static const union AnimCmd *const sAnims_MIMIKYU[] = +{ sAnim_GeneralFrame0, sAnim_MIMIKYU_1, }; -static const union AnimCmd *const sAnims_BRUXISH[] ={ +static const union AnimCmd *const sAnims_BRUXISH[] = +{ sAnim_GeneralFrame0, sAnim_BRUXISH_1, }; -static const union AnimCmd *const sAnims_DRAMPA[] ={ +static const union AnimCmd *const sAnims_DRAMPA[] = +{ sAnim_GeneralFrame0, sAnim_DRAMPA_1, }; -static const union AnimCmd *const sAnims_DHELMISE[] ={ +static const union AnimCmd *const sAnims_DHELMISE[] = +{ sAnim_GeneralFrame0, sAnim_DHELMISE_1, }; -static const union AnimCmd *const sAnims_JANGMO_O[] ={ +static const union AnimCmd *const sAnims_JANGMO_O[] = +{ sAnim_GeneralFrame0, sAnim_JANGMO_O_1, }; -static const union AnimCmd *const sAnims_HAKAMO_O[] ={ +static const union AnimCmd *const sAnims_HAKAMO_O[] = +{ sAnim_GeneralFrame0, sAnim_HAKAMO_O_1, }; -static const union AnimCmd *const sAnims_KOMMO_O[] ={ +static const union AnimCmd *const sAnims_KOMMO_O[] = +{ sAnim_GeneralFrame0, sAnim_KOMMO_O_1, }; -static const union AnimCmd *const sAnims_TAPU_KOKO[] ={ +static const union AnimCmd *const sAnims_TAPU_KOKO[] = +{ sAnim_GeneralFrame0, sAnim_TAPU_KOKO_1, }; -static const union AnimCmd *const sAnims_TAPU_LELE[] ={ +static const union AnimCmd *const sAnims_TAPU_LELE[] = +{ sAnim_GeneralFrame0, sAnim_TAPU_LELE_1, }; -static const union AnimCmd *const sAnims_TAPU_BULU[] ={ +static const union AnimCmd *const sAnims_TAPU_BULU[] = +{ sAnim_GeneralFrame0, sAnim_TAPU_BULU_1, }; -static const union AnimCmd *const sAnims_TAPU_FINI[] ={ +static const union AnimCmd *const sAnims_TAPU_FINI[] = +{ sAnim_GeneralFrame0, sAnim_TAPU_FINI_1, }; -static const union AnimCmd *const sAnims_COSMOG[] ={ +static const union AnimCmd *const sAnims_COSMOG[] = +{ sAnim_GeneralFrame0, sAnim_COSMOG_1, }; -static const union AnimCmd *const sAnims_COSMOEM[] ={ +static const union AnimCmd *const sAnims_COSMOEM[] = +{ sAnim_GeneralFrame0, sAnim_COSMOEM_1, }; -static const union AnimCmd *const sAnims_SOLGALEO[] ={ +static const union AnimCmd *const sAnims_SOLGALEO[] = +{ sAnim_GeneralFrame0, sAnim_SOLGALEO_1, }; -static const union AnimCmd *const sAnims_LUNALA[] ={ +static const union AnimCmd *const sAnims_LUNALA[] = +{ sAnim_GeneralFrame0, sAnim_LUNALA_1, }; -static const union AnimCmd *const sAnims_NIHILEGO[] ={ +static const union AnimCmd *const sAnims_NIHILEGO[] = +{ sAnim_GeneralFrame0, sAnim_NIHILEGO_1, }; -static const union AnimCmd *const sAnims_BUZZWOLE[] ={ +static const union AnimCmd *const sAnims_BUZZWOLE[] = +{ sAnim_GeneralFrame0, sAnim_BUZZWOLE_1, }; -static const union AnimCmd *const sAnims_PHEROMOSA[] ={ +static const union AnimCmd *const sAnims_PHEROMOSA[] = +{ sAnim_GeneralFrame0, sAnim_PHEROMOSA_1, }; -static const union AnimCmd *const sAnims_XURKITREE[] ={ +static const union AnimCmd *const sAnims_XURKITREE[] = +{ sAnim_GeneralFrame0, sAnim_XURKITREE_1, }; -static const union AnimCmd *const sAnims_CELESTEELA[] ={ +static const union AnimCmd *const sAnims_CELESTEELA[] = +{ sAnim_GeneralFrame0, sAnim_CELESTEELA_1, }; -static const union AnimCmd *const sAnims_KARTANA[] ={ +static const union AnimCmd *const sAnims_KARTANA[] = +{ sAnim_GeneralFrame0, sAnim_KARTANA_1, }; -static const union AnimCmd *const sAnims_GUZZLORD[] ={ +static const union AnimCmd *const sAnims_GUZZLORD[] = +{ sAnim_GeneralFrame0, sAnim_GUZZLORD_1, }; -static const union AnimCmd *const sAnims_NECROZMA[] ={ +static const union AnimCmd *const sAnims_NECROZMA[] = +{ sAnim_GeneralFrame0, sAnim_NECROZMA_1, }; -static const union AnimCmd *const sAnims_MAGEARNA[] ={ +static const union AnimCmd *const sAnims_MAGEARNA[] = +{ sAnim_GeneralFrame0, sAnim_MAGEARNA_1, }; -static const union AnimCmd *const sAnims_MARSHADOW[] ={ +static const union AnimCmd *const sAnims_MARSHADOW[] = +{ sAnim_GeneralFrame0, sAnim_MARSHADOW_1, }; -static const union AnimCmd *const sAnims_POIPOLE[] ={ +static const union AnimCmd *const sAnims_POIPOLE[] = +{ sAnim_GeneralFrame0, sAnim_POIPOLE_1, }; -static const union AnimCmd *const sAnims_NAGANADEL[] ={ +static const union AnimCmd *const sAnims_NAGANADEL[] = +{ sAnim_GeneralFrame0, sAnim_NAGANADEL_1, }; -static const union AnimCmd *const sAnims_STAKATAKA[] ={ +static const union AnimCmd *const sAnims_STAKATAKA[] = +{ sAnim_GeneralFrame0, sAnim_STAKATAKA_1, }; -static const union AnimCmd *const sAnims_BLACEPHALON[] ={ +static const union AnimCmd *const sAnims_BLACEPHALON[] = +{ sAnim_GeneralFrame0, sAnim_BLACEPHALON_1, }; -static const union AnimCmd *const sAnims_ZERAORA[] ={ +static const union AnimCmd *const sAnims_ZERAORA[] = +{ sAnim_GeneralFrame0, sAnim_ZERAORA_1, }; -static const union AnimCmd *const sAnims_MELTAN[] ={ +static const union AnimCmd *const sAnims_MELTAN[] = +{ sAnim_GeneralFrame0, sAnim_MELTAN_1, }; -static const union AnimCmd *const sAnims_MELMETAL[] ={ +static const union AnimCmd *const sAnims_MELMETAL[] = +{ sAnim_GeneralFrame0, sAnim_MELMETAL_1, }; +#endif -static const union AnimCmd *const sAnims_GROOKEY[] ={ +#if P_NEW_POKEMON >= GEN_8 +static const union AnimCmd *const sAnims_GROOKEY[] = +{ sAnim_GeneralFrame0, sAnim_GROOKEY_1, }; -static const union AnimCmd *const sAnims_THWACKEY[] ={ +static const union AnimCmd *const sAnims_THWACKEY[] = +{ sAnim_GeneralFrame0, sAnim_THWACKEY_1, }; -static const union AnimCmd *const sAnims_RILLABOOM[] ={ +static const union AnimCmd *const sAnims_RILLABOOM[] = +{ sAnim_GeneralFrame0, sAnim_RILLABOOM_1, }; -static const union AnimCmd *const sAnims_SCORBUNNY[] ={ +static const union AnimCmd *const sAnims_SCORBUNNY[] = +{ sAnim_GeneralFrame0, sAnim_SCORBUNNY_1, }; -static const union AnimCmd *const sAnims_RABOOT[] ={ +static const union AnimCmd *const sAnims_RABOOT[] = +{ sAnim_GeneralFrame0, sAnim_RABOOT_1, }; -static const union AnimCmd *const sAnims_CINDERACE[] ={ +static const union AnimCmd *const sAnims_CINDERACE[] = +{ sAnim_GeneralFrame0, sAnim_CINDERACE_1, }; -static const union AnimCmd *const sAnims_SOBBLE[] ={ +static const union AnimCmd *const sAnims_SOBBLE[] = +{ sAnim_GeneralFrame0, sAnim_SOBBLE_1, }; -static const union AnimCmd *const sAnims_DRIZZILE[] ={ +static const union AnimCmd *const sAnims_DRIZZILE[] = +{ sAnim_GeneralFrame0, sAnim_DRIZZILE_1, }; -static const union AnimCmd *const sAnims_INTELEON[] ={ +static const union AnimCmd *const sAnims_INTELEON[] = +{ sAnim_GeneralFrame0, sAnim_INTELEON_1, }; -static const union AnimCmd *const sAnims_SKWOVET[] ={ +static const union AnimCmd *const sAnims_SKWOVET[] = +{ sAnim_GeneralFrame0, sAnim_SKWOVET_1, }; -static const union AnimCmd *const sAnims_GREEDENT[] ={ +static const union AnimCmd *const sAnims_GREEDENT[] = +{ sAnim_GeneralFrame0, sAnim_GREEDENT_1, }; -static const union AnimCmd *const sAnims_ROOKIDEE[] ={ +static const union AnimCmd *const sAnims_ROOKIDEE[] = +{ sAnim_GeneralFrame0, sAnim_ROOKIDEE_1, }; -static const union AnimCmd *const sAnims_CORVISQUIRE[] ={ +static const union AnimCmd *const sAnims_CORVISQUIRE[] = +{ sAnim_GeneralFrame0, sAnim_CORVISQUIRE_1, }; -static const union AnimCmd *const sAnims_CORVIKNIGHT[] ={ +static const union AnimCmd *const sAnims_CORVIKNIGHT[] = +{ sAnim_GeneralFrame0, sAnim_CORVIKNIGHT_1, }; -static const union AnimCmd *const sAnims_BLIPBUG[] ={ +static const union AnimCmd *const sAnims_BLIPBUG[] = +{ sAnim_GeneralFrame0, sAnim_BLIPBUG_1, }; -static const union AnimCmd *const sAnims_DOTTLER[] ={ +static const union AnimCmd *const sAnims_DOTTLER[] = +{ sAnim_GeneralFrame0, sAnim_DOTTLER_1, }; -static const union AnimCmd *const sAnims_ORBEETLE[] ={ +static const union AnimCmd *const sAnims_ORBEETLE[] = +{ sAnim_GeneralFrame0, sAnim_ORBEETLE_1, }; -static const union AnimCmd *const sAnims_NICKIT[] ={ +static const union AnimCmd *const sAnims_NICKIT[] = +{ sAnim_GeneralFrame0, sAnim_NICKIT_1, }; -static const union AnimCmd *const sAnims_THIEVUL[] ={ +static const union AnimCmd *const sAnims_THIEVUL[] = +{ sAnim_GeneralFrame0, sAnim_THIEVUL_1, }; -static const union AnimCmd *const sAnims_GOSSIFLEUR[] ={ +static const union AnimCmd *const sAnims_GOSSIFLEUR[] = +{ sAnim_GeneralFrame0, sAnim_GOSSIFLEUR_1, }; -static const union AnimCmd *const sAnims_ELDEGOSS[] ={ +static const union AnimCmd *const sAnims_ELDEGOSS[] = +{ sAnim_GeneralFrame0, sAnim_ELDEGOSS_1, }; -static const union AnimCmd *const sAnims_WOOLOO[] ={ +static const union AnimCmd *const sAnims_WOOLOO[] = +{ sAnim_GeneralFrame0, sAnim_WOOLOO_1, }; -static const union AnimCmd *const sAnims_DUBWOOL[] ={ +static const union AnimCmd *const sAnims_DUBWOOL[] = +{ sAnim_GeneralFrame0, sAnim_DUBWOOL_1, }; -static const union AnimCmd *const sAnims_CHEWTLE[] ={ +static const union AnimCmd *const sAnims_CHEWTLE[] = +{ sAnim_GeneralFrame0, sAnim_CHEWTLE_1, }; -static const union AnimCmd *const sAnims_DREDNAW[] ={ +static const union AnimCmd *const sAnims_DREDNAW[] = +{ sAnim_GeneralFrame0, sAnim_DREDNAW_1, }; -static const union AnimCmd *const sAnims_YAMPER[] ={ +static const union AnimCmd *const sAnims_YAMPER[] = +{ sAnim_GeneralFrame0, sAnim_YAMPER_1, }; -static const union AnimCmd *const sAnims_BOLTUND[] ={ +static const union AnimCmd *const sAnims_BOLTUND[] = +{ sAnim_GeneralFrame0, sAnim_BOLTUND_1, }; -static const union AnimCmd *const sAnims_ROLYCOLY[] ={ +static const union AnimCmd *const sAnims_ROLYCOLY[] = +{ sAnim_GeneralFrame0, sAnim_ROLYCOLY_1, }; -static const union AnimCmd *const sAnims_CARKOL[] ={ +static const union AnimCmd *const sAnims_CARKOL[] = +{ sAnim_GeneralFrame0, sAnim_CARKOL_1, }; -static const union AnimCmd *const sAnims_COALOSSAL[] ={ +static const union AnimCmd *const sAnims_COALOSSAL[] = +{ sAnim_GeneralFrame0, sAnim_COALOSSAL_1, }; -static const union AnimCmd *const sAnims_APPLIN[] ={ +static const union AnimCmd *const sAnims_APPLIN[] = +{ sAnim_GeneralFrame0, sAnim_APPLIN_1, }; -static const union AnimCmd *const sAnims_FLAPPLE[] ={ +static const union AnimCmd *const sAnims_FLAPPLE[] = +{ sAnim_GeneralFrame0, sAnim_FLAPPLE_1, }; -static const union AnimCmd *const sAnims_APPLETUN[] ={ +static const union AnimCmd *const sAnims_APPLETUN[] = +{ sAnim_GeneralFrame0, sAnim_APPLETUN_1, }; -static const union AnimCmd *const sAnims_SILICOBRA[] ={ +static const union AnimCmd *const sAnims_SILICOBRA[] = +{ sAnim_GeneralFrame0, sAnim_SILICOBRA_1, }; -static const union AnimCmd *const sAnims_SANDACONDA[] ={ +static const union AnimCmd *const sAnims_SANDACONDA[] = +{ sAnim_GeneralFrame0, sAnim_SANDACONDA_1, }; -static const union AnimCmd *const sAnims_CRAMORANT[] ={ +static const union AnimCmd *const sAnims_CRAMORANT[] = +{ sAnim_GeneralFrame0, sAnim_CRAMORANT_1, }; -static const union AnimCmd *const sAnims_ARROKUDA[] ={ +static const union AnimCmd *const sAnims_ARROKUDA[] = +{ sAnim_GeneralFrame0, sAnim_ARROKUDA_1, }; -static const union AnimCmd *const sAnims_BARRASKEWDA[] ={ +static const union AnimCmd *const sAnims_BARRASKEWDA[] = +{ sAnim_GeneralFrame0, sAnim_BARRASKEWDA_1, }; -static const union AnimCmd *const sAnims_TOXEL[] ={ +static const union AnimCmd *const sAnims_TOXEL[] = +{ sAnim_GeneralFrame0, sAnim_TOXEL_1, }; -static const union AnimCmd *const sAnims_TOXTRICITY[] ={ +static const union AnimCmd *const sAnims_TOXTRICITY[] = +{ sAnim_GeneralFrame0, sAnim_TOXTRICITY_1, }; -static const union AnimCmd *const sAnims_SIZZLIPEDE[] ={ +static const union AnimCmd *const sAnims_SIZZLIPEDE[] = +{ sAnim_GeneralFrame0, sAnim_SIZZLIPEDE_1, }; -static const union AnimCmd *const sAnims_CENTISKORCH[] ={ +static const union AnimCmd *const sAnims_CENTISKORCH[] = +{ sAnim_GeneralFrame0, sAnim_CENTISKORCH_1, }; -static const union AnimCmd *const sAnims_CLOBBOPUS[] ={ +static const union AnimCmd *const sAnims_CLOBBOPUS[] = +{ sAnim_GeneralFrame0, sAnim_CLOBBOPUS_1, }; -static const union AnimCmd *const sAnims_GRAPPLOCT[] ={ +static const union AnimCmd *const sAnims_GRAPPLOCT[] = +{ sAnim_GeneralFrame0, sAnim_GRAPPLOCT_1, }; -static const union AnimCmd *const sAnims_SINISTEA[] ={ +static const union AnimCmd *const sAnims_SINISTEA[] = +{ sAnim_GeneralFrame0, sAnim_SINISTEA_1, }; -static const union AnimCmd *const sAnims_POLTEAGEIST[] ={ +static const union AnimCmd *const sAnims_POLTEAGEIST[] = +{ sAnim_GeneralFrame0, sAnim_POLTEAGEIST_1, }; -static const union AnimCmd *const sAnims_HATENNA[] ={ +static const union AnimCmd *const sAnims_HATENNA[] = +{ sAnim_GeneralFrame0, sAnim_HATENNA_1, }; -static const union AnimCmd *const sAnims_HATTREM[] ={ +static const union AnimCmd *const sAnims_HATTREM[] = +{ sAnim_GeneralFrame0, sAnim_HATTREM_1, }; -static const union AnimCmd *const sAnims_HATTERENE[] ={ +static const union AnimCmd *const sAnims_HATTERENE[] = +{ sAnim_GeneralFrame0, sAnim_HATTERENE_1, }; -static const union AnimCmd *const sAnims_IMPIDIMP[] ={ +static const union AnimCmd *const sAnims_IMPIDIMP[] = +{ sAnim_GeneralFrame0, sAnim_IMPIDIMP_1, }; -static const union AnimCmd *const sAnims_MORGREM[] ={ +static const union AnimCmd *const sAnims_MORGREM[] = +{ sAnim_GeneralFrame0, sAnim_MORGREM_1, }; -static const union AnimCmd *const sAnims_GRIMMSNARL[] ={ +static const union AnimCmd *const sAnims_GRIMMSNARL[] = +{ sAnim_GeneralFrame0, sAnim_GRIMMSNARL_1, }; -static const union AnimCmd *const sAnims_OBSTAGOON[] ={ +static const union AnimCmd *const sAnims_OBSTAGOON[] = +{ sAnim_GeneralFrame0, sAnim_OBSTAGOON_1, }; -static const union AnimCmd *const sAnims_PERRSERKER[] ={ +static const union AnimCmd *const sAnims_PERRSERKER[] = +{ sAnim_GeneralFrame0, sAnim_PERRSERKER_1, }; -static const union AnimCmd *const sAnims_CURSOLA[] ={ +static const union AnimCmd *const sAnims_CURSOLA[] = +{ sAnim_GeneralFrame0, sAnim_CURSOLA_1, }; -static const union AnimCmd *const sAnims_SIRFETCHD[] ={ +static const union AnimCmd *const sAnims_SIRFETCHD[] = +{ sAnim_GeneralFrame0, sAnim_SIRFETCHD_1, }; -static const union AnimCmd *const sAnims_MR_RIME[] ={ +static const union AnimCmd *const sAnims_MR_RIME[] = +{ sAnim_GeneralFrame0, sAnim_MR_RIME_1, }; -static const union AnimCmd *const sAnims_RUNERIGUS[] ={ +static const union AnimCmd *const sAnims_RUNERIGUS[] = +{ sAnim_GeneralFrame0, sAnim_RUNERIGUS_1, }; -static const union AnimCmd *const sAnims_MILCERY[] ={ +static const union AnimCmd *const sAnims_MILCERY[] = +{ sAnim_GeneralFrame0, sAnim_MILCERY_1, }; -static const union AnimCmd *const sAnims_ALCREMIE[] ={ +static const union AnimCmd *const sAnims_ALCREMIE[] = +{ sAnim_GeneralFrame0, sAnim_ALCREMIE_1, }; -static const union AnimCmd *const sAnims_FALINKS[] ={ +static const union AnimCmd *const sAnims_FALINKS[] = +{ sAnim_GeneralFrame0, sAnim_FALINKS_1, }; -static const union AnimCmd *const sAnims_PINCURCHIN[] ={ +static const union AnimCmd *const sAnims_PINCURCHIN[] = +{ sAnim_GeneralFrame0, sAnim_PINCURCHIN_1, }; -static const union AnimCmd *const sAnims_SNOM[] ={ +static const union AnimCmd *const sAnims_SNOM[] = +{ sAnim_GeneralFrame0, sAnim_SNOM_1, }; -static const union AnimCmd *const sAnims_FROSMOTH[] ={ +static const union AnimCmd *const sAnims_FROSMOTH[] = +{ sAnim_GeneralFrame0, sAnim_FROSMOTH_1, }; -static const union AnimCmd *const sAnims_STONJOURNER[] ={ +static const union AnimCmd *const sAnims_STONJOURNER[] = +{ sAnim_GeneralFrame0, sAnim_STONJOURNER_1, }; -static const union AnimCmd *const sAnims_EISCUE[] ={ +static const union AnimCmd *const sAnims_EISCUE[] = +{ sAnim_GeneralFrame0, sAnim_EISCUE_1, }; -static const union AnimCmd *const sAnims_INDEEDEE[] ={ +static const union AnimCmd *const sAnims_INDEEDEE[] = +{ sAnim_GeneralFrame0, sAnim_INDEEDEE_1, }; -static const union AnimCmd *const sAnims_MORPEKO[] ={ +static const union AnimCmd *const sAnims_MORPEKO[] = +{ sAnim_GeneralFrame0, sAnim_MORPEKO_1, }; -static const union AnimCmd *const sAnims_CUFANT[] ={ +static const union AnimCmd *const sAnims_CUFANT[] = +{ sAnim_GeneralFrame0, sAnim_CUFANT_1, }; -static const union AnimCmd *const sAnims_COPPERAJAH[] ={ +static const union AnimCmd *const sAnims_COPPERAJAH[] = +{ sAnim_GeneralFrame0, sAnim_COPPERAJAH_1, }; -static const union AnimCmd *const sAnims_DRACOZOLT[] ={ +static const union AnimCmd *const sAnims_DRACOZOLT[] = +{ sAnim_GeneralFrame0, sAnim_DRACOZOLT_1, }; -static const union AnimCmd *const sAnims_ARCTOZOLT[] ={ +static const union AnimCmd *const sAnims_ARCTOZOLT[] = +{ sAnim_GeneralFrame0, sAnim_ARCTOZOLT_1, }; -static const union AnimCmd *const sAnims_DRACOVISH[] ={ +static const union AnimCmd *const sAnims_DRACOVISH[] = +{ sAnim_GeneralFrame0, sAnim_DRACOVISH_1, }; -static const union AnimCmd *const sAnims_ARCTOVISH[] ={ +static const union AnimCmd *const sAnims_ARCTOVISH[] = +{ sAnim_GeneralFrame0, sAnim_ARCTOVISH_1, }; -static const union AnimCmd *const sAnims_DURALUDON[] ={ +static const union AnimCmd *const sAnims_DURALUDON[] = +{ sAnim_GeneralFrame0, sAnim_DURALUDON_1, }; -static const union AnimCmd *const sAnims_DREEPY[] ={ +static const union AnimCmd *const sAnims_DREEPY[] = +{ sAnim_GeneralFrame0, sAnim_DREEPY_1, }; -static const union AnimCmd *const sAnims_DRAKLOAK[] ={ +static const union AnimCmd *const sAnims_DRAKLOAK[] = +{ sAnim_GeneralFrame0, sAnim_DRAKLOAK_1, }; -static const union AnimCmd *const sAnims_DRAGAPULT[] ={ +static const union AnimCmd *const sAnims_DRAGAPULT[] = +{ sAnim_GeneralFrame0, sAnim_DRAGAPULT_1, }; -static const union AnimCmd *const sAnims_ZACIAN[] ={ +static const union AnimCmd *const sAnims_ZACIAN[] = +{ sAnim_GeneralFrame0, sAnim_ZACIAN_1, }; -static const union AnimCmd *const sAnims_ZAMAZENTA[] ={ +static const union AnimCmd *const sAnims_ZAMAZENTA[] = +{ sAnim_GeneralFrame0, sAnim_ZAMAZENTA_1, }; -static const union AnimCmd *const sAnims_ETERNATUS[] ={ +static const union AnimCmd *const sAnims_ETERNATUS[] = +{ sAnim_GeneralFrame0, sAnim_ETERNATUS_1, }; -static const union AnimCmd *const sAnims_KUBFU[] ={ +static const union AnimCmd *const sAnims_KUBFU[] = +{ sAnim_GeneralFrame0, sAnim_KUBFU_1, }; -static const union AnimCmd *const sAnims_URSHIFU[] ={ +static const union AnimCmd *const sAnims_URSHIFU[] = +{ sAnim_GeneralFrame0, sAnim_URSHIFU_1, }; -static const union AnimCmd *const sAnims_ZARUDE[] ={ +static const union AnimCmd *const sAnims_ZARUDE[] = +{ sAnim_GeneralFrame0, sAnim_ZARUDE_1, }; -static const union AnimCmd *const sAnims_REGIELEKI[] ={ +static const union AnimCmd *const sAnims_REGIELEKI[] = +{ sAnim_GeneralFrame0, sAnim_REGIELEKI_1, }; -static const union AnimCmd *const sAnims_REGIDRAGO[] ={ +static const union AnimCmd *const sAnims_REGIDRAGO[] = +{ sAnim_GeneralFrame0, sAnim_REGIDRAGO_1, }; -static const union AnimCmd *const sAnims_GLASTRIER[] ={ +static const union AnimCmd *const sAnims_GLASTRIER[] = +{ sAnim_GeneralFrame0, sAnim_GLASTRIER_1, }; -static const union AnimCmd *const sAnims_SPECTRIER[] ={ +static const union AnimCmd *const sAnims_SPECTRIER[] = +{ sAnim_GeneralFrame0, sAnim_SPECTRIER_1, }; -static const union AnimCmd *const sAnims_CALYREX[] ={ +static const union AnimCmd *const sAnims_CALYREX[] = +{ sAnim_GeneralFrame0, sAnim_CALYREX_1, }; -static const union AnimCmd *const sAnims_WYRDEER[] ={ +static const union AnimCmd *const sAnims_WYRDEER[] = +{ sAnim_GeneralFrame0, sAnim_WYRDEER_1, }; -static const union AnimCmd *const sAnims_KLEAVOR[] ={ +static const union AnimCmd *const sAnims_KLEAVOR[] = +{ sAnim_GeneralFrame0, sAnim_KLEAVOR_1, }; -static const union AnimCmd *const sAnims_URSALUNA[] ={ +static const union AnimCmd *const sAnims_URSALUNA[] = +{ sAnim_GeneralFrame0, sAnim_URSALUNA_1, }; -static const union AnimCmd *const sAnims_BASCULEGION[] ={ +static const union AnimCmd *const sAnims_BASCULEGION[] = +{ sAnim_GeneralFrame0, sAnim_BASCULEGION_1, }; -static const union AnimCmd *const sAnims_SNEASLER[] ={ +static const union AnimCmd *const sAnims_SNEASLER[] = +{ sAnim_GeneralFrame0, sAnim_SNEASLER_1, }; -static const union AnimCmd *const sAnims_OVERQWIL[] ={ +static const union AnimCmd *const sAnims_OVERQWIL[] = +{ sAnim_GeneralFrame0, sAnim_OVERQWIL_1, }; -static const union AnimCmd *const sAnims_ENAMORUS[] ={ +static const union AnimCmd *const sAnims_ENAMORUS[] = +{ sAnim_GeneralFrame0, sAnim_ENAMORUS_1, }; +#endif -static const union AnimCmd *const sAnims_VENUSAUR_MEGA[] ={ +static const union AnimCmd *const sAnims_VENUSAUR_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_VENUSAUR_MEGA_1, }; -static const union AnimCmd *const sAnims_CHARIZARD_MEGA_X[] ={ +static const union AnimCmd *const sAnims_CHARIZARD_MEGA_X[] = +{ sAnim_GeneralFrame0, sAnim_CHARIZARD_MEGA_X_1, }; -static const union AnimCmd *const sAnims_CHARIZARD_MEGA_Y[] ={ +static const union AnimCmd *const sAnims_CHARIZARD_MEGA_Y[] = +{ sAnim_GeneralFrame0, sAnim_CHARIZARD_MEGA_Y_1, }; -static const union AnimCmd *const sAnims_BLASTOISE_MEGA[] ={ +static const union AnimCmd *const sAnims_BLASTOISE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_BLASTOISE_MEGA_1, }; -static const union AnimCmd *const sAnims_BEEDRILL_MEGA[] ={ +static const union AnimCmd *const sAnims_BEEDRILL_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_BEEDRILL_MEGA_1, }; -static const union AnimCmd *const sAnims_PIDGEOT_MEGA[] ={ +static const union AnimCmd *const sAnims_PIDGEOT_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_PIDGEOT_MEGA_1, }; -static const union AnimCmd *const sAnims_ALAKAZAM_MEGA[] ={ +static const union AnimCmd *const sAnims_ALAKAZAM_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_ALAKAZAM_MEGA_1, }; -static const union AnimCmd *const sAnims_SLOWBRO_MEGA[] ={ +static const union AnimCmd *const sAnims_SLOWBRO_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SLOWBRO_MEGA_1, }; -static const union AnimCmd *const sAnims_GENGAR_MEGA[] ={ +static const union AnimCmd *const sAnims_GENGAR_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_GENGAR_MEGA_1, }; -static const union AnimCmd *const sAnims_KANGASKHAN_MEGA[] ={ +static const union AnimCmd *const sAnims_KANGASKHAN_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_KANGASKHAN_MEGA_1, }; -static const union AnimCmd *const sAnims_PINSIR_MEGA[] ={ +static const union AnimCmd *const sAnims_PINSIR_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_PINSIR_MEGA_1, }; -static const union AnimCmd *const sAnims_GYARADOS_MEGA[] ={ +static const union AnimCmd *const sAnims_GYARADOS_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_GYARADOS_MEGA_1, }; -static const union AnimCmd *const sAnims_AERODACTYL_MEGA[] ={ +static const union AnimCmd *const sAnims_AERODACTYL_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_AERODACTYL_MEGA_1, }; -static const union AnimCmd *const sAnims_MEWTWO_MEGA_X[] ={ +static const union AnimCmd *const sAnims_MEWTWO_MEGA_X[] = +{ sAnim_GeneralFrame0, sAnim_MEWTWO_MEGA_X_1, }; -static const union AnimCmd *const sAnims_MEWTWO_MEGA_Y[] ={ +static const union AnimCmd *const sAnims_MEWTWO_MEGA_Y[] = +{ sAnim_GeneralFrame0, sAnim_MEWTWO_MEGA_Y_1, }; -static const union AnimCmd *const sAnims_AMPHAROS_MEGA[] ={ +static const union AnimCmd *const sAnims_AMPHAROS_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_AMPHAROS_MEGA_1, }; -static const union AnimCmd *const sAnims_STEELIX_MEGA[] ={ +static const union AnimCmd *const sAnims_STEELIX_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_STEELIX_MEGA_1, }; -static const union AnimCmd *const sAnims_SCIZOR_MEGA[] ={ +static const union AnimCmd *const sAnims_SCIZOR_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SCIZOR_MEGA_1, }; -static const union AnimCmd *const sAnims_HERACROSS_MEGA[] ={ +static const union AnimCmd *const sAnims_HERACROSS_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_HERACROSS_MEGA_1, }; -static const union AnimCmd *const sAnims_HOUNDOOM_MEGA[] ={ +static const union AnimCmd *const sAnims_HOUNDOOM_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_HOUNDOOM_MEGA_1, }; -static const union AnimCmd *const sAnims_TYRANITAR_MEGA[] ={ +static const union AnimCmd *const sAnims_TYRANITAR_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_TYRANITAR_MEGA_1, }; -static const union AnimCmd *const sAnims_SCEPTILE_MEGA[] ={ +static const union AnimCmd *const sAnims_SCEPTILE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SCEPTILE_MEGA_1, }; -static const union AnimCmd *const sAnims_BLAZIKEN_MEGA[] ={ +static const union AnimCmd *const sAnims_BLAZIKEN_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_BLAZIKEN_MEGA_1, }; -static const union AnimCmd *const sAnims_SWAMPERT_MEGA[] ={ +static const union AnimCmd *const sAnims_SWAMPERT_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SWAMPERT_MEGA_1, }; -static const union AnimCmd *const sAnims_GARDEVOIR_MEGA[] ={ +static const union AnimCmd *const sAnims_GARDEVOIR_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_GARDEVOIR_MEGA_1, }; -static const union AnimCmd *const sAnims_SABLEYE_MEGA[] ={ +static const union AnimCmd *const sAnims_SABLEYE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SABLEYE_MEGA_1, }; -static const union AnimCmd *const sAnims_MAWILE_MEGA[] ={ +static const union AnimCmd *const sAnims_MAWILE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_MAWILE_MEGA_1, }; -static const union AnimCmd *const sAnims_AGGRON_MEGA[] ={ +static const union AnimCmd *const sAnims_AGGRON_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_AGGRON_MEGA_1, }; -static const union AnimCmd *const sAnims_MEDICHAM_MEGA[] ={ +static const union AnimCmd *const sAnims_MEDICHAM_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_MEDICHAM_MEGA_1, }; -static const union AnimCmd *const sAnims_MANECTRIC_MEGA[] ={ +static const union AnimCmd *const sAnims_MANECTRIC_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_MANECTRIC_MEGA_1, }; -static const union AnimCmd *const sAnims_SHARPEDO_MEGA[] ={ +static const union AnimCmd *const sAnims_SHARPEDO_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SHARPEDO_MEGA_1, }; -static const union AnimCmd *const sAnims_CAMERUPT_MEGA[] ={ +static const union AnimCmd *const sAnims_CAMERUPT_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_CAMERUPT_MEGA_1, }; -static const union AnimCmd *const sAnims_ALTARIA_MEGA[] ={ +static const union AnimCmd *const sAnims_ALTARIA_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_ALTARIA_MEGA_1, }; -static const union AnimCmd *const sAnims_BANETTE_MEGA[] ={ +static const union AnimCmd *const sAnims_BANETTE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_BANETTE_MEGA_1, }; -static const union AnimCmd *const sAnims_ABSOL_MEGA[] ={ +static const union AnimCmd *const sAnims_ABSOL_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_ABSOL_MEGA_1, }; -static const union AnimCmd *const sAnims_GLALIE_MEGA[] ={ +static const union AnimCmd *const sAnims_GLALIE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_GLALIE_MEGA_1, }; -static const union AnimCmd *const sAnims_SALAMENCE_MEGA[] ={ +static const union AnimCmd *const sAnims_SALAMENCE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_SALAMENCE_MEGA_1, }; -static const union AnimCmd *const sAnims_METAGROSS_MEGA[] ={ +static const union AnimCmd *const sAnims_METAGROSS_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_METAGROSS_MEGA_1, }; -static const union AnimCmd *const sAnims_LATIAS_MEGA[] ={ +static const union AnimCmd *const sAnims_LATIAS_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_LATIAS_MEGA_1, }; -static const union AnimCmd *const sAnims_LATIOS_MEGA[] ={ +static const union AnimCmd *const sAnims_LATIOS_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_LATIOS_MEGA_1, }; -static const union AnimCmd *const sAnims_KYOGRE_PRIMAL[] ={ +static const union AnimCmd *const sAnims_KYOGRE_PRIMAL[] = +{ sAnim_GeneralFrame0, sAnim_KYOGRE_PRIMAL_1, }; -static const union AnimCmd *const sAnims_GROUDON_PRIMAL[] ={ +static const union AnimCmd *const sAnims_GROUDON_PRIMAL[] = +{ sAnim_GeneralFrame0, sAnim_GROUDON_PRIMAL_1, }; -static const union AnimCmd *const sAnims_RAYQUAZA_MEGA[] ={ +static const union AnimCmd *const sAnims_RAYQUAZA_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_RAYQUAZA_MEGA_1, }; -static const union AnimCmd *const sAnims_LOPUNNY_MEGA[] ={ +#if P_NEW_POKEMON >= GEN_4 +static const union AnimCmd *const sAnims_LOPUNNY_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_LOPUNNY_MEGA_1, }; -static const union AnimCmd *const sAnims_GARCHOMP_MEGA[] ={ +static const union AnimCmd *const sAnims_GARCHOMP_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_GARCHOMP_MEGA_1, }; -static const union AnimCmd *const sAnims_LUCARIO_MEGA[] ={ +static const union AnimCmd *const sAnims_LUCARIO_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_LUCARIO_MEGA_1, }; -static const union AnimCmd *const sAnims_ABOMASNOW_MEGA[] ={ +static const union AnimCmd *const sAnims_ABOMASNOW_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_ABOMASNOW_MEGA_1, }; -static const union AnimCmd *const sAnims_GALLADE_MEGA[] ={ +static const union AnimCmd *const sAnims_GALLADE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_GALLADE_MEGA_1, }; +#endif -static const union AnimCmd *const sAnims_AUDINO_MEGA[] ={ +#if P_NEW_POKEMON >= GEN_5 +static const union AnimCmd *const sAnims_AUDINO_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_AUDINO_MEGA_1, }; +#endif -static const union AnimCmd *const sAnims_DIANCIE_MEGA[] ={ +#if P_NEW_POKEMON >= GEN_6 +static const union AnimCmd *const sAnims_DIANCIE_MEGA[] = +{ sAnim_GeneralFrame0, sAnim_DIANCIE_MEGA_1, }; +#endif -static const union AnimCmd *const sAnims_RATTATA_ALOLAN[] ={ +static const union AnimCmd *const sAnims_RATTATA_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_RATTATA_ALOLAN_1, }; -static const union AnimCmd *const sAnims_RATICATE_ALOLAN[] ={ +static const union AnimCmd *const sAnims_RATICATE_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_RATICATE_ALOLAN_1, }; -static const union AnimCmd *const sAnims_RAICHU_ALOLAN[] ={ +static const union AnimCmd *const sAnims_RAICHU_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_RAICHU_ALOLAN_1, }; -static const union AnimCmd *const sAnims_SANDSHREW_ALOLAN[] ={ +static const union AnimCmd *const sAnims_SANDSHREW_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_SANDSHREW_ALOLAN_1, }; -static const union AnimCmd *const sAnims_SANDSLASH_ALOLAN[] ={ +static const union AnimCmd *const sAnims_SANDSLASH_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_SANDSLASH_ALOLAN_1, }; -static const union AnimCmd *const sAnims_VULPIX_ALOLAN[] ={ +static const union AnimCmd *const sAnims_VULPIX_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_VULPIX_ALOLAN_1, }; -static const union AnimCmd *const sAnims_NINETALES_ALOLAN[] ={ +static const union AnimCmd *const sAnims_NINETALES_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_NINETALES_ALOLAN_1, }; -static const union AnimCmd *const sAnims_DIGLETT_ALOLAN[] ={ +static const union AnimCmd *const sAnims_DIGLETT_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_DIGLETT_ALOLAN_1, }; -static const union AnimCmd *const sAnims_DUGTRIO_ALOLAN[] ={ +static const union AnimCmd *const sAnims_DUGTRIO_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_DUGTRIO_ALOLAN_1, }; -static const union AnimCmd *const sAnims_MEOWTH_ALOLAN[] ={ +static const union AnimCmd *const sAnims_MEOWTH_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_MEOWTH_ALOLAN_1, }; -static const union AnimCmd *const sAnims_PERSIAN_ALOLAN[] ={ +static const union AnimCmd *const sAnims_PERSIAN_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_PERSIAN_ALOLAN_1, }; -static const union AnimCmd *const sAnims_GEODUDE_ALOLAN[] ={ +static const union AnimCmd *const sAnims_GEODUDE_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_GEODUDE_ALOLAN_1, }; -static const union AnimCmd *const sAnims_GRAVELER_ALOLAN[] ={ +static const union AnimCmd *const sAnims_GRAVELER_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_GRAVELER_ALOLAN_1, }; -static const union AnimCmd *const sAnims_GOLEM_ALOLAN[] ={ +static const union AnimCmd *const sAnims_GOLEM_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_GOLEM_ALOLAN_1, }; -static const union AnimCmd *const sAnims_GRIMER_ALOLAN[] ={ +static const union AnimCmd *const sAnims_GRIMER_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_GRIMER_ALOLAN_1, }; -static const union AnimCmd *const sAnims_MUK_ALOLAN[] ={ +static const union AnimCmd *const sAnims_MUK_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_MUK_ALOLAN_1, }; -static const union AnimCmd *const sAnims_EXEGGUTOR_ALOLAN[] ={ +static const union AnimCmd *const sAnims_EXEGGUTOR_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_EXEGGUTOR_ALOLAN_1, }; -static const union AnimCmd *const sAnims_MAROWAK_ALOLAN[] ={ +static const union AnimCmd *const sAnims_MAROWAK_ALOLAN[] = +{ sAnim_GeneralFrame0, sAnim_MAROWAK_ALOLAN_1, }; -static const union AnimCmd *const sAnims_MEOWTH_GALARIAN[] ={ +static const union AnimCmd *const sAnims_MEOWTH_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_MEOWTH_GALARIAN_1, }; -static const union AnimCmd *const sAnims_PONYTA_GALARIAN[] ={ +static const union AnimCmd *const sAnims_PONYTA_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_PONYTA_GALARIAN_1, }; -static const union AnimCmd *const sAnims_RAPIDASH_GALARIAN[] ={ +static const union AnimCmd *const sAnims_RAPIDASH_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_RAPIDASH_GALARIAN_1, }; -static const union AnimCmd *const sAnims_SLOWPOKE_GALARIAN[] ={ +static const union AnimCmd *const sAnims_SLOWPOKE_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_SLOWPOKE_GALARIAN_1, }; -static const union AnimCmd *const sAnims_SLOWBRO_GALARIAN[] ={ +static const union AnimCmd *const sAnims_SLOWBRO_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_SLOWBRO_GALARIAN_1, }; -static const union AnimCmd *const sAnims_FARFETCHD_GALARIAN[] ={ +static const union AnimCmd *const sAnims_FARFETCHD_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_FARFETCHD_GALARIAN_1, }; -static const union AnimCmd *const sAnims_WEEZING_GALARIAN[] ={ +static const union AnimCmd *const sAnims_WEEZING_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_WEEZING_GALARIAN_1, }; -static const union AnimCmd *const sAnims_MR_MIME_GALARIAN[] ={ +static const union AnimCmd *const sAnims_MR_MIME_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_MR_MIME_GALARIAN_1, }; -static const union AnimCmd *const sAnims_ARTICUNO_GALARIAN[] ={ +static const union AnimCmd *const sAnims_ARTICUNO_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_ARTICUNO_GALARIAN_1, }; -static const union AnimCmd *const sAnims_ZAPDOS_GALARIAN[] ={ +static const union AnimCmd *const sAnims_ZAPDOS_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_ZAPDOS_GALARIAN_1, }; -static const union AnimCmd *const sAnims_MOLTRES_GALARIAN[] ={ +static const union AnimCmd *const sAnims_MOLTRES_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_MOLTRES_GALARIAN_1, }; -static const union AnimCmd *const sAnims_SLOWKING_GALARIAN[] ={ +static const union AnimCmd *const sAnims_SLOWKING_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_SLOWKING_GALARIAN_1, }; -static const union AnimCmd *const sAnims_CORSOLA_GALARIAN[] ={ +static const union AnimCmd *const sAnims_CORSOLA_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_CORSOLA_GALARIAN_1, }; -static const union AnimCmd *const sAnims_ZIGZAGOON_GALARIAN[] ={ +static const union AnimCmd *const sAnims_ZIGZAGOON_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_ZIGZAGOON_GALARIAN_1, }; -static const union AnimCmd *const sAnims_LINOONE_GALARIAN[] ={ +static const union AnimCmd *const sAnims_LINOONE_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_LINOONE_GALARIAN_1, }; -static const union AnimCmd *const sAnims_DARUMAKA_GALARIAN[] ={ +#if P_NEW_POKEMON >= GEN_5 +static const union AnimCmd *const sAnims_DARUMAKA_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_DARUMAKA_GALARIAN_1, }; -static const union AnimCmd *const sAnims_DARMANITAN_GALARIAN[] ={ +static const union AnimCmd *const sAnims_DARMANITAN_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_DARMANITAN_GALARIAN_1, }; -static const union AnimCmd *const sAnims_YAMASK_GALARIAN[] ={ +static const union AnimCmd *const sAnims_YAMASK_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_YAMASK_GALARIAN_1, }; -static const union AnimCmd *const sAnims_STUNFISK_GALARIAN[] ={ +static const union AnimCmd *const sAnims_STUNFISK_GALARIAN[] = +{ sAnim_GeneralFrame0, sAnim_STUNFISK_GALARIAN_1, }; +#endif -static const union AnimCmd *const sAnims_GROWLITHE_HISUIAN[] ={ +static const union AnimCmd *const sAnims_GROWLITHE_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_GROWLITHE_HISUIAN_1, }; -static const union AnimCmd *const sAnims_ARCANINE_HISUIAN[] ={ +static const union AnimCmd *const sAnims_ARCANINE_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_ARCANINE_HISUIAN_1, }; -static const union AnimCmd *const sAnims_VOLTORB_HISUIAN[] ={ +static const union AnimCmd *const sAnims_VOLTORB_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_VOLTORB_HISUIAN_1, }; -static const union AnimCmd *const sAnims_ELECTRODE_HISUIAN[] ={ +static const union AnimCmd *const sAnims_ELECTRODE_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_ELECTRODE_HISUIAN_1, }; -static const union AnimCmd *const sAnims_TYPHLOSION_HISUIAN[] ={ +static const union AnimCmd *const sAnims_TYPHLOSION_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_TYPHLOSION_HISUIAN_1, }; -static const union AnimCmd *const sAnims_QWILFISH_HISUIAN[] ={ +static const union AnimCmd *const sAnims_QWILFISH_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_QWILFISH_HISUIAN_1, }; -static const union AnimCmd *const sAnims_SNEASEL_HISUIAN[] ={ +static const union AnimCmd *const sAnims_SNEASEL_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_SNEASEL_HISUIAN_1, }; -static const union AnimCmd *const sAnims_SAMUROTT_HISUIAN[] ={ +#if P_NEW_POKEMON >= GEN_5 +static const union AnimCmd *const sAnims_SAMUROTT_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_SAMUROTT_HISUIAN_1, }; -static const union AnimCmd *const sAnims_LILLIGANT_HISUIAN[] ={ +static const union AnimCmd *const sAnims_LILLIGANT_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_LILLIGANT_HISUIAN_1, }; -static const union AnimCmd *const sAnims_ZORUA_HISUIAN[] ={ +static const union AnimCmd *const sAnims_ZORUA_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_ZORUA_HISUIAN_1, }; -static const union AnimCmd *const sAnims_ZOROARK_HISUIAN[] ={ +static const union AnimCmd *const sAnims_ZOROARK_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_ZOROARK_HISUIAN_1, }; -static const union AnimCmd *const sAnims_BRAVIARY_HISUIAN[] ={ +static const union AnimCmd *const sAnims_BRAVIARY_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_BRAVIARY_HISUIAN_1, }; +#endif -static const union AnimCmd *const sAnims_SLIGGOO_HISUIAN[] ={ +#if P_NEW_POKEMON >= GEN_6 +static const union AnimCmd *const sAnims_SLIGGOO_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_SLIGGOO_HISUIAN_1, }; -static const union AnimCmd *const sAnims_GOODRA_HISUIAN[] ={ +static const union AnimCmd *const sAnims_GOODRA_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_GOODRA_HISUIAN_1, }; -static const union AnimCmd *const sAnims_AVALUGG_HISUIAN[] ={ +static const union AnimCmd *const sAnims_AVALUGG_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_AVALUGG_HISUIAN_1, }; +#endif -static const union AnimCmd *const sAnims_DECIDUEYE_HISUIAN[] ={ +#if P_NEW_POKEMON >= GEN_7 +static const union AnimCmd *const sAnims_DECIDUEYE_HISUIAN[] = +{ sAnim_GeneralFrame0, sAnim_DECIDUEYE_HISUIAN_1, }; - -static const union AnimCmd *const sAnims_SHAYMIN_SKY[] ={ - sAnim_GeneralFrame0, - sAnim_SHAYMIN_SKY_1, -}; - -static const union AnimCmd *const sAnims_DIALGA_ORIGIN[] ={ - sAnim_GeneralFrame0, - sAnim_DIALGA_ORIGIN_1, -}; - -static const union AnimCmd *const sAnims_PALKIA_ORIGIN[] ={ - sAnim_GeneralFrame0, - sAnim_PALKIA_ORIGIN_1, -}; - -static const union AnimCmd *const sAnims_GIRATINA_ORIGIN[] ={ - sAnim_GeneralFrame0, - sAnim_GIRATINA_ORIGIN_1, -}; - -static const union AnimCmd *const sAnims_DARMANITAN_ZEN_MODE[] ={ - sAnim_GeneralFrame0, - sAnim_DARMANITAN_ZEN_MODE_1, -}; - -static const union AnimCmd *const sAnims_DARMANITAN_ZEN_MODE_GALARIAN[] ={ - sAnim_GeneralFrame0, - sAnim_DARMANITAN_ZEN_MODE_GALARIAN_1, -}; - -static const union AnimCmd *const sAnims_TORNADUS_THERIAN[] ={ - sAnim_GeneralFrame0, - sAnim_TORNADUS_THERIAN_1, -}; - -static const union AnimCmd *const sAnims_THUNDURUS_THERIAN[] ={ - sAnim_GeneralFrame0, - sAnim_THUNDURUS_THERIAN_1, -}; - -static const union AnimCmd *const sAnims_LANDORUS_THERIAN[] ={ - sAnim_GeneralFrame0, - sAnim_LANDORUS_THERIAN_1, -}; - -static const union AnimCmd *const sAnims_ENAMORUS_THERIAN[] ={ - sAnim_GeneralFrame0, - sAnim_ENAMORUS_THERIAN_1, -}; - -static const union AnimCmd *const sAnims_KELDEO_RESOLUTE[] ={ - sAnim_GeneralFrame0, - sAnim_KELDEO_RESOLUTE_1, -}; - -static const union AnimCmd *const sAnims_MELOETTA_PIROUETTE[] ={ - sAnim_GeneralFrame0, - sAnim_MELOETTA_PIROUETTE_1, -}; - -static const union AnimCmd *const sAnims_AEGISLASH_BLADE[] ={ - sAnim_GeneralFrame0, - sAnim_AEGISLASH_BLADE_1, -}; - -static const union AnimCmd *const sAnims_HOOPA_UNBOUND[] ={ - sAnim_GeneralFrame0, - sAnim_HOOPA_UNBOUND_1, -}; - -static const union AnimCmd *const sAnims_MINIOR_CORE[] ={ - sAnim_GeneralFrame0, - sAnim_MINIOR_CORE_1, -}; - -static const union AnimCmd *const sAnims_WISHIWASHI_SCHOOL[] ={ - sAnim_GeneralFrame0, - sAnim_WISHIWASHI_SCHOOL_1, -}; - -static const union AnimCmd *const sAnims_KYUREM_BLACK[] ={ - sAnim_GeneralFrame0, - sAnim_KYUREM_BLACK_1, -}; - -static const union AnimCmd *const sAnims_KYUREM_WHITE[] ={ - sAnim_GeneralFrame0, - sAnim_KYUREM_WHITE_1, -}; - -static const union AnimCmd *const sAnims_MIMIKYU_BUSTED[] ={ - sAnim_GeneralFrame0, - sAnim_MIMIKYU_BUSTED_1, -}; - -static const union AnimCmd *const sAnims_LYCANROC_MIDNIGHT[] ={ - sAnim_GeneralFrame0, - sAnim_LYCANROC_MIDNIGHT_1, -}; - -static const union AnimCmd *const sAnims_LYCANROC_DUSK[] ={ - sAnim_GeneralFrame0, - sAnim_LYCANROC_DUSK_1, -}; - -static const union AnimCmd *const sAnims_ZYGARDE_10[] ={ - sAnim_GeneralFrame0, - sAnim_ZYGARDE_10_1, -}; - -static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] ={ - sAnim_GeneralFrame0, - sAnim_ZYGARDE_COMPLETE_1, -}; #endif -static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] ={ + +static const union AnimCmd *const sAnims_PIKACHU_COSPLAY[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_COSPLAY_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ROCK_STAR[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ROCK_STAR_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_BELLE[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_BELLE_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_POP_STAR[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_POP_STAR_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_PH_D[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_PH_D_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_LIBRE[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_LIBRE_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ORIGINAL_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ORIGINAL_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_HOENN_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_HOENN_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_SINNOH_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_SINNOH_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_UNOVA_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_UNOVA_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_KALOS_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_KALOS_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_ALOLA_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_ALOLA_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_PARTNER_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_PARTNER_CAP_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_WORLD_CAP[] = +{ + sAnim_GeneralFrame0, + sAnim_PIKACHU_WORLD_CAP_1, +}; + +static const union AnimCmd *const sAnims_PICHU_SPIKY_EARED[] = { + sAnim_GeneralFrame0, + sAnim_PICHU_SPIKY_EARED_1, +}; +static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] = +{ sAnim_GeneralFrame0, sAnim_DEOXYS_ATTACK_1, sAnim_DEOXYS_ATTACK_2, }; -static const union AnimCmd *const sAnims_DEOXYS_DEFENSE[] ={ +static const union AnimCmd *const sAnims_DEOXYS_DEFENSE[] = +{ sAnim_GeneralFrame0, sAnim_DEOXYS_DEFENSE_1, sAnim_DEOXYS_DEFENSE_2, }; -static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={ +static const union AnimCmd *const sAnims_DEOXYS_SPEED[] = +{ sAnim_GeneralFrame0, sAnim_DEOXYS_SPEED_1, sAnim_DEOXYS_SPEED_2, }; -#if P_NEW_POKEMON == TRUE -static const union AnimCmd *const sAnims_PIKACHU_COSPLAY[] ={ +#if P_NEW_POKEMON >= GEN_4 +static const union AnimCmd *const sAnims_DIALGA_ORIGIN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_COSPLAY_1, + sAnim_DIALGA_ORIGIN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_ROCK_STAR[] ={ +static const union AnimCmd *const sAnims_PALKIA_ORIGIN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_ROCK_STAR_1, + sAnim_PALKIA_ORIGIN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_BELLE[] ={ +static const union AnimCmd *const sAnims_GIRATINA_ORIGIN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_BELLE_1, + sAnim_GIRATINA_ORIGIN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_POP_STAR[] ={ +static const union AnimCmd *const sAnims_SHAYMIN_SKY[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_POP_STAR_1, + sAnim_SHAYMIN_SKY_1, +}; +#endif + +#if P_NEW_POKEMON >= GEN_5 +static const union AnimCmd *const sAnims_DARMANITAN_ZEN_MODE[] = +{ + sAnim_GeneralFrame0, + sAnim_DARMANITAN_ZEN_MODE_1, }; -static const union AnimCmd *const sAnims_PIKACHU_PH_D[] ={ +static const union AnimCmd *const sAnims_DARMANITAN_ZEN_MODE_GALARIAN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_PH_D_1, + sAnim_DARMANITAN_ZEN_MODE_GALARIAN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_LIBRE[] ={ +static const union AnimCmd *const sAnims_TORNADUS_THERIAN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_LIBRE_1, + sAnim_TORNADUS_THERIAN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_ORIGINAL_CAP[] ={ +static const union AnimCmd *const sAnims_THUNDURUS_THERIAN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_ORIGINAL_CAP_1, + sAnim_THUNDURUS_THERIAN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_HOENN_CAP[] ={ +static const union AnimCmd *const sAnims_LANDORUS_THERIAN[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_HOENN_CAP_1, + sAnim_LANDORUS_THERIAN_1, }; -static const union AnimCmd *const sAnims_PIKACHU_SINNOH_CAP[] ={ +static const union AnimCmd *const sAnims_KYUREM_BLACK[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_SINNOH_CAP_1, + sAnim_KYUREM_BLACK_1, }; -static const union AnimCmd *const sAnims_PIKACHU_UNOVA_CAP[] ={ +static const union AnimCmd *const sAnims_KYUREM_WHITE[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_UNOVA_CAP_1, + sAnim_KYUREM_WHITE_1, }; -static const union AnimCmd *const sAnims_PIKACHU_KALOS_CAP[] ={ +static const union AnimCmd *const sAnims_KELDEO_RESOLUTE[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_KALOS_CAP_1, + sAnim_KELDEO_RESOLUTE_1, }; -static const union AnimCmd *const sAnims_PIKACHU_ALOLA_CAP[] ={ +static const union AnimCmd *const sAnims_MELOETTA_PIROUETTE[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_ALOLA_CAP_1, + sAnim_MELOETTA_PIROUETTE_1, +}; +#endif + +#if P_NEW_POKEMON >= GEN_6 +static const union AnimCmd *const sAnims_AEGISLASH_BLADE[] = +{ + sAnim_GeneralFrame0, + sAnim_AEGISLASH_BLADE_1, }; -static const union AnimCmd *const sAnims_PIKACHU_PARTNER_CAP[] ={ +static const union AnimCmd *const sAnims_ZYGARDE_10[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_PARTNER_CAP_1, + sAnim_ZYGARDE_10_1, }; -static const union AnimCmd *const sAnims_PIKACHU_WORLD_CAP[] ={ +static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] = +{ sAnim_GeneralFrame0, - sAnim_PIKACHU_WORLD_CAP_1, + sAnim_ZYGARDE_COMPLETE_1, }; -static const union AnimCmd *const sAnims_PICHU_SPIKY_EARED[] ={ +static const union AnimCmd *const sAnims_HOOPA_UNBOUND[] = +{ sAnim_GeneralFrame0, - sAnim_PICHU_SPIKY_EARED_1, + sAnim_HOOPA_UNBOUND_1, +}; +#endif + +#if P_NEW_POKEMON >= GEN_7 +static const union AnimCmd *const sAnims_MINIOR_CORE[] = +{ + sAnim_GeneralFrame0, + sAnim_MINIOR_CORE_1, +}; + +static const union AnimCmd *const sAnims_WISHIWASHI_SCHOOL[] = +{ + sAnim_GeneralFrame0, + sAnim_WISHIWASHI_SCHOOL_1, +}; + +static const union AnimCmd *const sAnims_MIMIKYU_BUSTED[] = +{ + sAnim_GeneralFrame0, + sAnim_MIMIKYU_BUSTED_1, +}; + +static const union AnimCmd *const sAnims_LYCANROC_MIDNIGHT[] = +{ + sAnim_GeneralFrame0, + sAnim_LYCANROC_MIDNIGHT_1, +}; + +static const union AnimCmd *const sAnims_LYCANROC_DUSK[] = +{ + sAnim_GeneralFrame0, + sAnim_LYCANROC_DUSK_1, +}; +#endif + +#if P_NEW_POKEMON >= GEN_8 +static const union AnimCmd *const sAnims_ENAMORUS_THERIAN[] = +{ + sAnim_GeneralFrame0, + sAnim_ENAMORUS_THERIAN_1, }; #endif @@ -15353,7 +16496,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(JIRACHI), ANIM_CMD(DEOXYS), ANIM_CMD(CHIMECHO), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 ANIM_CMD(TURTWIG), ANIM_CMD(GROTLE), ANIM_CMD(TORTERRA), @@ -15461,6 +16604,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DARKRAI), ANIM_CMD(SHAYMIN), ANIM_CMD(ARCEUS), +#endif +#if P_NEW_POKEMON >= GEN_5 ANIM_CMD(VICTINI), ANIM_CMD(SNIVY), ANIM_CMD(SERVINE), @@ -15617,6 +16762,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(KELDEO), ANIM_CMD(MELOETTA), ANIM_CMD(GENESECT), +#endif +#if P_NEW_POKEMON >= GEN_6 ANIM_CMD(CHESPIN), ANIM_CMD(QUILLADIN), ANIM_CMD(CHESNAUGHT), @@ -15689,6 +16836,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DIANCIE), ANIM_CMD(HOOPA), ANIM_CMD(VOLCANION), +#endif +#if P_NEW_POKEMON >= GEN_7 ANIM_CMD(ROWLET), ANIM_CMD(DARTRIX), ANIM_CMD(DECIDUEYE), @@ -15777,6 +16926,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(ZERAORA), ANIM_CMD(MELTAN), ANIM_CMD(MELMETAL), +#endif +#if P_NEW_POKEMON >= GEN_8 ANIM_CMD(GROOKEY), ANIM_CMD(THWACKEY), ANIM_CMD(RILLABOOM), @@ -15873,6 +17024,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(SNEASLER), ANIM_CMD(OVERQWIL), ANIM_CMD(ENAMORUS), +#endif ANIM_CMD(VENUSAUR_MEGA), ANIM_CMD(CHARIZARD_MEGA_X), ANIM_CMD(CHARIZARD_MEGA_Y), @@ -15913,13 +17065,19 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(METAGROSS_MEGA), ANIM_CMD(LATIAS_MEGA), ANIM_CMD(LATIOS_MEGA), +#if P_NEW_POKEMON >= GEN_4 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 ANIM_CMD(AUDINO_MEGA), +#endif +#if P_NEW_POKEMON >= GEN_6 ANIM_CMD(DIANCIE_MEGA), +#endif ANIM_CMD(RAYQUAZA_MEGA), ANIM_CMD(KYOGRE_PRIMAL), ANIM_CMD(GROUDON_PRIMAL), @@ -15956,10 +17114,12 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(CORSOLA_GALARIAN), ANIM_CMD(ZIGZAGOON_GALARIAN), ANIM_CMD(LINOONE_GALARIAN), +#if P_NEW_POKEMON >= GEN_5 ANIM_CMD(DARUMAKA_GALARIAN), ANIM_CMD(DARMANITAN_GALARIAN), ANIM_CMD(YAMASK_GALARIAN), ANIM_CMD(STUNFISK_GALARIAN), +#endif ANIM_CMD(GROWLITHE_HISUIAN), ANIM_CMD(ARCANINE_HISUIAN), ANIM_CMD(VOLTORB_HISUIAN), @@ -15967,15 +17127,21 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(TYPHLOSION_HISUIAN), ANIM_CMD(QWILFISH_HISUIAN), ANIM_CMD(SNEASEL_HISUIAN), +#if P_NEW_POKEMON >= GEN_5 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 ANIM_CMD(SLIGGOO_HISUIAN), ANIM_CMD(GOODRA_HISUIAN), ANIM_CMD(AVALUGG_HISUIAN), +#endif +#if P_NEW_POKEMON >= GEN_7 ANIM_CMD(DECIDUEYE_HISUIAN), +#endif ANIM_CMD(PIKACHU_COSPLAY), ANIM_CMD(PIKACHU_ROCK_STAR), ANIM_CMD(PIKACHU_BELLE), @@ -15991,7 +17157,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(PIKACHU_PARTNER_CAP), ANIM_CMD(PIKACHU_WORLD_CAP), ANIM_CMD(PICHU_SPIKY_EARED), -#endif ANIM_CMD(UNOWN_B), ANIM_CMD(UNOWN_C), ANIM_CMD(UNOWN_D), @@ -16025,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 ANIM_CMD_FULL(BURMY_SANDY_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(BURMY_TRASH_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(WORMADAM_SANDY_CLOAK, sAnims_WORMADAM), @@ -16059,6 +17224,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(ARCEUS_DRAGON, sAnims_ARCEUS), ANIM_CMD_FULL(ARCEUS_DARK, sAnims_ARCEUS), ANIM_CMD_FULL(ARCEUS_FAIRY, sAnims_ARCEUS), +#endif +#if P_NEW_POKEMON >= GEN_5 ANIM_CMD_FULL(BASCULIN_BLUE_STRIPED, sAnims_BASCULIN), ANIM_CMD_FULL(BASCULIN_WHITE_STRIPED, sAnims_BASCULIN), ANIM_CMD(DARMANITAN_ZEN_MODE), @@ -16072,7 +17239,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(TORNADUS_THERIAN), ANIM_CMD(THUNDURUS_THERIAN), ANIM_CMD(LANDORUS_THERIAN), - ANIM_CMD(ENAMORUS_THERIAN), ANIM_CMD(KYUREM_WHITE), ANIM_CMD(KYUREM_BLACK), ANIM_CMD(MELOETTA_PIROUETTE), @@ -16081,6 +17247,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(GENESECT_SHOCK_DRIVE, sAnims_GENESECT), ANIM_CMD_FULL(GENESECT_BURN_DRIVE, sAnims_GENESECT), ANIM_CMD_FULL(GENESECT_CHILL_DRIVE, sAnims_GENESECT), +#endif +#if P_NEW_POKEMON >= GEN_6 ANIM_CMD_FULL(GRENINJA_BATTLE_BOND, sAnims_GRENINJA), ANIM_CMD_FULL(GRENINJA_ASH, sAnims_GRENINJA), ANIM_CMD_FULL(VIVILLON_POLAR, sAnims_VIVILLON), @@ -16138,6 +17306,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(ZYGARDE_50_POWER_CONSTRUCT, sAnims_ZYGARDE), ANIM_CMD(ZYGARDE_COMPLETE), ANIM_CMD(HOOPA_UNBOUND), +#endif +#if P_NEW_POKEMON >= GEN_7 ANIM_CMD_FULL(ORICORIO_POM_POM, sAnims_ORICORIO), ANIM_CMD_FULL(ORICORIO_PAU, sAnims_ORICORIO), ANIM_CMD_FULL(ORICORIO_SENSU, sAnims_ORICORIO), @@ -16180,6 +17350,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(NECROZMA_DAWN_WINGS, sAnims_NECROZMA), ANIM_CMD_FULL(NECROZMA_ULTRA, sAnims_NECROZMA), ANIM_CMD_FULL(MAGEARNA_ORIGINAL_COLOR, sAnims_MAGEARNA), +#endif +#if P_NEW_POKEMON >= GEN_8 ANIM_CMD_FULL(CRAMORANT_GULPING, sAnims_CRAMORANT), ANIM_CMD_FULL(CRAMORANT_GORGING, sAnims_CRAMORANT), ANIM_CMD_FULL(TOXTRICITY_LOW_KEY, sAnims_TOXTRICITY), @@ -16203,6 +17375,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(ZARUDE_DADA, sAnims_ZARUDE), ANIM_CMD_FULL(CALYREX_ICE_RIDER, sAnims_CALYREX), ANIM_CMD_FULL(CALYREX_SHADOW_RIDER, sAnims_CALYREX), + ANIM_CMD(ENAMORUS_THERIAN), #endif ANIM_CMD(EGG), }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 4c41a50e1..f508087df 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(40, 48), @@ -2475,6 +2475,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(48, 56), @@ -3255,6 +3257,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), @@ -3615,6 +3619,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = { .size = MON_COORDS_SIZE(32, 40), @@ -4055,6 +4061,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 4, }, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = { .size = MON_COORDS_SIZE(40, 48), @@ -4535,6 +4543,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif // Megas [SPECIES_VENUSAUR_MEGA] = { @@ -4736,6 +4745,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#if P_NEW_POKEMON >= GEN_4 [SPECIES_LOPUNNY_MEGA] = { .size = MON_COORDS_SIZE(56, 64), @@ -4761,16 +4771,21 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 6, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = { @@ -4954,6 +4969,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 40), .y_offset = 13, }, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_DARUMAKA_GALARIAN] = { .size = MON_COORDS_SIZE(40, 40), @@ -4974,6 +4990,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(48, 40), .y_offset = 14, }, +#endif // Hisuian Forms [SPECIES_GROWLITHE_HISUIAN] = { @@ -5010,6 +5027,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 56), .y_offset = 7, }, +#if P_NEW_POKEMON >= GEN_5 [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5035,6 +5053,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), @@ -5050,11 +5070,14 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 48), .y_offset = 5, }, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = @@ -5134,7 +5157,6 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(32, 40), .y_offset = 14, }, -#endif // Unown [SPECIES_UNOWN_B] = { @@ -5303,7 +5325,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { @@ -5478,6 +5500,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { @@ -5548,11 +5572,6 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, - [SPECIES_ENAMORUS_THERIAN] = - { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 0, - }, // Kyurem [SPECIES_KYUREM_WHITE] = { @@ -5597,6 +5616,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = { @@ -5895,6 +5916,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM] = { @@ -6114,6 +6137,8 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 64), .y_offset = 0, }, +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING] = { @@ -6243,6 +6268,11 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, + [SPECIES_ENAMORUS_THERIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, #endif // Egg [SPECIES_EGG] = diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index d94162a4b..76fec7264 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig), SPECIES_SPRITE(GROTLE, gMonFrontPic_Grotle), SPECIES_SPRITE(TORTERRA, gMonFrontPic_Torterra), @@ -495,6 +495,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(DARKRAI, gMonFrontPic_Darkrai), SPECIES_SPRITE(SHAYMIN, gMonFrontPic_Shaymin), SPECIES_SPRITE(ARCEUS, gMonFrontPic_Arceus), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SPRITE(VICTINI, gMonFrontPic_Victini), SPECIES_SPRITE(SNIVY, gMonFrontPic_Snivy), SPECIES_SPRITE(SERVINE, gMonFrontPic_Servine), @@ -651,6 +653,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(KELDEO, gMonFrontPic_Keldeo), SPECIES_SPRITE(MELOETTA, gMonFrontPic_Meloetta), SPECIES_SPRITE(GENESECT, gMonFrontPic_Genesect), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(CHESPIN, gMonFrontPic_Chespin), SPECIES_SPRITE(QUILLADIN, gMonFrontPic_Quilladin), SPECIES_SPRITE(CHESNAUGHT, gMonFrontPic_Chesnaught), @@ -723,6 +727,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(DIANCIE, gMonFrontPic_Diancie), SPECIES_SPRITE(HOOPA, gMonFrontPic_Hoopa), SPECIES_SPRITE(VOLCANION, gMonFrontPic_Volcanion), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_SPRITE(ROWLET, gMonFrontPic_Rowlet), SPECIES_SPRITE(DARTRIX, gMonFrontPic_Dartrix), SPECIES_SPRITE(DECIDUEYE, gMonFrontPic_Decidueye), @@ -811,6 +817,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ZERAORA, gMonFrontPic_Zeraora), SPECIES_SPRITE(MELTAN, gMonFrontPic_Meltan), SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SPRITE(GROOKEY, gMonFrontPic_Grookey), SPECIES_SPRITE(THWACKEY, gMonFrontPic_Thwackey), SPECIES_SPRITE(RILLABOOM, gMonFrontPic_Rillaboom), @@ -907,7 +915,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler), SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil), SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus), - +#endif SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX), SPECIES_SPRITE(CHARIZARD_MEGA_Y, gMonFrontPic_CharizardMegaY), @@ -948,13 +956,19 @@ 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 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 SPECIES_SPRITE(AUDINO_MEGA, gMonFrontPic_AudinoMega), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(DIANCIE_MEGA, gMonFrontPic_DiancieMega), +#endif SPECIES_SPRITE(RAYQUAZA_MEGA, gMonFrontPic_RayquazaMega), SPECIES_SPRITE(KYOGRE_PRIMAL, gMonFrontPic_KyogrePrimal), @@ -994,10 +1008,12 @@ 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 SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonFrontPic_DarumakaGalarian), SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonFrontPic_DarmanitanGalarian), SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonFrontPic_StunfiskGalarian), +#endif SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonFrontPic_GrowlitheHisuian), SPECIES_SPRITE(ARCANINE_HISUIAN, gMonFrontPic_ArcanineHisuian), @@ -1006,15 +1022,21 @@ 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 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 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 SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian), +#endif SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonFrontPic_PikachuRockStar), @@ -1033,7 +1055,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonFrontPic_PikachuWorldCap), SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonFrontPic_PichuSpikyEared), -#endif + SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB), SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC), SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD), @@ -1069,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonFrontPic_BurmySandyCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonFrontPic_BurmyTrashCloak), @@ -1111,7 +1133,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ARCEUS_DRAGON, gMonFrontPic_Arceus), SPECIES_SPRITE(ARCEUS_DARK, gMonFrontPic_Arceus), SPECIES_SPRITE(ARCEUS_FAIRY, gMonFrontPic_Arceus), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonFrontPic_BasculinBlueStriped), SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_BasculinWhiteStriped), @@ -1129,7 +1153,6 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(TORNADUS_THERIAN, gMonFrontPic_TornadusTherian), SPECIES_SPRITE(THUNDURUS_THERIAN, gMonFrontPic_ThundurusTherian), SPECIES_SPRITE(LANDORUS_THERIAN, gMonFrontPic_LandorusTherian), - SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian), SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite), SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack), @@ -1142,7 +1165,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(GENESECT_SHOCK_DRIVE, gMonFrontPic_Genesect), SPECIES_SPRITE(GENESECT_BURN_DRIVE, gMonFrontPic_Genesect), SPECIES_SPRITE(GENESECT_CHILL_DRIVE, gMonFrontPic_Genesect), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(GRENINJA_BATTLE_BOND, gMonFrontPic_Greninja), SPECIES_SPRITE(GRENINJA_ASH, gMonFrontPic_GreninjaAsh), @@ -1212,7 +1237,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonFrontPic_ZygardeComplete), SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom), SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu), @@ -1263,7 +1290,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(NECROZMA_ULTRA, gMonFrontPic_NecrozmaUltra), SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonFrontPic_MagearnaOriginalColor), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SPRITE(CRAMORANT_GULPING, gMonFrontPic_CramorantGulping), SPECIES_SPRITE(CRAMORANT_GORGING, gMonFrontPic_CramorantGorging), @@ -1300,6 +1329,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider), SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider), + + SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; @@ -1307,7 +1338,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF), @@ -1318,10 +1349,16 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF), SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF), SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), +#endif +#if P_NEW_POKEMON >= GEN_7 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 65fbf835b..7a5d2267c 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_PAL(TURTWIG, gMonPalette_Turtwig), SPECIES_PAL(GROTLE, gMonPalette_Grotle), SPECIES_PAL(TORTERRA, gMonPalette_Torterra), @@ -495,6 +495,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(DARKRAI, gMonPalette_Darkrai), SPECIES_PAL(SHAYMIN, gMonPalette_Shaymin), SPECIES_PAL(ARCEUS, gMonPalette_Arceus), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_PAL(VICTINI, gMonPalette_Victini), SPECIES_PAL(SNIVY, gMonPalette_Snivy), SPECIES_PAL(SERVINE, gMonPalette_Servine), @@ -651,6 +653,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(KELDEO, gMonPalette_Keldeo), SPECIES_PAL(MELOETTA, gMonPalette_Meloetta), SPECIES_PAL(GENESECT, gMonPalette_Genesect), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_PAL(CHESPIN, gMonPalette_Chespin), SPECIES_PAL(QUILLADIN, gMonPalette_Quilladin), SPECIES_PAL(CHESNAUGHT, gMonPalette_Chesnaught), @@ -723,6 +727,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(DIANCIE, gMonPalette_Diancie), SPECIES_PAL(HOOPA, gMonPalette_Hoopa), SPECIES_PAL(VOLCANION, gMonPalette_Volcanion), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_PAL(ROWLET, gMonPalette_Rowlet), SPECIES_PAL(DARTRIX, gMonPalette_Dartrix), SPECIES_PAL(DECIDUEYE, gMonPalette_Decidueye), @@ -811,6 +817,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ZERAORA, gMonPalette_Zeraora), SPECIES_PAL(MELTAN, gMonPalette_Meltan), SPECIES_PAL(MELMETAL, gMonPalette_Melmetal), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_PAL(GROOKEY, gMonPalette_Grookey), SPECIES_PAL(THWACKEY, gMonPalette_Thwackey), SPECIES_PAL(RILLABOOM, gMonPalette_Rillaboom), @@ -907,7 +915,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler), SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil), SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus), - +#endif SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega), SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX), SPECIES_PAL(CHARIZARD_MEGA_Y, gMonPalette_CharizardMegaY), @@ -948,13 +956,19 @@ 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 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 SPECIES_PAL(AUDINO_MEGA, gMonPalette_AudinoMega), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_PAL(DIANCIE_MEGA, gMonPalette_DiancieMega), +#endif SPECIES_PAL(RAYQUAZA_MEGA, gMonPalette_RayquazaMega), SPECIES_PAL(KYOGRE_PRIMAL, gMonPalette_KyogrePrimal), @@ -994,10 +1008,12 @@ 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 SPECIES_PAL(DARUMAKA_GALARIAN, gMonPalette_DarumakaGalarian), SPECIES_PAL(DARMANITAN_GALARIAN, gMonPalette_DarmanitanGalarian), SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian), SPECIES_PAL(STUNFISK_GALARIAN, gMonPalette_StunfiskGalarian), +#endif SPECIES_PAL(GROWLITHE_HISUIAN, gMonPalette_GrowlitheHisuian), SPECIES_PAL(ARCANINE_HISUIAN, gMonPalette_ArcanineHisuian), @@ -1005,16 +1021,22 @@ 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 SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian), SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian), SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian), SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_ZoruaHisuian), SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_ZoroarkHisuian), SPECIES_PAL(BRAVIARY_HISUIAN, gMonPalette_BraviaryHisuian), +#endif +#if P_NEW_POKEMON >= GEN_6 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 SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian), +#endif SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay), SPECIES_PAL(PIKACHU_ROCK_STAR, gMonPalette_PikachuRockStar), @@ -1033,7 +1055,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(PIKACHU_WORLD_CAP, gMonPalette_PikachuWorldCap), SPECIES_PAL(PICHU_SPIKY_EARED, gMonPalette_PichuSpikyEared), -#endif + SPECIES_PAL(UNOWN_B, gMonPalette_Unown), SPECIES_PAL(UNOWN_C, gMonPalette_Unown), SPECIES_PAL(UNOWN_D, gMonPalette_Unown), @@ -1069,7 +1091,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(DEOXYS_ATTACK, gMonPalette_DeoxysAttack), SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense), SPECIES_PAL(DEOXYS_SPEED, gMonPalette_DeoxysSpeed), -#if P_NEW_POKEMON == TRUE + +#if P_NEW_POKEMON >= GEN_4 SPECIES_PAL(BURMY_SANDY_CLOAK, gMonPalette_BurmySandyCloak), SPECIES_PAL(BURMY_TRASH_CLOAK, gMonPalette_BurmyTrashCloak), @@ -1111,7 +1134,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ARCEUS_DRAGON, gMonPalette_ArceusDragon), SPECIES_PAL(ARCEUS_DARK, gMonPalette_ArceusDark), SPECIES_PAL(ARCEUS_FAIRY, gMonPalette_ArceusFairy), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_PAL(BASCULIN_BLUE_STRIPED, gMonPalette_BasculinBlueStriped), SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_BasculinWhiteStriped), @@ -1129,7 +1154,6 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(TORNADUS_THERIAN, gMonPalette_TornadusTherian), SPECIES_PAL(THUNDURUS_THERIAN, gMonPalette_ThundurusTherian), SPECIES_PAL(LANDORUS_THERIAN, gMonPalette_LandorusTherian), - SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian), SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite), SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack), @@ -1142,7 +1166,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(GENESECT_SHOCK_DRIVE, gMonPalette_GenesectShockDrive), SPECIES_PAL(GENESECT_BURN_DRIVE, gMonPalette_GenesectBurnDrive), SPECIES_PAL(GENESECT_CHILL_DRIVE, gMonPalette_GenesectChillDrive), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_PAL(GRENINJA_BATTLE_BOND, gMonPalette_Greninja), SPECIES_PAL(GRENINJA_ASH, gMonPalette_GreninjaAsh), @@ -1212,7 +1238,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ZYGARDE_COMPLETE, gMonPalette_ZygardeComplete), SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom), SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau), SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu), @@ -1263,7 +1291,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(NECROZMA_ULTRA, gMonPalette_NecrozmaUltra), SPECIES_PAL(MAGEARNA_ORIGINAL_COLOR, gMonPalette_MagearnaOriginalColor), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(CRAMORANT_GORGING, gMonPalette_CramorantGorging), @@ -1300,6 +1330,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider), SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider), + SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian), #endif SPECIES_PAL(EGG, gMonPalette_Egg), }; @@ -1307,7 +1338,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = const struct CompressedSpritePalette gMonPaletteTableFemale[] = { SPECIES_PAL(EEVEE, gMonPalette_Eevee), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_PAL(COMBEE, gMonPalette_Combee), SPECIES_PAL(STARLY, gMonPalette_Starly), SPECIES_PAL(STARAVIA, gMonPalette_Staravia), @@ -1318,10 +1349,16 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(SHINX, gMonPalette_Shinx), SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), SPECIES_PAL(FRILLISH, gMonPalette_FrillishF), SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_PAL(PYROAR, gMonPalette_PyroarF), +#endif +#if P_NEW_POKEMON >= GEN_8 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 c029e91e1..3723dc209 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SHINY_PAL(TURTWIG, gMonShinyPalette_Turtwig), SPECIES_SHINY_PAL(GROTLE, gMonShinyPalette_Grotle), SPECIES_SHINY_PAL(TORTERRA, gMonShinyPalette_Torterra), @@ -495,6 +495,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(DARKRAI, gMonShinyPalette_Darkrai), SPECIES_SHINY_PAL(SHAYMIN, gMonShinyPalette_Shaymin), SPECIES_SHINY_PAL(ARCEUS, gMonShinyPalette_Arceus), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SHINY_PAL(VICTINI, gMonShinyPalette_Victini), SPECIES_SHINY_PAL(SNIVY, gMonShinyPalette_Snivy), SPECIES_SHINY_PAL(SERVINE, gMonShinyPalette_Servine), @@ -651,6 +653,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(KELDEO, gMonShinyPalette_Keldeo), SPECIES_SHINY_PAL(MELOETTA, gMonShinyPalette_Meloetta), SPECIES_SHINY_PAL(GENESECT, gMonShinyPalette_Genesect), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SHINY_PAL(CHESPIN, gMonShinyPalette_Chespin), SPECIES_SHINY_PAL(QUILLADIN, gMonShinyPalette_Quilladin), SPECIES_SHINY_PAL(CHESNAUGHT, gMonShinyPalette_Chesnaught), @@ -723,6 +727,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(DIANCIE, gMonShinyPalette_Diancie), SPECIES_SHINY_PAL(HOOPA, gMonShinyPalette_Hoopa), SPECIES_SHINY_PAL(VOLCANION, gMonShinyPalette_Volcanion), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_SHINY_PAL(ROWLET, gMonShinyPalette_Rowlet), SPECIES_SHINY_PAL(DARTRIX, gMonShinyPalette_Dartrix), SPECIES_SHINY_PAL(DECIDUEYE, gMonShinyPalette_Decidueye), @@ -811,6 +817,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ZERAORA, gMonShinyPalette_Zeraora), SPECIES_SHINY_PAL(MELTAN, gMonShinyPalette_Meltan), SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SHINY_PAL(GROOKEY, gMonShinyPalette_Grookey), SPECIES_SHINY_PAL(THWACKEY, gMonShinyPalette_Thwackey), SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_Rillaboom), @@ -907,6 +915,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler), SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil), SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus), +#endif SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega), SPECIES_SHINY_PAL(CHARIZARD_MEGA_X, gMonShinyPalette_CharizardMegaX), @@ -948,13 +957,19 @@ 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 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 SPECIES_SHINY_PAL(AUDINO_MEGA, gMonShinyPalette_AudinoMega), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SHINY_PAL(DIANCIE_MEGA, gMonShinyPalette_DiancieMega), +#endif SPECIES_SHINY_PAL(RAYQUAZA_MEGA, gMonShinyPalette_RayquazaMega), SPECIES_SHINY_PAL(KYOGRE_PRIMAL, gMonShinyPalette_KyogrePrimal), @@ -994,10 +1009,12 @@ 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 SPECIES_SHINY_PAL(DARUMAKA_GALARIAN, gMonShinyPalette_DarumakaGalarian), SPECIES_SHINY_PAL(DARMANITAN_GALARIAN, gMonShinyPalette_DarmanitanGalarian), SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian), SPECIES_SHINY_PAL(STUNFISK_GALARIAN, gMonShinyPalette_StunfiskGalarian), +#endif SPECIES_SHINY_PAL(GROWLITHE_HISUIAN, gMonShinyPalette_GrowlitheHisuian), SPECIES_SHINY_PAL(ARCANINE_HISUIAN, gMonShinyPalette_ArcanineHisuian), @@ -1006,15 +1023,21 @@ 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 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 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 SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian), +#endif SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay), SPECIES_SHINY_PAL(PIKACHU_ROCK_STAR, gMonShinyPalette_PikachuRockStar), @@ -1033,7 +1056,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(PIKACHU_WORLD_CAP, gMonShinyPalette_PikachuWorldCap), SPECIES_SHINY_PAL(PICHU_SPIKY_EARED, gMonShinyPalette_PichuSpikyEared), -#endif + SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_D, gMonShinyPalette_Unown), @@ -1069,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SHINY_PAL(BURMY_SANDY_CLOAK, gMonShinyPalette_BurmySandyCloak), SPECIES_SHINY_PAL(BURMY_TRASH_CLOAK, gMonShinyPalette_BurmyTrashCloak), @@ -1111,7 +1134,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ARCEUS_DRAGON, gMonShinyPalette_ArceusDragon), SPECIES_SHINY_PAL(ARCEUS_DARK, gMonShinyPalette_ArceusDark), SPECIES_SHINY_PAL(ARCEUS_FAIRY, gMonShinyPalette_ArceusFairy), - +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_SHINY_PAL(BASCULIN_BLUE_STRIPED, gMonShinyPalette_BasculinBlueStriped), SPECIES_SHINY_PAL(BASCULIN_WHITE_STRIPED, gMonShinyPalette_BasculinWhiteStriped), @@ -1129,7 +1153,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(TORNADUS_THERIAN, gMonShinyPalette_TornadusTherian), SPECIES_SHINY_PAL(THUNDURUS_THERIAN, gMonShinyPalette_ThundurusTherian), SPECIES_SHINY_PAL(LANDORUS_THERIAN, gMonShinyPalette_LandorusTherian), - SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian), SPECIES_SHINY_PAL(KYUREM_WHITE, gMonShinyPalette_KyuremWhite), SPECIES_SHINY_PAL(KYUREM_BLACK, gMonShinyPalette_KyuremBlack), @@ -1142,7 +1165,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(GENESECT_SHOCK_DRIVE, gMonShinyPalette_GenesectShockDrive), SPECIES_SHINY_PAL(GENESECT_BURN_DRIVE, gMonShinyPalette_GenesectBurnDrive), SPECIES_SHINY_PAL(GENESECT_CHILL_DRIVE, gMonShinyPalette_GenesectChillDrive), - +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_SHINY_PAL(GRENINJA_BATTLE_BOND, gMonShinyPalette_Greninja), SPECIES_SHINY_PAL(GRENINJA_ASH, gMonShinyPalette_GreninjaAsh), @@ -1212,7 +1236,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ZYGARDE_COMPLETE, gMonShinyPalette_ZygardeComplete), SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_SHINY_PAL(ORICORIO_POM_POM, gMonShinyPalette_OricorioPomPom), SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau), SPECIES_SHINY_PAL(ORICORIO_SENSU, gMonShinyPalette_OricorioSensu), @@ -1263,7 +1289,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(NECROZMA_ULTRA, gMonShinyPalette_NecrozmaUltra), SPECIES_SHINY_PAL(MAGEARNA_ORIGINAL_COLOR, gMonShinyPalette_MagearnaOriginalColor), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_SHINY_PAL(CRAMORANT_GULPING, gMonShinyPalette_CramorantGulping), SPECIES_SHINY_PAL(CRAMORANT_GORGING, gMonShinyPalette_CramorantGorging), @@ -1300,6 +1328,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider), SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider), + + SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian), #endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), }; @@ -1307,7 +1337,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_SHINY_PAL(STARLY, gMonShinyPalette_Starly), SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia), SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor), @@ -1318,10 +1348,16 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee), SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), +#endif +#if P_NEW_POKEMON >= GEN_5 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 SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), +#endif +#if P_NEW_POKEMON >= GEN_8 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 ad0a1ba7c..4f6d700a3 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = _("Turtwig"), [SPECIES_GROTLE] = _("Grotle"), [SPECIES_TORTERRA] = _("Torterra"), @@ -494,6 +494,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DARKRAI] = _("Darkrai"), [SPECIES_SHAYMIN] = _("Shaymin"), [SPECIES_ARCEUS] = _("Arceus"), +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = _("Victini"), [SPECIES_SNIVY] = _("Snivy"), [SPECIES_SERVINE] = _("Servine"), @@ -650,6 +652,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_KELDEO] = _("Keldeo"), [SPECIES_MELOETTA] = _("Meloetta"), [SPECIES_GENESECT] = _("Genesect"), +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = _("Chespin"), [SPECIES_QUILLADIN] = _("Quilladin"), [SPECIES_CHESNAUGHT] = _("Chesnaught"), @@ -722,6 +726,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DIANCIE] = _("Diancie"), [SPECIES_HOOPA] = _("Hoopa"), [SPECIES_VOLCANION] = _("Volcanion"), +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = _("Rowlet"), [SPECIES_DARTRIX] = _("Dartrix"), [SPECIES_DECIDUEYE] = _("Decidueye"), @@ -810,6 +816,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ZERAORA] = _("Zeraora"), [SPECIES_MELTAN] = _("Meltan"), [SPECIES_MELMETAL] = _("Melmetal"), +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = _("Grookey"), [SPECIES_THWACKEY] = _("Thwackey"), [SPECIES_RILLABOOM] = _("Rillaboom"), @@ -906,6 +914,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SNEASLER] = _("Sneasler"), [SPECIES_OVERQWIL] = _("Overqwil"), [SPECIES_ENAMORUS] = _("Enamorus"), +#endif // Megas [SPECIES_VENUSAUR_MEGA] = _("Venusaur"), @@ -948,13 +957,19 @@ 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 [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 [SPECIES_AUDINO_MEGA] = _("Audino"), +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = _("Diancie"), +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = _("Rayquaza"), [SPECIES_KYOGRE_PRIMAL] = _("Kyogre"), @@ -996,10 +1011,12 @@ 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 [SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"), [SPECIES_DARMANITAN_GALARIAN] = _("Darmanitan"), [SPECIES_YAMASK_GALARIAN] = _("Yamask"), [SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"), +#endif //Hisuian Forms [SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"), @@ -1009,15 +1026,21 @@ 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 [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 [SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"), [SPECIES_GOODRA_HISUIAN] = _("Goodra"), [SPECIES_AVALUGG_HISUIAN] = _("Avalugg"), +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), +#endif // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), @@ -1037,7 +1060,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"), // Pichu [SPECIES_PICHU_SPIKY_EARED] = _("Pichu"), -#endif // Unown [SPECIES_UNOWN_B] = _("Unown"), [SPECIES_UNOWN_C] = _("Unown"), @@ -1074,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"), [SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"), @@ -1117,6 +1139,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ARCEUS_DRAGON] = _("Arceus"), [SPECIES_ARCEUS_DARK] = _("Arceus"), [SPECIES_ARCEUS_FAIRY] = _("Arceus"), +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"), [SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"), @@ -1148,6 +1172,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GENESECT_SHOCK_DRIVE] = _("Genesect"), [SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"), [SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"), +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = _("Greninja"), [SPECIES_GRENINJA_ASH] = _("Greninja"), @@ -1218,6 +1244,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), // Hoopa [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), [SPECIES_ORICORIO_PAU] = _("Oricorio"), @@ -1269,6 +1297,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_NECROZMA_ULTRA] = _("Necrozma"), // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"), +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING] = _("Cramorant"), [SPECIES_CRAMORANT_GORGING] = _("Cramorant"), diff --git a/src/pokemon.c b/src/pokemon.c index 350aebf0b..8e8e60b68 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_TO_HOENN(RHYPERIOR), #endif SPECIES_TO_HOENN(SNORUNT), SPECIES_TO_HOENN(GLALIE), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 SPECIES_TO_NATIONAL(TURTWIG), SPECIES_TO_NATIONAL(GROTLE), SPECIES_TO_NATIONAL(TORTERRA), @@ -833,6 +833,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(DARKRAI), SPECIES_TO_NATIONAL(SHAYMIN), SPECIES_TO_NATIONAL(ARCEUS), +#endif +#if P_NEW_POKEMON >= GEN_5 SPECIES_TO_NATIONAL(VICTINI), SPECIES_TO_NATIONAL(SNIVY), SPECIES_TO_NATIONAL(SERVINE), @@ -989,6 +991,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(KELDEO), SPECIES_TO_NATIONAL(MELOETTA), SPECIES_TO_NATIONAL(GENESECT), +#endif +#if P_NEW_POKEMON >= GEN_6 SPECIES_TO_NATIONAL(CHESPIN), SPECIES_TO_NATIONAL(QUILLADIN), SPECIES_TO_NATIONAL(CHESNAUGHT), @@ -1061,6 +1065,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(DIANCIE), SPECIES_TO_NATIONAL(HOOPA), SPECIES_TO_NATIONAL(VOLCANION), +#endif +#if P_NEW_POKEMON >= GEN_7 SPECIES_TO_NATIONAL(ROWLET), SPECIES_TO_NATIONAL(DARTRIX), SPECIES_TO_NATIONAL(DECIDUEYE), @@ -1149,6 +1155,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(ZERAORA), SPECIES_TO_NATIONAL(MELTAN), SPECIES_TO_NATIONAL(MELMETAL), +#endif +#if P_NEW_POKEMON >= GEN_8 SPECIES_TO_NATIONAL(GROOKEY), SPECIES_TO_NATIONAL(THWACKEY), SPECIES_TO_NATIONAL(RILLABOOM), @@ -1245,6 +1253,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SNEASLER), SPECIES_TO_NATIONAL(OVERQWIL), SPECIES_TO_NATIONAL(ENAMORUS), +#endif // Megas [SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR, @@ -1287,13 +1296,19 @@ 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 [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 [SPECIES_AUDINO_MEGA - 1] = NATIONAL_DEX_AUDINO, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA - 1] = NATIONAL_DEX_DIANCIE, +#endif // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA - 1] = NATIONAL_DEX_RAYQUAZA, [SPECIES_KYOGRE_PRIMAL - 1] = NATIONAL_DEX_KYOGRE, @@ -1333,10 +1348,12 @@ 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 [SPECIES_DARUMAKA_GALARIAN - 1] = NATIONAL_DEX_DARUMAKA, [SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK, [SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK, +#endif //Hisuian Forms [SPECIES_GROWLITHE_HISUIAN - 1] = NATIONAL_DEX_GROWLITHE, [SPECIES_ARCANINE_HISUIAN - 1] = NATIONAL_DEX_ARCANINE, @@ -1345,15 +1362,21 @@ 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 [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 [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 [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, +#endif // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU, @@ -1372,7 +1395,6 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_PIKACHU_WORLD_CAP - 1] = NATIONAL_DEX_PIKACHU, // Pichu [SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU, -#endif // Unown [SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN, [SPECIES_UNOWN_C - 1] = NATIONAL_DEX_UNOWN, @@ -1409,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 // Burmy [SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY, [SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY, @@ -1452,6 +1474,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ARCEUS_DRAGON - 1] = NATIONAL_DEX_ARCEUS, [SPECIES_ARCEUS_DARK - 1] = NATIONAL_DEX_ARCEUS, [SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS, +#endif +#if P_NEW_POKEMON >= GEN_5 // Basculin [SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, [SPECIES_BASCULIN_WHITE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, @@ -1470,7 +1494,6 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_TORNADUS_THERIAN - 1] = NATIONAL_DEX_TORNADUS, [SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS, [SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS, - [SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS, // Kyurem [SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM, [SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM, @@ -1483,6 +1506,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_GENESECT_SHOCK_DRIVE - 1] = NATIONAL_DEX_GENESECT, [SPECIES_GENESECT_BURN_DRIVE - 1] = NATIONAL_DEX_GENESECT, [SPECIES_GENESECT_CHILL_DRIVE - 1] = NATIONAL_DEX_GENESECT, +#endif +#if P_NEW_POKEMON >= GEN_6 // Greninja [SPECIES_GRENINJA_BATTLE_BOND - 1] = NATIONAL_DEX_GRENINJA, [SPECIES_GRENINJA_ASH - 1] = NATIONAL_DEX_GRENINJA, @@ -1553,6 +1578,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ZYGARDE_COMPLETE - 1] = NATIONAL_DEX_ZYGARDE, // Hoopa [SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA, +#endif +#if P_NEW_POKEMON >= GEN_7 // Oricorio [SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO, [SPECIES_ORICORIO_PAU - 1] = NATIONAL_DEX_ORICORIO, @@ -1604,6 +1631,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_NECROZMA_ULTRA - 1] = NATIONAL_DEX_NECROZMA, // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR - 1] = NATIONAL_DEX_MAGEARNA, +#endif +#if P_NEW_POKEMON >= GEN_8 // Cramorant [SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT, [SPECIES_CRAMORANT_GORGING - 1] = NATIONAL_DEX_CRAMORANT, @@ -1641,6 +1670,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Calyrex [SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX, + [SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS, #endif }; @@ -1678,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(GALLADE), #endif HOENN_TO_NATIONAL(SURSKIT), @@ -1710,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(PROBOPASS), #endif HOENN_TO_NATIONAL(SKITTY), @@ -1736,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(MAGNEZONE), #endif HOENN_TO_NATIONAL(VOLTORB), @@ -1749,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(BUDEW), HOENN_TO_NATIONAL(ROSELIA), HOENN_TO_NATIONAL(ROSERADE), @@ -1811,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(DUSKNOIR), HOENN_TO_NATIONAL(TROPIUS), HOENN_TO_NATIONAL(CHINGLING), @@ -1838,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(RHYPERIOR), #endif HOENN_TO_NATIONAL(SNORUNT), HOENN_TO_NATIONAL(GLALIE), -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 HOENN_TO_NATIONAL(FROSLASS), #endif HOENN_TO_NATIONAL(SPHEAL), @@ -1923,11 +1953,7 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] = #include "data/pokemon/base_stats.h" #include "data/pokemon/level_up_learnsets.h" #include "data/pokemon/teachable_learnsets.h" -#if P_NEW_POKEMON == TRUE #include "data/pokemon/evolution.h" -#else -#include "data/pokemon/evolution_old.h" -#endif #include "data/pokemon/level_up_learnset_pointers.h" #include "data/pokemon/teachable_learnset_pointers.h" #include "data/pokemon/form_species_tables.h" @@ -2329,7 +2355,6 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_JIRACHI - 1] = ANIM_SWING_CONVEX, [SPECIES_DEOXYS - 1] = ANIM_H_PIVOT, -#if P_NEW_POKEMON == TRUE // Gen 4 [SPECIES_TURTWIG - 1] = ANIM_V_SLIDE, [SPECIES_GROTLE - 1] = ANIM_H_SLIDE, @@ -2882,7 +2907,6 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_ARCEUS_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE, [SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE, [SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE, -#endif }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = @@ -2942,8 +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 == TRUE +#if P_NEW_POKEMON >= GEN_7 [SPECIES_TAPU_FINI - 1] = 5, +#endif +#if P_NEW_POKEMON >= GEN_4 [SPECIES_ROTOM_FAN - 1] = 7, #endif }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 4bbdf07b0..fe71f51ce 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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_TURTWIG] = gMonIcon_Turtwig, [SPECIES_GROTLE] = gMonIcon_Grotle, [SPECIES_TORTERRA] = gMonIcon_Torterra, @@ -521,6 +521,8 @@ const u8 *const gMonIconTable[] = [SPECIES_DARKRAI] = gMonIcon_Darkrai, [SPECIES_SHAYMIN] = gMonIcon_Shaymin, [SPECIES_ARCEUS] = gMonIcon_Arceus, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_VICTINI] = gMonIcon_Victini, [SPECIES_SNIVY] = gMonIcon_Snivy, [SPECIES_SERVINE] = gMonIcon_Servine, @@ -677,6 +679,8 @@ const u8 *const gMonIconTable[] = [SPECIES_KELDEO] = gMonIcon_Keldeo, [SPECIES_MELOETTA] = gMonIcon_Meloetta, [SPECIES_GENESECT] = gMonIcon_Genesect, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_CHESPIN] = gMonIcon_Chespin, [SPECIES_QUILLADIN] = gMonIcon_Quilladin, [SPECIES_CHESNAUGHT] = gMonIcon_Chesnaught, @@ -749,6 +753,8 @@ const u8 *const gMonIconTable[] = [SPECIES_DIANCIE] = gMonIcon_Diancie, [SPECIES_HOOPA] = gMonIcon_Hoopa, [SPECIES_VOLCANION] = gMonIcon_Volcanion, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ROWLET] = gMonIcon_Rowlet, [SPECIES_DARTRIX] = gMonIcon_Dartrix, [SPECIES_DECIDUEYE] = gMonIcon_Decidueye, @@ -837,6 +843,8 @@ const u8 *const gMonIconTable[] = [SPECIES_ZERAORA] = gMonIcon_Zeraora, [SPECIES_MELTAN] = gMonIcon_Meltan, [SPECIES_MELMETAL] = gMonIcon_Melmetal, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_GROOKEY] = gMonIcon_Grookey, [SPECIES_THWACKEY] = gMonIcon_Thwackey, [SPECIES_RILLABOOM] = gMonIcon_Rillaboom, @@ -933,6 +941,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SNEASLER] = gMonIcon_Sneasler, [SPECIES_OVERQWIL] = gMonIcon_Overqwil, [SPECIES_ENAMORUS] = gMonIcon_Enamorus, +#endif [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, @@ -973,13 +982,19 @@ 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 [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 [SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega, +#endif [SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega, [SPECIES_KYOGRE_PRIMAL] = gMonIcon_KyogrePrimal, [SPECIES_GROUDON_PRIMAL] = gMonIcon_GroudonPrimal, @@ -1016,10 +1031,12 @@ 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 [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, +#endif [SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian, [SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian, [SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian, @@ -1027,15 +1044,21 @@ 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 [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 [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, +#endif [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, @@ -1051,7 +1074,6 @@ const u8 *const gMonIconTable[] = [SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap, [SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark, [SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared, -#endif [SPECIES_UNOWN_B] = gMonIcon_UnownB, [SPECIES_UNOWN_C] = gMonIcon_UnownC, [SPECIES_UNOWN_D] = gMonIcon_UnownD, @@ -1085,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 == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak, [SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak, [SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak, @@ -1119,6 +1141,8 @@ const u8 *const gMonIconTable[] = [SPECIES_ARCEUS_DRAGON] = gMonIcon_Arceus, [SPECIES_ARCEUS_DARK] = gMonIcon_Arceus, [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, @@ -1132,7 +1156,6 @@ const u8 *const gMonIconTable[] = [SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian, [SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian, [SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian, - [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, [SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite, [SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack, [SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute, @@ -1141,6 +1164,8 @@ const u8 *const gMonIconTable[] = [SPECIES_GENESECT_SHOCK_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_BURN_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_CHILL_DRIVE] = gMonIcon_Genesect, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja, [SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh, [SPECIES_VIVILLON_POLAR] = gMonIcon_VivillonPolar, @@ -1198,6 +1223,8 @@ const u8 *const gMonIconTable[] = [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde, [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, @@ -1240,6 +1267,8 @@ const u8 *const gMonIconTable[] = [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, @@ -1263,6 +1292,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, + [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, #endif [SPECIES_EGG] = gMonIcon_Egg, }; @@ -1270,7 +1300,7 @@ const u8 *const gMonIconTable[] = const u8 *const gMonIconTableFemale[] = { [SPECIES_EEVEE] = gMonIcon_Eevee, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_STARLY] = gMonIcon_Starly, [SPECIES_STARAVIA] = gMonIcon_Staravia, [SPECIES_STARAPTOR] = gMonIcon_Staraptor, @@ -1281,10 +1311,16 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_COMBEE] = gMonIcon_Combee, [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, [SPECIES_FRILLISH] = gMonIcon_FrillishF, [SPECIES_JELLICENT] = gMonIcon_JellicentF, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_PYROAR] = gMonIcon_PyroarF, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_BASCULEGION] = gMonIcon_BasculegionF, #endif }; @@ -1677,7 +1713,6 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_JIRACHI] = 0, [SPECIES_DEOXYS] = 0, [SPECIES_CHIMECHO] = 0, -#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = 1, [SPECIES_GROTLE] = 1, [SPECIES_TORTERRA] = 1, @@ -2315,7 +2350,6 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PIKACHU_PARTNER_CAP] = 0, [SPECIES_PIKACHU_WORLD_CAP] = 0, [SPECIES_PICHU_SPIKY_EARED] = 1, -#endif [SPECIES_UNOWN_B ... SPECIES_UNOWN_QMARK] = 0, [SPECIES_CASTFORM_SUNNY] = 0, [SPECIES_CASTFORM_RAINY] = 0, @@ -2323,7 +2357,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DEOXYS_ATTACK] = 0, [SPECIES_DEOXYS_DEFENSE] = 0, [SPECIES_DEOXYS_SPEED] = 0, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_BURMY_SANDY_CLOAK] = 1, [SPECIES_BURMY_TRASH_CLOAK] = 0, [SPECIES_WORMADAM_SANDY_CLOAK] = 1, @@ -2357,6 +2391,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARCEUS_DRAGON] = 1, [SPECIES_ARCEUS_DARK] = 1, [SPECIES_ARCEUS_FAIRY] = 1, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_BASCULIN_BLUE_STRIPED] = 0, [SPECIES_BASCULIN_WHITE_STRIPED] = 0, [SPECIES_DARMANITAN_ZEN_MODE] = 0, @@ -2370,7 +2406,6 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TORNADUS_THERIAN] = 1, [SPECIES_THUNDURUS_THERIAN] = 0, [SPECIES_LANDORUS_THERIAN] = 0, - [SPECIES_ENAMORUS_THERIAN] = 1, [SPECIES_KYUREM_WHITE] = 0, [SPECIES_KYUREM_BLACK] = 0, [SPECIES_KELDEO_RESOLUTE] = 0, @@ -2379,6 +2414,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_GENESECT_SHOCK_DRIVE] = 2, [SPECIES_GENESECT_BURN_DRIVE] = 2, [SPECIES_GENESECT_CHILL_DRIVE] = 2, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_GRENINJA_BATTLE_BOND] = 0, [SPECIES_GRENINJA_ASH] = 0, [SPECIES_VIVILLON_POLAR] = 0, @@ -2436,6 +2473,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = 1, [SPECIES_ZYGARDE_COMPLETE] = 1, [SPECIES_HOOPA_UNBOUND] = 0, +#endif +#if P_NEW_POKEMON >= GEN_7 [SPECIES_ORICORIO_POM_POM] = 1, [SPECIES_ORICORIO_PAU] = 1, [SPECIES_ORICORIO_SENSU] = 0, @@ -2472,6 +2511,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_NECROZMA_DAWN_WINGS] = 0, [SPECIES_NECROZMA_ULTRA] = 2, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_CRAMORANT_GULPING] = 0, [SPECIES_CRAMORANT_GORGING] = 0, [SPECIES_TOXTRICITY_LOW_KEY] = 2, @@ -2495,6 +2536,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZARUDE_DADA] = 1, [SPECIES_CALYREX_ICE_RIDER] = 0, [SPECIES_CALYREX_SHADOW_RIDER] = 0, + [SPECIES_ENAMORUS_THERIAN] = 1, #endif [SPECIES_EGG] = 1, }; @@ -2502,7 +2544,7 @@ const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndicesFemale[] = { [SPECIES_EEVEE] = 2, -#if P_NEW_POKEMON == TRUE +#if P_NEW_POKEMON >= GEN_4 [SPECIES_STARLY] = 0, [SPECIES_STARAVIA] = 0, [SPECIES_BIDOOF] = 2, @@ -2512,10 +2554,16 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_COMBEE] = 0, [SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOWDON] = 1, +#endif +#if P_NEW_POKEMON >= GEN_5 [SPECIES_UNFEZANT] = 1, [SPECIES_FRILLISH] = 1, [SPECIES_JELLICENT] = 1, +#endif +#if P_NEW_POKEMON >= GEN_6 [SPECIES_PYROAR] = 2, +#endif +#if P_NEW_POKEMON >= GEN_8 [SPECIES_BASCULEGION] = 0, #endif };