Separated P_NEW_POKEMON into sections by generation.

Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
This commit is contained in:
Eduardo Quezada 2022-08-30 08:17:06 -04:00
parent 2cd01bd95d
commit df4c065ea6
33 changed files with 5354 additions and 2097 deletions

View File

@ -2,7 +2,7 @@
#define GUARD_CONSTANTS_POKEDEX_H #define GUARD_CONSTANTS_POKEDEX_H
#include "constants/pokemon_config.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 { enum {
NATIONAL_DEX_NONE, NATIONAL_DEX_NONE,
// Kanto // Kanto
@ -923,8 +923,16 @@ enum {
#define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define KANTO_DEX_COUNT NATIONAL_DEX_MEW
#define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI #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 #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 #else
#define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS #define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS
#endif #endif
@ -964,7 +972,7 @@ enum {
HOENN_DEX_RALTS, HOENN_DEX_RALTS,
HOENN_DEX_KIRLIA, HOENN_DEX_KIRLIA,
HOENN_DEX_GARDEVOIR, HOENN_DEX_GARDEVOIR,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_GALLADE, HOENN_DEX_GALLADE,
#endif #endif
HOENN_DEX_SURSKIT, HOENN_DEX_SURSKIT,
@ -996,7 +1004,7 @@ enum {
HOENN_DEX_GRAVELER, HOENN_DEX_GRAVELER,
HOENN_DEX_GOLEM, HOENN_DEX_GOLEM,
HOENN_DEX_NOSEPASS, HOENN_DEX_NOSEPASS,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_PROBOPASS, HOENN_DEX_PROBOPASS,
#endif #endif
HOENN_DEX_SKITTY, HOENN_DEX_SKITTY,
@ -1022,7 +1030,7 @@ enum {
HOENN_DEX_MINUN, HOENN_DEX_MINUN,
HOENN_DEX_MAGNEMITE, HOENN_DEX_MAGNEMITE,
HOENN_DEX_MAGNETON, HOENN_DEX_MAGNETON,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_MAGNEZONE, HOENN_DEX_MAGNEZONE,
#endif #endif
HOENN_DEX_VOLTORB, HOENN_DEX_VOLTORB,
@ -1035,7 +1043,7 @@ enum {
HOENN_DEX_BELLOSSOM, HOENN_DEX_BELLOSSOM,
HOENN_DEX_DODUO, HOENN_DEX_DODUO,
HOENN_DEX_DODRIO, HOENN_DEX_DODRIO,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_BUDEW, HOENN_DEX_BUDEW,
HOENN_DEX_ROSELIA, HOENN_DEX_ROSELIA,
HOENN_DEX_ROSERADE, HOENN_DEX_ROSERADE,
@ -1097,7 +1105,7 @@ enum {
HOENN_DEX_BANETTE, HOENN_DEX_BANETTE,
HOENN_DEX_DUSKULL, HOENN_DEX_DUSKULL,
HOENN_DEX_DUSCLOPS, HOENN_DEX_DUSCLOPS,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_DUSKNOIR, HOENN_DEX_DUSKNOIR,
HOENN_DEX_TROPIUS, HOENN_DEX_TROPIUS,
HOENN_DEX_CHINGLING, HOENN_DEX_CHINGLING,
@ -1124,12 +1132,12 @@ enum {
HOENN_DEX_HERACROSS, HOENN_DEX_HERACROSS,
HOENN_DEX_RHYHORN, HOENN_DEX_RHYHORN,
HOENN_DEX_RHYDON, HOENN_DEX_RHYDON,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_RHYPERIOR, HOENN_DEX_RHYPERIOR,
#endif #endif
HOENN_DEX_SNORUNT, HOENN_DEX_SNORUNT,
HOENN_DEX_GLALIE, HOENN_DEX_GLALIE,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_DEX_FROSLASS, HOENN_DEX_FROSLASS,
#endif #endif
HOENN_DEX_SPHEAL, HOENN_DEX_SPHEAL,

View File

@ -19,7 +19,7 @@
#define P_KADABRA_EVERSTONE GEN_8 // Since Gen 4, Kadabra can evolve even when holding an Everstone. #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_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. #define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.

View File

@ -1046,7 +1046,6 @@
// Pichu // Pichu
#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118 #define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118
#if P_NEW_POKEMON == TRUE
// Unown // Unown
#define SPECIES_UNOWN_B FORMS_START + 119 #define SPECIES_UNOWN_B FORMS_START + 119
#define SPECIES_UNOWN_C FORMS_START + 120 #define SPECIES_UNOWN_C FORMS_START + 120
@ -1086,47 +1085,6 @@
#define SPECIES_DEOXYS_DEFENSE FORMS_START + 150 #define SPECIES_DEOXYS_DEFENSE FORMS_START + 150
#define SPECIES_DEOXYS_SPEED FORMS_START + 151 #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 // Burmy
#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152 #define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152
#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153 #define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153
@ -1412,13 +1370,8 @@
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327 #define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328 #define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328
#if P_NEW_POKEMON == TRUE
#define FORMS_START SPECIES_ENAMORUS #define FORMS_START SPECIES_ENAMORUS
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1 #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 #define NUM_SPECIES SPECIES_EGG

View File

@ -454,7 +454,7 @@ extern const u32 gMonFrontPic_Groudon[];
extern const u32 gMonFrontPic_Rayquaza[]; extern const u32 gMonFrontPic_Rayquaza[];
extern const u32 gMonFrontPic_Jirachi[]; extern const u32 gMonFrontPic_Jirachi[];
extern const u32 gMonFrontPic_Deoxys[]; 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_Turtwig[];
extern const u32 gMonFrontPic_Grotle[]; extern const u32 gMonFrontPic_Grotle[];
extern const u32 gMonFrontPic_Torterra[]; extern const u32 gMonFrontPic_Torterra[];
@ -571,6 +571,8 @@ extern const u32 gMonFrontPic_Manaphy[];
extern const u32 gMonFrontPic_Darkrai[]; extern const u32 gMonFrontPic_Darkrai[];
extern const u32 gMonFrontPic_Shaymin[]; extern const u32 gMonFrontPic_Shaymin[];
extern const u32 gMonFrontPic_Arceus[]; extern const u32 gMonFrontPic_Arceus[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonFrontPic_Victini[]; extern const u32 gMonFrontPic_Victini[];
extern const u32 gMonFrontPic_Snivy[]; extern const u32 gMonFrontPic_Snivy[];
extern const u32 gMonFrontPic_Servine[]; extern const u32 gMonFrontPic_Servine[];
@ -730,6 +732,8 @@ extern const u32 gMonFrontPic_Kyurem[];
extern const u32 gMonFrontPic_Keldeo[]; extern const u32 gMonFrontPic_Keldeo[];
extern const u32 gMonFrontPic_Meloetta[]; extern const u32 gMonFrontPic_Meloetta[];
extern const u32 gMonFrontPic_Genesect[]; extern const u32 gMonFrontPic_Genesect[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonFrontPic_Chespin[]; extern const u32 gMonFrontPic_Chespin[];
extern const u32 gMonFrontPic_Quilladin[]; extern const u32 gMonFrontPic_Quilladin[];
extern const u32 gMonFrontPic_Chesnaught[]; extern const u32 gMonFrontPic_Chesnaught[];
@ -803,6 +807,8 @@ extern const u32 gMonFrontPic_Zygarde[];
extern const u32 gMonFrontPic_Diancie[]; extern const u32 gMonFrontPic_Diancie[];
extern const u32 gMonFrontPic_Hoopa[]; extern const u32 gMonFrontPic_Hoopa[];
extern const u32 gMonFrontPic_Volcanion[]; extern const u32 gMonFrontPic_Volcanion[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonFrontPic_Rowlet[]; extern const u32 gMonFrontPic_Rowlet[];
extern const u32 gMonFrontPic_Dartrix[]; extern const u32 gMonFrontPic_Dartrix[];
extern const u32 gMonFrontPic_Decidueye[]; extern const u32 gMonFrontPic_Decidueye[];
@ -891,6 +897,8 @@ extern const u32 gMonFrontPic_Blacephalon[];
extern const u32 gMonFrontPic_Zeraora[]; extern const u32 gMonFrontPic_Zeraora[];
extern const u32 gMonFrontPic_Meltan[]; extern const u32 gMonFrontPic_Meltan[];
extern const u32 gMonFrontPic_Melmetal[]; extern const u32 gMonFrontPic_Melmetal[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonFrontPic_Grookey[]; extern const u32 gMonFrontPic_Grookey[];
extern const u32 gMonFrontPic_Thwackey[]; extern const u32 gMonFrontPic_Thwackey[];
extern const u32 gMonFrontPic_Rillaboom[]; extern const u32 gMonFrontPic_Rillaboom[];
@ -988,6 +996,7 @@ extern const u32 gMonFrontPic_Ursaluna[];
//extern const u32 gMonFrontPic_Sneasler[]; //extern const u32 gMonFrontPic_Sneasler[];
extern const u32 gMonFrontPic_Overqwil[]; extern const u32 gMonFrontPic_Overqwil[];
//extern const u32 gMonFrontPic_Enamorus[]; //extern const u32 gMonFrontPic_Enamorus[];
#endif
extern const u32 gMonFrontPic_VenusaurMega[]; extern const u32 gMonFrontPic_VenusaurMega[];
extern const u32 gMonFrontPic_CharizardMegaX[]; extern const u32 gMonFrontPic_CharizardMegaX[];
extern const u32 gMonFrontPic_CharizardMegaY[]; extern const u32 gMonFrontPic_CharizardMegaY[];
@ -1028,13 +1037,19 @@ extern const u32 gMonFrontPic_SalamenceMega[];
extern const u32 gMonFrontPic_MetagrossMega[]; extern const u32 gMonFrontPic_MetagrossMega[];
extern const u32 gMonFrontPic_LatiasMega[]; extern const u32 gMonFrontPic_LatiasMega[];
extern const u32 gMonFrontPic_LatiosMega[]; extern const u32 gMonFrontPic_LatiosMega[];
#if P_NEW_POKEMON >= GEN_4
extern const u32 gMonFrontPic_LopunnyMega[]; extern const u32 gMonFrontPic_LopunnyMega[];
extern const u32 gMonFrontPic_GarchompMega[]; extern const u32 gMonFrontPic_GarchompMega[];
extern const u32 gMonFrontPic_LucarioMega[]; extern const u32 gMonFrontPic_LucarioMega[];
extern const u32 gMonFrontPic_AbomasnowMega[]; extern const u32 gMonFrontPic_AbomasnowMega[];
extern const u32 gMonFrontPic_GalladeMega[]; extern const u32 gMonFrontPic_GalladeMega[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonFrontPic_AudinoMega[]; extern const u32 gMonFrontPic_AudinoMega[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonFrontPic_DiancieMega[]; extern const u32 gMonFrontPic_DiancieMega[];
#endif
extern const u32 gMonFrontPic_RayquazaMega[]; extern const u32 gMonFrontPic_RayquazaMega[];
extern const u32 gMonFrontPic_KyogrePrimal[]; extern const u32 gMonFrontPic_KyogrePrimal[];
extern const u32 gMonFrontPic_GroudonPrimal[]; extern const u32 gMonFrontPic_GroudonPrimal[];
@ -1071,10 +1086,12 @@ extern const u32 gMonFrontPic_SlowkingGalarian[];
extern const u32 gMonFrontPic_CorsolaGalarian[]; extern const u32 gMonFrontPic_CorsolaGalarian[];
extern const u32 gMonFrontPic_ZigzagoonGalarian[]; extern const u32 gMonFrontPic_ZigzagoonGalarian[];
extern const u32 gMonFrontPic_LinooneGalarian[]; extern const u32 gMonFrontPic_LinooneGalarian[];
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonFrontPic_DarumakaGalarian[]; extern const u32 gMonFrontPic_DarumakaGalarian[];
extern const u32 gMonFrontPic_DarmanitanGalarian[]; extern const u32 gMonFrontPic_DarmanitanGalarian[];
extern const u32 gMonFrontPic_YamaskGalarian[]; extern const u32 gMonFrontPic_YamaskGalarian[];
extern const u32 gMonFrontPic_StunfiskGalarian[]; extern const u32 gMonFrontPic_StunfiskGalarian[];
#endif
extern const u32 gMonFrontPic_GrowlitheHisuian[]; extern const u32 gMonFrontPic_GrowlitheHisuian[];
extern const u32 gMonFrontPic_ArcanineHisuian[]; extern const u32 gMonFrontPic_ArcanineHisuian[];
extern const u32 gMonFrontPic_VoltorbHisuian[]; extern const u32 gMonFrontPic_VoltorbHisuian[];
@ -1082,15 +1099,21 @@ extern const u32 gMonFrontPic_ElectrodeHisuian[];
extern const u32 gMonFrontPic_TyphlosionHisuian[]; extern const u32 gMonFrontPic_TyphlosionHisuian[];
extern const u32 gMonFrontPic_QwilfishHisuian[]; extern const u32 gMonFrontPic_QwilfishHisuian[];
extern const u32 gMonFrontPic_SneaselHisuian[]; extern const u32 gMonFrontPic_SneaselHisuian[];
#if P_NEW_POKEMON >= GEN_5
//extern const u32 gMonFrontPic_SamurottHisuian[]; //extern const u32 gMonFrontPic_SamurottHisuian[];
extern const u32 gMonFrontPic_LilligantHisuian[]; extern const u32 gMonFrontPic_LilligantHisuian[];
extern const u32 gMonFrontPic_ZoruaHisuian[]; extern const u32 gMonFrontPic_ZoruaHisuian[];
extern const u32 gMonFrontPic_ZoroarkHisuian[]; extern const u32 gMonFrontPic_ZoroarkHisuian[];
extern const u32 gMonFrontPic_BraviaryHisuian[]; extern const u32 gMonFrontPic_BraviaryHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonFrontPic_SliggooHisuian[]; extern const u32 gMonFrontPic_SliggooHisuian[];
extern const u32 gMonFrontPic_GoodraHisuian[]; extern const u32 gMonFrontPic_GoodraHisuian[];
extern const u32 gMonFrontPic_AvaluggHisuian[]; extern const u32 gMonFrontPic_AvaluggHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_7
//extern const u32 gMonFrontPic_DecidueyeHisuian[]; //extern const u32 gMonFrontPic_DecidueyeHisuian[];
#endif
extern const u32 gMonFrontPic_PikachuCosplay[]; extern const u32 gMonFrontPic_PikachuCosplay[];
extern const u32 gMonFrontPic_PikachuRockStar[]; extern const u32 gMonFrontPic_PikachuRockStar[];
extern const u32 gMonFrontPic_PikachuBelle[]; extern const u32 gMonFrontPic_PikachuBelle[];
@ -1106,7 +1129,6 @@ extern const u32 gMonFrontPic_PikachuAlolaCap[];
extern const u32 gMonFrontPic_PikachuPartnerCap[]; extern const u32 gMonFrontPic_PikachuPartnerCap[];
extern const u32 gMonFrontPic_PikachuWorldCap[]; extern const u32 gMonFrontPic_PikachuWorldCap[];
extern const u32 gMonFrontPic_PichuSpikyEared[]; extern const u32 gMonFrontPic_PichuSpikyEared[];
#endif
extern const u32 gMonFrontPic_UnownB[]; extern const u32 gMonFrontPic_UnownB[];
extern const u32 gMonFrontPic_UnownC[]; extern const u32 gMonFrontPic_UnownC[];
extern const u32 gMonFrontPic_UnownD[]; extern const u32 gMonFrontPic_UnownD[];
@ -1140,7 +1162,7 @@ extern const u32 gMonFrontPic_CastformSnowy[];
extern const u32 gMonFrontPic_DeoxysAttack[]; extern const u32 gMonFrontPic_DeoxysAttack[];
extern const u32 gMonFrontPic_DeoxysDefense[]; extern const u32 gMonFrontPic_DeoxysDefense[];
extern const u32 gMonFrontPic_DeoxysSpeed[]; 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_BurmySandyCloak[];
extern const u32 gMonFrontPic_BurmyTrashCloak[]; extern const u32 gMonFrontPic_BurmyTrashCloak[];
extern const u32 gMonFrontPic_WormadamSandyCloak[]; extern const u32 gMonFrontPic_WormadamSandyCloak[];
@ -1157,6 +1179,8 @@ extern const u32 gMonFrontPic_DialgaOrigin[];
extern const u32 gMonFrontPic_PalkiaOrigin[]; extern const u32 gMonFrontPic_PalkiaOrigin[];
extern const u32 gMonFrontPic_GiratinaOrigin[]; extern const u32 gMonFrontPic_GiratinaOrigin[];
extern const u32 gMonFrontPic_ShayminSky[]; extern const u32 gMonFrontPic_ShayminSky[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonFrontPic_BasculinBlueStriped[]; extern const u32 gMonFrontPic_BasculinBlueStriped[];
extern const u32 gMonFrontPic_BasculinWhiteStriped[]; extern const u32 gMonFrontPic_BasculinWhiteStriped[];
extern const u32 gMonFrontPic_DarmanitanZenMode[]; extern const u32 gMonFrontPic_DarmanitanZenMode[];
@ -1167,11 +1191,14 @@ extern const u32 gMonFrontPic_SawsbuckWinter[];
extern const u32 gMonFrontPic_TornadusTherian[]; extern const u32 gMonFrontPic_TornadusTherian[];
extern const u32 gMonFrontPic_ThundurusTherian[]; extern const u32 gMonFrontPic_ThundurusTherian[];
extern const u32 gMonFrontPic_LandorusTherian[]; 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_KyuremWhite[];
extern const u32 gMonFrontPic_KyuremBlack[]; extern const u32 gMonFrontPic_KyuremBlack[];
extern const u32 gMonFrontPic_KeldeoResolute[]; extern const u32 gMonFrontPic_KeldeoResolute[];
extern const u32 gMonFrontPic_MeloettaPirouette[]; extern const u32 gMonFrontPic_MeloettaPirouette[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonFrontPic_GreninjaAsh[]; extern const u32 gMonFrontPic_GreninjaAsh[];
extern const u32 gMonFrontPic_VivillonPolar[]; extern const u32 gMonFrontPic_VivillonPolar[];
extern const u32 gMonFrontPic_VivillonTundra[]; extern const u32 gMonFrontPic_VivillonTundra[];
@ -1214,6 +1241,8 @@ extern const u32 gMonFrontPic_XerneasActive[];
extern const u32 gMonFrontPic_Zygarde10[]; extern const u32 gMonFrontPic_Zygarde10[];
extern const u32 gMonFrontPic_ZygardeComplete[]; extern const u32 gMonFrontPic_ZygardeComplete[];
extern const u32 gMonFrontPic_HoopaUnbound[]; extern const u32 gMonFrontPic_HoopaUnbound[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonFrontPic_OricorioPomPom[]; extern const u32 gMonFrontPic_OricorioPomPom[];
extern const u32 gMonFrontPic_OricorioPau[]; extern const u32 gMonFrontPic_OricorioPau[];
extern const u32 gMonFrontPic_OricorioSensu[]; extern const u32 gMonFrontPic_OricorioSensu[];
@ -1226,6 +1255,8 @@ extern const u32 gMonFrontPic_NecrozmaDuskMane[];
extern const u32 gMonFrontPic_NecrozmaDawnWings[]; extern const u32 gMonFrontPic_NecrozmaDawnWings[];
extern const u32 gMonFrontPic_NecrozmaUltra[]; extern const u32 gMonFrontPic_NecrozmaUltra[];
extern const u32 gMonFrontPic_MagearnaOriginalColor[]; extern const u32 gMonFrontPic_MagearnaOriginalColor[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonFrontPic_CramorantGulping[]; extern const u32 gMonFrontPic_CramorantGulping[];
extern const u32 gMonFrontPic_CramorantGorging[]; extern const u32 gMonFrontPic_CramorantGorging[];
extern const u32 gMonFrontPic_ToxtricityLowKey[]; extern const u32 gMonFrontPic_ToxtricityLowKey[];
@ -1247,6 +1278,7 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonFrontPic_ZarudeDada[]; extern const u32 gMonFrontPic_ZarudeDada[];
extern const u32 gMonFrontPic_CalyrexIceRider[]; extern const u32 gMonFrontPic_CalyrexIceRider[];
extern const u32 gMonFrontPic_CalyrexShadowRider[]; extern const u32 gMonFrontPic_CalyrexShadowRider[];
//extern const u32 gMonFrontPic_EnamorusTherian[];
#endif #endif
extern const u32 gMonFrontPic_Egg[]; extern const u32 gMonFrontPic_Egg[];
@ -1639,7 +1671,7 @@ extern const u32 gMonBackPic_Groudon[];
extern const u32 gMonBackPic_Rayquaza[]; extern const u32 gMonBackPic_Rayquaza[];
extern const u32 gMonBackPic_Jirachi[]; extern const u32 gMonBackPic_Jirachi[];
extern const u32 gMonBackPic_Deoxys[]; 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_Turtwig[];
extern const u32 gMonBackPic_Grotle[]; extern const u32 gMonBackPic_Grotle[];
extern const u32 gMonBackPic_Torterra[]; extern const u32 gMonBackPic_Torterra[];
@ -1755,6 +1787,8 @@ extern const u32 gMonBackPic_Manaphy[];
extern const u32 gMonBackPic_Darkrai[]; extern const u32 gMonBackPic_Darkrai[];
extern const u32 gMonBackPic_Shaymin[]; extern const u32 gMonBackPic_Shaymin[];
extern const u32 gMonBackPic_Arceus[]; extern const u32 gMonBackPic_Arceus[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonBackPic_Victini[]; extern const u32 gMonBackPic_Victini[];
extern const u32 gMonBackPic_Snivy[]; extern const u32 gMonBackPic_Snivy[];
extern const u32 gMonBackPic_Servine[]; extern const u32 gMonBackPic_Servine[];
@ -1914,6 +1948,8 @@ extern const u32 gMonBackPic_Kyurem[];
extern const u32 gMonBackPic_Keldeo[]; extern const u32 gMonBackPic_Keldeo[];
extern const u32 gMonBackPic_Meloetta[]; extern const u32 gMonBackPic_Meloetta[];
extern const u32 gMonBackPic_Genesect[]; extern const u32 gMonBackPic_Genesect[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonBackPic_Chespin[]; extern const u32 gMonBackPic_Chespin[];
extern const u32 gMonBackPic_Quilladin[]; extern const u32 gMonBackPic_Quilladin[];
extern const u32 gMonBackPic_Chesnaught[]; extern const u32 gMonBackPic_Chesnaught[];
@ -1987,6 +2023,8 @@ extern const u32 gMonBackPic_Zygarde[];
extern const u32 gMonBackPic_Diancie[]; extern const u32 gMonBackPic_Diancie[];
extern const u32 gMonBackPic_Hoopa[]; extern const u32 gMonBackPic_Hoopa[];
extern const u32 gMonBackPic_Volcanion[]; extern const u32 gMonBackPic_Volcanion[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonBackPic_Rowlet[]; extern const u32 gMonBackPic_Rowlet[];
extern const u32 gMonBackPic_Dartrix[]; extern const u32 gMonBackPic_Dartrix[];
extern const u32 gMonBackPic_Decidueye[]; extern const u32 gMonBackPic_Decidueye[];
@ -2075,6 +2113,8 @@ extern const u32 gMonBackPic_Blacephalon[];
extern const u32 gMonBackPic_Zeraora[]; extern const u32 gMonBackPic_Zeraora[];
extern const u32 gMonBackPic_Meltan[]; extern const u32 gMonBackPic_Meltan[];
extern const u32 gMonBackPic_Melmetal[]; extern const u32 gMonBackPic_Melmetal[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonBackPic_Grookey[]; extern const u32 gMonBackPic_Grookey[];
extern const u32 gMonBackPic_Thwackey[]; extern const u32 gMonBackPic_Thwackey[];
extern const u32 gMonBackPic_Rillaboom[]; extern const u32 gMonBackPic_Rillaboom[];
@ -2172,6 +2212,7 @@ extern const u32 gMonBackPic_Ursaluna[];
//extern const u32 gMonBackPic_Sneasler[]; //extern const u32 gMonBackPic_Sneasler[];
extern const u32 gMonBackPic_Overqwil[]; extern const u32 gMonBackPic_Overqwil[];
//extern const u32 gMonBackPic_Enamorus[]; //extern const u32 gMonBackPic_Enamorus[];
#endif
extern const u32 gMonBackPic_VenusaurMega[]; extern const u32 gMonBackPic_VenusaurMega[];
extern const u32 gMonBackPic_CharizardMegaX[]; extern const u32 gMonBackPic_CharizardMegaX[];
extern const u32 gMonBackPic_CharizardMegaY[]; extern const u32 gMonBackPic_CharizardMegaY[];
@ -2212,13 +2253,19 @@ extern const u32 gMonBackPic_SalamenceMega[];
extern const u32 gMonBackPic_MetagrossMega[]; extern const u32 gMonBackPic_MetagrossMega[];
extern const u32 gMonBackPic_LatiasMega[]; extern const u32 gMonBackPic_LatiasMega[];
extern const u32 gMonBackPic_LatiosMega[]; extern const u32 gMonBackPic_LatiosMega[];
#if P_NEW_POKEMON >= GEN_4
extern const u32 gMonBackPic_LopunnyMega[]; extern const u32 gMonBackPic_LopunnyMega[];
extern const u32 gMonBackPic_GarchompMega[]; extern const u32 gMonBackPic_GarchompMega[];
extern const u32 gMonBackPic_LucarioMega[]; extern const u32 gMonBackPic_LucarioMega[];
extern const u32 gMonBackPic_AbomasnowMega[]; extern const u32 gMonBackPic_AbomasnowMega[];
extern const u32 gMonBackPic_GalladeMega[]; extern const u32 gMonBackPic_GalladeMega[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonBackPic_AudinoMega[]; extern const u32 gMonBackPic_AudinoMega[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonBackPic_DiancieMega[]; extern const u32 gMonBackPic_DiancieMega[];
#endif
extern const u32 gMonBackPic_RayquazaMega[]; extern const u32 gMonBackPic_RayquazaMega[];
extern const u32 gMonBackPic_KyogrePrimal[]; extern const u32 gMonBackPic_KyogrePrimal[];
extern const u32 gMonBackPic_GroudonPrimal[]; extern const u32 gMonBackPic_GroudonPrimal[];
@ -2255,10 +2302,12 @@ extern const u32 gMonBackPic_SlowkingGalarian[];
extern const u32 gMonBackPic_CorsolaGalarian[]; extern const u32 gMonBackPic_CorsolaGalarian[];
extern const u32 gMonBackPic_ZigzagoonGalarian[]; extern const u32 gMonBackPic_ZigzagoonGalarian[];
extern const u32 gMonBackPic_LinooneGalarian[]; extern const u32 gMonBackPic_LinooneGalarian[];
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonBackPic_DarumakaGalarian[]; extern const u32 gMonBackPic_DarumakaGalarian[];
extern const u32 gMonBackPic_DarmanitanGalarian[]; extern const u32 gMonBackPic_DarmanitanGalarian[];
extern const u32 gMonBackPic_YamaskGalarian[]; extern const u32 gMonBackPic_YamaskGalarian[];
extern const u32 gMonBackPic_StunfiskGalarian[]; extern const u32 gMonBackPic_StunfiskGalarian[];
#endif
extern const u32 gMonBackPic_GrowlitheHisuian[]; extern const u32 gMonBackPic_GrowlitheHisuian[];
extern const u32 gMonBackPic_ArcanineHisuian[]; extern const u32 gMonBackPic_ArcanineHisuian[];
extern const u32 gMonBackPic_VoltorbHisuian[]; extern const u32 gMonBackPic_VoltorbHisuian[];
@ -2266,15 +2315,21 @@ extern const u32 gMonBackPic_ElectrodeHisuian[];
extern const u32 gMonBackPic_TyphlosionHisuian[]; extern const u32 gMonBackPic_TyphlosionHisuian[];
extern const u32 gMonBackPic_QwilfishHisuian[]; extern const u32 gMonBackPic_QwilfishHisuian[];
extern const u32 gMonBackPic_SneaselHisuian[]; extern const u32 gMonBackPic_SneaselHisuian[];
#if P_NEW_POKEMON >= GEN_5
//extern const u32 gMonBackPic_SamurottHisuian[]; //extern const u32 gMonBackPic_SamurottHisuian[];
extern const u32 gMonBackPic_LilligantHisuian[]; extern const u32 gMonBackPic_LilligantHisuian[];
extern const u32 gMonBackPic_ZoruaHisuian[]; extern const u32 gMonBackPic_ZoruaHisuian[];
extern const u32 gMonBackPic_ZoroarkHisuian[]; extern const u32 gMonBackPic_ZoroarkHisuian[];
extern const u32 gMonBackPic_BraviaryHisuian[]; extern const u32 gMonBackPic_BraviaryHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonBackPic_SliggooHisuian[]; extern const u32 gMonBackPic_SliggooHisuian[];
extern const u32 gMonBackPic_GoodraHisuian[]; extern const u32 gMonBackPic_GoodraHisuian[];
extern const u32 gMonBackPic_AvaluggHisuian[]; extern const u32 gMonBackPic_AvaluggHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_7
//extern const u32 gMonBackPic_DecidueyeHisuian[]; //extern const u32 gMonBackPic_DecidueyeHisuian[];
#endif
extern const u32 gMonBackPic_PikachuCosplay[]; extern const u32 gMonBackPic_PikachuCosplay[];
extern const u32 gMonBackPic_PikachuRockStar[]; extern const u32 gMonBackPic_PikachuRockStar[];
extern const u32 gMonBackPic_PikachuBelle[]; extern const u32 gMonBackPic_PikachuBelle[];
@ -2290,7 +2345,6 @@ extern const u32 gMonBackPic_PikachuAlolaCap[];
extern const u32 gMonBackPic_PikachuPartnerCap[]; extern const u32 gMonBackPic_PikachuPartnerCap[];
extern const u32 gMonBackPic_PikachuWorldCap[]; extern const u32 gMonBackPic_PikachuWorldCap[];
extern const u32 gMonBackPic_PichuSpikyEared[]; extern const u32 gMonBackPic_PichuSpikyEared[];
#endif
extern const u32 gMonBackPic_UnownB[]; extern const u32 gMonBackPic_UnownB[];
extern const u32 gMonBackPic_UnownC[]; extern const u32 gMonBackPic_UnownC[];
extern const u32 gMonBackPic_UnownD[]; extern const u32 gMonBackPic_UnownD[];
@ -2324,7 +2378,7 @@ extern const u32 gMonBackPic_CastformSnowy[];
extern const u32 gMonBackPic_DeoxysAttack[]; extern const u32 gMonBackPic_DeoxysAttack[];
extern const u32 gMonBackPic_DeoxysDefense[]; extern const u32 gMonBackPic_DeoxysDefense[];
extern const u32 gMonBackPic_DeoxysSpeed[]; 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_BurmySandyCloak[];
extern const u32 gMonBackPic_BurmyTrashCloak[]; extern const u32 gMonBackPic_BurmyTrashCloak[];
extern const u32 gMonBackPic_WormadamSandyCloak[]; extern const u32 gMonBackPic_WormadamSandyCloak[];
@ -2341,6 +2395,8 @@ extern const u32 gMonBackPic_DialgaOrigin[];
extern const u32 gMonBackPic_PalkiaOrigin[]; extern const u32 gMonBackPic_PalkiaOrigin[];
extern const u32 gMonBackPic_GiratinaOrigin[]; extern const u32 gMonBackPic_GiratinaOrigin[];
extern const u32 gMonBackPic_ShayminSky[]; extern const u32 gMonBackPic_ShayminSky[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonBackPic_BasculinBlueStriped[]; extern const u32 gMonBackPic_BasculinBlueStriped[];
extern const u32 gMonBackPic_BasculinWhiteStriped[]; extern const u32 gMonBackPic_BasculinWhiteStriped[];
extern const u32 gMonBackPic_DarmanitanZenMode[]; extern const u32 gMonBackPic_DarmanitanZenMode[];
@ -2351,11 +2407,12 @@ extern const u32 gMonBackPic_SawsbuckWinter[];
extern const u32 gMonBackPic_TornadusTherian[]; extern const u32 gMonBackPic_TornadusTherian[];
extern const u32 gMonBackPic_ThundurusTherian[]; extern const u32 gMonBackPic_ThundurusTherian[];
extern const u32 gMonBackPic_LandorusTherian[]; extern const u32 gMonBackPic_LandorusTherian[];
//extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_KyuremWhite[]; extern const u32 gMonBackPic_KyuremWhite[];
extern const u32 gMonBackPic_KyuremBlack[]; extern const u32 gMonBackPic_KyuremBlack[];
extern const u32 gMonBackPic_KeldeoResolute[]; extern const u32 gMonBackPic_KeldeoResolute[];
extern const u32 gMonBackPic_MeloettaPirouette[]; extern const u32 gMonBackPic_MeloettaPirouette[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonBackPic_GreninjaAsh[]; extern const u32 gMonBackPic_GreninjaAsh[];
extern const u32 gMonBackPic_VivillonPolar[]; extern const u32 gMonBackPic_VivillonPolar[];
extern const u32 gMonBackPic_VivillonTundra[]; extern const u32 gMonBackPic_VivillonTundra[];
@ -2398,6 +2455,8 @@ extern const u32 gMonBackPic_XerneasActive[];
extern const u32 gMonBackPic_Zygarde10[]; extern const u32 gMonBackPic_Zygarde10[];
extern const u32 gMonBackPic_ZygardeComplete[]; extern const u32 gMonBackPic_ZygardeComplete[];
extern const u32 gMonBackPic_HoopaUnbound[]; extern const u32 gMonBackPic_HoopaUnbound[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonBackPic_OricorioPomPom[]; extern const u32 gMonBackPic_OricorioPomPom[];
extern const u32 gMonBackPic_OricorioPau[]; extern const u32 gMonBackPic_OricorioPau[];
extern const u32 gMonBackPic_OricorioSensu[]; extern const u32 gMonBackPic_OricorioSensu[];
@ -2410,6 +2469,8 @@ extern const u32 gMonBackPic_NecrozmaDuskMane[];
extern const u32 gMonBackPic_NecrozmaDawnWings[]; extern const u32 gMonBackPic_NecrozmaDawnWings[];
extern const u32 gMonBackPic_NecrozmaUltra[]; extern const u32 gMonBackPic_NecrozmaUltra[];
extern const u32 gMonBackPic_MagearnaOriginalColor[]; extern const u32 gMonBackPic_MagearnaOriginalColor[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonBackPic_CramorantGulping[]; extern const u32 gMonBackPic_CramorantGulping[];
extern const u32 gMonBackPic_CramorantGorging[]; extern const u32 gMonBackPic_CramorantGorging[];
extern const u32 gMonBackPic_ToxtricityLowKey[]; extern const u32 gMonBackPic_ToxtricityLowKey[];
@ -2431,6 +2492,7 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonBackPic_ZarudeDada[]; extern const u32 gMonBackPic_ZarudeDada[];
extern const u32 gMonBackPic_CalyrexIceRider[]; extern const u32 gMonBackPic_CalyrexIceRider[];
extern const u32 gMonBackPic_CalyrexShadowRider[]; extern const u32 gMonBackPic_CalyrexShadowRider[];
//extern const u32 gMonBackPic_EnamorusTherian[];
#endif #endif
extern const u32 gMonPalette_CircledQuestionMark[]; extern const u32 gMonPalette_CircledQuestionMark[];
@ -2821,7 +2883,7 @@ extern const u32 gMonPalette_Groudon[];
extern const u32 gMonPalette_Rayquaza[]; extern const u32 gMonPalette_Rayquaza[];
extern const u32 gMonPalette_Jirachi[]; extern const u32 gMonPalette_Jirachi[];
extern const u32 gMonPalette_Deoxys[]; 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_Turtwig[];
extern const u32 gMonPalette_Grotle[]; extern const u32 gMonPalette_Grotle[];
extern const u32 gMonPalette_Torterra[]; extern const u32 gMonPalette_Torterra[];
@ -2931,6 +2993,8 @@ extern const u32 gMonPalette_Manaphy[];
extern const u32 gMonPalette_Darkrai[]; extern const u32 gMonPalette_Darkrai[];
extern const u32 gMonPalette_Shaymin[]; extern const u32 gMonPalette_Shaymin[];
extern const u32 gMonPalette_Arceus[]; extern const u32 gMonPalette_Arceus[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonPalette_Victini[]; extern const u32 gMonPalette_Victini[];
extern const u32 gMonPalette_Snivy[]; extern const u32 gMonPalette_Snivy[];
extern const u32 gMonPalette_Servine[]; extern const u32 gMonPalette_Servine[];
@ -3090,6 +3154,8 @@ extern const u32 gMonPalette_Kyurem[];
extern const u32 gMonPalette_Keldeo[]; extern const u32 gMonPalette_Keldeo[];
extern const u32 gMonPalette_Meloetta[]; extern const u32 gMonPalette_Meloetta[];
extern const u32 gMonPalette_Genesect[]; extern const u32 gMonPalette_Genesect[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonPalette_Chespin[]; extern const u32 gMonPalette_Chespin[];
extern const u32 gMonPalette_Quilladin[]; extern const u32 gMonPalette_Quilladin[];
extern const u32 gMonPalette_Chesnaught[]; extern const u32 gMonPalette_Chesnaught[];
@ -3163,6 +3229,8 @@ extern const u32 gMonPalette_Zygarde[];
extern const u32 gMonPalette_Diancie[]; extern const u32 gMonPalette_Diancie[];
extern const u32 gMonPalette_Hoopa[]; extern const u32 gMonPalette_Hoopa[];
extern const u32 gMonPalette_Volcanion[]; extern const u32 gMonPalette_Volcanion[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonPalette_Rowlet[]; extern const u32 gMonPalette_Rowlet[];
extern const u32 gMonPalette_Dartrix[]; extern const u32 gMonPalette_Dartrix[];
extern const u32 gMonPalette_Decidueye[]; extern const u32 gMonPalette_Decidueye[];
@ -3251,6 +3319,8 @@ extern const u32 gMonPalette_Blacephalon[];
extern const u32 gMonPalette_Zeraora[]; extern const u32 gMonPalette_Zeraora[];
extern const u32 gMonPalette_Meltan[]; extern const u32 gMonPalette_Meltan[];
extern const u32 gMonPalette_Melmetal[]; extern const u32 gMonPalette_Melmetal[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonPalette_Grookey[]; extern const u32 gMonPalette_Grookey[];
extern const u32 gMonPalette_Thwackey[]; extern const u32 gMonPalette_Thwackey[];
extern const u32 gMonPalette_Rillaboom[]; extern const u32 gMonPalette_Rillaboom[];
@ -3348,6 +3418,7 @@ extern const u32 gMonPalette_Ursaluna[];
//extern const u32 gMonPalette_Sneasler[]; //extern const u32 gMonPalette_Sneasler[];
extern const u32 gMonPalette_Overqwil[]; extern const u32 gMonPalette_Overqwil[];
//extern const u32 gMonPalette_Enamorus[]; //extern const u32 gMonPalette_Enamorus[];
#endif
extern const u32 gMonPalette_VenusaurMega[]; extern const u32 gMonPalette_VenusaurMega[];
extern const u32 gMonPalette_CharizardMegaX[]; extern const u32 gMonPalette_CharizardMegaX[];
extern const u32 gMonPalette_CharizardMegaY[]; extern const u32 gMonPalette_CharizardMegaY[];
@ -3388,13 +3459,19 @@ extern const u32 gMonPalette_SalamenceMega[];
extern const u32 gMonPalette_MetagrossMega[]; extern const u32 gMonPalette_MetagrossMega[];
extern const u32 gMonPalette_LatiasMega[]; extern const u32 gMonPalette_LatiasMega[];
extern const u32 gMonPalette_LatiosMega[]; extern const u32 gMonPalette_LatiosMega[];
#if P_NEW_POKEMON >= GEN_4
extern const u32 gMonPalette_LopunnyMega[]; extern const u32 gMonPalette_LopunnyMega[];
extern const u32 gMonPalette_GarchompMega[]; extern const u32 gMonPalette_GarchompMega[];
extern const u32 gMonPalette_LucarioMega[]; extern const u32 gMonPalette_LucarioMega[];
extern const u32 gMonPalette_AbomasnowMega[]; extern const u32 gMonPalette_AbomasnowMega[];
extern const u32 gMonPalette_GalladeMega[]; extern const u32 gMonPalette_GalladeMega[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonPalette_AudinoMega[]; extern const u32 gMonPalette_AudinoMega[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonPalette_DiancieMega[]; extern const u32 gMonPalette_DiancieMega[];
#endif
extern const u32 gMonPalette_RayquazaMega[]; extern const u32 gMonPalette_RayquazaMega[];
extern const u32 gMonPalette_KyogrePrimal[]; extern const u32 gMonPalette_KyogrePrimal[];
extern const u32 gMonPalette_GroudonPrimal[]; extern const u32 gMonPalette_GroudonPrimal[];
@ -3431,10 +3508,12 @@ extern const u32 gMonPalette_SlowkingGalarian[];
extern const u32 gMonPalette_CorsolaGalarian[]; extern const u32 gMonPalette_CorsolaGalarian[];
extern const u32 gMonPalette_ZigzagoonGalarian[]; extern const u32 gMonPalette_ZigzagoonGalarian[];
extern const u32 gMonPalette_LinooneGalarian[]; extern const u32 gMonPalette_LinooneGalarian[];
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonPalette_DarumakaGalarian[]; extern const u32 gMonPalette_DarumakaGalarian[];
extern const u32 gMonPalette_DarmanitanGalarian[]; extern const u32 gMonPalette_DarmanitanGalarian[];
extern const u32 gMonPalette_YamaskGalarian[]; extern const u32 gMonPalette_YamaskGalarian[];
extern const u32 gMonPalette_StunfiskGalarian[]; extern const u32 gMonPalette_StunfiskGalarian[];
#endif
extern const u32 gMonPalette_GrowlitheHisuian[]; extern const u32 gMonPalette_GrowlitheHisuian[];
extern const u32 gMonPalette_ArcanineHisuian[]; extern const u32 gMonPalette_ArcanineHisuian[];
extern const u32 gMonPalette_VoltorbHisuian[]; extern const u32 gMonPalette_VoltorbHisuian[];
@ -3442,15 +3521,21 @@ extern const u32 gMonPalette_ElectrodeHisuian[];
extern const u32 gMonPalette_TyphlosionHisuian[]; extern const u32 gMonPalette_TyphlosionHisuian[];
extern const u32 gMonPalette_QwilfishHisuian[]; extern const u32 gMonPalette_QwilfishHisuian[];
extern const u32 gMonPalette_SneaselHisuian[]; extern const u32 gMonPalette_SneaselHisuian[];
#if P_NEW_POKEMON >= GEN_5
//extern const u32 gMonPalette_SamurottHisuian[]; //extern const u32 gMonPalette_SamurottHisuian[];
extern const u32 gMonPalette_LilligantHisuian[]; extern const u32 gMonPalette_LilligantHisuian[];
extern const u32 gMonPalette_ZoruaHisuian[]; extern const u32 gMonPalette_ZoruaHisuian[];
extern const u32 gMonPalette_ZoroarkHisuian[]; extern const u32 gMonPalette_ZoroarkHisuian[];
extern const u32 gMonPalette_BraviaryHisuian[]; extern const u32 gMonPalette_BraviaryHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonPalette_SliggooHisuian[]; extern const u32 gMonPalette_SliggooHisuian[];
extern const u32 gMonPalette_GoodraHisuian[]; extern const u32 gMonPalette_GoodraHisuian[];
extern const u32 gMonPalette_AvaluggHisuian[]; extern const u32 gMonPalette_AvaluggHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_7
//extern const u32 gMonPalette_DecidueyeHisuian[]; //extern const u32 gMonPalette_DecidueyeHisuian[];
#endif
extern const u32 gMonPalette_PikachuCosplay[]; extern const u32 gMonPalette_PikachuCosplay[];
extern const u32 gMonPalette_PikachuRockStar[]; extern const u32 gMonPalette_PikachuRockStar[];
extern const u32 gMonPalette_PikachuBelle[]; extern const u32 gMonPalette_PikachuBelle[];
@ -3466,14 +3551,13 @@ extern const u32 gMonPalette_PikachuAlolaCap[];
extern const u32 gMonPalette_PikachuPartnerCap[]; extern const u32 gMonPalette_PikachuPartnerCap[];
extern const u32 gMonPalette_PikachuWorldCap[]; extern const u32 gMonPalette_PikachuWorldCap[];
extern const u32 gMonPalette_PichuSpikyEared[]; extern const u32 gMonPalette_PichuSpikyEared[];
#endif
extern const u32 gMonPalette_CastformSunny[]; extern const u32 gMonPalette_CastformSunny[];
extern const u32 gMonPalette_CastformRainy[]; extern const u32 gMonPalette_CastformRainy[];
extern const u32 gMonPalette_CastformSnowy[]; extern const u32 gMonPalette_CastformSnowy[];
extern const u32 gMonPalette_DeoxysAttack[]; extern const u32 gMonPalette_DeoxysAttack[];
extern const u32 gMonPalette_DeoxysDefense[]; extern const u32 gMonPalette_DeoxysDefense[];
extern const u32 gMonPalette_DeoxysSpeed[]; 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_BurmySandyCloak[];
extern const u32 gMonPalette_BurmyTrashCloak[]; extern const u32 gMonPalette_BurmyTrashCloak[];
extern const u32 gMonPalette_WormadamSandyCloak[]; extern const u32 gMonPalette_WormadamSandyCloak[];
@ -3507,6 +3591,8 @@ extern const u32 gMonPalette_ArceusIce[];
extern const u32 gMonPalette_ArceusDragon[]; extern const u32 gMonPalette_ArceusDragon[];
extern const u32 gMonPalette_ArceusDark[]; extern const u32 gMonPalette_ArceusDark[];
extern const u32 gMonPalette_ArceusFairy[]; extern const u32 gMonPalette_ArceusFairy[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonPalette_BasculinBlueStriped[]; extern const u32 gMonPalette_BasculinBlueStriped[];
extern const u32 gMonPalette_BasculinWhiteStriped[]; extern const u32 gMonPalette_BasculinWhiteStriped[];
extern const u32 gMonPalette_DarmanitanZenMode[]; extern const u32 gMonPalette_DarmanitanZenMode[];
@ -3520,7 +3606,6 @@ extern const u32 gMonPalette_SawsbuckWinter[];
extern const u32 gMonPalette_TornadusTherian[]; extern const u32 gMonPalette_TornadusTherian[];
extern const u32 gMonPalette_ThundurusTherian[]; extern const u32 gMonPalette_ThundurusTherian[];
extern const u32 gMonPalette_LandorusTherian[]; extern const u32 gMonPalette_LandorusTherian[];
//extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_KyuremWhite[]; extern const u32 gMonPalette_KyuremWhite[];
extern const u32 gMonPalette_KyuremBlack[]; extern const u32 gMonPalette_KyuremBlack[];
extern const u32 gMonPalette_KeldeoResolute[]; extern const u32 gMonPalette_KeldeoResolute[];
@ -3529,6 +3614,8 @@ extern const u32 gMonPalette_GenesectDouseDrive[];
extern const u32 gMonPalette_GenesectShockDrive[]; extern const u32 gMonPalette_GenesectShockDrive[];
extern const u32 gMonPalette_GenesectBurnDrive[]; extern const u32 gMonPalette_GenesectBurnDrive[];
extern const u32 gMonPalette_GenesectChillDrive[]; extern const u32 gMonPalette_GenesectChillDrive[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonPalette_GreninjaAsh[]; extern const u32 gMonPalette_GreninjaAsh[];
extern const u32 gMonPalette_VivillonPolar[]; extern const u32 gMonPalette_VivillonPolar[];
extern const u32 gMonPalette_VivillonTundra[]; extern const u32 gMonPalette_VivillonTundra[];
@ -3577,6 +3664,8 @@ extern const u32 gMonPalette_XerneasActive[];
extern const u32 gMonPalette_Zygarde10[]; extern const u32 gMonPalette_Zygarde10[];
extern const u32 gMonPalette_ZygardeComplete[]; extern const u32 gMonPalette_ZygardeComplete[];
extern const u32 gMonPalette_HoopaUnbound[]; extern const u32 gMonPalette_HoopaUnbound[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonPalette_OricorioPomPom[]; extern const u32 gMonPalette_OricorioPomPom[];
extern const u32 gMonPalette_OricorioPau[]; extern const u32 gMonPalette_OricorioPau[];
extern const u32 gMonPalette_OricorioSensu[]; extern const u32 gMonPalette_OricorioSensu[];
@ -3612,6 +3701,8 @@ extern const u32 gMonPalette_NecrozmaDuskMane[];
extern const u32 gMonPalette_NecrozmaDawnWings[]; extern const u32 gMonPalette_NecrozmaDawnWings[];
extern const u32 gMonPalette_NecrozmaUltra[]; extern const u32 gMonPalette_NecrozmaUltra[];
extern const u32 gMonPalette_MagearnaOriginalColor[]; extern const u32 gMonPalette_MagearnaOriginalColor[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonPalette_CramorantGulping[]; extern const u32 gMonPalette_CramorantGulping[];
extern const u32 gMonPalette_CramorantGorging[]; extern const u32 gMonPalette_CramorantGorging[];
extern const u32 gMonPalette_ToxtricityLowKey[]; extern const u32 gMonPalette_ToxtricityLowKey[];
@ -3633,6 +3724,7 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonPalette_ZarudeDada[]; extern const u32 gMonPalette_ZarudeDada[];
extern const u32 gMonPalette_CalyrexIceRider[]; extern const u32 gMonPalette_CalyrexIceRider[];
extern const u32 gMonPalette_CalyrexShadowRider[]; extern const u32 gMonPalette_CalyrexShadowRider[];
//extern const u32 gMonPalette_EnamorusTherian[];
#endif #endif
extern const u32 gMonPalette_Egg[]; extern const u32 gMonPalette_Egg[];
@ -4024,7 +4116,7 @@ extern const u32 gMonShinyPalette_Groudon[];
extern const u32 gMonShinyPalette_Rayquaza[]; extern const u32 gMonShinyPalette_Rayquaza[];
extern const u32 gMonShinyPalette_Jirachi[]; extern const u32 gMonShinyPalette_Jirachi[];
extern const u32 gMonShinyPalette_Deoxys[]; 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_Turtwig[];
extern const u32 gMonShinyPalette_Grotle[]; extern const u32 gMonShinyPalette_Grotle[];
extern const u32 gMonShinyPalette_Torterra[]; extern const u32 gMonShinyPalette_Torterra[];
@ -4135,6 +4227,8 @@ extern const u32 gMonShinyPalette_Manaphy[];
extern const u32 gMonShinyPalette_Darkrai[]; extern const u32 gMonShinyPalette_Darkrai[];
extern const u32 gMonShinyPalette_Shaymin[]; extern const u32 gMonShinyPalette_Shaymin[];
extern const u32 gMonShinyPalette_Arceus[]; extern const u32 gMonShinyPalette_Arceus[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonShinyPalette_Victini[]; extern const u32 gMonShinyPalette_Victini[];
extern const u32 gMonShinyPalette_Snivy[]; extern const u32 gMonShinyPalette_Snivy[];
extern const u32 gMonShinyPalette_Servine[]; extern const u32 gMonShinyPalette_Servine[];
@ -4294,6 +4388,8 @@ extern const u32 gMonShinyPalette_Kyurem[];
extern const u32 gMonShinyPalette_Keldeo[]; extern const u32 gMonShinyPalette_Keldeo[];
extern const u32 gMonShinyPalette_Meloetta[]; extern const u32 gMonShinyPalette_Meloetta[];
extern const u32 gMonShinyPalette_Genesect[]; extern const u32 gMonShinyPalette_Genesect[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonShinyPalette_Chespin[]; extern const u32 gMonShinyPalette_Chespin[];
extern const u32 gMonShinyPalette_Quilladin[]; extern const u32 gMonShinyPalette_Quilladin[];
extern const u32 gMonShinyPalette_Chesnaught[]; extern const u32 gMonShinyPalette_Chesnaught[];
@ -4367,6 +4463,8 @@ extern const u32 gMonShinyPalette_Zygarde[];
extern const u32 gMonShinyPalette_Diancie[]; extern const u32 gMonShinyPalette_Diancie[];
extern const u32 gMonShinyPalette_Hoopa[]; extern const u32 gMonShinyPalette_Hoopa[];
extern const u32 gMonShinyPalette_Volcanion[]; extern const u32 gMonShinyPalette_Volcanion[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonShinyPalette_Rowlet[]; extern const u32 gMonShinyPalette_Rowlet[];
extern const u32 gMonShinyPalette_Dartrix[]; extern const u32 gMonShinyPalette_Dartrix[];
extern const u32 gMonShinyPalette_Decidueye[]; extern const u32 gMonShinyPalette_Decidueye[];
@ -4455,6 +4553,8 @@ extern const u32 gMonShinyPalette_Blacephalon[];
extern const u32 gMonShinyPalette_Zeraora[]; extern const u32 gMonShinyPalette_Zeraora[];
extern const u32 gMonShinyPalette_Meltan[]; extern const u32 gMonShinyPalette_Meltan[];
extern const u32 gMonShinyPalette_Melmetal[]; extern const u32 gMonShinyPalette_Melmetal[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonShinyPalette_Grookey[]; extern const u32 gMonShinyPalette_Grookey[];
extern const u32 gMonShinyPalette_Thwackey[]; extern const u32 gMonShinyPalette_Thwackey[];
extern const u32 gMonShinyPalette_Rillaboom[]; extern const u32 gMonShinyPalette_Rillaboom[];
@ -4552,6 +4652,7 @@ extern const u32 gMonShinyPalette_Ursaluna[];
//extern const u32 gMonShinyPalette_Sneasler[]; //extern const u32 gMonShinyPalette_Sneasler[];
extern const u32 gMonShinyPalette_Overqwil[]; extern const u32 gMonShinyPalette_Overqwil[];
//extern const u32 gMonShinyPalette_Enamorus[]; //extern const u32 gMonShinyPalette_Enamorus[];
#endif
extern const u32 gMonShinyPalette_VenusaurMega[]; extern const u32 gMonShinyPalette_VenusaurMega[];
extern const u32 gMonShinyPalette_CharizardMegaX[]; extern const u32 gMonShinyPalette_CharizardMegaX[];
extern const u32 gMonShinyPalette_CharizardMegaY[]; extern const u32 gMonShinyPalette_CharizardMegaY[];
@ -4592,13 +4693,19 @@ extern const u32 gMonShinyPalette_SalamenceMega[];
extern const u32 gMonShinyPalette_MetagrossMega[]; extern const u32 gMonShinyPalette_MetagrossMega[];
extern const u32 gMonShinyPalette_LatiasMega[]; extern const u32 gMonShinyPalette_LatiasMega[];
extern const u32 gMonShinyPalette_LatiosMega[]; extern const u32 gMonShinyPalette_LatiosMega[];
#if P_NEW_POKEMON >= GEN_4
extern const u32 gMonShinyPalette_LopunnyMega[]; extern const u32 gMonShinyPalette_LopunnyMega[];
extern const u32 gMonShinyPalette_GarchompMega[]; extern const u32 gMonShinyPalette_GarchompMega[];
extern const u32 gMonShinyPalette_LucarioMega[]; extern const u32 gMonShinyPalette_LucarioMega[];
extern const u32 gMonShinyPalette_AbomasnowMega[]; extern const u32 gMonShinyPalette_AbomasnowMega[];
extern const u32 gMonShinyPalette_GalladeMega[]; extern const u32 gMonShinyPalette_GalladeMega[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonShinyPalette_AudinoMega[]; extern const u32 gMonShinyPalette_AudinoMega[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonShinyPalette_DiancieMega[]; extern const u32 gMonShinyPalette_DiancieMega[];
#endif
extern const u32 gMonShinyPalette_RayquazaMega[]; extern const u32 gMonShinyPalette_RayquazaMega[];
extern const u32 gMonShinyPalette_KyogrePrimal[]; extern const u32 gMonShinyPalette_KyogrePrimal[];
extern const u32 gMonShinyPalette_GroudonPrimal[]; extern const u32 gMonShinyPalette_GroudonPrimal[];
@ -4635,10 +4742,12 @@ extern const u32 gMonShinyPalette_SlowkingGalarian[];
extern const u32 gMonShinyPalette_CorsolaGalarian[]; extern const u32 gMonShinyPalette_CorsolaGalarian[];
extern const u32 gMonShinyPalette_ZigzagoonGalarian[]; extern const u32 gMonShinyPalette_ZigzagoonGalarian[];
extern const u32 gMonShinyPalette_LinooneGalarian[]; extern const u32 gMonShinyPalette_LinooneGalarian[];
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonShinyPalette_DarumakaGalarian[]; extern const u32 gMonShinyPalette_DarumakaGalarian[];
extern const u32 gMonShinyPalette_DarmanitanGalarian[]; extern const u32 gMonShinyPalette_DarmanitanGalarian[];
extern const u32 gMonShinyPalette_YamaskGalarian[]; extern const u32 gMonShinyPalette_YamaskGalarian[];
extern const u32 gMonShinyPalette_StunfiskGalarian[]; extern const u32 gMonShinyPalette_StunfiskGalarian[];
#endif
extern const u32 gMonShinyPalette_GrowlitheHisuian[]; extern const u32 gMonShinyPalette_GrowlitheHisuian[];
extern const u32 gMonShinyPalette_ArcanineHisuian[]; extern const u32 gMonShinyPalette_ArcanineHisuian[];
extern const u32 gMonShinyPalette_VoltorbHisuian[]; extern const u32 gMonShinyPalette_VoltorbHisuian[];
@ -4646,15 +4755,21 @@ extern const u32 gMonShinyPalette_ElectrodeHisuian[];
extern const u32 gMonShinyPalette_TyphlosionHisuian[]; extern const u32 gMonShinyPalette_TyphlosionHisuian[];
extern const u32 gMonShinyPalette_QwilfishHisuian[]; extern const u32 gMonShinyPalette_QwilfishHisuian[];
extern const u32 gMonShinyPalette_SneaselHisuian[]; extern const u32 gMonShinyPalette_SneaselHisuian[];
#if P_NEW_POKEMON >= GEN_5
//extern const u32 gMonShinyPalette_SamurottHisuian[]; //extern const u32 gMonShinyPalette_SamurottHisuian[];
extern const u32 gMonShinyPalette_LilligantHisuian[]; extern const u32 gMonShinyPalette_LilligantHisuian[];
extern const u32 gMonShinyPalette_ZoruaHisuian[]; extern const u32 gMonShinyPalette_ZoruaHisuian[];
extern const u32 gMonShinyPalette_ZoroarkHisuian[]; extern const u32 gMonShinyPalette_ZoroarkHisuian[];
extern const u32 gMonShinyPalette_BraviaryHisuian[]; extern const u32 gMonShinyPalette_BraviaryHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonShinyPalette_SliggooHisuian[]; extern const u32 gMonShinyPalette_SliggooHisuian[];
extern const u32 gMonShinyPalette_GoodraHisuian[]; extern const u32 gMonShinyPalette_GoodraHisuian[];
extern const u32 gMonShinyPalette_AvaluggHisuian[]; extern const u32 gMonShinyPalette_AvaluggHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_7
//extern const u32 gMonShinyPalette_DecidueyeHisuian[]; //extern const u32 gMonShinyPalette_DecidueyeHisuian[];
#endif
extern const u32 gMonShinyPalette_PikachuCosplay[]; extern const u32 gMonShinyPalette_PikachuCosplay[];
extern const u32 gMonShinyPalette_PikachuRockStar[]; extern const u32 gMonShinyPalette_PikachuRockStar[];
extern const u32 gMonShinyPalette_PikachuBelle[]; extern const u32 gMonShinyPalette_PikachuBelle[];
@ -4670,14 +4785,13 @@ extern const u32 gMonShinyPalette_PikachuAlolaCap[];
extern const u32 gMonShinyPalette_PikachuPartnerCap[]; extern const u32 gMonShinyPalette_PikachuPartnerCap[];
extern const u32 gMonShinyPalette_PikachuWorldCap[]; extern const u32 gMonShinyPalette_PikachuWorldCap[];
extern const u32 gMonShinyPalette_PichuSpikyEared[]; extern const u32 gMonShinyPalette_PichuSpikyEared[];
#endif
extern const u32 gMonShinyPalette_CastformSunny[]; extern const u32 gMonShinyPalette_CastformSunny[];
extern const u32 gMonShinyPalette_CastformRainy[]; extern const u32 gMonShinyPalette_CastformRainy[];
extern const u32 gMonShinyPalette_CastformSnowy[]; extern const u32 gMonShinyPalette_CastformSnowy[];
extern const u32 gMonShinyPalette_DeoxysAttack[]; extern const u32 gMonShinyPalette_DeoxysAttack[];
extern const u32 gMonShinyPalette_DeoxysDefense[]; extern const u32 gMonShinyPalette_DeoxysDefense[];
extern const u32 gMonShinyPalette_DeoxysSpeed[]; 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_BurmySandyCloak[];
extern const u32 gMonShinyPalette_BurmyTrashCloak[]; extern const u32 gMonShinyPalette_BurmyTrashCloak[];
extern const u32 gMonShinyPalette_WormadamSandyCloak[]; extern const u32 gMonShinyPalette_WormadamSandyCloak[];
@ -4711,6 +4825,8 @@ extern const u32 gMonShinyPalette_ArceusIce[];
extern const u32 gMonShinyPalette_ArceusDragon[]; extern const u32 gMonShinyPalette_ArceusDragon[];
extern const u32 gMonShinyPalette_ArceusDark[]; extern const u32 gMonShinyPalette_ArceusDark[];
extern const u32 gMonShinyPalette_ArceusFairy[]; extern const u32 gMonShinyPalette_ArceusFairy[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u32 gMonShinyPalette_BasculinBlueStriped[]; extern const u32 gMonShinyPalette_BasculinBlueStriped[];
extern const u32 gMonShinyPalette_BasculinWhiteStriped[]; extern const u32 gMonShinyPalette_BasculinWhiteStriped[];
extern const u32 gMonShinyPalette_DarmanitanZenMode[]; extern const u32 gMonShinyPalette_DarmanitanZenMode[];
@ -4724,7 +4840,6 @@ extern const u32 gMonShinyPalette_SawsbuckWinter[];
extern const u32 gMonShinyPalette_TornadusTherian[]; extern const u32 gMonShinyPalette_TornadusTherian[];
extern const u32 gMonShinyPalette_ThundurusTherian[]; extern const u32 gMonShinyPalette_ThundurusTherian[];
extern const u32 gMonShinyPalette_LandorusTherian[]; extern const u32 gMonShinyPalette_LandorusTherian[];
//extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_KyuremWhite[]; extern const u32 gMonShinyPalette_KyuremWhite[];
extern const u32 gMonShinyPalette_KyuremBlack[]; extern const u32 gMonShinyPalette_KyuremBlack[];
extern const u32 gMonShinyPalette_KeldeoResolute[]; extern const u32 gMonShinyPalette_KeldeoResolute[];
@ -4733,6 +4848,8 @@ extern const u32 gMonShinyPalette_GenesectDouseDrive[];
extern const u32 gMonShinyPalette_GenesectShockDrive[]; extern const u32 gMonShinyPalette_GenesectShockDrive[];
extern const u32 gMonShinyPalette_GenesectBurnDrive[]; extern const u32 gMonShinyPalette_GenesectBurnDrive[];
extern const u32 gMonShinyPalette_GenesectChillDrive[]; extern const u32 gMonShinyPalette_GenesectChillDrive[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u32 gMonShinyPalette_GreninjaAsh[]; extern const u32 gMonShinyPalette_GreninjaAsh[];
extern const u32 gMonShinyPalette_VivillonPolar[]; extern const u32 gMonShinyPalette_VivillonPolar[];
extern const u32 gMonShinyPalette_VivillonTundra[]; extern const u32 gMonShinyPalette_VivillonTundra[];
@ -4781,6 +4898,8 @@ extern const u32 gMonShinyPalette_XerneasActive[];
extern const u32 gMonShinyPalette_Zygarde10[]; extern const u32 gMonShinyPalette_Zygarde10[];
extern const u32 gMonShinyPalette_ZygardeComplete[]; extern const u32 gMonShinyPalette_ZygardeComplete[];
extern const u32 gMonShinyPalette_HoopaUnbound[]; extern const u32 gMonShinyPalette_HoopaUnbound[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u32 gMonShinyPalette_OricorioPomPom[]; extern const u32 gMonShinyPalette_OricorioPomPom[];
extern const u32 gMonShinyPalette_OricorioPau[]; extern const u32 gMonShinyPalette_OricorioPau[];
extern const u32 gMonShinyPalette_OricorioSensu[]; extern const u32 gMonShinyPalette_OricorioSensu[];
@ -4810,6 +4929,8 @@ extern const u32 gMonShinyPalette_NecrozmaDuskMane[];
extern const u32 gMonShinyPalette_NecrozmaDawnWings[]; extern const u32 gMonShinyPalette_NecrozmaDawnWings[];
extern const u32 gMonShinyPalette_NecrozmaUltra[]; extern const u32 gMonShinyPalette_NecrozmaUltra[];
extern const u32 gMonShinyPalette_MagearnaOriginalColor[]; extern const u32 gMonShinyPalette_MagearnaOriginalColor[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u32 gMonShinyPalette_CramorantGulping[]; extern const u32 gMonShinyPalette_CramorantGulping[];
extern const u32 gMonShinyPalette_CramorantGorging[]; extern const u32 gMonShinyPalette_CramorantGorging[];
extern const u32 gMonShinyPalette_ToxtricityLowKey[]; extern const u32 gMonShinyPalette_ToxtricityLowKey[];
@ -4831,6 +4952,7 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonShinyPalette_ZarudeDada[]; extern const u32 gMonShinyPalette_ZarudeDada[];
extern const u32 gMonShinyPalette_CalyrexIceRider[]; extern const u32 gMonShinyPalette_CalyrexIceRider[];
extern const u32 gMonShinyPalette_CalyrexShadowRider[]; extern const u32 gMonShinyPalette_CalyrexShadowRider[];
//extern const u32 gMonShinyPalette_EnamorusTherian[];
#endif #endif
extern const u8 gMonIcon_QuestionMark[]; extern const u8 gMonIcon_QuestionMark[];
@ -5220,7 +5342,7 @@ extern const u8 gMonIcon_Groudon[];
extern const u8 gMonIcon_Rayquaza[]; extern const u8 gMonIcon_Rayquaza[];
extern const u8 gMonIcon_Jirachi[]; extern const u8 gMonIcon_Jirachi[];
extern const u8 gMonIcon_Deoxys[]; 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_Turtwig[];
extern const u8 gMonIcon_Grotle[]; extern const u8 gMonIcon_Grotle[];
extern const u8 gMonIcon_Torterra[]; extern const u8 gMonIcon_Torterra[];
@ -5328,6 +5450,8 @@ extern const u8 gMonIcon_Manaphy[];
extern const u8 gMonIcon_Darkrai[]; extern const u8 gMonIcon_Darkrai[];
extern const u8 gMonIcon_Shaymin[]; extern const u8 gMonIcon_Shaymin[];
extern const u8 gMonIcon_Arceus[]; extern const u8 gMonIcon_Arceus[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u8 gMonIcon_Victini[]; extern const u8 gMonIcon_Victini[];
extern const u8 gMonIcon_Snivy[]; extern const u8 gMonIcon_Snivy[];
extern const u8 gMonIcon_Servine[]; extern const u8 gMonIcon_Servine[];
@ -5487,6 +5611,8 @@ extern const u8 gMonIcon_Kyurem[];
extern const u8 gMonIcon_Keldeo[]; extern const u8 gMonIcon_Keldeo[];
extern const u8 gMonIcon_Meloetta[]; extern const u8 gMonIcon_Meloetta[];
extern const u8 gMonIcon_Genesect[]; extern const u8 gMonIcon_Genesect[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u8 gMonIcon_Chespin[]; extern const u8 gMonIcon_Chespin[];
extern const u8 gMonIcon_Quilladin[]; extern const u8 gMonIcon_Quilladin[];
extern const u8 gMonIcon_Chesnaught[]; extern const u8 gMonIcon_Chesnaught[];
@ -5560,6 +5686,8 @@ extern const u8 gMonIcon_Zygarde[];
extern const u8 gMonIcon_Diancie[]; extern const u8 gMonIcon_Diancie[];
extern const u8 gMonIcon_Hoopa[]; extern const u8 gMonIcon_Hoopa[];
extern const u8 gMonIcon_Volcanion[]; extern const u8 gMonIcon_Volcanion[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u8 gMonIcon_Rowlet[]; extern const u8 gMonIcon_Rowlet[];
extern const u8 gMonIcon_Dartrix[]; extern const u8 gMonIcon_Dartrix[];
extern const u8 gMonIcon_Decidueye[]; extern const u8 gMonIcon_Decidueye[];
@ -5648,6 +5776,8 @@ extern const u8 gMonIcon_Blacephalon[];
extern const u8 gMonIcon_Zeraora[]; extern const u8 gMonIcon_Zeraora[];
extern const u8 gMonIcon_Meltan[]; extern const u8 gMonIcon_Meltan[];
extern const u8 gMonIcon_Melmetal[]; extern const u8 gMonIcon_Melmetal[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u8 gMonIcon_Grookey[]; extern const u8 gMonIcon_Grookey[];
extern const u8 gMonIcon_Thwackey[]; extern const u8 gMonIcon_Thwackey[];
extern const u8 gMonIcon_Rillaboom[]; extern const u8 gMonIcon_Rillaboom[];
@ -5745,6 +5875,7 @@ extern const u8 gMonIcon_BasculegionF[];
extern const u8 gMonIcon_Sneasler[]; extern const u8 gMonIcon_Sneasler[];
extern const u8 gMonIcon_Overqwil[]; extern const u8 gMonIcon_Overqwil[];
extern const u8 gMonIcon_Enamorus[]; extern const u8 gMonIcon_Enamorus[];
#endif
extern const u8 gMonIcon_VenusaurMega[]; extern const u8 gMonIcon_VenusaurMega[];
extern const u8 gMonIcon_CharizardMegaX[]; extern const u8 gMonIcon_CharizardMegaX[];
extern const u8 gMonIcon_CharizardMegaY[]; extern const u8 gMonIcon_CharizardMegaY[];
@ -5785,13 +5916,19 @@ extern const u8 gMonIcon_SalamenceMega[];
extern const u8 gMonIcon_MetagrossMega[]; extern const u8 gMonIcon_MetagrossMega[];
extern const u8 gMonIcon_LatiasMega[]; extern const u8 gMonIcon_LatiasMega[];
extern const u8 gMonIcon_LatiosMega[]; extern const u8 gMonIcon_LatiosMega[];
#if P_NEW_POKEMON >= GEN_4
extern const u8 gMonIcon_LopunnyMega[]; extern const u8 gMonIcon_LopunnyMega[];
extern const u8 gMonIcon_GarchompMega[]; extern const u8 gMonIcon_GarchompMega[];
extern const u8 gMonIcon_LucarioMega[]; extern const u8 gMonIcon_LucarioMega[];
extern const u8 gMonIcon_AbomasnowMega[]; extern const u8 gMonIcon_AbomasnowMega[];
extern const u8 gMonIcon_GalladeMega[]; extern const u8 gMonIcon_GalladeMega[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u8 gMonIcon_AudinoMega[]; extern const u8 gMonIcon_AudinoMega[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u8 gMonIcon_DiancieMega[]; extern const u8 gMonIcon_DiancieMega[];
#endif
extern const u8 gMonIcon_RayquazaMega[]; extern const u8 gMonIcon_RayquazaMega[];
extern const u8 gMonIcon_KyogrePrimal[]; extern const u8 gMonIcon_KyogrePrimal[];
extern const u8 gMonIcon_GroudonPrimal[]; extern const u8 gMonIcon_GroudonPrimal[];
@ -5828,10 +5965,12 @@ extern const u8 gMonIcon_SlowkingGalarian[];
extern const u8 gMonIcon_CorsolaGalarian[]; extern const u8 gMonIcon_CorsolaGalarian[];
extern const u8 gMonIcon_ZigzagoonGalarian[]; extern const u8 gMonIcon_ZigzagoonGalarian[];
extern const u8 gMonIcon_LinooneGalarian[]; extern const u8 gMonIcon_LinooneGalarian[];
#if P_NEW_POKEMON >= GEN_5
extern const u8 gMonIcon_DarumakaGalarian[]; extern const u8 gMonIcon_DarumakaGalarian[];
extern const u8 gMonIcon_DarmanitanGalarian[]; extern const u8 gMonIcon_DarmanitanGalarian[];
extern const u8 gMonIcon_YamaskGalarian[]; extern const u8 gMonIcon_YamaskGalarian[];
extern const u8 gMonIcon_StunfiskGalarian[]; extern const u8 gMonIcon_StunfiskGalarian[];
#endif
extern const u8 gMonIcon_GrowlitheHisuian[]; extern const u8 gMonIcon_GrowlitheHisuian[];
extern const u8 gMonIcon_ArcanineHisuian[]; extern const u8 gMonIcon_ArcanineHisuian[];
extern const u8 gMonIcon_VoltorbHisuian[]; extern const u8 gMonIcon_VoltorbHisuian[];
@ -5839,15 +5978,21 @@ extern const u8 gMonIcon_ElectrodeHisuian[];
extern const u8 gMonIcon_TyphlosionHisuian[]; extern const u8 gMonIcon_TyphlosionHisuian[];
extern const u8 gMonIcon_QwilfishHisuian[]; extern const u8 gMonIcon_QwilfishHisuian[];
extern const u8 gMonIcon_SneaselHisuian[]; extern const u8 gMonIcon_SneaselHisuian[];
#if P_NEW_POKEMON >= GEN_5
extern const u8 gMonIcon_SamurottHisuian[]; extern const u8 gMonIcon_SamurottHisuian[];
extern const u8 gMonIcon_LilligantHisuian[]; extern const u8 gMonIcon_LilligantHisuian[];
extern const u8 gMonIcon_ZoruaHisuian[]; extern const u8 gMonIcon_ZoruaHisuian[];
extern const u8 gMonIcon_ZoroarkHisuian[]; extern const u8 gMonIcon_ZoroarkHisuian[];
extern const u8 gMonIcon_BraviaryHisuian[]; extern const u8 gMonIcon_BraviaryHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u8 gMonIcon_SliggooHisuian[]; extern const u8 gMonIcon_SliggooHisuian[];
extern const u8 gMonIcon_GoodraHisuian[]; extern const u8 gMonIcon_GoodraHisuian[];
extern const u8 gMonIcon_AvaluggHisuian[]; extern const u8 gMonIcon_AvaluggHisuian[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u8 gMonIcon_DecidueyeHisuian[]; extern const u8 gMonIcon_DecidueyeHisuian[];
#endif
extern const u8 gMonIcon_PikachuCosplay[]; extern const u8 gMonIcon_PikachuCosplay[];
extern const u8 gMonIcon_PikachuRockStar[]; extern const u8 gMonIcon_PikachuRockStar[];
extern const u8 gMonIcon_PikachuBelle[]; extern const u8 gMonIcon_PikachuBelle[];
@ -5862,7 +6007,6 @@ extern const u8 gMonIcon_PikachuKalosCap[];
extern const u8 gMonIcon_PikachuAlolaCap[]; extern const u8 gMonIcon_PikachuAlolaCap[];
extern const u8 gMonIcon_PikachuPartnerCap[]; extern const u8 gMonIcon_PikachuPartnerCap[];
extern const u8 gMonIcon_PichuSpikyEared[]; extern const u8 gMonIcon_PichuSpikyEared[];
#endif
extern const u8 gMonIcon_UnownB[]; extern const u8 gMonIcon_UnownB[];
extern const u8 gMonIcon_UnownC[]; extern const u8 gMonIcon_UnownC[];
extern const u8 gMonIcon_UnownD[]; extern const u8 gMonIcon_UnownD[];
@ -5896,7 +6040,7 @@ extern const u8 gMonIcon_CastformSnowy[];
extern const u8 gMonIcon_DeoxysAttack[]; extern const u8 gMonIcon_DeoxysAttack[];
extern const u8 gMonIcon_DeoxysDefense[]; extern const u8 gMonIcon_DeoxysDefense[];
extern const u8 gMonIcon_DeoxysSpeed[]; 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_BurmySandyCloak[];
extern const u8 gMonIcon_BurmyTrashCloak[]; extern const u8 gMonIcon_BurmyTrashCloak[];
extern const u8 gMonIcon_WormadamSandyCloak[]; extern const u8 gMonIcon_WormadamSandyCloak[];
@ -5913,6 +6057,8 @@ extern const u8 gMonIcon_DialgaOrigin[];
extern const u8 gMonIcon_PalkiaOrigin[]; extern const u8 gMonIcon_PalkiaOrigin[];
extern const u8 gMonIcon_GiratinaOrigin[]; extern const u8 gMonIcon_GiratinaOrigin[];
extern const u8 gMonIcon_ShayminSky[]; extern const u8 gMonIcon_ShayminSky[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u8 gMonIcon_BasculinBlueStriped[]; extern const u8 gMonIcon_BasculinBlueStriped[];
extern const u8 gMonIcon_BasculinWhiteStriped[]; extern const u8 gMonIcon_BasculinWhiteStriped[];
extern const u8 gMonIcon_DarmanitanZenMode[]; extern const u8 gMonIcon_DarmanitanZenMode[];
@ -5926,11 +6072,12 @@ extern const u8 gMonIcon_SawsbuckWinter[];
extern const u8 gMonIcon_TornadusTherian[]; extern const u8 gMonIcon_TornadusTherian[];
extern const u8 gMonIcon_ThundurusTherian[]; extern const u8 gMonIcon_ThundurusTherian[];
extern const u8 gMonIcon_LandorusTherian[]; extern const u8 gMonIcon_LandorusTherian[];
extern const u8 gMonIcon_EnamorusTherian[];
extern const u8 gMonIcon_KyuremWhite[]; extern const u8 gMonIcon_KyuremWhite[];
extern const u8 gMonIcon_KyuremBlack[]; extern const u8 gMonIcon_KyuremBlack[];
extern const u8 gMonIcon_KeldeoResolute[]; extern const u8 gMonIcon_KeldeoResolute[];
extern const u8 gMonIcon_MeloettaPirouette[]; extern const u8 gMonIcon_MeloettaPirouette[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u8 gMonIcon_GreninjaAsh[]; extern const u8 gMonIcon_GreninjaAsh[];
extern const u8 gMonIcon_VivillonPolar[]; extern const u8 gMonIcon_VivillonPolar[];
extern const u8 gMonIcon_VivillonTundra[]; extern const u8 gMonIcon_VivillonTundra[];
@ -5979,6 +6126,8 @@ extern const u8 gMonIcon_XerneasActive[];
extern const u8 gMonIcon_Zygarde10[]; extern const u8 gMonIcon_Zygarde10[];
extern const u8 gMonIcon_ZygardeComplete[]; extern const u8 gMonIcon_ZygardeComplete[];
extern const u8 gMonIcon_HoopaUnbound[]; extern const u8 gMonIcon_HoopaUnbound[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u8 gMonIcon_OricorioPomPom[]; extern const u8 gMonIcon_OricorioPomPom[];
extern const u8 gMonIcon_OricorioPau[]; extern const u8 gMonIcon_OricorioPau[];
extern const u8 gMonIcon_OricorioSensu[]; extern const u8 gMonIcon_OricorioSensu[];
@ -5997,6 +6146,8 @@ extern const u8 gMonIcon_NecrozmaDuskMane[];
extern const u8 gMonIcon_NecrozmaDawnWings[]; extern const u8 gMonIcon_NecrozmaDawnWings[];
extern const u8 gMonIcon_NecrozmaUltra[]; extern const u8 gMonIcon_NecrozmaUltra[];
extern const u8 gMonIcon_MagearnaOriginalColor[]; extern const u8 gMonIcon_MagearnaOriginalColor[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u8 gMonIcon_CramorantGulping[]; extern const u8 gMonIcon_CramorantGulping[];
extern const u8 gMonIcon_CramorantGorging[]; extern const u8 gMonIcon_CramorantGorging[];
extern const u8 gMonIcon_ToxtricityLowKey[]; extern const u8 gMonIcon_ToxtricityLowKey[];
@ -6017,6 +6168,7 @@ extern const u8 gMonIcon_EternatusEternamax[];
extern const u8 gMonIcon_ZarudeDada[]; extern const u8 gMonIcon_ZarudeDada[];
extern const u8 gMonIcon_CalyrexIceRider[]; extern const u8 gMonIcon_CalyrexIceRider[];
extern const u8 gMonIcon_CalyrexShadowRider[]; extern const u8 gMonIcon_CalyrexShadowRider[];
extern const u8 gMonIcon_EnamorusTherian[];
#endif #endif
extern const u8 gMonIcon_Egg[]; extern const u8 gMonIcon_Egg[];
@ -6407,7 +6559,7 @@ extern const u8 gMonFootprint_Latios[];
extern const u8 gMonFootprint_Jirachi[]; extern const u8 gMonFootprint_Jirachi[];
extern const u8 gMonFootprint_Deoxys[]; extern const u8 gMonFootprint_Deoxys[];
extern const u8 gMonFootprint_Chimecho[]; 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_Turtwig[];
extern const u8 gMonFootprint_Grotle[]; extern const u8 gMonFootprint_Grotle[];
extern const u8 gMonFootprint_Torterra[]; extern const u8 gMonFootprint_Torterra[];
@ -6515,6 +6667,8 @@ extern const u8 gMonFootprint_Manaphy[];
extern const u8 gMonFootprint_Darkrai[]; extern const u8 gMonFootprint_Darkrai[];
extern const u8 gMonFootprint_Shaymin[]; extern const u8 gMonFootprint_Shaymin[];
extern const u8 gMonFootprint_Arceus[]; extern const u8 gMonFootprint_Arceus[];
#endif
#if P_NEW_POKEMON >= GEN_5
extern const u8 gMonFootprint_Victini[]; extern const u8 gMonFootprint_Victini[];
extern const u8 gMonFootprint_Snivy[]; extern const u8 gMonFootprint_Snivy[];
extern const u8 gMonFootprint_Servine[]; extern const u8 gMonFootprint_Servine[];
@ -6671,6 +6825,8 @@ extern const u8 gMonFootprint_Kyurem[];
extern const u8 gMonFootprint_Keldeo[]; extern const u8 gMonFootprint_Keldeo[];
extern const u8 gMonFootprint_Meloetta[]; extern const u8 gMonFootprint_Meloetta[];
extern const u8 gMonFootprint_Genesect[]; extern const u8 gMonFootprint_Genesect[];
#endif
#if P_NEW_POKEMON >= GEN_6
extern const u8 gMonFootprint_Chespin[]; extern const u8 gMonFootprint_Chespin[];
extern const u8 gMonFootprint_Quilladin[]; extern const u8 gMonFootprint_Quilladin[];
extern const u8 gMonFootprint_Chesnaught[]; extern const u8 gMonFootprint_Chesnaught[];
@ -6743,6 +6899,8 @@ extern const u8 gMonFootprint_Zygarde[];
extern const u8 gMonFootprint_Diancie[]; extern const u8 gMonFootprint_Diancie[];
extern const u8 gMonFootprint_Hoopa[]; extern const u8 gMonFootprint_Hoopa[];
extern const u8 gMonFootprint_Volcanion[]; extern const u8 gMonFootprint_Volcanion[];
#endif
#if P_NEW_POKEMON >= GEN_7
extern const u8 gMonFootprint_Rowlet[]; extern const u8 gMonFootprint_Rowlet[];
extern const u8 gMonFootprint_Dartrix[]; extern const u8 gMonFootprint_Dartrix[];
extern const u8 gMonFootprint_Decidueye[]; extern const u8 gMonFootprint_Decidueye[];
@ -6831,6 +6989,8 @@ extern const u8 gMonFootprint_Blacephalon[];
extern const u8 gMonFootprint_Zeraora[]; extern const u8 gMonFootprint_Zeraora[];
extern const u8 gMonFootprint_Meltan[]; extern const u8 gMonFootprint_Meltan[];
extern const u8 gMonFootprint_Melmetal[]; extern const u8 gMonFootprint_Melmetal[];
#endif
#if P_NEW_POKEMON >= GEN_8
extern const u8 gMonFootprint_Grookey[]; extern const u8 gMonFootprint_Grookey[];
extern const u8 gMonFootprint_Thwackey[]; extern const u8 gMonFootprint_Thwackey[];
extern const u8 gMonFootprint_Rillaboom[]; extern const u8 gMonFootprint_Rillaboom[];

File diff suppressed because it is too large Load Diff

View File

@ -1930,7 +1930,7 @@ Cry_Jirachi::
Cry_Deoxys:: Cry_Deoxys::
.incbin "sound/direct_sound_samples/cries/deoxys.bin" .incbin "sound/direct_sound_samples/cries/deoxys.bin"
.if P_NEW_POKEMON == TRUE .if P_NEW_POKEMON >= GEN_4
.align 2 .align 2
Cry_Turtwig:: Cry_Turtwig::
.incbin "sound/direct_sound_samples/cries/turtwig.bin" .incbin "sound/direct_sound_samples/cries/turtwig.bin"
@ -2358,7 +2358,9 @@ Cry_Shaymin::
.align 2 .align 2
Cry_Arceus:: Cry_Arceus::
.incbin "sound/direct_sound_samples/cries/arceus.bin" .incbin "sound/direct_sound_samples/cries/arceus.bin"
.endif
.if P_NEW_POKEMON >= GEN_5
.align 2 .align 2
Cry_Victini:: Cry_Victini::
.incbin "sound/direct_sound_samples/cries/victini.bin" .incbin "sound/direct_sound_samples/cries/victini.bin"
@ -2982,7 +2984,9 @@ Cry_Meloetta::
.align 2 .align 2
Cry_Genesect:: Cry_Genesect::
.incbin "sound/direct_sound_samples/cries/genesect.bin" .incbin "sound/direct_sound_samples/cries/genesect.bin"
.endif
.if P_NEW_POKEMON >= GEN_6
.align 2 .align 2
Cry_Chespin:: Cry_Chespin::
.incbin "sound/direct_sound_samples/cries/chespin.bin" .incbin "sound/direct_sound_samples/cries/chespin.bin"
@ -3270,7 +3274,9 @@ Cry_Hoopa::
.align 2 .align 2
Cry_Volcanion:: Cry_Volcanion::
.incbin "sound/direct_sound_samples/cries/volcanion.bin" .incbin "sound/direct_sound_samples/cries/volcanion.bin"
.endif
.if P_NEW_POKEMON >= GEN_7
.align 2 .align 2
Cry_Rowlet:: Cry_Rowlet::
.incbin "sound/direct_sound_samples/cries/rowlet.bin" .incbin "sound/direct_sound_samples/cries/rowlet.bin"
@ -3622,7 +3628,9 @@ Cry_Meltan::
.align 2 .align 2
Cry_Melmetal:: Cry_Melmetal::
.incbin "sound/direct_sound_samples/cries/melmetal.bin" .incbin "sound/direct_sound_samples/cries/melmetal.bin"
.endif
.if P_NEW_POKEMON >= GEN_8
.align 2 .align 2
Cry_Grookey:: Cry_Grookey::
.incbin "sound/direct_sound_samples/cries/grookey.bin" .incbin "sound/direct_sound_samples/cries/grookey.bin"
@ -4007,6 +4015,7 @@ Cry_Overqwil::
Cry_Enamorus:: Cry_Enamorus::
.incbin "sound/direct_sound_samples/cries/enamorus.bin" .incbin "sound/direct_sound_samples/cries/enamorus.bin"
*/ */
.endif
.align 2 .align 2
Cry_VenusaurMega:: Cry_VenusaurMega::
@ -4168,6 +4177,7 @@ Cry_LatiasMega::
Cry_LatiosMega:: Cry_LatiosMega::
.incbin "sound/direct_sound_samples/cries/mega_latios.bin" .incbin "sound/direct_sound_samples/cries/mega_latios.bin"
.if P_NEW_POKEMON >= GEN_4
.align 2 .align 2
Cry_LopunnyMega:: Cry_LopunnyMega::
.incbin "sound/direct_sound_samples/cries/mega_lopunny.bin" .incbin "sound/direct_sound_samples/cries/mega_lopunny.bin"
@ -4187,14 +4197,19 @@ Cry_AbomasnowMega::
.align 2 .align 2
Cry_GalladeMega:: Cry_GalladeMega::
.incbin "sound/direct_sound_samples/cries/mega_gallade.bin" .incbin "sound/direct_sound_samples/cries/mega_gallade.bin"
.endif
.if P_NEW_POKEMON >= GEN_5
.align 2 .align 2
Cry_AudinoMega:: Cry_AudinoMega::
.incbin "sound/direct_sound_samples/cries/mega_audino.bin" .incbin "sound/direct_sound_samples/cries/mega_audino.bin"
.endif
.if P_NEW_POKEMON >= GEN_6
.align 2 .align 2
Cry_DiancieMega:: Cry_DiancieMega::
.incbin "sound/direct_sound_samples/cries/mega_diancie.bin" .incbin "sound/direct_sound_samples/cries/mega_diancie.bin"
.endif
.align 2 .align 2
Cry_RayquazaMega:: Cry_RayquazaMega::
@ -4212,10 +4227,13 @@ Cry_GroudonPrimal::
Cry_SlowpokeGalarian:: Cry_SlowpokeGalarian::
.incbin "sound/direct_sound_samples/cries/slowpoke_galarian.bin" .incbin "sound/direct_sound_samples/cries/slowpoke_galarian.bin"
.if P_NEW_POKEMON >= GEN_4
.align 2 .align 2
Cry_ShayminSky:: Cry_ShayminSky::
.incbin "sound/direct_sound_samples/cries/shaymin_sky.bin" .incbin "sound/direct_sound_samples/cries/shaymin_sky.bin"
.endif
.if P_NEW_POKEMON >= GEN_4
.align 2 .align 2
Cry_TornadusTherian:: Cry_TornadusTherian::
.incbin "sound/direct_sound_samples/cries/tornadus_therian.bin" .incbin "sound/direct_sound_samples/cries/tornadus_therian.bin"
@ -4227,11 +4245,6 @@ Cry_ThundurusTherian::
.align 2 .align 2
Cry_LandorusTherian:: Cry_LandorusTherian::
.incbin "sound/direct_sound_samples/cries/landorus_therian.bin" .incbin "sound/direct_sound_samples/cries/landorus_therian.bin"
/*
.align 2
Cry_EnamorusTherian::
.incbin "sound/direct_sound_samples/cries/enamorus_therian.bin"
*/
.align 2 .align 2
Cry_KyuremWhite:: Cry_KyuremWhite::
@ -4240,7 +4253,9 @@ Cry_KyuremWhite::
.align 2 .align 2
Cry_KyuremBlack:: Cry_KyuremBlack::
.incbin "sound/direct_sound_samples/cries/kyurem_black.bin" .incbin "sound/direct_sound_samples/cries/kyurem_black.bin"
.endif
.if P_NEW_POKEMON >= GEN_6
.align 2 .align 2
Cry_FloetteEternalFlower:: Cry_FloetteEternalFlower::
.incbin "sound/direct_sound_samples/cries/floette_eternal_flower.bin" .incbin "sound/direct_sound_samples/cries/floette_eternal_flower.bin"
@ -4300,7 +4315,9 @@ Cry_NecrozmaDawnWings::
.align 2 .align 2
Cry_NecrozmaUltra:: Cry_NecrozmaUltra::
.incbin "sound/direct_sound_samples/cries/necrozma_ultra.bin" .incbin "sound/direct_sound_samples/cries/necrozma_ultra.bin"
.endif
.if P_NEW_POKEMON >= GEN_8
.align 2 .align 2
Cry_ToxtricityLowKey:: Cry_ToxtricityLowKey::
.incbin "sound/direct_sound_samples/cries/toxtricity_low_key.bin" .incbin "sound/direct_sound_samples/cries/toxtricity_low_key.bin"
@ -4340,6 +4357,12 @@ Cry_CalyrexIceRider::
.align 2 .align 2
Cry_CalyrexShadowRider:: Cry_CalyrexShadowRider::
.incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin" .incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin"
/*
.align 2
Cry_EnamorusTherian::
.incbin "sound/direct_sound_samples/cries/enamorus_therian.bin"
*/
.endif .endif
.align 2 .align 2

View File

@ -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_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_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz");
const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/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_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_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz");
const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/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_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_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front.4bpp.lz");
const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/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_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_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/anim_front.4bpp.lz");
const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/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_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_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz");
const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/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_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_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/anim_front.4bpp.lz");
const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/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_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_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz");
const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/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_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/front.4bpp.lz");
const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/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"); 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_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/front.4bpp.lz");
const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/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"); 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_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/front.4bpp.lz");
const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/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"); 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_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/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"); //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_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_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"); 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_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_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz");
const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/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_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_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_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_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/front.4bpp.lz");
const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/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"); 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"); 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_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_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz");
const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/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_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_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz");
const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/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_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_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_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz");
const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/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_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_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/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_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_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/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_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_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_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_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/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_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_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz");
const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/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"); //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_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_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz");
const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/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_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_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"); 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_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_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"); 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_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_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"); 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_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_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"); 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_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_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"); 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_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_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"); 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_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_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_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_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_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_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz");
const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/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_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_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"); 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_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_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"); 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_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_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz");
const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/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_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_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/front.4bpp.lz");
const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/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_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_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/front.4bpp.lz");
const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/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_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_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_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 #endif
const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); 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_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz");
const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/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"); 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_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz");
const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/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"); 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_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz");
const u32 gMonBackPic_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/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"); 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_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/back.4bpp.lz");
const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/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"); 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_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp.lz");
const u32 gMonBackPic_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/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"); 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_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/back.4bpp.lz");
const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/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"); 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_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/back.4bpp.lz");
const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/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"); 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_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz");
const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/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"); 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_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/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"); //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_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_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"); 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_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_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/back.4bpp.lz");
const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/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_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_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_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_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/back.4bpp.lz");
const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/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"); 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"); 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_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_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/back.4bpp.lz");
const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/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_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_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/back.4bpp.lz");
const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/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_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_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_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz");
const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/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_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_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz");
const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/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_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_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz");
const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/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_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_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_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_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz");
const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/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_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_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz");
const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/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"); //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_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_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz");
const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/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_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_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"); 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_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_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz");
const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/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_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_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz");
const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/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_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_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"); 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_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_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/back.4bpp.lz");
const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/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_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_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"); 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_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_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_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_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_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_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz");
const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/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_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_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/back.4bpp.lz");
const u32 gMonBackPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/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_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_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz");
const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/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_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_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz");
const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/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_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_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/back.4bpp.lz");
const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/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_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_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/back.4bpp.lz");
const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/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_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_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_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 #endif
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz"); 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_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz");
const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/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"); 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_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz");
const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/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"); 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_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/normal.gbapal.lz");
const u32 gMonPalette_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/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"); 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_Victini[] = INCBIN_U32("graphics/pokemon/victini/normal.gbapal.lz");
const u32 gMonPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/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"); 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_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbapal.lz");
const u32 gMonPalette_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/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"); 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_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/normal.gbapal.lz");
const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/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"); 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_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/normal.gbapal.lz");
const u32 gMonPalette_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/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"); 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_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/normal.gbapal.lz");
const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/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"); 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_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/normal.gbapal.lz");
const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/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"); 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_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/normal.gbapal.lz");
const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/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"); 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_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/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"); //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_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_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"); 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_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_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/normal.gbapal.lz");
const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/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_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_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_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_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/normal.gbapal.lz");
const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/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"); 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"); 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_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_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/normal.gbapal.lz");
const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/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_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_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/normal.gbapal.lz");
const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/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_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_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_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz");
const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/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_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_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz");
const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/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_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_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz");
const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/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_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_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_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_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz");
const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/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_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_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz");
const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/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"); //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_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_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz");
const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/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_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_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"); 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_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_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_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_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_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz");
const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/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_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_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"); 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_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_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/normal.gbapal.lz");
const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/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_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_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"); 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_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_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_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_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_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/normal.gbapal.lz");
const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/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_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_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"); 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_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_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/normal.gbapal.lz");
const u32 gMonPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/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_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_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz");
const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/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_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_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz");
const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/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_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_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/normal.gbapal.lz");
const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/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_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_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/normal.gbapal.lz");
const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/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_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_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_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 #endif
const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); 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_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz");
const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/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"); 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_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz");
const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/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"); 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_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shiny.gbapal.lz");
const u32 gMonShinyPalette_Shaymin[] = INCBIN_U32("graphics/pokemon/shaymin/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"); 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_Victini[] = INCBIN_U32("graphics/pokemon/victini/shiny.gbapal.lz");
const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/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"); 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_Keldeo[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz");
const u32 gMonShinyPalette_Meloetta[] = INCBIN_U32("graphics/pokemon/meloetta/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"); 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_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/shiny.gbapal.lz");
const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/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"); 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_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shiny.gbapal.lz");
const u32 gMonShinyPalette_Hoopa[] = INCBIN_U32("graphics/pokemon/hoopa/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"); 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_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/shiny.gbapal.lz");
const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/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"); 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_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shiny.gbapal.lz");
const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/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"); 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_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz");
const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/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"); 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_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/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"); //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_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_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"); 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_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_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/shiny.gbapal.lz");
const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/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_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_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_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_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/shiny.gbapal.lz");
const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/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"); 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"); 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_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_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/shiny.gbapal.lz");
const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/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_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_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/shiny.gbapal.lz");
const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/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_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_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_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz");
const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/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_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_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/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_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_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/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_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_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_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_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/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_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_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz");
const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/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"); //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_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_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz");
const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/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_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_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"); 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_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_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_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_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_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz");
const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/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_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_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"); 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_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_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/shiny.gbapal.lz");
const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/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_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_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"); 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_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_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_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_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_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/shiny.gbapal.lz");
const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/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_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_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"); 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_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_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/shiny.gbapal.lz");
const u32 gMonShinyPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/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_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_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz");
const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/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_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_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz");
const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/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_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_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/shiny.gbapal.lz");
const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/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_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_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/shiny.gbapal.lz");
const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/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_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_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_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 #endif
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); 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_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp");
const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp");
const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/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_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp");
const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp");
const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/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_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp");
const u8 gMonIcon_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); const u8 gMonIcon_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp");
const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/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_Victini[] = INCBIN_U8("graphics/pokemon/victini/icon.4bpp");
const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/icon.4bpp"); const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/icon.4bpp");
const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/servine/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_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp");
const u8 gMonIcon_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp"); const u8 gMonIcon_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp");
const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/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_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/icon.4bpp");
const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/icon.4bpp"); const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/icon.4bpp");
const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/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_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/icon.4bpp");
const u8 gMonIcon_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp"); const u8 gMonIcon_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp");
const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/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_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/icon.4bpp");
const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/icon.4bpp"); const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/icon.4bpp");
const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/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_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp");
const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp"); const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp");
const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/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_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp");
const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp"); const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp");
const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/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_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp");
const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp"); const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp");
const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/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_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_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp");
const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/charizard/mega_y/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_MetagrossMega[] = INCBIN_U8("graphics/pokemon/metagross/mega/icon.4bpp");
const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/latias/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"); 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_LopunnyMega[] = INCBIN_U8("graphics/pokemon/lopunny/mega/icon.4bpp");
const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/garchomp/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_LucarioMega[] = INCBIN_U8("graphics/pokemon/lucario/mega/icon.4bpp");
const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/abomasnow/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"); 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"); 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"); 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_RayquazaMega[] = INCBIN_U8("graphics/pokemon/rayquaza/mega/icon.4bpp");
const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/kyogre/primal/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"); 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_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp");
const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/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"); 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_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp");
const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/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_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp");
const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/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_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp");
const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/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"); 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_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp");
const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/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"); 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_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp");
const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/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_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp");
const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/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"); 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_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp");
const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/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"); 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"); 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_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_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp");
const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/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_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_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp");
const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/pichu/spiky_eared/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_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp");
const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/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"); 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_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp");
const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/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"); 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_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_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp");
const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_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_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/icon.4bpp");
const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/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"); 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_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_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/basculin/white_striped/icon.4bpp");
const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/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_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/therian/icon.4bpp");
const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/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_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_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/white/icon.4bpp");
const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/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_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/keldeo/resolute/icon.4bpp");
const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/meloetta/pirouette/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_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/greninja/ash/icon.4bpp");
const u8 gMonIcon_VivillonPolar[] = INCBIN_U8("graphics/pokemon/vivillon/polar/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"); 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_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_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp");
const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/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_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_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp");
const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/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_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_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp");
const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/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_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp");
const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/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"); 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_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_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_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp");
#endif #endif
const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); 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_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp");
const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp");
const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/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_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp");
const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp"); const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp");
const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/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_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint.1bpp");
const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp"); const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp");
const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/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_Victini[] = INCBIN_U8("graphics/pokemon/victini/footprint.1bpp");
const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp"); const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp");
const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/servine/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_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp");
const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp"); const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp");
const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/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_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp");
const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp"); const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp");
const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/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_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp");
const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp"); const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp");
const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/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_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/footprint.1bpp");
const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp"); const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp");
const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/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_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint.1bpp");
const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp"); const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp");
const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/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_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/footprint.1bpp");
const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp"); const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp");
const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp"); const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp");

View File

@ -10637,7 +10637,7 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_MYTHICAL, .flags = FLAG_MYTHICAL,
}, },
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = [SPECIES_TURTWIG] =
{ {
.baseHP = 55, .baseHP = 55,
@ -13216,7 +13216,9 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_MYTHICAL, .flags = FLAG_MYTHICAL,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = [SPECIES_VICTINI] =
{ {
.baseHP = 100, .baseHP = 100,
@ -17046,7 +17048,9 @@ const struct BaseStats gBaseStats[] =
}, },
[SPECIES_GENESECT] = GENESECT_BASE_STATS, [SPECIES_GENESECT] = GENESECT_BASE_STATS,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = [SPECIES_CHESPIN] =
{ {
.baseHP = 56, .baseHP = 56,
@ -18633,7 +18637,9 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_MYTHICAL, .flags = FLAG_MYTHICAL,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = [SPECIES_ROWLET] =
{ {
.baseHP = 68, .baseHP = 68,
@ -20681,7 +20687,9 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_MYTHICAL, .flags = FLAG_MYTHICAL,
}, },
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = [SPECIES_GROOKEY] =
{ {
.baseHP = 50, .baseHP = 50,
@ -22854,6 +22862,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_LEGENDARY, .flags = FLAG_LEGENDARY,
}, },
#endif
[SPECIES_VENUSAUR_MEGA] = [SPECIES_VENUSAUR_MEGA] =
{ {
@ -23837,6 +23846,7 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_LEGENDARY, .flags = FLAG_LEGENDARY,
}, },
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = [SPECIES_LOPUNNY_MEGA] =
{ {
.baseHP = 65, .baseHP = 65,
@ -23959,7 +23969,9 @@ const struct BaseStats gBaseStats[] =
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = [SPECIES_AUDINO_MEGA] =
{ {
.baseHP = 103, .baseHP = 103,
@ -23985,7 +23997,9 @@ const struct BaseStats gBaseStats[] =
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = [SPECIES_DIANCIE_MEGA] =
{ {
.baseHP = 50, .baseHP = 50,
@ -24011,6 +24025,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_MYTHICAL, .flags = FLAG_MYTHICAL,
}, },
#endif
[SPECIES_RAYQUAZA_MEGA] = [SPECIES_RAYQUAZA_MEGA] =
{ {
@ -24928,6 +24943,7 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = [SPECIES_DARUMAKA_GALARIAN] =
{ {
.baseHP = 70, .baseHP = 70,
@ -25027,6 +25043,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_GALARIAN_FORM, .flags = FLAG_GALARIAN_FORM,
}, },
#endif
[SPECIES_GROWLITHE_HISUIAN] = [SPECIES_GROWLITHE_HISUIAN] =
{ {
@ -25205,6 +25222,7 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_HISUIAN_FORM, .flags = FLAG_HISUIAN_FORM,
}, },
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = [SPECIES_SAMUROTT_HISUIAN] =
{ {
.baseHP = 90, .baseHP = 90,
@ -25332,7 +25350,9 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM, .flags = FLAG_HISUIAN_FORM,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = [SPECIES_SLIGGOO_HISUIAN] =
{ {
.baseHP = 58, .baseHP = 58,
@ -25410,7 +25430,9 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM, .flags = FLAG_HISUIAN_FORM,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = [SPECIES_DECIDUEYE_HISUIAN] =
{ {
.baseHP = 88, .baseHP = 88,
@ -25435,6 +25457,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_HISUIAN_FORM, .flags = FLAG_HISUIAN_FORM,
}, },
#endif
[SPECIES_PIKACHU_COSPLAY] = COSPLAY_PIKACHU_BASE_STATS(FLIP), [SPECIES_PIKACHU_COSPLAY] = COSPLAY_PIKACHU_BASE_STATS(FLIP),
[SPECIES_PIKACHU_ROCK_STAR] = 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_PIKACHU_WORLD_CAP] = CAP_PIKACHU_BASE_STATS(FLIP),
[SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP), [SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP),
#endif
[SPECIES_UNOWN_B] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_B] = UNOWN_BASE_STATS(NO_FLIP),
[SPECIES_UNOWN_C] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_C] = UNOWN_BASE_STATS(NO_FLIP),
[SPECIES_UNOWN_D] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_D] = UNOWN_BASE_STATS(NO_FLIP),
@ -25560,7 +25583,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = TRUE, .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_SANDY_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_BROWN),
[SPECIES_BURMY_TRASH_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_RED), [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_DRAGON] = ARCEUS_BASE_STATS(TYPE_DRAGON),
[SPECIES_ARCEUS_DARK] = ARCEUS_BASE_STATS(TYPE_DARK), [SPECIES_ARCEUS_DARK] = ARCEUS_BASE_STATS(TYPE_DARK),
[SPECIES_ARCEUS_FAIRY] = ARCEUS_BASE_STATS(TYPE_FAIRY), [SPECIES_ARCEUS_FAIRY] = ARCEUS_BASE_STATS(TYPE_FAIRY),
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_BASCULIN_BLUE_STRIPED] = [SPECIES_BASCULIN_BLUE_STRIPED] =
{ {
.baseHP = 70, .baseHP = 70,
@ -25927,31 +25952,6 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_LEGENDARY, .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] = [SPECIES_KYUREM_WHITE] =
{ {
.baseHP = 125, .baseHP = 125,
@ -26060,7 +26060,9 @@ const struct BaseStats gBaseStats[] =
[SPECIES_GENESECT_SHOCK_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_SHOCK_DRIVE] = GENESECT_BASE_STATS,
[SPECIES_GENESECT_BURN_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_BURN_DRIVE] = GENESECT_BASE_STATS,
[SPECIES_GENESECT_CHILL_DRIVE] = GENESECT_BASE_STATS, [SPECIES_GENESECT_CHILL_DRIVE] = GENESECT_BASE_STATS,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_GRENINJA_BATTLE_BOND] = [SPECIES_GRENINJA_BATTLE_BOND] =
{ {
.baseHP = 72, .baseHP = 72,
@ -26262,6 +26264,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 41, .baseSpeed = 41,
.baseSpAttack = 44, .baseSpAttack = 44,
.baseSpDefense = 55, .baseSpDefense = 55,
.itemCommon = ITEM_MIRACLE_SEED,
.itemRare = ITEM_MIRACLE_SEED,
PUMKPABOO_MISC_STATS, PUMKPABOO_MISC_STATS,
}, },
@ -26295,6 +26299,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 54, .baseSpeed = 54,
.baseSpAttack = 58, .baseSpAttack = 58,
.baseSpDefense = 75, .baseSpDefense = 75,
.itemCommon = ITEM_MIRACLE_SEED,
.itemRare = ITEM_MIRACLE_SEED,
GOURGEIST_MISC_STATS, GOURGEIST_MISC_STATS,
}, },
@ -26353,7 +26359,9 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
.flags = FLAG_MYTHICAL, .flags = FLAG_MYTHICAL,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ORICORIO_POM_POM] = ORICORIO_BASE_STATS(TYPE_ELECTRIC, BODY_COLOR_YELLOW), [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_PAU] = ORICORIO_BASE_STATS(TYPE_PSYCHIC, BODY_COLOR_PINK),
[SPECIES_ORICORIO_SENSU] = ORICORIO_BASE_STATS(TYPE_GHOST, BODY_COLOR_PURPLE), [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), [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_GULPING] = CRAMORANT_BASE_STATS,
[SPECIES_CRAMORANT_GORGING] = CRAMORANT_BASE_STATS, [SPECIES_CRAMORANT_GORGING] = CRAMORANT_BASE_STATS,
@ -26763,5 +26773,30 @@ const struct BaseStats gBaseStats[] =
.bodyColor = BODY_COLOR_BLACK, .bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE, .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 #endif
}; };

View File

@ -2387,7 +2387,7 @@ const u16 gEggMoves[] = {
MOVE_ENDURE, MOVE_ENDURE,
MOVE_DEFENSE_CURL), MOVE_DEFENSE_CURL),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
egg_moves(TURTWIG, egg_moves(TURTWIG,
MOVE_WORRY_SEED, MOVE_WORRY_SEED,
MOVE_GROWTH, MOVE_GROWTH,
@ -2877,7 +2877,9 @@ const u16 gEggMoves[] = {
MOVE_AVALANCHE, MOVE_AVALANCHE,
MOVE_NATURAL_GIFT, MOVE_NATURAL_GIFT,
MOVE_BULLET_SEED), MOVE_BULLET_SEED),
#endif
#if P_NEW_POKEMON >= GEN_5
egg_moves(SNIVY, egg_moves(SNIVY,
MOVE_CAPTIVATE, MOVE_CAPTIVATE,
MOVE_NATURAL_GIFT, MOVE_NATURAL_GIFT,
@ -3600,7 +3602,9 @@ const u16 gEggMoves[] = {
MOVE_ZEN_HEADBUTT, MOVE_ZEN_HEADBUTT,
MOVE_MORNING_SUN, MOVE_MORNING_SUN,
MOVE_MAGNET_RISE), MOVE_MAGNET_RISE),
#endif
#if P_NEW_POKEMON >= GEN_6
egg_moves(CHESPIN, egg_moves(CHESPIN,
MOVE_SYNTHESIS, MOVE_SYNTHESIS,
MOVE_BELLY_DRUM, MOVE_BELLY_DRUM,
@ -3807,7 +3811,9 @@ const u16 gEggMoves[] = {
MOVE_SNATCH, MOVE_SNATCH,
MOVE_OUTRAGE, MOVE_OUTRAGE,
MOVE_TAILWIND), MOVE_TAILWIND),
#endif
#if P_NEW_POKEMON >= GEN_7
egg_moves(ROWLET, egg_moves(ROWLET,
MOVE_CURSE, MOVE_CURSE,
MOVE_CONFUSE_RAY, MOVE_CONFUSE_RAY,
@ -4034,7 +4040,9 @@ const u16 gEggMoves[] = {
MOVE_COUNTER, MOVE_COUNTER,
MOVE_REVERSAL, MOVE_REVERSAL,
MOVE_DRAGON_BREATH), MOVE_DRAGON_BREATH),
#endif
#if P_NEW_POKEMON >= GEN_8
egg_moves(GROOKEY, egg_moves(GROOKEY,
MOVE_GROWTH, MOVE_GROWTH,
MOVE_HAMMER_ARM, MOVE_HAMMER_ARM,
@ -4230,6 +4238,7 @@ const u16 gEggMoves[] = {
MOVE_DISABLE, MOVE_DISABLE,
MOVE_DRAGON_TAIL, MOVE_DRAGON_TAIL,
MOVE_SUCKER_PUNCH), MOVE_SUCKER_PUNCH),
#endif
egg_moves(RATTATA_ALOLAN, egg_moves(RATTATA_ALOLAN,
MOVE_COUNTER, MOVE_COUNTER,
@ -4382,6 +4391,7 @@ const u16 gEggMoves[] = {
MOVE_QUICK_GUARD, MOVE_QUICK_GUARD,
MOVE_KNOCK_OFF), MOVE_KNOCK_OFF),
#if P_NEW_POKEMON >= GEN_5
egg_moves(DARUMAKA_GALARIAN, egg_moves(DARUMAKA_GALARIAN,
MOVE_FOCUS_PUNCH, MOVE_FOCUS_PUNCH,
MOVE_HAMMER_ARM, MOVE_HAMMER_ARM,
@ -4404,13 +4414,13 @@ const u16 gEggMoves[] = {
MOVE_COUNTER, MOVE_COUNTER,
MOVE_PAIN_SPLIT, MOVE_PAIN_SPLIT,
MOVE_REFLECT_TYPE), MOVE_REFLECT_TYPE),
#endif
egg_moves(INDEEDEE_FEMALE, egg_moves(INDEEDEE_FEMALE,
MOVE_PSYCH_UP, MOVE_PSYCH_UP,
MOVE_FAKE_OUT, MOVE_FAKE_OUT,
MOVE_PSYCHO_SHIFT, MOVE_PSYCHO_SHIFT,
MOVE_HEAL_PULSE), MOVE_HEAL_PULSE),
#endif
EGG_MOVES_TERMINATOR EGG_MOVES_TERMINATOR
}; };

View File

@ -61,8 +61,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}},
[SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA}}, [SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA}},
[SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_MAGNETON] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, [SPECIES_MAGNETON] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}},
#endif
[SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}},
[SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}}, [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}},
[SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}}, [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}}, {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR_ALOLAN}},
[SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}, [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK},
{EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK_ALOLAN}}, {EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK_ALOLAN}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}}, [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}},
#endif
[SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}},
[SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_RHYDON] = {{EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}}, [SPECIES_RHYDON] = {{EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}},
#endif
[SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}}, [SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}},
#endif
[SPECIES_KANGASKHAN] = {{EVO_MEGA_EVOLUTION, ITEM_KANGASKHANITE, SPECIES_KANGASKHAN_MEGA}}, [SPECIES_KANGASKHAN] = {{EVO_MEGA_EVOLUTION, ITEM_KANGASKHANITE, SPECIES_KANGASKHAN_MEGA}},
[SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}}, [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}},
[SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}}, [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}},
[SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}}, [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}},
[SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}}, [SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}},
[SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}}, [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_ELECTABUZZ] = {{EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}},
[SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}}, [SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}},
#endif
[SPECIES_PINSIR] = {{EVO_MEGA_EVOLUTION, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA}}, [SPECIES_PINSIR] = {{EVO_MEGA_EVOLUTION, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA}},
[SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}}, [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}},
[SPECIES_GYARADOS] = {{EVO_MEGA_EVOLUTION, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA}}, [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_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON},
{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON}, {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON},
{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}, {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON},
#if P_NEW_POKEMON >= GEN_4
{EVO_SPECIFIC_MAP, MAP_PETALBURG_WOODS, SPECIES_LEAFEON}, {EVO_SPECIFIC_MAP, MAP_PETALBURG_WOODS, SPECIES_LEAFEON},
{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON}, {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON},
{EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_GLACEON}, {EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_GLACEON},
{EVO_ITEM, ITEM_ICE_STONE, 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_PORYGON] = {{EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}},
[SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}}, [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}},
[SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}}, [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_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}},
[SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}}, [SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}},
[SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}}, [SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_TOGETIC] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}}, [SPECIES_TOGETIC] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}},
#endif
[SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}},
[SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}}, [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}},
[SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}}, [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_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}},
[SPECIES_AIPOM] = {{EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}}, [SPECIES_AIPOM] = {{EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}},
[SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}}, [SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}}, [SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}},
#endif
[SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}}, [SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}},
[SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}}, [SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}},
#endif
[SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}}, [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_GLIGAR] = {{EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}}, [SPECIES_GLIGAR] = {{EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}},
#endif
[SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_STEELIXITE, SPECIES_STEELIX_MEGA}}, [SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_STEELIXITE, SPECIES_STEELIX_MEGA}},
[SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}},
[SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_SCIZORITE, SPECIES_SCIZOR_MEGA}}, [SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_SCIZORITE, SPECIES_SCIZOR_MEGA}},
[SPECIES_HERACROSS] = {{EVO_MEGA_EVOLUTION, ITEM_HERACRONITE, SPECIES_HERACROSS_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}}, [SPECIES_SNEASEL] = {{EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}},
#endif
[SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}},
[SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}},
[SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}}, [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_PILOSWINE] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}}, [SPECIES_PILOSWINE] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}},
#endif
[SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}},
[SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}},
[SPECIES_HOUNDOOM] = {{EVO_MEGA_EVOLUTION, ITEM_HOUNDOOMINITE, SPECIES_HOUNDOOM_MEGA}}, [SPECIES_HOUNDOOM] = {{EVO_MEGA_EVOLUTION, ITEM_HOUNDOOMINITE, SPECIES_HOUNDOOM_MEGA}},
[SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}}, [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}}, [SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}},
#endif
[SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN},
{EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE},
{EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}}, {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_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}},
[SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}}, [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}},
[SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}}, [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_NOSEPASS] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}}, [SPECIES_NOSEPASS] = {{EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}},
#endif
[SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA}}, [SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA}},
[SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}}, [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}},
[SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}}, [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_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}},
[SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}}, [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}},
[SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}, [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_GLALIE] = {{EVO_MEGA_EVOLUTION, ITEM_GLALITITE, SPECIES_GLALIE_MEGA}},
[SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}}, [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}},
[SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}}, [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_ALTARIA] = {{EVO_MEGA_EVOLUTION, ITEM_ALTARIANITE, SPECIES_ALTARIA_MEGA}},
[SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}}, [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}},
[SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}}, [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}},
#if P_NEW_POKEMON >= GEN_4
[SPECIES_DUSCLOPS] = {{EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}}, [SPECIES_DUSCLOPS] = {{EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}},
[SPECIES_ROSELIA] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}}, [SPECIES_ROSELIA] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}},
#endif
[SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}}, [SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}},
[SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}}, [SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}},
[SPECIES_GULPIN] = {{EVO_LEVEL, 26, SPECIES_SWALOT}}, [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_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}},
[SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}}, [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}},
[SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}, [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_GARDEVOIR] = {{EVO_MEGA_EVOLUTION, ITEM_GARDEVOIRITE, SPECIES_GARDEVOIR_MEGA}},
[SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}}, [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}},
[SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, [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_GROUDON] = {{EVO_PRIMAL_REVERSION, ITEM_RED_ORB, SPECIES_GROUDON_PRIMAL}},
[SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_DRAGON_ASCENT, SPECIES_RAYQUAZA_MEGA}}, [SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_DRAGON_ASCENT, SPECIES_RAYQUAZA_MEGA}},
#if P_NEW_POKEMON >= GEN_4
// Gens 4-7 // Gens 4-7
[SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}}, [SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}},
[SPECIES_GROTLE] = {{EVO_LEVEL, 32, SPECIES_TORTERRA}}, [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_SNOVER] = {{EVO_LEVEL, 40, SPECIES_ABOMASNOW}},
[SPECIES_ABOMASNOW] = {{EVO_MEGA_EVOLUTION, ITEM_ABOMASITE, SPECIES_ABOMASNOW_MEGA}}, [SPECIES_ABOMASNOW] = {{EVO_MEGA_EVOLUTION, ITEM_ABOMASITE, SPECIES_ABOMASNOW_MEGA}},
[SPECIES_GALLADE] = {{EVO_MEGA_EVOLUTION, ITEM_GALLADITE, SPECIES_GALLADE_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_SNIVY] = {{EVO_LEVEL, 17, SPECIES_SERVINE}},
[SPECIES_SERVINE] = {{EVO_LEVEL, 36, SPECIES_SERPERIOR}}, [SPECIES_SERVINE] = {{EVO_LEVEL, 36, SPECIES_SERPERIOR}},
[SPECIES_TEPIG] = {{EVO_LEVEL, 17, SPECIES_PIGNITE}}, [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_DEINO] = {{EVO_LEVEL, 50, SPECIES_ZWEILOUS}},
[SPECIES_ZWEILOUS] = {{EVO_LEVEL, 64, SPECIES_HYDREIGON}}, [SPECIES_ZWEILOUS] = {{EVO_LEVEL, 64, SPECIES_HYDREIGON}},
[SPECIES_LARVESTA] = {{EVO_LEVEL, 59, SPECIES_VOLCARONA}}, [SPECIES_LARVESTA] = {{EVO_LEVEL, 59, SPECIES_VOLCARONA}},
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = {{EVO_LEVEL, 16, SPECIES_QUILLADIN}}, [SPECIES_CHESPIN] = {{EVO_LEVEL, 16, SPECIES_QUILLADIN}},
[SPECIES_QUILLADIN] = {{EVO_LEVEL, 36, SPECIES_CHESNAUGHT}}, [SPECIES_QUILLADIN] = {{EVO_LEVEL, 36, SPECIES_CHESNAUGHT}},
[SPECIES_FENNEKIN] = {{EVO_LEVEL, 16, SPECIES_BRAIXEN}}, [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_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG}},
[SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}}, [SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}},
[SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_DIANCITE, SPECIES_DIANCIE_MEGA}}, [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_ROWLET] = {{EVO_LEVEL, 17, SPECIES_DARTRIX}},
[SPECIES_DARTRIX] = {{EVO_LEVEL, 34, SPECIES_DECIDUEYE}}, [SPECIES_DARTRIX] = {{EVO_LEVEL, 34, SPECIES_DECIDUEYE}},
[SPECIES_LITTEN] = {{EVO_LEVEL, 17, SPECIES_TORRACAT}}, [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}, [SPECIES_COSMOEM] = {{EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO},
{EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}},
[SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}}, [SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}},
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = {{EVO_LEVEL, 16, SPECIES_THWACKEY}}, [SPECIES_GROOKEY] = {{EVO_LEVEL, 16, SPECIES_THWACKEY}},
[SPECIES_THWACKEY] = {{EVO_LEVEL, 35, SPECIES_RILLABOOM}}, [SPECIES_THWACKEY] = {{EVO_LEVEL, 35, SPECIES_RILLABOOM}},
[SPECIES_SCORBUNNY] = {{EVO_LEVEL, 16, SPECIES_RABOOT}}, [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_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT}},
[SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU}, [SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU},
{EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, {EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}},
#endif
[SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}},
[SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}},
[SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_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_GEODUDE_ALOLAN] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}},
[SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}}, [SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}},
[SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}}, [SPECIES_GRIMER_ALOLAN] = {{EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}},
#if P_NEW_POKEMON >= GEN_8
[SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}}, [SPECIES_MEOWTH_GALARIAN] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER}},
#endif
[SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}},
[SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN},
{EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_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_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}},
[SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}},
[SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, [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_LINOONE_GALARIAN] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}},
[SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}},
[SPECIES_YAMASK_GALARIAN] = {{EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}}, [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}, [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
[SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, [SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
[SPECIES_SHELLOS_EAST_SEA] = {{EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}}, [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_SUMMER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}},
[SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}}, [SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}},
[SPECIES_DEERLING_WINTER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}}, [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_YELLOW_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_YELLOW_FLOWER}},
[SPECIES_FLABEBE_ORANGE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_ORANGE_FLOWER}}, [SPECIES_FLABEBE_ORANGE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_ORANGE_FLOWER}},
[SPECIES_FLABEBE_BLUE_FLOWER] = {{EVO_LEVEL, 19, SPECIES_FLOETTE_BLUE_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_SMALL] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}},
[SPECIES_PUMPKABOO_LARGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}}, [SPECIES_PUMPKABOO_LARGE] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}},
[SPECIES_PUMPKABOO_SUPER] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}}, [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}}, [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}}, [SPECIES_SINISTEA_ANTIQUE] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}},
#endif
}; };

View File

@ -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}},
};

View File

@ -1,6 +1,6 @@
const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
{ {
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_GIRATINA] = sGiratinaFormChangeTable, [SPECIES_GIRATINA] = sGiratinaFormChangeTable,
[SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable, [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable,
[SPECIES_SHAYMIN] = sShayminFormChangeTable, [SPECIES_SHAYMIN] = sShayminFormChangeTable,
@ -23,14 +23,14 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
[SPECIES_ARCEUS_DRAGON] = sArceusFormChangeTable, [SPECIES_ARCEUS_DRAGON] = sArceusFormChangeTable,
[SPECIES_ARCEUS_DARK] = sArceusFormChangeTable, [SPECIES_ARCEUS_DARK] = sArceusFormChangeTable,
[SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable, [SPECIES_ARCEUS_FAIRY] = sArceusFormChangeTable,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_TORNADUS] = sTornadusFormChangeTable, [SPECIES_TORNADUS] = sTornadusFormChangeTable,
[SPECIES_TORNADUS_THERIAN] = sTornadusTherianFormChangeTable, [SPECIES_TORNADUS_THERIAN] = sTornadusTherianFormChangeTable,
[SPECIES_THUNDURUS] = sThundurusFormChangeTable, [SPECIES_THUNDURUS] = sThundurusFormChangeTable,
[SPECIES_THUNDURUS_THERIAN] = sThundurusTherianFormChangeTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusTherianFormChangeTable,
[SPECIES_LANDORUS] = sLandorusFormChangeTable, [SPECIES_LANDORUS] = sLandorusFormChangeTable,
[SPECIES_LANDORUS_THERIAN] = sLandorusTherianFormChangeTable, [SPECIES_LANDORUS_THERIAN] = sLandorusTherianFormChangeTable,
[SPECIES_ENAMORUS] = sEnamorusFormChangeTable,
[SPECIES_ENAMORUS_THERIAN] = sEnamorusTherianFormChangeTable,
[SPECIES_KELDEO] = sKeldeoFormChangeTable, [SPECIES_KELDEO] = sKeldeoFormChangeTable,
[SPECIES_KELDEO_RESOLUTE] = sKeldeoResoluteFormChangeTable, [SPECIES_KELDEO_RESOLUTE] = sKeldeoResoluteFormChangeTable,
[SPECIES_GENESECT] = sGenesectFormChangeTable, [SPECIES_GENESECT] = sGenesectFormChangeTable,
@ -38,8 +38,12 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
[SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormChangeTable, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormChangeTable,
[SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormChangeTable, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormChangeTable,
[SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormChangeTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormChangeTable,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_HOOPA] = sHoopaFormChangeTable, [SPECIES_HOOPA] = sHoopaFormChangeTable,
[SPECIES_HOOPA_UNBOUND] = sHoopaUnboundFormChangeTable, [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundFormChangeTable,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ORICORIO] = sOricorioFormChangeTable, [SPECIES_ORICORIO] = sOricorioFormChangeTable,
[SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormChangeTable,
[SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable, [SPECIES_ORICORIO_PAU] = sOricorioFormChangeTable,
@ -63,4 +67,8 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
[SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable,
[SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable,
#endif #endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_ENAMORUS] = sEnamorusFormChangeTable,
[SPECIES_ENAMORUS_THERIAN] = sEnamorusTherianFormChangeTable,
#endif
}; };

View File

@ -43,7 +43,7 @@ FORM_ITEM_USE_TIME:
#define DAY 0 #define DAY 0
#define NIGHT 1 #define NIGHT 1
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
static const struct FormChange sGiratinaFormChangeTable[] = { static const struct FormChange sGiratinaFormChangeTable[] = {
{FORM_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE}, {FORM_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE},
{FORM_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB}, {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_ITEM_HOLD_ABILITY, SPECIES_ARCEUS_FAIRY, ITEM_FAIRIUM_Z, ABILITY_MULTITYPE},
{FORM_CHANGE_END}, {FORM_CHANGE_END},
}; };
#endif
#if P_NEW_POKEMON >= GEN_5
static const struct FormChange sTornadusFormChangeTable[] = { static const struct FormChange sTornadusFormChangeTable[] = {
{FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS},
{FORM_CHANGE_END}, {FORM_CHANGE_END},
@ -125,16 +127,6 @@ static const struct FormChange sLandorusTherianFormChangeTable[] = {
{FORM_CHANGE_END}, {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[] = { static const struct FormChange sKeldeoFormChangeTable[] = {
{FORM_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED}, {FORM_MOVE, SPECIES_KELDEO_RESOLUTE, MOVE_SECRET_SWORD, WHEN_LEARNED},
{FORM_CHANGE_END}, {FORM_CHANGE_END},
@ -153,7 +145,9 @@ static const struct FormChange sGenesectFormChangeTable[] = {
{FORM_ITEM_HOLD, SPECIES_GENESECT_CHILL_DRIVE, ITEM_CHILL_DRIVE}, {FORM_ITEM_HOLD, SPECIES_GENESECT_CHILL_DRIVE, ITEM_CHILL_DRIVE},
{FORM_CHANGE_END}, {FORM_CHANGE_END},
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const struct FormChange sHoopaFormChangeTable[] = { static const struct FormChange sHoopaFormChangeTable[] = {
// {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, // {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA},
{FORM_CHANGE_END}, {FORM_CHANGE_END},
@ -163,7 +157,9 @@ static const struct FormChange sHoopaUnboundFormChangeTable[] = {
{FORM_WITHDRAW, SPECIES_HOOPA}, {FORM_WITHDRAW, SPECIES_HOOPA},
{FORM_CHANGE_END}, {FORM_CHANGE_END},
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const struct FormChange sOricorioFormChangeTable[] = { static const struct FormChange sOricorioFormChangeTable[] = {
{FORM_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO, ITEM_RED_NECTAR},
{FORM_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR}, {FORM_ITEM_USE, SPECIES_ORICORIO_POM_POM, ITEM_YELLOW_NECTAR},
@ -195,5 +191,17 @@ static const struct FormChange sSilvallyFormChangeTable[] = {
}; };
#endif #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_LEARNED
#undef WHEN_FORGOTTEN #undef WHEN_FORGOTTEN

View File

@ -1,6 +1,5 @@
const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
{ {
#if P_NEW_POKEMON == TRUE
[SPECIES_VENUSAUR] = sVenusaurFormSpeciesIdTable, [SPECIES_VENUSAUR] = sVenusaurFormSpeciesIdTable,
[SPECIES_CHARIZARD] = sCharizardFormSpeciesIdTable, [SPECIES_CHARIZARD] = sCharizardFormSpeciesIdTable,
[SPECIES_BLASTOISE] = sBlastoiseFormSpeciesIdTable, [SPECIES_BLASTOISE] = sBlastoiseFormSpeciesIdTable,
@ -52,9 +51,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable,
[SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable,
[SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable,
#endif
[SPECIES_UNOWN] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN] = sUnownFormSpeciesIdTable,
#if P_NEW_POKEMON == TRUE
[SPECIES_STEELIX] = sSteelixFormSpeciesIdTable, [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable,
[SPECIES_SCIZOR] = sScizorFormSpeciesIdTable, [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable,
[SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable, [SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable,
@ -75,9 +72,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable, [SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable,
[SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable, [SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable,
[SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable, [SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable,
#endif
[SPECIES_CASTFORM] = sCastformFormSpeciesIdTable, [SPECIES_CASTFORM] = sCastformFormSpeciesIdTable,
#if P_NEW_POKEMON == TRUE
[SPECIES_BANETTE] = sBanetteFormSpeciesIdTable, [SPECIES_BANETTE] = sBanetteFormSpeciesIdTable,
[SPECIES_ABSOL] = sAbsolFormSpeciesIdTable, [SPECIES_ABSOL] = sAbsolFormSpeciesIdTable,
[SPECIES_GLALIE] = sGlalieFormSpeciesIdTable, [SPECIES_GLALIE] = sGlalieFormSpeciesIdTable,
@ -88,9 +83,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable, [SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable,
[SPECIES_GROUDON] = sGroudonFormSpeciesIdTable, [SPECIES_GROUDON] = sGroudonFormSpeciesIdTable,
[SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable, [SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable,
#endif
[SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_BURMY] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY] = sBurmyFormSpeciesIdTable,
[SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable, [SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable,
[SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable, [SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable,
@ -105,9 +99,11 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_DIALGA] = sDialgaFormSpeciesIdTable, [SPECIES_DIALGA] = sDialgaFormSpeciesIdTable,
[SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable, [SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable,
[SPECIES_GIRATINA] = sGiratinaFormSpeciesIdTable, [SPECIES_GIRATINA] = sGiratinaFormSpeciesIdTable,
[SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable,
[SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable, [SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable,
[SPECIES_ARCEUS] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS] = sArceusFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable,
[SPECIES_AUDINO] = sAudinoFormSpeciesIdTable, [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable,
[SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable,
[SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable, [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable,
@ -127,6 +123,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_KELDEO] = sKeldeoFormSpeciesIdTable, [SPECIES_KELDEO] = sKeldeoFormSpeciesIdTable,
[SPECIES_MELOETTA] = sMeloettaFormSpeciesIdTable, [SPECIES_MELOETTA] = sMeloettaFormSpeciesIdTable,
[SPECIES_GENESECT] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT] = sGenesectFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_GRENINJA] = sGreninjaFormSpeciesIdTable, [SPECIES_GRENINJA] = sGreninjaFormSpeciesIdTable,
[SPECIES_VIVILLON] = sVivillonFormSpeciesIdTable, [SPECIES_VIVILLON] = sVivillonFormSpeciesIdTable,
[SPECIES_FLABEBE] = sFlabebeFormSpeciesIdTable, [SPECIES_FLABEBE] = sFlabebeFormSpeciesIdTable,
@ -144,6 +142,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable,
[SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable,
[SPECIES_HOOPA] = sHoopaFormSpeciesIdTable, [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable,
[SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable,
[SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable,
@ -154,6 +154,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_MIMIKYU] = sMimikyuFormSpeciesIdTable, [SPECIES_MIMIKYU] = sMimikyuFormSpeciesIdTable,
[SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable, [SPECIES_NECROZMA] = sNecrozmaFormSpeciesIdTable,
[SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable, [SPECIES_MAGEARNA] = sMagearnaFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT] = sCramorantFormSpeciesIdTable,
[SPECIES_TOXTRICITY] = sToxtricityFormSpeciesIdTable, [SPECIES_TOXTRICITY] = sToxtricityFormSpeciesIdTable,
[SPECIES_SINISTEA] = sSinisteaFormSpeciesIdTable, [SPECIES_SINISTEA] = sSinisteaFormSpeciesIdTable,
@ -169,6 +171,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable, [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable,
[SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable,
[SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable, [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable,
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable,
[SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable, [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable,
@ -210,13 +213,19 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_METAGROSS_MEGA] = sMetagrossFormSpeciesIdTable, [SPECIES_METAGROSS_MEGA] = sMetagrossFormSpeciesIdTable,
[SPECIES_LATIAS_MEGA] = sLatiasFormSpeciesIdTable, [SPECIES_LATIAS_MEGA] = sLatiasFormSpeciesIdTable,
[SPECIES_LATIOS_MEGA] = sLatiosFormSpeciesIdTable, [SPECIES_LATIOS_MEGA] = sLatiosFormSpeciesIdTable,
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = sLopunnyFormSpeciesIdTable, [SPECIES_LOPUNNY_MEGA] = sLopunnyFormSpeciesIdTable,
[SPECIES_GARCHOMP_MEGA] = sGarchompFormSpeciesIdTable, [SPECIES_GARCHOMP_MEGA] = sGarchompFormSpeciesIdTable,
[SPECIES_LUCARIO_MEGA] = sLucarioFormSpeciesIdTable, [SPECIES_LUCARIO_MEGA] = sLucarioFormSpeciesIdTable,
[SPECIES_ABOMASNOW_MEGA] = sAbomasnowFormSpeciesIdTable, [SPECIES_ABOMASNOW_MEGA] = sAbomasnowFormSpeciesIdTable,
[SPECIES_GALLADE_MEGA] = sGalladeFormSpeciesIdTable, [SPECIES_GALLADE_MEGA] = sGalladeFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = sAudinoFormSpeciesIdTable, [SPECIES_AUDINO_MEGA] = sAudinoFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = sDiancieFormSpeciesIdTable, [SPECIES_DIANCIE_MEGA] = sDiancieFormSpeciesIdTable,
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = sRayquazaFormSpeciesIdTable, [SPECIES_RAYQUAZA_MEGA] = sRayquazaFormSpeciesIdTable,
[SPECIES_KYOGRE_PRIMAL] = sKyogreFormSpeciesIdTable, [SPECIES_KYOGRE_PRIMAL] = sKyogreFormSpeciesIdTable,
@ -256,10 +265,12 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_CORSOLA_GALARIAN] = sCorsolaFormSpeciesIdTable, [SPECIES_CORSOLA_GALARIAN] = sCorsolaFormSpeciesIdTable,
[SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonFormSpeciesIdTable, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonFormSpeciesIdTable,
[SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable, [SPECIES_LINOONE_GALARIAN] = sLinooneFormSpeciesIdTable,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable, [SPECIES_DARUMAKA_GALARIAN] = sDarumakaFormSpeciesIdTable,
[SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable,
[SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable,
[SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable, [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable,
#endif
//Hisuian Forms //Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable, [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable,
[SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable, [SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable,
@ -268,15 +279,21 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable, [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable,
[SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable, [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable,
[SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable, [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable, [SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable,
[SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable, [SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable,
[SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable, [SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable,
[SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable, [SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable,
[SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable, [SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable, [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable,
[SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable, [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable,
[SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable, [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable,
#endif
// Misc Forms // Misc Forms
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable,
@ -296,7 +313,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable, [SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable,
// Pichu // Pichu
[SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable, [SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable,
#endif
// Unown // Unown
[SPECIES_UNOWN_B] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_B] = sUnownFormSpeciesIdTable,
[SPECIES_UNOWN_C] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_C] = sUnownFormSpeciesIdTable,
@ -333,7 +349,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_DEOXYS_ATTACK] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_ATTACK] = sDeoxysFormSpeciesIdTable,
[SPECIES_DEOXYS_DEFENSE] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_DEFENSE] = sDeoxysFormSpeciesIdTable,
[SPECIES_DEOXYS_SPEED] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_SPEED] = sDeoxysFormSpeciesIdTable,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable,
[SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable,
@ -376,6 +392,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_ARCEUS_DRAGON] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_DRAGON] = sArceusFormSpeciesIdTable,
[SPECIES_ARCEUS_DARK] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_DARK] = sArceusFormSpeciesIdTable,
[SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable, [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_5
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable,
[SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable,
@ -407,6 +425,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectFormSpeciesIdTable,
[SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectFormSpeciesIdTable,
[SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormSpeciesIdTable, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaFormSpeciesIdTable, [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaFormSpeciesIdTable,
[SPECIES_GRENINJA_ASH] = sGreninjaFormSpeciesIdTable, [SPECIES_GRENINJA_ASH] = sGreninjaFormSpeciesIdTable,
@ -477,6 +497,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_ZYGARDE_COMPLETE] = sZygardeFormSpeciesIdTable, [SPECIES_ZYGARDE_COMPLETE] = sZygardeFormSpeciesIdTable,
// Hoopa // Hoopa
[SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable, [SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable,
[SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable,
@ -528,6 +550,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_NECROZMA_ULTRA] = sNecrozmaFormSpeciesIdTable, [SPECIES_NECROZMA_ULTRA] = sNecrozmaFormSpeciesIdTable,
// Magearna // Magearna
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaFormSpeciesIdTable, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaFormSpeciesIdTable,
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT_GULPING] = sCramorantFormSpeciesIdTable,
[SPECIES_CRAMORANT_GORGING] = sCramorantFormSpeciesIdTable, [SPECIES_CRAMORANT_GORGING] = sCramorantFormSpeciesIdTable,

View File

@ -1,4 +1,3 @@
#if P_NEW_POKEMON == TRUE
static const u16 sVenusaurFormSpeciesIdTable[] = { static const u16 sVenusaurFormSpeciesIdTable[] = {
SPECIES_VENUSAUR, SPECIES_VENUSAUR,
SPECIES_VENUSAUR_MEGA, SPECIES_VENUSAUR_MEGA,
@ -321,7 +320,7 @@ static const u16 sSneaselFormSpeciesIdTable[] = {
SPECIES_SNEASEL_HISUIAN, SPECIES_SNEASEL_HISUIAN,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#endif
static const u16 sUnownFormSpeciesIdTable[] = { static const u16 sUnownFormSpeciesIdTable[] = {
SPECIES_UNOWN, SPECIES_UNOWN,
SPECIES_UNOWN_B, SPECIES_UNOWN_B,
@ -354,7 +353,6 @@ static const u16 sUnownFormSpeciesIdTable[] = {
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#if P_NEW_POKEMON == TRUE
static const u16 sSteelixFormSpeciesIdTable[] = { static const u16 sSteelixFormSpeciesIdTable[] = {
SPECIES_STEELIX, SPECIES_STEELIX,
SPECIES_STEELIX_MEGA, SPECIES_STEELIX_MEGA,
@ -474,7 +472,7 @@ static const u16 sAltariaFormSpeciesIdTable[] = {
SPECIES_ALTARIA_MEGA, SPECIES_ALTARIA_MEGA,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#endif
static const u16 sCastformFormSpeciesIdTable[] = { static const u16 sCastformFormSpeciesIdTable[] = {
SPECIES_CASTFORM, SPECIES_CASTFORM,
SPECIES_CASTFORM_SUNNY, SPECIES_CASTFORM_SUNNY,
@ -483,7 +481,6 @@ static const u16 sCastformFormSpeciesIdTable[] = {
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#if P_NEW_POKEMON == TRUE
static const u16 sBanetteFormSpeciesIdTable[] = { static const u16 sBanetteFormSpeciesIdTable[] = {
SPECIES_BANETTE, SPECIES_BANETTE,
SPECIES_BANETTE_MEGA, SPECIES_BANETTE_MEGA,
@ -543,7 +540,7 @@ static const u16 sRayquazaFormSpeciesIdTable[] = {
SPECIES_RAYQUAZA_MEGA, SPECIES_RAYQUAZA_MEGA,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#endif
static const u16 sDeoxysFormSpeciesIdTable[] = { static const u16 sDeoxysFormSpeciesIdTable[] = {
SPECIES_DEOXYS, SPECIES_DEOXYS,
SPECIES_DEOXYS_ATTACK, SPECIES_DEOXYS_ATTACK,
@ -551,7 +548,8 @@ static const u16 sDeoxysFormSpeciesIdTable[] = {
SPECIES_DEOXYS_SPEED, SPECIES_DEOXYS_SPEED,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#if P_NEW_POKEMON == TRUE
#if P_NEW_POKEMON >= GEN_4
static const u16 sBurmyFormSpeciesIdTable[] = { static const u16 sBurmyFormSpeciesIdTable[] = {
SPECIES_BURMY, SPECIES_BURMY,
SPECIES_BURMY_SANDY_CLOAK, SPECIES_BURMY_SANDY_CLOAK,
@ -642,12 +640,6 @@ static const u16 sGiratinaFormSpeciesIdTable[] = {
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
static const u16 sSamurottFormSpeciesIdTable[] = {
SPECIES_SAMUROTT,
SPECIES_SAMUROTT_HISUIAN,
FORM_SPECIES_END,
};
static const u16 sShayminFormSpeciesIdTable[] = { static const u16 sShayminFormSpeciesIdTable[] = {
SPECIES_SHAYMIN, SPECIES_SHAYMIN,
SPECIES_SHAYMIN_SKY, SPECIES_SHAYMIN_SKY,
@ -675,6 +667,14 @@ static const u16 sArceusFormSpeciesIdTable[] = {
SPECIES_ARCEUS_FAIRY, SPECIES_ARCEUS_FAIRY,
FORM_SPECIES_END, 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[] = { static const u16 sAudinoFormSpeciesIdTable[] = {
SPECIES_AUDINO, SPECIES_AUDINO,
@ -806,7 +806,9 @@ static const u16 sGenesectFormSpeciesIdTable[] = {
SPECIES_GENESECT_CHILL_DRIVE, SPECIES_GENESECT_CHILL_DRIVE,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const u16 sGreninjaFormSpeciesIdTable[] = { static const u16 sGreninjaFormSpeciesIdTable[] = {
SPECIES_GRENINJA, SPECIES_GRENINJA,
SPECIES_GRENINJA_BATTLE_BOND, SPECIES_GRENINJA_BATTLE_BOND,
@ -952,7 +954,9 @@ static const u16 sHoopaFormSpeciesIdTable[] = {
SPECIES_HOOPA_UNBOUND, SPECIES_HOOPA_UNBOUND,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const u16 sDecidueyeFormSpeciesIdTable[] = { static const u16 sDecidueyeFormSpeciesIdTable[] = {
SPECIES_DECIDUEYE, SPECIES_DECIDUEYE,
SPECIES_DECIDUEYE_HISUIAN, SPECIES_DECIDUEYE_HISUIAN,
@ -1045,7 +1049,9 @@ static const u16 sMagearnaFormSpeciesIdTable[] = {
SPECIES_MAGEARNA_ORIGINAL_COLOR, SPECIES_MAGEARNA_ORIGINAL_COLOR,
FORM_SPECIES_END, FORM_SPECIES_END,
}; };
#endif
#if P_NEW_POKEMON >= GEN_8
static const u16 sCramorantFormSpeciesIdTable[] = { static const u16 sCramorantFormSpeciesIdTable[] = {
SPECIES_CRAMORANT, SPECIES_CRAMORANT,
SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT_GULPING,

View File

@ -387,7 +387,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_JIRACHI] = sJirachiLevelUpLearnset, [SPECIES_JIRACHI] = sJirachiLevelUpLearnset,
[SPECIES_DEOXYS] = sDeoxysLevelUpLearnset, [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset,
[SPECIES_CHIMECHO] = sChimechoLevelUpLearnset, [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = sTurtwigLevelUpLearnset, [SPECIES_TURTWIG] = sTurtwigLevelUpLearnset,
[SPECIES_GROTLE] = sGrotleLevelUpLearnset, [SPECIES_GROTLE] = sGrotleLevelUpLearnset,
[SPECIES_TORTERRA] = sTorterraLevelUpLearnset, [SPECIES_TORTERRA] = sTorterraLevelUpLearnset,
@ -495,6 +495,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DARKRAI] = sDarkraiLevelUpLearnset, [SPECIES_DARKRAI] = sDarkraiLevelUpLearnset,
[SPECIES_SHAYMIN] = sShayminLevelUpLearnset, [SPECIES_SHAYMIN] = sShayminLevelUpLearnset,
[SPECIES_ARCEUS] = sArceusLevelUpLearnset, [SPECIES_ARCEUS] = sArceusLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = sVictiniLevelUpLearnset, [SPECIES_VICTINI] = sVictiniLevelUpLearnset,
[SPECIES_SNIVY] = sSnivyLevelUpLearnset, [SPECIES_SNIVY] = sSnivyLevelUpLearnset,
[SPECIES_SERVINE] = sServineLevelUpLearnset, [SPECIES_SERVINE] = sServineLevelUpLearnset,
@ -651,6 +653,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_KELDEO] = sKeldeoLevelUpLearnset, [SPECIES_KELDEO] = sKeldeoLevelUpLearnset,
[SPECIES_MELOETTA] = sMeloettaLevelUpLearnset, [SPECIES_MELOETTA] = sMeloettaLevelUpLearnset,
[SPECIES_GENESECT] = sGenesectLevelUpLearnset, [SPECIES_GENESECT] = sGenesectLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = sChespinLevelUpLearnset, [SPECIES_CHESPIN] = sChespinLevelUpLearnset,
[SPECIES_QUILLADIN] = sQuilladinLevelUpLearnset, [SPECIES_QUILLADIN] = sQuilladinLevelUpLearnset,
[SPECIES_CHESNAUGHT] = sChesnaughtLevelUpLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtLevelUpLearnset,
@ -723,6 +727,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DIANCIE] = sDiancieLevelUpLearnset, [SPECIES_DIANCIE] = sDiancieLevelUpLearnset,
[SPECIES_HOOPA] = sHoopaLevelUpLearnset, [SPECIES_HOOPA] = sHoopaLevelUpLearnset,
[SPECIES_VOLCANION] = sVolcanionLevelUpLearnset, [SPECIES_VOLCANION] = sVolcanionLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = sRowletLevelUpLearnset, [SPECIES_ROWLET] = sRowletLevelUpLearnset,
[SPECIES_DARTRIX] = sDartrixLevelUpLearnset, [SPECIES_DARTRIX] = sDartrixLevelUpLearnset,
[SPECIES_DECIDUEYE] = sDecidueyeLevelUpLearnset, [SPECIES_DECIDUEYE] = sDecidueyeLevelUpLearnset,
@ -811,6 +817,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ZERAORA] = sZeraoraLevelUpLearnset, [SPECIES_ZERAORA] = sZeraoraLevelUpLearnset,
[SPECIES_MELTAN] = sMeltanLevelUpLearnset, [SPECIES_MELTAN] = sMeltanLevelUpLearnset,
[SPECIES_MELMETAL] = sMelmetalLevelUpLearnset, [SPECIES_MELMETAL] = sMelmetalLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = sGrookeyLevelUpLearnset, [SPECIES_GROOKEY] = sGrookeyLevelUpLearnset,
[SPECIES_THWACKEY] = sThwackeyLevelUpLearnset, [SPECIES_THWACKEY] = sThwackeyLevelUpLearnset,
[SPECIES_RILLABOOM] = sRillaboomLevelUpLearnset, [SPECIES_RILLABOOM] = sRillaboomLevelUpLearnset,
@ -907,6 +915,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_SNEASLER] = sSneaslerLevelUpLearnset, [SPECIES_SNEASLER] = sSneaslerLevelUpLearnset,
[SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset, [SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset,
[SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset, [SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset,
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset,
[SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset, [SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset,
@ -948,13 +957,19 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_METAGROSS_MEGA] = sMetagrossLevelUpLearnset, [SPECIES_METAGROSS_MEGA] = sMetagrossLevelUpLearnset,
[SPECIES_LATIAS_MEGA] = sLatiasLevelUpLearnset, [SPECIES_LATIAS_MEGA] = sLatiasLevelUpLearnset,
[SPECIES_LATIOS_MEGA] = sLatiosLevelUpLearnset, [SPECIES_LATIOS_MEGA] = sLatiosLevelUpLearnset,
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = sLopunnyLevelUpLearnset, [SPECIES_LOPUNNY_MEGA] = sLopunnyLevelUpLearnset,
[SPECIES_GARCHOMP_MEGA] = sGarchompLevelUpLearnset, [SPECIES_GARCHOMP_MEGA] = sGarchompLevelUpLearnset,
[SPECIES_LUCARIO_MEGA] = sLucarioLevelUpLearnset, [SPECIES_LUCARIO_MEGA] = sLucarioLevelUpLearnset,
[SPECIES_ABOMASNOW_MEGA] = sAbomasnowLevelUpLearnset, [SPECIES_ABOMASNOW_MEGA] = sAbomasnowLevelUpLearnset,
[SPECIES_GALLADE_MEGA] = sGalladeLevelUpLearnset, [SPECIES_GALLADE_MEGA] = sGalladeLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset, [SPECIES_AUDINO_MEGA] = sAudinoLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset, [SPECIES_DIANCIE_MEGA] = sDiancieLevelUpLearnset,
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = sRayquazaLevelUpLearnset, [SPECIES_RAYQUAZA_MEGA] = sRayquazaLevelUpLearnset,
[SPECIES_KYOGRE_PRIMAL] = sKyogreLevelUpLearnset, [SPECIES_KYOGRE_PRIMAL] = sKyogreLevelUpLearnset,
@ -994,10 +1009,12 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianLevelUpLearnset, [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianLevelUpLearnset,
[SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianLevelUpLearnset, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianLevelUpLearnset,
[SPECIES_LINOONE_GALARIAN] = sLinooneGalarianLevelUpLearnset, [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianLevelUpLearnset,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset, [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianLevelUpLearnset,
[SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset,
[SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset,
[SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset,
#endif
// Hisuian Forms // Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset, [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset,
[SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset, [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset,
@ -1006,15 +1023,21 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset, [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset,
[SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset, [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset,
[SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset, [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset, [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset,
[SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset, [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset,
[SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset, [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset,
[SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset, [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset,
[SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset, [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset, [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset,
[SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset, [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset,
[SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset, [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset,
#endif
// Misc Forms // Misc Forms
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset,
@ -1034,7 +1057,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset, [SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset,
// Pichu // Pichu
[SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset, [SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset,
#endif
// Unown // Unown
[SPECIES_UNOWN_B] = sUnownLevelUpLearnset, [SPECIES_UNOWN_B] = sUnownLevelUpLearnset,
[SPECIES_UNOWN_C] = sUnownLevelUpLearnset, [SPECIES_UNOWN_C] = sUnownLevelUpLearnset,
@ -1071,7 +1093,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset, [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset,
[SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset, [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset,
[SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset, [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK] = sBurmyLevelUpLearnset, [SPECIES_BURMY_SANDY_CLOAK] = sBurmyLevelUpLearnset,
[SPECIES_BURMY_TRASH_CLOAK] = sBurmyLevelUpLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyLevelUpLearnset,
@ -1114,6 +1136,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ARCEUS_DRAGON] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_DRAGON] = sArceusLevelUpLearnset,
[SPECIES_ARCEUS_DARK] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_DARK] = sArceusLevelUpLearnset,
[SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset, [SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_5
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset,
[SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset,
@ -1132,7 +1156,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset, [SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset,
[SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset, [SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset,
[SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset, [SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset,
[SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset,
// Kyurem // Kyurem
[SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset, [SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset,
[SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset, [SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset,
@ -1145,6 +1168,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectLevelUpLearnset,
[SPECIES_GENESECT_BURN_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectLevelUpLearnset,
[SPECIES_GENESECT_CHILL_DRIVE] = sGenesectLevelUpLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaLevelUpLearnset, [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaLevelUpLearnset,
[SPECIES_GRENINJA_ASH] = sGreninjaLevelUpLearnset, [SPECIES_GRENINJA_ASH] = sGreninjaLevelUpLearnset,
@ -1215,6 +1240,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset, [SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset,
// Hoopa // Hoopa
[SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset,
[SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset,
@ -1266,6 +1293,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_NECROZMA_ULTRA] = sNecrozmaLevelUpLearnset, [SPECIES_NECROZMA_ULTRA] = sNecrozmaLevelUpLearnset,
// Magearna // Magearna
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaLevelUpLearnset, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaLevelUpLearnset,
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset, [SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset,
[SPECIES_CRAMORANT_GORGING] = sCramorantLevelUpLearnset, [SPECIES_CRAMORANT_GORGING] = sCramorantLevelUpLearnset,
@ -1303,5 +1332,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
// Calyrex // Calyrex
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset, [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset,
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset,
#endif #endif
}; };

View File

@ -7903,7 +7903,7 @@ static const struct LevelUpMove sChimechoLevelUpLearnset[] = {
LEVEL_UP_END LEVEL_UP_END
}; };
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
static const struct LevelUpMove sTurtwigLevelUpLearnset[] = { static const struct LevelUpMove sTurtwigLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_WITHDRAW), LEVEL_UP_MOVE( 5, MOVE_WITHDRAW),
@ -9991,7 +9991,9 @@ static const struct LevelUpMove sArceusLevelUpLearnset[] = {
LEVEL_UP_MOVE(100, MOVE_JUDGMENT), LEVEL_UP_MOVE(100, MOVE_JUDGMENT),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_5
static const struct LevelUpMove sVictiniLevelUpLearnset[] = { static const struct LevelUpMove sVictiniLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SEARING_SHOT), LEVEL_UP_MOVE( 1, MOVE_SEARING_SHOT),
LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), 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_MOVE(77, MOVE_SELF_DESTRUCT),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const struct LevelUpMove sChespinLevelUpLearnset[] = { static const struct LevelUpMove sChespinLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_GROWL),
LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), 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_MOVE(85, MOVE_STEAM_ERUPTION),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const struct LevelUpMove sRowletLevelUpLearnset[] = { static const struct LevelUpMove sRowletLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_LEAFAGE), LEVEL_UP_MOVE( 1, MOVE_LEAFAGE),
@ -16523,6 +16529,9 @@ static const struct LevelUpMove sMelmetalLevelUpLearnset[] = {
LEVEL_UP_MOVE( 90, MOVE_HYPER_BEAM), LEVEL_UP_MOVE( 90, MOVE_HYPER_BEAM),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_8
static const struct LevelUpMove sGrookeyLevelUpLearnset[] = { static const struct LevelUpMove sGrookeyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_GROWL),
@ -18177,6 +18186,7 @@ static const struct LevelUpMove sEnamorusLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 1, MOVE_SPRINGTIDE_STORM), //LEVEL_UP_MOVE( 1, MOVE_SPRINGTIDE_STORM),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
@ -18855,6 +18865,7 @@ static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = {
LEVEL_UP_END LEVEL_UP_END
}; };
#if P_NEW_POKEMON >= GEN_5
static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW),
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
@ -18931,6 +18942,7 @@ static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = {
LEVEL_UP_MOVE(55, MOVE_FISSURE), LEVEL_UP_MOVE(55, MOVE_FISSURE),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
@ -19021,6 +19033,7 @@ static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = {
LEVEL_UP_END LEVEL_UP_END
}; };
#if P_NEW_POKEMON >= GEN_5
static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), //LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH),
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
@ -19090,7 +19103,9 @@ static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE(52, MOVE_HURRICANE), //LEVEL_UP_MOVE(52, MOVE_HURRICANE),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 1, MOVE_BUBBLE),
//LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), //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_MOVE(47, MOVE_DOUBLE_EDGE),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), //LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH),
LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_GUST),
@ -19203,7 +19220,7 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = {
LEVEL_UP_END LEVEL_UP_END
}; };
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), //LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, 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_MOVE(92, MOVE_HYPER_VOICE),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), 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_MOVE(85, MOVE_HYPERSPACE_FURY),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const struct LevelUpMove sLycanrocMidnightLevelUpLearnset[] = { static const struct LevelUpMove sLycanrocMidnightLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_COUNTER), //LEVEL_UP_MOVE( 0, MOVE_COUNTER),
LEVEL_UP_MOVE( 1, MOVE_REVERSAL), LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
@ -19417,7 +19438,9 @@ static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = {
LEVEL_UP_MOVE(48, MOVE_STONE_EDGE), LEVEL_UP_MOVE(48, MOVE_STONE_EDGE),
LEVEL_UP_END LEVEL_UP_END
}; };
#endif
#if P_NEW_POKEMON >= GEN_8
static const struct LevelUpMove sToxtricityLowKeyLevelUpLearnset[] = { static const struct LevelUpMove sToxtricityLowKeyLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_SPARK), //LEVEL_UP_MOVE( 0, MOVE_SPARK),
LEVEL_UP_MOVE( 1, MOVE_SPARK), LEVEL_UP_MOVE( 1, MOVE_SPARK),

View File

@ -4644,7 +4644,7 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerOffset = 2, .trainerOffset = 2,
}, },
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[NATIONAL_DEX_TURTWIG] = [NATIONAL_DEX_TURTWIG] =
{ {
.categoryName = _("Tiny Leaf"), .categoryName = _("Tiny Leaf"),
@ -5928,7 +5928,9 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 256, .trainerScale = 256,
.trainerOffset = 0, .trainerOffset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
[NATIONAL_DEX_VICTINI] = [NATIONAL_DEX_VICTINI] =
{ {
.categoryName = _("Victory"), .categoryName = _("Victory"),
@ -7800,7 +7802,9 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 256, .trainerScale = 256,
.trainerOffset = 0, .trainerOffset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[NATIONAL_DEX_CHESPIN] = [NATIONAL_DEX_CHESPIN] =
{ {
.categoryName = _("Spiny Nut"), .categoryName = _("Spiny Nut"),
@ -8664,7 +8668,9 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 256, .trainerScale = 256,
.trainerOffset = 0, .trainerOffset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[NATIONAL_DEX_ROWLET] = [NATIONAL_DEX_ROWLET] =
{ {
.categoryName = _("Grass Quill"), .categoryName = _("Grass Quill"),
@ -9720,7 +9726,9 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 387, .trainerScale = 387,
.trainerOffset = 2, .trainerOffset = 2,
}, },
#endif
#if P_NEW_POKEMON >= GEN_8
[NATIONAL_DEX_GROOKEY] = [NATIONAL_DEX_GROOKEY] =
{ {
.categoryName = _("Chimp"), .categoryName = _("Chimp"),

View File

@ -2320,7 +2320,7 @@ const u8 gChimechoPokedexText[] = _(
"themselves using seven different and\n" "themselves using seven different and\n"
"distinguishing cries."); "distinguishing cries.");
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
const u8 gTurtwigPokedexText[] = _( const u8 gTurtwigPokedexText[] = _(
"The shell on its back is made of soil. \n" "The shell on its back is made of soil. \n"
"On a very healthy Turtwig, the shell \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" "emerged from an egg and shaped all there\n"
"is in this world, before the universe\n" "is in this world, before the universe\n"
"even existed."); "even existed.");
#endif
#if P_NEW_POKEMON >= GEN_5
const u8 gVictiniPokedexText[] = _( const u8 gVictiniPokedexText[] = _(
"This Pokémon brings victory.\n" "This Pokémon brings victory.\n"
"It is said that Trainers with Victini\n" "It is said that Trainers with Victini\n"
@ -3898,7 +3900,9 @@ const u8 gGenesectPokedexText[] = _(
"feared as the strongest of hunters.\n" "feared as the strongest of hunters.\n"
"Team Plasma altered it and attached\n" "Team Plasma altered it and attached\n"
"a cannon to its back."); "a cannon to its back.");
#endif
#if P_NEW_POKEMON >= GEN_6
const u8 gChespinPokedexText[] = _( const u8 gChespinPokedexText[] = _(
"The quills on its head are usually soft.\n" "The quills on its head are usually soft.\n"
"When it flexes them, the points become\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" "on its back and disappears into the dense\n"
"fog. It's said to live in mountains where\n" "fog. It's said to live in mountains where\n"
"humans do not tread."); "humans do not tread.");
#endif
#if P_NEW_POKEMON >= GEN_7
const u8 gRowletPokedexText[] = _( const u8 gRowletPokedexText[] = _(
"This wary Pokémon uses photosynthesis\n" "This wary Pokémon uses photosynthesis\n"
"to store up energy during the day, while\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" "Revered long ago for its capacity to create\n"
"iron from nothing, for some reason it has\n" "iron from nothing, for some reason it has\n"
"come back to life after 3,000 years."); "come back to life after 3,000 years.");
#endif
#if P_NEW_POKEMON >= GEN_8
const u8 gGrookeyPokedexText[] = _( const u8 gGrookeyPokedexText[] = _(
"When it uses its special stick to strike up\n" "When it uses its special stick to strike up\n"
"a beat, the sound waves produced carry\n" "a beat, the sound waves produced carry\n"

View File

@ -387,7 +387,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_JIRACHI] = sJirachiTeachableLearnset, [SPECIES_JIRACHI] = sJirachiTeachableLearnset,
[SPECIES_DEOXYS] = sDeoxysTeachableLearnset, [SPECIES_DEOXYS] = sDeoxysTeachableLearnset,
[SPECIES_CHIMECHO] = sChimechoTeachableLearnset, [SPECIES_CHIMECHO] = sChimechoTeachableLearnset,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = sTurtwigTeachableLearnset, [SPECIES_TURTWIG] = sTurtwigTeachableLearnset,
[SPECIES_GROTLE] = sGrotleTeachableLearnset, [SPECIES_GROTLE] = sGrotleTeachableLearnset,
[SPECIES_TORTERRA] = sTorterraTeachableLearnset, [SPECIES_TORTERRA] = sTorterraTeachableLearnset,
@ -495,6 +495,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_DARKRAI] = sDarkraiTeachableLearnset, [SPECIES_DARKRAI] = sDarkraiTeachableLearnset,
[SPECIES_SHAYMIN] = sShayminTeachableLearnset, [SPECIES_SHAYMIN] = sShayminTeachableLearnset,
[SPECIES_ARCEUS] = sArceusTeachableLearnset, [SPECIES_ARCEUS] = sArceusTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = sVictiniTeachableLearnset, [SPECIES_VICTINI] = sVictiniTeachableLearnset,
[SPECIES_SNIVY] = sSnivyTeachableLearnset, [SPECIES_SNIVY] = sSnivyTeachableLearnset,
[SPECIES_SERVINE] = sServineTeachableLearnset, [SPECIES_SERVINE] = sServineTeachableLearnset,
@ -651,6 +653,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_KELDEO] = sKeldeoTeachableLearnset, [SPECIES_KELDEO] = sKeldeoTeachableLearnset,
[SPECIES_MELOETTA] = sMeloettaTeachableLearnset, [SPECIES_MELOETTA] = sMeloettaTeachableLearnset,
[SPECIES_GENESECT] = sGenesectTeachableLearnset, [SPECIES_GENESECT] = sGenesectTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = sChespinTeachableLearnset, [SPECIES_CHESPIN] = sChespinTeachableLearnset,
[SPECIES_QUILLADIN] = sQuilladinTeachableLearnset, [SPECIES_QUILLADIN] = sQuilladinTeachableLearnset,
[SPECIES_CHESNAUGHT] = sChesnaughtTeachableLearnset, [SPECIES_CHESNAUGHT] = sChesnaughtTeachableLearnset,
@ -723,6 +727,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_DIANCIE] = sDiancieTeachableLearnset, [SPECIES_DIANCIE] = sDiancieTeachableLearnset,
[SPECIES_HOOPA] = sHoopaTeachableLearnset, [SPECIES_HOOPA] = sHoopaTeachableLearnset,
[SPECIES_VOLCANION] = sVolcanionTeachableLearnset, [SPECIES_VOLCANION] = sVolcanionTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = sRowletTeachableLearnset, [SPECIES_ROWLET] = sRowletTeachableLearnset,
[SPECIES_DARTRIX] = sDartrixTeachableLearnset, [SPECIES_DARTRIX] = sDartrixTeachableLearnset,
[SPECIES_DECIDUEYE] = sDecidueyeTeachableLearnset, [SPECIES_DECIDUEYE] = sDecidueyeTeachableLearnset,
@ -811,6 +817,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_ZERAORA] = sZeraoraTeachableLearnset, [SPECIES_ZERAORA] = sZeraoraTeachableLearnset,
[SPECIES_MELTAN] = sMeltanTeachableLearnset, [SPECIES_MELTAN] = sMeltanTeachableLearnset,
[SPECIES_MELMETAL] = sMelmetalTeachableLearnset, [SPECIES_MELMETAL] = sMelmetalTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = sGrookeyTeachableLearnset, [SPECIES_GROOKEY] = sGrookeyTeachableLearnset,
[SPECIES_THWACKEY] = sThwackeyTeachableLearnset, [SPECIES_THWACKEY] = sThwackeyTeachableLearnset,
[SPECIES_RILLABOOM] = sRillaboomTeachableLearnset, [SPECIES_RILLABOOM] = sRillaboomTeachableLearnset,
@ -907,6 +915,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_SNEASLER] = sSneaslerTeachableLearnset, [SPECIES_SNEASLER] = sSneaslerTeachableLearnset,
[SPECIES_OVERQWIL] = sOverqwilTeachableLearnset, [SPECIES_OVERQWIL] = sOverqwilTeachableLearnset,
[SPECIES_ENAMORUS] = sEnamorusTeachableLearnset, [SPECIES_ENAMORUS] = sEnamorusTeachableLearnset,
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset, [SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset,
[SPECIES_CHARIZARD_MEGA_X] = sCharizardTeachableLearnset, [SPECIES_CHARIZARD_MEGA_X] = sCharizardTeachableLearnset,
@ -948,13 +957,19 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_METAGROSS_MEGA] = sMetagrossTeachableLearnset, [SPECIES_METAGROSS_MEGA] = sMetagrossTeachableLearnset,
[SPECIES_LATIAS_MEGA] = sLatiasTeachableLearnset, [SPECIES_LATIAS_MEGA] = sLatiasTeachableLearnset,
[SPECIES_LATIOS_MEGA] = sLatiosTeachableLearnset, [SPECIES_LATIOS_MEGA] = sLatiosTeachableLearnset,
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = sLopunnyTeachableLearnset, [SPECIES_LOPUNNY_MEGA] = sLopunnyTeachableLearnset,
[SPECIES_GARCHOMP_MEGA] = sGarchompTeachableLearnset, [SPECIES_GARCHOMP_MEGA] = sGarchompTeachableLearnset,
[SPECIES_LUCARIO_MEGA] = sLucarioTeachableLearnset, [SPECIES_LUCARIO_MEGA] = sLucarioTeachableLearnset,
[SPECIES_ABOMASNOW_MEGA] = sAbomasnowTeachableLearnset, [SPECIES_ABOMASNOW_MEGA] = sAbomasnowTeachableLearnset,
[SPECIES_GALLADE_MEGA] = sGalladeTeachableLearnset, [SPECIES_GALLADE_MEGA] = sGalladeTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = sAudinoTeachableLearnset, [SPECIES_AUDINO_MEGA] = sAudinoTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = sDiancieTeachableLearnset, [SPECIES_DIANCIE_MEGA] = sDiancieTeachableLearnset,
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = sRayquazaTeachableLearnset, [SPECIES_RAYQUAZA_MEGA] = sRayquazaTeachableLearnset,
[SPECIES_KYOGRE_PRIMAL] = sKyogreTeachableLearnset, [SPECIES_KYOGRE_PRIMAL] = sKyogreTeachableLearnset,
@ -994,10 +1009,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianTeachableLearnset, [SPECIES_CORSOLA_GALARIAN] = sCorsolaGalarianTeachableLearnset,
[SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianTeachableLearnset, [SPECIES_ZIGZAGOON_GALARIAN] = sZigzagoonGalarianTeachableLearnset,
[SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset, [SPECIES_LINOONE_GALARIAN] = sLinooneGalarianTeachableLearnset,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset, [SPECIES_DARUMAKA_GALARIAN] = sDarumakaGalarianTeachableLearnset,
[SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianTeachableLearnset, [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianTeachableLearnset,
[SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianTeachableLearnset,
[SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianTeachableLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianTeachableLearnset,
#endif
// Hisuian Forms // Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianTeachableLearnset, [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianTeachableLearnset,
[SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianTeachableLearnset, [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianTeachableLearnset,
@ -1006,15 +1023,21 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianTeachableLearnset, [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianTeachableLearnset,
[SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianTeachableLearnset, [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianTeachableLearnset,
[SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianTeachableLearnset, [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianTeachableLearnset,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianTeachableLearnset, [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianTeachableLearnset,
[SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianTeachableLearnset, [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianTeachableLearnset,
[SPECIES_ZORUA_HISUIAN] = sZoruaHisuianTeachableLearnset, [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianTeachableLearnset,
[SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianTeachableLearnset, [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianTeachableLearnset,
[SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianTeachableLearnset, [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianTeachableLearnset, [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianTeachableLearnset,
[SPECIES_GOODRA_HISUIAN] = sGoodraHisuianTeachableLearnset, [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianTeachableLearnset,
[SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianTeachableLearnset, [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset,
#endif
// Misc Forms // Misc Forms
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset,
@ -1034,7 +1057,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_PIKACHU_WORLD_CAP] = sPikachuTeachableLearnset, [SPECIES_PIKACHU_WORLD_CAP] = sPikachuTeachableLearnset,
// Pichu // Pichu
[SPECIES_PICHU_SPIKY_EARED] = sPichuTeachableLearnset, [SPECIES_PICHU_SPIKY_EARED] = sPichuTeachableLearnset,
#endif
// Unown // Unown
[SPECIES_UNOWN_B] = sUnownTeachableLearnset, [SPECIES_UNOWN_B] = sUnownTeachableLearnset,
[SPECIES_UNOWN_C] = sUnownTeachableLearnset, [SPECIES_UNOWN_C] = sUnownTeachableLearnset,
@ -1071,7 +1093,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_DEOXYS_ATTACK] = sDeoxysAttackTeachableLearnset, [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackTeachableLearnset,
[SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseTeachableLearnset, [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseTeachableLearnset,
[SPECIES_DEOXYS_SPEED] = sDeoxysSpeedTeachableLearnset, [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedTeachableLearnset,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK] = sBurmyTeachableLearnset, [SPECIES_BURMY_SANDY_CLOAK] = sBurmyTeachableLearnset,
[SPECIES_BURMY_TRASH_CLOAK] = sBurmyTeachableLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyTeachableLearnset,
@ -1114,6 +1136,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_ARCEUS_DRAGON] = sArceusTeachableLearnset, [SPECIES_ARCEUS_DRAGON] = sArceusTeachableLearnset,
[SPECIES_ARCEUS_DARK] = sArceusTeachableLearnset, [SPECIES_ARCEUS_DARK] = sArceusTeachableLearnset,
[SPECIES_ARCEUS_FAIRY] = sArceusTeachableLearnset, [SPECIES_ARCEUS_FAIRY] = sArceusTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_5
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinTeachableLearnset, [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinTeachableLearnset,
[SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset, [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinTeachableLearnset,
@ -1132,7 +1156,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_TORNADUS_THERIAN] = sTornadusTeachableLearnset, [SPECIES_TORNADUS_THERIAN] = sTornadusTeachableLearnset,
[SPECIES_THUNDURUS_THERIAN] = sThundurusTeachableLearnset, [SPECIES_THUNDURUS_THERIAN] = sThundurusTeachableLearnset,
[SPECIES_LANDORUS_THERIAN] = sLandorusTeachableLearnset, [SPECIES_LANDORUS_THERIAN] = sLandorusTeachableLearnset,
[SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset,
// Kyurem // Kyurem
[SPECIES_KYUREM_WHITE] = sKyuremTeachableLearnset, [SPECIES_KYUREM_WHITE] = sKyuremTeachableLearnset,
[SPECIES_KYUREM_BLACK] = sKyuremTeachableLearnset, [SPECIES_KYUREM_BLACK] = sKyuremTeachableLearnset,
@ -1145,6 +1168,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_SHOCK_DRIVE] = sGenesectTeachableLearnset,
[SPECIES_GENESECT_BURN_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_BURN_DRIVE] = sGenesectTeachableLearnset,
[SPECIES_GENESECT_CHILL_DRIVE] = sGenesectTeachableLearnset, [SPECIES_GENESECT_CHILL_DRIVE] = sGenesectTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaTeachableLearnset, [SPECIES_GRENINJA_BATTLE_BOND] = sGreninjaTeachableLearnset,
[SPECIES_GRENINJA_ASH] = sGreninjaTeachableLearnset, [SPECIES_GRENINJA_ASH] = sGreninjaTeachableLearnset,
@ -1215,6 +1240,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_ZYGARDE_COMPLETE] = sZygardeTeachableLearnset, [SPECIES_ZYGARDE_COMPLETE] = sZygardeTeachableLearnset,
// Hoopa // Hoopa
[SPECIES_HOOPA_UNBOUND] = sHoopaUnboundTeachableLearnset, [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM] = sOricorioTeachableLearnset, [SPECIES_ORICORIO_POM_POM] = sOricorioTeachableLearnset,
[SPECIES_ORICORIO_PAU] = sOricorioTeachableLearnset, [SPECIES_ORICORIO_PAU] = sOricorioTeachableLearnset,
@ -1266,6 +1293,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_NECROZMA_ULTRA] = sNecrozmaTeachableLearnset, [SPECIES_NECROZMA_ULTRA] = sNecrozmaTeachableLearnset,
// Magearna // Magearna
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaTeachableLearnset, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = sMagearnaTeachableLearnset,
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING] = sCramorantTeachableLearnset, [SPECIES_CRAMORANT_GULPING] = sCramorantTeachableLearnset,
[SPECIES_CRAMORANT_GORGING] = sCramorantTeachableLearnset, [SPECIES_CRAMORANT_GORGING] = sCramorantTeachableLearnset,
@ -1303,5 +1332,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
// Calyrex // Calyrex
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderTeachableLearnset, [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderTeachableLearnset,
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset,
// Enamorus
[SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset,
#endif #endif
}; };

View File

@ -16203,8 +16203,7 @@ static const u16 sDeoxysTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
static const u16 sTurtwigTeachableLearnset[] = { static const u16 sTurtwigTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_BULLET_SEED, MOVE_BULLET_SEED,
@ -20326,7 +20325,9 @@ static const u16 sArceusTeachableLearnset[] = {
MOVE_THUNDER_WAVE, MOVE_THUNDER_WAVE,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_5
static const u16 sVictiniTeachableLearnset[] = { static const u16 sVictiniTeachableLearnset[] = {
MOVE_BRICK_BREAK, MOVE_BRICK_BREAK,
MOVE_DOUBLE_TEAM, MOVE_DOUBLE_TEAM,
@ -25417,7 +25418,9 @@ static const u16 sGenesectTeachableLearnset[] = {
MOVE_THUNDER_WAVE, MOVE_THUNDER_WAVE,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const u16 sChespinTeachableLearnset[] = { static const u16 sChespinTeachableLearnset[] = {
MOVE_AERIAL_ACE, MOVE_AERIAL_ACE,
MOVE_ATTRACT, MOVE_ATTRACT,
@ -27826,7 +27829,9 @@ static const u16 sVolcanionTeachableLearnset[] = {
MOVE_SWAGGER, MOVE_SWAGGER,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const u16 sRowletTeachableLearnset[] = { static const u16 sRowletTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_DOUBLE_TEAM, MOVE_DOUBLE_TEAM,
@ -30208,7 +30213,9 @@ static const u16 sMelmetalTeachableLearnset[] = {
MOVE_HIDDEN_POWER, MOVE_HIDDEN_POWER,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_8
static const u16 sGrookeyTeachableLearnset[] = { static const u16 sGrookeyTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_FACADE, MOVE_FACADE,
@ -32120,6 +32127,7 @@ static const u16 sOverqwilTeachableLearnset[] = {
static const u16 sEnamorusTeachableLearnset[] = { static const u16 sEnamorusTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
static const u16 sRattataAlolanTeachableLearnset[] = { static const u16 sRattataAlolanTeachableLearnset[] = {
MOVE_BLIZZARD, MOVE_BLIZZARD,
@ -32849,6 +32857,7 @@ static const u16 sLinooneGalarianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#if P_NEW_POKEMON >= GEN_5
static const u16 sDarumakaGalarianTeachableLearnset[] = { static const u16 sDarumakaGalarianTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_BLIZZARD, MOVE_BLIZZARD,
@ -32958,6 +32967,7 @@ static const u16 sStunfiskGalarianTeachableLearnset[] = {
MOVE_THUNDER_WAVE, MOVE_THUNDER_WAVE,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
static const u16 sGrowlitheHisuianTeachableLearnset[] = { static const u16 sGrowlitheHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
@ -32987,6 +32997,7 @@ static const u16 sSneaselHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#if P_NEW_POKEMON >= GEN_5
static const u16 sSamurottHisuianTeachableLearnset[] = { static const u16 sSamurottHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
@ -33006,7 +33017,9 @@ static const u16 sZoroarkHisuianTeachableLearnset[] = {
static const u16 sBraviaryHisuianTeachableLearnset[] = { static const u16 sBraviaryHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const u16 sSliggooHisuianTeachableLearnset[] = { static const u16 sSliggooHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
@ -33018,11 +33031,12 @@ static const u16 sGoodraHisuianTeachableLearnset[] = {
static const u16 sAvaluggHisuianTeachableLearnset[] = { static const u16 sAvaluggHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const u16 sDecidueyeHisuianTeachableLearnset[] = { static const u16 sDecidueyeHisuianTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif #endif
static const u16 sDeoxysAttackTeachableLearnset[] = { static const u16 sDeoxysAttackTeachableLearnset[] = {
@ -33145,8 +33159,7 @@ static const u16 sDeoxysSpeedTeachableLearnset[] = {
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
static const u16 sBurmySandyCloakTeachableLearnset[] = { static const u16 sBurmySandyCloakTeachableLearnset[] = {
MOVE_HIDDEN_POWER, MOVE_HIDDEN_POWER,
MOVE_PROTECT, MOVE_PROTECT,
@ -33280,7 +33293,9 @@ static const u16 sShayminSkyTeachableLearnset[] = {
MOVE_TOXIC, MOVE_TOXIC,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_6
static const u16 sFloetteEternalFlowerTeachableLearnset[] = { static const u16 sFloetteEternalFlowerTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_CALM_MIND, MOVE_CALM_MIND,
@ -33373,7 +33388,9 @@ static const u16 sMeowsticFemaleTeachableLearnset[] = {
MOVE_THUNDER_WAVE, MOVE_THUNDER_WAVE,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_7
static const u16 sLycanrocMidnightTeachableLearnset[] = { static const u16 sLycanrocMidnightTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_BRICK_BREAK, MOVE_BRICK_BREAK,
@ -33411,7 +33428,9 @@ static const u16 sLycanrocDuskTeachableLearnset[] = {
MOVE_TOXIC, MOVE_TOXIC,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif
#if P_NEW_POKEMON >= GEN_8
static const u16 sToxtricityLowKeyTeachableLearnset[] = { static const u16 sToxtricityLowKeyTeachableLearnset[] = {
MOVE_ATTRACT, MOVE_ATTRACT,
MOVE_FACADE, MOVE_FACADE,
@ -33552,5 +33571,4 @@ static const u16 sCalyrexShadowRiderTeachableLearnset[] = {
MOVE_SWIFT, MOVE_SWIFT,
MOVE_UNAVAILABLE, MOVE_UNAVAILABLE,
}; };
#endif #endif

View File

@ -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 // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame
// the sprite's non-transparent pixels actually are. // the sprite's non-transparent pixels actually are.
// .size is the dimensions of this drawn pixel area. // .size is the dimensions of this drawn pixel area.
@ -129,11 +148,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 1, .y_offset = 1,
}, },
[SPECIES_PIKACHU] = [SPECIES_PIKACHU] = PIKACHU_BACK_PIC_COORDS,
{
.size = MON_COORDS_SIZE(64, 56),
.y_offset = 4,
},
[SPECIES_RAICHU] = [SPECIES_RAICHU] =
{ {
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
@ -1939,7 +1954,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 9, .y_offset = 9,
}, },
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = [SPECIES_TURTWIG] =
{ {
.size = MON_COORDS_SIZE(48, 56), .size = MON_COORDS_SIZE(48, 56),
@ -2470,11 +2485,9 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(56, 40), .size = MON_COORDS_SIZE(56, 40),
.y_offset = 15, .y_offset = 15,
}, },
[SPECIES_ARCEUS] = [SPECIES_ARCEUS] = ARCEUS_BACK_PIC_COORDS,
{ #endif
.size = MON_COORDS_SIZE(64, 64), #if P_NEW_POKEMON >= GEN_5
.y_offset = 3,
},
[SPECIES_VICTINI] = [SPECIES_VICTINI] =
{ {
.size = MON_COORDS_SIZE(40, 64), .size = MON_COORDS_SIZE(40, 64),
@ -2930,11 +2943,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 6, .y_offset = 6,
}, },
[SPECIES_DEERLING] = [SPECIES_DEERLING] = DEERLING_BACK_PIC_COORDS,
{
.size = MON_COORDS_SIZE(48, 56),
.y_offset = 9,
},
[SPECIES_SAWSBUCK] = [SPECIES_SAWSBUCK] =
{ {
.size = MON_COORDS_SIZE(48, 64), .size = MON_COORDS_SIZE(48, 64),
@ -3255,6 +3264,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 48), .size = MON_COORDS_SIZE(64, 48),
.y_offset = 8, .y_offset = 8,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = [SPECIES_CHESPIN] =
{ {
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
@ -3615,6 +3626,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 3, .y_offset = 3,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = [SPECIES_ROWLET] =
{ {
.size = MON_COORDS_SIZE(48, 40), .size = MON_COORDS_SIZE(48, 40),
@ -4055,6 +4068,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 40), .size = MON_COORDS_SIZE(64, 40),
.y_offset = 13, .y_offset = 13,
}, },
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = [SPECIES_GROOKEY] =
{ {
.size = MON_COORDS_SIZE(48, 56), .size = MON_COORDS_SIZE(48, 56),
@ -4535,6 +4550,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA] = [SPECIES_VENUSAUR_MEGA] =
{ {
@ -4736,6 +4752,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 1, .y_offset = 1,
}, },
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = [SPECIES_LOPUNNY_MEGA] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
@ -4761,16 +4778,21 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 3, .y_offset = 3,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = [SPECIES_AUDINO_MEGA] =
{ {
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = [SPECIES_DIANCIE_MEGA] =
{ {
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 5, .y_offset = 5,
}, },
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = [SPECIES_RAYQUAZA_MEGA] =
{ {
@ -4954,6 +4976,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 40), .size = MON_COORDS_SIZE(64, 40),
.y_offset = 13, .y_offset = 13,
}, },
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = [SPECIES_DARUMAKA_GALARIAN] =
{ {
.size = MON_COORDS_SIZE(56, 48), .size = MON_COORDS_SIZE(56, 48),
@ -4974,6 +4997,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 24), .size = MON_COORDS_SIZE(64, 24),
.y_offset = 23, .y_offset = 23,
}, },
#endif
// Hisuian Forms // Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = [SPECIES_GROWLITHE_HISUIAN] =
{ {
@ -5010,6 +5034,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
.y_offset = 3, .y_offset = 3,
}, },
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = [SPECIES_SAMUROTT_HISUIAN] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
@ -5035,6 +5060,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = [SPECIES_SLIGGOO_HISUIAN] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
@ -5050,91 +5077,37 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 32), .size = MON_COORDS_SIZE(64, 32),
.y_offset = 17, .y_offset = 17,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = [SPECIES_DECIDUEYE_HISUIAN] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
// Misc Forms // Misc Forms
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = [SPECIES_PIKACHU_COSPLAY] = PIKACHU_BACK_PIC_COORDS,
{ [SPECIES_PIKACHU_ROCK_STAR] = PIKACHU_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 56), [SPECIES_PIKACHU_BELLE] = PIKACHU_BACK_PIC_COORDS,
.y_offset = 4, [SPECIES_PIKACHU_POP_STAR] = PIKACHU_BACK_PIC_COORDS,
}, [SPECIES_PIKACHU_PH_D] = PIKACHU_BACK_PIC_COORDS,
[SPECIES_PIKACHU_ROCK_STAR] = [SPECIES_PIKACHU_LIBRE] = PIKACHU_BACK_PIC_COORDS,
{
.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,
},
// Cap Pikachu // Cap Pikachu
[SPECIES_PIKACHU_ORIGINAL_CAP] = [SPECIES_PIKACHU_ORIGINAL_CAP] = PIKACHU_BACK_PIC_COORDS,
{ [SPECIES_PIKACHU_HOENN_CAP] = PIKACHU_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 56), [SPECIES_PIKACHU_SINNOH_CAP] = PIKACHU_BACK_PIC_COORDS,
.y_offset = 4, [SPECIES_PIKACHU_UNOVA_CAP] = PIKACHU_BACK_PIC_COORDS,
}, [SPECIES_PIKACHU_KALOS_CAP] = PIKACHU_BACK_PIC_COORDS,
[SPECIES_PIKACHU_HOENN_CAP] = [SPECIES_PIKACHU_ALOLA_CAP] = PIKACHU_BACK_PIC_COORDS,
{ [SPECIES_PIKACHU_PARTNER_CAP] = PIKACHU_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 56), [SPECIES_PIKACHU_WORLD_CAP] = PIKACHU_BACK_PIC_COORDS,
.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,
},
// Pichu // Pichu
[SPECIES_PICHU_SPIKY_EARED] = [SPECIES_PICHU_SPIKY_EARED] =
{ {
.size = MON_COORDS_SIZE(48, 56), .size = MON_COORDS_SIZE(48, 56),
.y_offset = 8, .y_offset = 8,
}, },
#endif
// Unown // Unown
[SPECIES_UNOWN_B] = [SPECIES_UNOWN_B] =
{ {
@ -5303,7 +5276,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK] = [SPECIES_BURMY_SANDY_CLOAK] =
{ {
@ -5393,91 +5366,25 @@ const struct MonCoords gMonBackPicCoords[] =
.y_offset = 2, .y_offset = 2,
}, },
// Arceus // Arceus
[SPECIES_ARCEUS_FIGHTING] = [SPECIES_ARCEUS_FIGHTING] = ARCEUS_BACK_PIC_COORDS,
{ [SPECIES_ARCEUS_FLYING] = ARCEUS_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 64), [SPECIES_ARCEUS_POISON] = ARCEUS_BACK_PIC_COORDS,
.y_offset = 3, [SPECIES_ARCEUS_GROUND] = ARCEUS_BACK_PIC_COORDS,
}, [SPECIES_ARCEUS_ROCK] = ARCEUS_BACK_PIC_COORDS,
[SPECIES_ARCEUS_FLYING] = [SPECIES_ARCEUS_BUG] = ARCEUS_BACK_PIC_COORDS,
{ [SPECIES_ARCEUS_GHOST] = ARCEUS_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 64), [SPECIES_ARCEUS_STEEL] = ARCEUS_BACK_PIC_COORDS,
.y_offset = 3, [SPECIES_ARCEUS_FIRE] = ARCEUS_BACK_PIC_COORDS,
}, [SPECIES_ARCEUS_WATER] = ARCEUS_BACK_PIC_COORDS,
[SPECIES_ARCEUS_POISON] = [SPECIES_ARCEUS_GRASS] = ARCEUS_BACK_PIC_COORDS,
{ [SPECIES_ARCEUS_ELECTRIC] = ARCEUS_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 64), [SPECIES_ARCEUS_PSYCHIC] = ARCEUS_BACK_PIC_COORDS,
.y_offset = 3, [SPECIES_ARCEUS_ICE] = ARCEUS_BACK_PIC_COORDS,
}, [SPECIES_ARCEUS_DRAGON] = ARCEUS_BACK_PIC_COORDS,
[SPECIES_ARCEUS_GROUND] = [SPECIES_ARCEUS_DARK] = ARCEUS_BACK_PIC_COORDS,
{ [SPECIES_ARCEUS_FAIRY] = ARCEUS_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(64, 64), #endif
.y_offset = 3, #if P_NEW_POKEMON >= GEN_5
},
[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,
},
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = [SPECIES_BASCULIN_BLUE_STRIPED] =
{ {
@ -5501,21 +5408,9 @@ const struct MonCoords gMonBackPicCoords[] =
.y_offset = 1, .y_offset = 1,
}, },
// Deerling // Deerling
[SPECIES_DEERLING_SUMMER] = [SPECIES_DEERLING_SUMMER] = DEERLING_BACK_PIC_COORDS,
{ [SPECIES_DEERLING_AUTUMN] = DEERLING_BACK_PIC_COORDS,
.size = MON_COORDS_SIZE(48, 56), [SPECIES_DEERLING_WINTER] = DEERLING_BACK_PIC_COORDS,
.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,
},
// Sawsbuck // Sawsbuck
[SPECIES_SAWSBUCK_SUMMER] = [SPECIES_SAWSBUCK_SUMMER] =
{ {
@ -5548,11 +5443,6 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 7, .y_offset = 7,
}, },
[SPECIES_ENAMORUS_THERIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Kyurem // Kyurem
[SPECIES_KYUREM_WHITE] = [SPECIES_KYUREM_WHITE] =
{ {
@ -5597,6 +5487,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 48), .size = MON_COORDS_SIZE(64, 48),
.y_offset = 8, .y_offset = 8,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = [SPECIES_GRENINJA_BATTLE_BOND] =
{ {
@ -5895,6 +5787,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM] = [SPECIES_ORICORIO_POM_POM] =
{ {
@ -6114,6 +6008,8 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 4, .y_offset = 4,
}, },
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING] = [SPECIES_CRAMORANT_GULPING] =
{ {
@ -6243,6 +6139,11 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 7, .y_offset = 7,
}, },
[SPECIES_ENAMORUS_THERIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
#endif #endif
// Egg // Egg
[SPECIES_EGG] = [SPECIES_EGG] =

View File

@ -387,7 +387,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi), SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi),
SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys), SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys),
SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho), SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig), SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig),
SPECIES_SPRITE(GROTLE, gMonBackPic_Grotle), SPECIES_SPRITE(GROTLE, gMonBackPic_Grotle),
SPECIES_SPRITE(TORTERRA, gMonBackPic_Torterra), SPECIES_SPRITE(TORTERRA, gMonBackPic_Torterra),
@ -495,6 +495,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(DARKRAI, gMonBackPic_Darkrai), SPECIES_SPRITE(DARKRAI, gMonBackPic_Darkrai),
SPECIES_SPRITE(SHAYMIN, gMonBackPic_Shaymin), SPECIES_SPRITE(SHAYMIN, gMonBackPic_Shaymin),
SPECIES_SPRITE(ARCEUS, gMonBackPic_Arceus), SPECIES_SPRITE(ARCEUS, gMonBackPic_Arceus),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(VICTINI, gMonBackPic_Victini), SPECIES_SPRITE(VICTINI, gMonBackPic_Victini),
SPECIES_SPRITE(SNIVY, gMonBackPic_Snivy), SPECIES_SPRITE(SNIVY, gMonBackPic_Snivy),
SPECIES_SPRITE(SERVINE, gMonBackPic_Servine), SPECIES_SPRITE(SERVINE, gMonBackPic_Servine),
@ -651,6 +653,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(KELDEO, gMonBackPic_Keldeo), SPECIES_SPRITE(KELDEO, gMonBackPic_Keldeo),
SPECIES_SPRITE(MELOETTA, gMonBackPic_Meloetta), SPECIES_SPRITE(MELOETTA, gMonBackPic_Meloetta),
SPECIES_SPRITE(GENESECT, gMonBackPic_Genesect), SPECIES_SPRITE(GENESECT, gMonBackPic_Genesect),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(CHESPIN, gMonBackPic_Chespin), SPECIES_SPRITE(CHESPIN, gMonBackPic_Chespin),
SPECIES_SPRITE(QUILLADIN, gMonBackPic_Quilladin), SPECIES_SPRITE(QUILLADIN, gMonBackPic_Quilladin),
SPECIES_SPRITE(CHESNAUGHT, gMonBackPic_Chesnaught), SPECIES_SPRITE(CHESNAUGHT, gMonBackPic_Chesnaught),
@ -723,6 +727,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(DIANCIE, gMonBackPic_Diancie), SPECIES_SPRITE(DIANCIE, gMonBackPic_Diancie),
SPECIES_SPRITE(HOOPA, gMonBackPic_Hoopa), SPECIES_SPRITE(HOOPA, gMonBackPic_Hoopa),
SPECIES_SPRITE(VOLCANION, gMonBackPic_Volcanion), SPECIES_SPRITE(VOLCANION, gMonBackPic_Volcanion),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SPRITE(ROWLET, gMonBackPic_Rowlet), SPECIES_SPRITE(ROWLET, gMonBackPic_Rowlet),
SPECIES_SPRITE(DARTRIX, gMonBackPic_Dartrix), SPECIES_SPRITE(DARTRIX, gMonBackPic_Dartrix),
SPECIES_SPRITE(DECIDUEYE, gMonBackPic_Decidueye), SPECIES_SPRITE(DECIDUEYE, gMonBackPic_Decidueye),
@ -811,6 +817,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ZERAORA, gMonBackPic_Zeraora), SPECIES_SPRITE(ZERAORA, gMonBackPic_Zeraora),
SPECIES_SPRITE(MELTAN, gMonBackPic_Meltan), SPECIES_SPRITE(MELTAN, gMonBackPic_Meltan),
SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal), SPECIES_SPRITE(MELMETAL, gMonBackPic_Melmetal),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SPRITE(GROOKEY, gMonBackPic_Grookey), SPECIES_SPRITE(GROOKEY, gMonBackPic_Grookey),
SPECIES_SPRITE(THWACKEY, gMonBackPic_Thwackey), SPECIES_SPRITE(THWACKEY, gMonBackPic_Thwackey),
SPECIES_SPRITE(RILLABOOM, gMonBackPic_Rillaboom), SPECIES_SPRITE(RILLABOOM, gMonBackPic_Rillaboom),
@ -907,6 +915,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler), SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil), SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus), SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus),
#endif
SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega), SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega),
SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonBackPic_CharizardMegaX), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonBackPic_CharizardMegaX),
@ -948,13 +957,19 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(METAGROSS_MEGA, gMonBackPic_MetagrossMega), SPECIES_SPRITE(METAGROSS_MEGA, gMonBackPic_MetagrossMega),
SPECIES_SPRITE(LATIAS_MEGA, gMonBackPic_LatiasMega), SPECIES_SPRITE(LATIAS_MEGA, gMonBackPic_LatiasMega),
SPECIES_SPRITE(LATIOS_MEGA, gMonBackPic_LatiosMega), SPECIES_SPRITE(LATIOS_MEGA, gMonBackPic_LatiosMega),
#if P_NEW_POKEMON >= GEN_4
SPECIES_SPRITE(LOPUNNY_MEGA, gMonBackPic_LopunnyMega), SPECIES_SPRITE(LOPUNNY_MEGA, gMonBackPic_LopunnyMega),
SPECIES_SPRITE(GARCHOMP_MEGA, gMonBackPic_GarchompMega), SPECIES_SPRITE(GARCHOMP_MEGA, gMonBackPic_GarchompMega),
SPECIES_SPRITE(LUCARIO_MEGA, gMonBackPic_LucarioMega), SPECIES_SPRITE(LUCARIO_MEGA, gMonBackPic_LucarioMega),
SPECIES_SPRITE(ABOMASNOW_MEGA, gMonBackPic_AbomasnowMega), SPECIES_SPRITE(ABOMASNOW_MEGA, gMonBackPic_AbomasnowMega),
SPECIES_SPRITE(GALLADE_MEGA, gMonBackPic_GalladeMega), SPECIES_SPRITE(GALLADE_MEGA, gMonBackPic_GalladeMega),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(AUDINO_MEGA, gMonBackPic_AudinoMega), SPECIES_SPRITE(AUDINO_MEGA, gMonBackPic_AudinoMega),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(DIANCIE_MEGA, gMonBackPic_DiancieMega), SPECIES_SPRITE(DIANCIE_MEGA, gMonBackPic_DiancieMega),
#endif
SPECIES_SPRITE(RAYQUAZA_MEGA, gMonBackPic_RayquazaMega), SPECIES_SPRITE(RAYQUAZA_MEGA, gMonBackPic_RayquazaMega),
SPECIES_SPRITE(KYOGRE_PRIMAL, gMonBackPic_KyogrePrimal), SPECIES_SPRITE(KYOGRE_PRIMAL, gMonBackPic_KyogrePrimal),
@ -994,10 +1009,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(CORSOLA_GALARIAN, gMonBackPic_CorsolaGalarian), SPECIES_SPRITE(CORSOLA_GALARIAN, gMonBackPic_CorsolaGalarian),
SPECIES_SPRITE(ZIGZAGOON_GALARIAN, gMonBackPic_ZigzagoonGalarian), SPECIES_SPRITE(ZIGZAGOON_GALARIAN, gMonBackPic_ZigzagoonGalarian),
SPECIES_SPRITE(LINOONE_GALARIAN, gMonBackPic_LinooneGalarian), SPECIES_SPRITE(LINOONE_GALARIAN, gMonBackPic_LinooneGalarian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonBackPic_DarumakaGalarian), SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonBackPic_DarumakaGalarian),
SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonBackPic_DarmanitanGalarian), SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonBackPic_DarmanitanGalarian),
SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian), SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian),
SPECIES_SPRITE(STUNFISK_GALARIAN, gMonBackPic_StunfiskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonBackPic_StunfiskGalarian),
#endif
SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonBackPic_GrowlitheHisuian), SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonBackPic_GrowlitheHisuian),
SPECIES_SPRITE(ARCANINE_HISUIAN, gMonBackPic_ArcanineHisuian), SPECIES_SPRITE(ARCANINE_HISUIAN, gMonBackPic_ArcanineHisuian),
@ -1006,15 +1023,21 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonBackPic_TyphlosionHisuian), SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonBackPic_TyphlosionHisuian),
SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_QwilfishHisuian), SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_QwilfishHisuian),
SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_SneaselHisuian), SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_SneaselHisuian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian), SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian),
SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_LilligantHisuian), SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_LilligantHisuian),
SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_ZoruaHisuian), SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_ZoruaHisuian),
SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_ZoroarkHisuian), SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_ZoroarkHisuian),
SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonBackPic_BraviaryHisuian), SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonBackPic_BraviaryHisuian),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonBackPic_SliggooHisuian), SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonBackPic_SliggooHisuian),
SPECIES_SPRITE(GOODRA_HISUIAN, gMonBackPic_GoodraHisuian), SPECIES_SPRITE(GOODRA_HISUIAN, gMonBackPic_GoodraHisuian),
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_AvaluggHisuian), SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_AvaluggHisuian),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian), SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian),
#endif
SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay),
SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonBackPic_PikachuRockStar), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonBackPic_PikachuRockStar),
@ -1033,7 +1056,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonBackPic_PikachuWorldCap), SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonBackPic_PikachuWorldCap),
SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonBackPic_PichuSpikyEared), SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonBackPic_PichuSpikyEared),
#endif
SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB), SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB),
SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC), SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC),
SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD), SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD),
@ -1069,7 +1092,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(DEOXYS_ATTACK, gMonBackPic_DeoxysAttack), SPECIES_SPRITE(DEOXYS_ATTACK, gMonBackPic_DeoxysAttack),
SPECIES_SPRITE(DEOXYS_DEFENSE, gMonBackPic_DeoxysDefense), SPECIES_SPRITE(DEOXYS_DEFENSE, gMonBackPic_DeoxysDefense),
SPECIES_SPRITE(DEOXYS_SPEED, gMonBackPic_DeoxysSpeed), 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_SANDY_CLOAK, gMonBackPic_BurmySandyCloak),
SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonBackPic_BurmyTrashCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonBackPic_BurmyTrashCloak),
@ -1111,7 +1134,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ARCEUS_DRAGON, gMonBackPic_Arceus), SPECIES_SPRITE(ARCEUS_DRAGON, gMonBackPic_Arceus),
SPECIES_SPRITE(ARCEUS_DARK, gMonBackPic_Arceus), SPECIES_SPRITE(ARCEUS_DARK, gMonBackPic_Arceus),
SPECIES_SPRITE(ARCEUS_FAIRY, 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_BLUE_STRIPED, gMonBackPic_BasculinBlueStriped),
SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_BasculinWhiteStriped), SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_BasculinWhiteStriped),
@ -1129,7 +1154,6 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(TORNADUS_THERIAN, gMonBackPic_TornadusTherian), SPECIES_SPRITE(TORNADUS_THERIAN, gMonBackPic_TornadusTherian),
SPECIES_SPRITE(THUNDURUS_THERIAN, gMonBackPic_ThundurusTherian), SPECIES_SPRITE(THUNDURUS_THERIAN, gMonBackPic_ThundurusTherian),
SPECIES_SPRITE(LANDORUS_THERIAN, gMonBackPic_LandorusTherian), SPECIES_SPRITE(LANDORUS_THERIAN, gMonBackPic_LandorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite), SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite),
SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack), SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack),
@ -1142,7 +1166,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(GENESECT_SHOCK_DRIVE, gMonBackPic_Genesect), SPECIES_SPRITE(GENESECT_SHOCK_DRIVE, gMonBackPic_Genesect),
SPECIES_SPRITE(GENESECT_BURN_DRIVE, gMonBackPic_Genesect), SPECIES_SPRITE(GENESECT_BURN_DRIVE, gMonBackPic_Genesect),
SPECIES_SPRITE(GENESECT_CHILL_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_BATTLE_BOND, gMonBackPic_Greninja),
SPECIES_SPRITE(GRENINJA_ASH, gMonBackPic_GreninjaAsh), SPECIES_SPRITE(GRENINJA_ASH, gMonBackPic_GreninjaAsh),
@ -1212,7 +1238,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonBackPic_ZygardeComplete), SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonBackPic_ZygardeComplete),
SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound), SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom), SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom),
SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau), SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau),
SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu), SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu),
@ -1263,7 +1291,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(NECROZMA_ULTRA, gMonBackPic_NecrozmaUltra), SPECIES_SPRITE(NECROZMA_ULTRA, gMonBackPic_NecrozmaUltra),
SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonBackPic_MagearnaOriginalColor), SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonBackPic_MagearnaOriginalColor),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SPRITE(CRAMORANT_GULPING, gMonBackPic_CramorantGulping), SPECIES_SPRITE(CRAMORANT_GULPING, gMonBackPic_CramorantGulping),
SPECIES_SPRITE(CRAMORANT_GORGING, gMonBackPic_CramorantGorging), SPECIES_SPRITE(CRAMORANT_GORGING, gMonBackPic_CramorantGorging),
@ -1300,6 +1330,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider), SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider), SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian),
#endif #endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg), SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
}; };
@ -1307,7 +1339,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
const struct CompressedSpriteSheet gMonBackPicTableFemale[] = const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
{ {
SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF),
SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF), SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF),
SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor), SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor),
@ -1318,10 +1350,16 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), SPECIES_SPRITE(COMBEE, gMonBackPic_Combee),
SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF), SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF),
SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF), SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF), SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF),
SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF), SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF), SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF), SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF),
#endif #endif
}; };

View File

@ -58,7 +58,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_LATIOS] = 6, [SPECIES_LATIOS] = 6,
[SPECIES_JIRACHI] = 14, [SPECIES_JIRACHI] = 14,
[SPECIES_CHIMECHO] = 16, [SPECIES_CHIMECHO] = 16,
#if P_NEW_POKEMON == TRUE
// Gen 4 // Gen 4
[SPECIES_MOTHIM] = 10, [SPECIES_MOTHIM] = 10,
[SPECIES_COMBEE] = 8, [SPECIES_COMBEE] = 8,
@ -182,7 +181,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_VOLTORB_HISUIAN] = 1, [SPECIES_VOLTORB_HISUIAN] = 1,
[SPECIES_ELECTRODE_HISUIAN] = 4, [SPECIES_ELECTRODE_HISUIAN] = 4,
[SPECIES_BRAVIARY_HISUIAN] = 3, [SPECIES_BRAVIARY_HISUIAN] = 3,
#endif
// Other Forms // Other Forms
[SPECIES_UNOWN_B] = 8, [SPECIES_UNOWN_B] = 8,
[SPECIES_UNOWN_C] = 8, [SPECIES_UNOWN_C] = 8,
@ -214,7 +212,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_CASTFORM_SUNNY] = 5, [SPECIES_CASTFORM_SUNNY] = 5,
[SPECIES_CASTFORM_RAINY] = 5, [SPECIES_CASTFORM_RAINY] = 5,
[SPECIES_CASTFORM_SNOWY] = 5, [SPECIES_CASTFORM_SNOWY] = 5,
#if P_NEW_POKEMON == TRUE
[SPECIES_ROTOM_HEAT] = 6, [SPECIES_ROTOM_HEAT] = 6,
[SPECIES_ROTOM_WASH] = 6, [SPECIES_ROTOM_WASH] = 6,
[SPECIES_ROTOM_FROST] = 6, [SPECIES_ROTOM_FROST] = 6,
@ -271,5 +268,4 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_SINISTEA_ANTIQUE] = 10,
[SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_POLTEAGEIST_ANTIQUE] = 12,
[SPECIES_ETERNATUS_ETERNAMAX] = 13, [SPECIES_ETERNATUS_ETERNAMAX] = 13,
#endif
}; };

View File

@ -387,7 +387,7 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_JIRACHI] = gMonFootprint_Jirachi, [SPECIES_JIRACHI] = gMonFootprint_Jirachi,
[SPECIES_DEOXYS] = gMonFootprint_Deoxys, [SPECIES_DEOXYS] = gMonFootprint_Deoxys,
[SPECIES_CHIMECHO] = gMonFootprint_Chimecho, [SPECIES_CHIMECHO] = gMonFootprint_Chimecho,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = gMonFootprint_Turtwig, [SPECIES_TURTWIG] = gMonFootprint_Turtwig,
[SPECIES_GROTLE] = gMonFootprint_Grotle, [SPECIES_GROTLE] = gMonFootprint_Grotle,
[SPECIES_TORTERRA] = gMonFootprint_Torterra, [SPECIES_TORTERRA] = gMonFootprint_Torterra,
@ -495,6 +495,8 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_DARKRAI] = gMonFootprint_Darkrai, [SPECIES_DARKRAI] = gMonFootprint_Darkrai,
[SPECIES_SHAYMIN] = gMonFootprint_Shaymin, [SPECIES_SHAYMIN] = gMonFootprint_Shaymin,
[SPECIES_ARCEUS] = gMonFootprint_Arceus, [SPECIES_ARCEUS] = gMonFootprint_Arceus,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = gMonFootprint_Victini, [SPECIES_VICTINI] = gMonFootprint_Victini,
[SPECIES_SNIVY] = gMonFootprint_Snivy, [SPECIES_SNIVY] = gMonFootprint_Snivy,
[SPECIES_SERVINE] = gMonFootprint_Servine, [SPECIES_SERVINE] = gMonFootprint_Servine,
@ -651,6 +653,8 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_KELDEO] = gMonFootprint_Keldeo, [SPECIES_KELDEO] = gMonFootprint_Keldeo,
[SPECIES_MELOETTA] = gMonFootprint_Meloetta, [SPECIES_MELOETTA] = gMonFootprint_Meloetta,
[SPECIES_GENESECT] = gMonFootprint_Genesect, [SPECIES_GENESECT] = gMonFootprint_Genesect,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = gMonFootprint_Chespin, [SPECIES_CHESPIN] = gMonFootprint_Chespin,
[SPECIES_QUILLADIN] = gMonFootprint_Quilladin, [SPECIES_QUILLADIN] = gMonFootprint_Quilladin,
[SPECIES_CHESNAUGHT] = gMonFootprint_Chesnaught, [SPECIES_CHESNAUGHT] = gMonFootprint_Chesnaught,
@ -723,6 +727,8 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_DIANCIE] = gMonFootprint_Diancie, [SPECIES_DIANCIE] = gMonFootprint_Diancie,
[SPECIES_HOOPA] = gMonFootprint_Hoopa, [SPECIES_HOOPA] = gMonFootprint_Hoopa,
[SPECIES_VOLCANION] = gMonFootprint_Volcanion, [SPECIES_VOLCANION] = gMonFootprint_Volcanion,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = gMonFootprint_Rowlet, [SPECIES_ROWLET] = gMonFootprint_Rowlet,
[SPECIES_DARTRIX] = gMonFootprint_Dartrix, [SPECIES_DARTRIX] = gMonFootprint_Dartrix,
[SPECIES_DECIDUEYE] = gMonFootprint_Decidueye, [SPECIES_DECIDUEYE] = gMonFootprint_Decidueye,
@ -811,6 +817,8 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_ZERAORA] = gMonFootprint_Zeraora, [SPECIES_ZERAORA] = gMonFootprint_Zeraora,
[SPECIES_MELTAN] = gMonFootprint_Meltan, [SPECIES_MELTAN] = gMonFootprint_Meltan,
[SPECIES_MELMETAL] = gMonFootprint_Melmetal, [SPECIES_MELMETAL] = gMonFootprint_Melmetal,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = gMonFootprint_Grookey, [SPECIES_GROOKEY] = gMonFootprint_Grookey,
[SPECIES_THWACKEY] = gMonFootprint_Thwackey, [SPECIES_THWACKEY] = gMonFootprint_Thwackey,
[SPECIES_RILLABOOM] = gMonFootprint_Rillaboom, [SPECIES_RILLABOOM] = gMonFootprint_Rillaboom,

File diff suppressed because it is too large Load Diff

View File

@ -1939,7 +1939,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(48, 48), .size = MON_COORDS_SIZE(48, 48),
.y_offset = 11, .y_offset = 11,
}, },
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = [SPECIES_TURTWIG] =
{ {
.size = MON_COORDS_SIZE(40, 48), .size = MON_COORDS_SIZE(40, 48),
@ -2475,6 +2475,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = [SPECIES_VICTINI] =
{ {
.size = MON_COORDS_SIZE(48, 56), .size = MON_COORDS_SIZE(48, 56),
@ -3255,6 +3257,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = [SPECIES_CHESPIN] =
{ {
.size = MON_COORDS_SIZE(40, 48), .size = MON_COORDS_SIZE(40, 48),
@ -3615,6 +3619,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = [SPECIES_ROWLET] =
{ {
.size = MON_COORDS_SIZE(32, 40), .size = MON_COORDS_SIZE(32, 40),
@ -4055,6 +4061,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 56), .size = MON_COORDS_SIZE(64, 56),
.y_offset = 4, .y_offset = 4,
}, },
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = [SPECIES_GROOKEY] =
{ {
.size = MON_COORDS_SIZE(40, 48), .size = MON_COORDS_SIZE(40, 48),
@ -4535,6 +4543,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA] = [SPECIES_VENUSAUR_MEGA] =
{ {
@ -4736,6 +4745,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = [SPECIES_LOPUNNY_MEGA] =
{ {
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
@ -4761,16 +4771,21 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 1, .y_offset = 1,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = [SPECIES_AUDINO_MEGA] =
{ {
.size = MON_COORDS_SIZE(48, 64), .size = MON_COORDS_SIZE(48, 64),
.y_offset = 6, .y_offset = 6,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = [SPECIES_DIANCIE_MEGA] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = [SPECIES_RAYQUAZA_MEGA] =
{ {
@ -4954,6 +4969,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 40), .size = MON_COORDS_SIZE(64, 40),
.y_offset = 13, .y_offset = 13,
}, },
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = [SPECIES_DARUMAKA_GALARIAN] =
{ {
.size = MON_COORDS_SIZE(40, 40), .size = MON_COORDS_SIZE(40, 40),
@ -4974,6 +4990,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(48, 40), .size = MON_COORDS_SIZE(48, 40),
.y_offset = 14, .y_offset = 14,
}, },
#endif
// Hisuian Forms // Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = [SPECIES_GROWLITHE_HISUIAN] =
{ {
@ -5010,6 +5027,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(56, 56), .size = MON_COORDS_SIZE(56, 56),
.y_offset = 7, .y_offset = 7,
}, },
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = [SPECIES_SAMUROTT_HISUIAN] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
@ -5035,6 +5053,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = [SPECIES_SLIGGOO_HISUIAN] =
{ {
.size = MON_COORDS_SIZE(48, 56), .size = MON_COORDS_SIZE(48, 56),
@ -5050,11 +5070,14 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 48), .size = MON_COORDS_SIZE(64, 48),
.y_offset = 5, .y_offset = 5,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = [SPECIES_DECIDUEYE_HISUIAN] =
{ {
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
// Misc Forms // Misc Forms
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = [SPECIES_PIKACHU_COSPLAY] =
@ -5134,7 +5157,6 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(32, 40), .size = MON_COORDS_SIZE(32, 40),
.y_offset = 14, .y_offset = 14,
}, },
#endif
// Unown // Unown
[SPECIES_UNOWN_B] = [SPECIES_UNOWN_B] =
{ {
@ -5303,7 +5325,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 1, .y_offset = 1,
}, },
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK] = [SPECIES_BURMY_SANDY_CLOAK] =
{ {
@ -5478,6 +5500,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_5
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = [SPECIES_BASCULIN_BLUE_STRIPED] =
{ {
@ -5548,11 +5572,6 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
[SPECIES_ENAMORUS_THERIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
// Kyurem // Kyurem
[SPECIES_KYUREM_WHITE] = [SPECIES_KYUREM_WHITE] =
{ {
@ -5597,6 +5616,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = [SPECIES_GRENINJA_BATTLE_BOND] =
{ {
@ -5895,6 +5916,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM] = [SPECIES_ORICORIO_POM_POM] =
{ {
@ -6114,6 +6137,8 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(56, 64), .size = MON_COORDS_SIZE(56, 64),
.y_offset = 0, .y_offset = 0,
}, },
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING] = [SPECIES_CRAMORANT_GULPING] =
{ {
@ -6243,6 +6268,11 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64), .size = MON_COORDS_SIZE(64, 64),
.y_offset = 0, .y_offset = 0,
}, },
[SPECIES_ENAMORUS_THERIAN] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
#endif #endif
// Egg // Egg
[SPECIES_EGG] = [SPECIES_EGG] =

View File

@ -387,7 +387,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi), SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi),
SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys), SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys),
SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho), SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig), SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig),
SPECIES_SPRITE(GROTLE, gMonFrontPic_Grotle), SPECIES_SPRITE(GROTLE, gMonFrontPic_Grotle),
SPECIES_SPRITE(TORTERRA, gMonFrontPic_Torterra), SPECIES_SPRITE(TORTERRA, gMonFrontPic_Torterra),
@ -495,6 +495,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(DARKRAI, gMonFrontPic_Darkrai), SPECIES_SPRITE(DARKRAI, gMonFrontPic_Darkrai),
SPECIES_SPRITE(SHAYMIN, gMonFrontPic_Shaymin), SPECIES_SPRITE(SHAYMIN, gMonFrontPic_Shaymin),
SPECIES_SPRITE(ARCEUS, gMonFrontPic_Arceus), SPECIES_SPRITE(ARCEUS, gMonFrontPic_Arceus),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(VICTINI, gMonFrontPic_Victini), SPECIES_SPRITE(VICTINI, gMonFrontPic_Victini),
SPECIES_SPRITE(SNIVY, gMonFrontPic_Snivy), SPECIES_SPRITE(SNIVY, gMonFrontPic_Snivy),
SPECIES_SPRITE(SERVINE, gMonFrontPic_Servine), SPECIES_SPRITE(SERVINE, gMonFrontPic_Servine),
@ -651,6 +653,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(KELDEO, gMonFrontPic_Keldeo), SPECIES_SPRITE(KELDEO, gMonFrontPic_Keldeo),
SPECIES_SPRITE(MELOETTA, gMonFrontPic_Meloetta), SPECIES_SPRITE(MELOETTA, gMonFrontPic_Meloetta),
SPECIES_SPRITE(GENESECT, gMonFrontPic_Genesect), SPECIES_SPRITE(GENESECT, gMonFrontPic_Genesect),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(CHESPIN, gMonFrontPic_Chespin), SPECIES_SPRITE(CHESPIN, gMonFrontPic_Chespin),
SPECIES_SPRITE(QUILLADIN, gMonFrontPic_Quilladin), SPECIES_SPRITE(QUILLADIN, gMonFrontPic_Quilladin),
SPECIES_SPRITE(CHESNAUGHT, gMonFrontPic_Chesnaught), SPECIES_SPRITE(CHESNAUGHT, gMonFrontPic_Chesnaught),
@ -723,6 +727,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(DIANCIE, gMonFrontPic_Diancie), SPECIES_SPRITE(DIANCIE, gMonFrontPic_Diancie),
SPECIES_SPRITE(HOOPA, gMonFrontPic_Hoopa), SPECIES_SPRITE(HOOPA, gMonFrontPic_Hoopa),
SPECIES_SPRITE(VOLCANION, gMonFrontPic_Volcanion), SPECIES_SPRITE(VOLCANION, gMonFrontPic_Volcanion),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SPRITE(ROWLET, gMonFrontPic_Rowlet), SPECIES_SPRITE(ROWLET, gMonFrontPic_Rowlet),
SPECIES_SPRITE(DARTRIX, gMonFrontPic_Dartrix), SPECIES_SPRITE(DARTRIX, gMonFrontPic_Dartrix),
SPECIES_SPRITE(DECIDUEYE, gMonFrontPic_Decidueye), SPECIES_SPRITE(DECIDUEYE, gMonFrontPic_Decidueye),
@ -811,6 +817,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ZERAORA, gMonFrontPic_Zeraora), SPECIES_SPRITE(ZERAORA, gMonFrontPic_Zeraora),
SPECIES_SPRITE(MELTAN, gMonFrontPic_Meltan), SPECIES_SPRITE(MELTAN, gMonFrontPic_Meltan),
SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal), SPECIES_SPRITE(MELMETAL, gMonFrontPic_Melmetal),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SPRITE(GROOKEY, gMonFrontPic_Grookey), SPECIES_SPRITE(GROOKEY, gMonFrontPic_Grookey),
SPECIES_SPRITE(THWACKEY, gMonFrontPic_Thwackey), SPECIES_SPRITE(THWACKEY, gMonFrontPic_Thwackey),
SPECIES_SPRITE(RILLABOOM, gMonFrontPic_Rillaboom), SPECIES_SPRITE(RILLABOOM, gMonFrontPic_Rillaboom),
@ -907,7 +915,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler), SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil), SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus), SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus),
#endif
SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega), SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega),
SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX),
SPECIES_SPRITE(CHARIZARD_MEGA_Y, gMonFrontPic_CharizardMegaY), SPECIES_SPRITE(CHARIZARD_MEGA_Y, gMonFrontPic_CharizardMegaY),
@ -948,13 +956,19 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(METAGROSS_MEGA, gMonFrontPic_MetagrossMega), SPECIES_SPRITE(METAGROSS_MEGA, gMonFrontPic_MetagrossMega),
SPECIES_SPRITE(LATIAS_MEGA, gMonFrontPic_LatiasMega), SPECIES_SPRITE(LATIAS_MEGA, gMonFrontPic_LatiasMega),
SPECIES_SPRITE(LATIOS_MEGA, gMonFrontPic_LatiosMega), SPECIES_SPRITE(LATIOS_MEGA, gMonFrontPic_LatiosMega),
#if P_NEW_POKEMON >= GEN_4
SPECIES_SPRITE(LOPUNNY_MEGA, gMonFrontPic_LopunnyMega), SPECIES_SPRITE(LOPUNNY_MEGA, gMonFrontPic_LopunnyMega),
SPECIES_SPRITE(GARCHOMP_MEGA, gMonFrontPic_GarchompMega), SPECIES_SPRITE(GARCHOMP_MEGA, gMonFrontPic_GarchompMega),
SPECIES_SPRITE(LUCARIO_MEGA, gMonFrontPic_LucarioMega), SPECIES_SPRITE(LUCARIO_MEGA, gMonFrontPic_LucarioMega),
SPECIES_SPRITE(ABOMASNOW_MEGA, gMonFrontPic_AbomasnowMega), SPECIES_SPRITE(ABOMASNOW_MEGA, gMonFrontPic_AbomasnowMega),
SPECIES_SPRITE(GALLADE_MEGA, gMonFrontPic_GalladeMega), SPECIES_SPRITE(GALLADE_MEGA, gMonFrontPic_GalladeMega),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(AUDINO_MEGA, gMonFrontPic_AudinoMega), SPECIES_SPRITE(AUDINO_MEGA, gMonFrontPic_AudinoMega),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(DIANCIE_MEGA, gMonFrontPic_DiancieMega), SPECIES_SPRITE(DIANCIE_MEGA, gMonFrontPic_DiancieMega),
#endif
SPECIES_SPRITE(RAYQUAZA_MEGA, gMonFrontPic_RayquazaMega), SPECIES_SPRITE(RAYQUAZA_MEGA, gMonFrontPic_RayquazaMega),
SPECIES_SPRITE(KYOGRE_PRIMAL, gMonFrontPic_KyogrePrimal), SPECIES_SPRITE(KYOGRE_PRIMAL, gMonFrontPic_KyogrePrimal),
@ -994,10 +1008,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(CORSOLA_GALARIAN, gMonFrontPic_CorsolaGalarian), SPECIES_SPRITE(CORSOLA_GALARIAN, gMonFrontPic_CorsolaGalarian),
SPECIES_SPRITE(ZIGZAGOON_GALARIAN, gMonFrontPic_ZigzagoonGalarian), SPECIES_SPRITE(ZIGZAGOON_GALARIAN, gMonFrontPic_ZigzagoonGalarian),
SPECIES_SPRITE(LINOONE_GALARIAN, gMonFrontPic_LinooneGalarian), SPECIES_SPRITE(LINOONE_GALARIAN, gMonFrontPic_LinooneGalarian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonFrontPic_DarumakaGalarian), SPECIES_SPRITE(DARUMAKA_GALARIAN, gMonFrontPic_DarumakaGalarian),
SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonFrontPic_DarmanitanGalarian), SPECIES_SPRITE(DARMANITAN_GALARIAN, gMonFrontPic_DarmanitanGalarian),
SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian), SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian),
SPECIES_SPRITE(STUNFISK_GALARIAN, gMonFrontPic_StunfiskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonFrontPic_StunfiskGalarian),
#endif
SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonFrontPic_GrowlitheHisuian), SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonFrontPic_GrowlitheHisuian),
SPECIES_SPRITE(ARCANINE_HISUIAN, gMonFrontPic_ArcanineHisuian), SPECIES_SPRITE(ARCANINE_HISUIAN, gMonFrontPic_ArcanineHisuian),
@ -1006,15 +1022,21 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonFrontPic_TyphlosionHisuian), SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonFrontPic_TyphlosionHisuian),
SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_QwilfishHisuian), SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_QwilfishHisuian),
SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_SneaselHisuian), SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_SneaselHisuian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian), SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian),
SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_LilligantHisuian), SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_LilligantHisuian),
SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_ZoruaHisuian), SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_ZoruaHisuian),
SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_ZoroarkHisuian), SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_ZoroarkHisuian),
SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonFrontPic_BraviaryHisuian), SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonFrontPic_BraviaryHisuian),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonFrontPic_SliggooHisuian), SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonFrontPic_SliggooHisuian),
SPECIES_SPRITE(GOODRA_HISUIAN, gMonFrontPic_GoodraHisuian), SPECIES_SPRITE(GOODRA_HISUIAN, gMonFrontPic_GoodraHisuian),
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_AvaluggHisuian), SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_AvaluggHisuian),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian), SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian),
#endif
SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay),
SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonFrontPic_PikachuRockStar), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonFrontPic_PikachuRockStar),
@ -1033,7 +1055,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonFrontPic_PikachuWorldCap), SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonFrontPic_PikachuWorldCap),
SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonFrontPic_PichuSpikyEared), SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonFrontPic_PichuSpikyEared),
#endif
SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB), SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB),
SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC), SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC),
SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD), SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD),
@ -1069,7 +1091,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(DEOXYS_ATTACK, gMonFrontPic_DeoxysAttack), SPECIES_SPRITE(DEOXYS_ATTACK, gMonFrontPic_DeoxysAttack),
SPECIES_SPRITE(DEOXYS_DEFENSE, gMonFrontPic_DeoxysDefense), SPECIES_SPRITE(DEOXYS_DEFENSE, gMonFrontPic_DeoxysDefense),
SPECIES_SPRITE(DEOXYS_SPEED, gMonFrontPic_DeoxysSpeed), 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_SANDY_CLOAK, gMonFrontPic_BurmySandyCloak),
SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonFrontPic_BurmyTrashCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonFrontPic_BurmyTrashCloak),
@ -1111,7 +1133,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ARCEUS_DRAGON, gMonFrontPic_Arceus), SPECIES_SPRITE(ARCEUS_DRAGON, gMonFrontPic_Arceus),
SPECIES_SPRITE(ARCEUS_DARK, gMonFrontPic_Arceus), SPECIES_SPRITE(ARCEUS_DARK, gMonFrontPic_Arceus),
SPECIES_SPRITE(ARCEUS_FAIRY, 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_BLUE_STRIPED, gMonFrontPic_BasculinBlueStriped),
SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_BasculinWhiteStriped), SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_BasculinWhiteStriped),
@ -1129,7 +1153,6 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(TORNADUS_THERIAN, gMonFrontPic_TornadusTherian), SPECIES_SPRITE(TORNADUS_THERIAN, gMonFrontPic_TornadusTherian),
SPECIES_SPRITE(THUNDURUS_THERIAN, gMonFrontPic_ThundurusTherian), SPECIES_SPRITE(THUNDURUS_THERIAN, gMonFrontPic_ThundurusTherian),
SPECIES_SPRITE(LANDORUS_THERIAN, gMonFrontPic_LandorusTherian), SPECIES_SPRITE(LANDORUS_THERIAN, gMonFrontPic_LandorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite), SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite),
SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack), SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack),
@ -1142,7 +1165,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(GENESECT_SHOCK_DRIVE, gMonFrontPic_Genesect), SPECIES_SPRITE(GENESECT_SHOCK_DRIVE, gMonFrontPic_Genesect),
SPECIES_SPRITE(GENESECT_BURN_DRIVE, gMonFrontPic_Genesect), SPECIES_SPRITE(GENESECT_BURN_DRIVE, gMonFrontPic_Genesect),
SPECIES_SPRITE(GENESECT_CHILL_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_BATTLE_BOND, gMonFrontPic_Greninja),
SPECIES_SPRITE(GRENINJA_ASH, gMonFrontPic_GreninjaAsh), SPECIES_SPRITE(GRENINJA_ASH, gMonFrontPic_GreninjaAsh),
@ -1212,7 +1237,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonFrontPic_ZygardeComplete), SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonFrontPic_ZygardeComplete),
SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound), SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom), SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom),
SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau), SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau),
SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu), SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu),
@ -1263,7 +1290,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(NECROZMA_ULTRA, gMonFrontPic_NecrozmaUltra), SPECIES_SPRITE(NECROZMA_ULTRA, gMonFrontPic_NecrozmaUltra),
SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonFrontPic_MagearnaOriginalColor), SPECIES_SPRITE(MAGEARNA_ORIGINAL_COLOR, gMonFrontPic_MagearnaOriginalColor),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SPRITE(CRAMORANT_GULPING, gMonFrontPic_CramorantGulping), SPECIES_SPRITE(CRAMORANT_GULPING, gMonFrontPic_CramorantGulping),
SPECIES_SPRITE(CRAMORANT_GORGING, gMonFrontPic_CramorantGorging), SPECIES_SPRITE(CRAMORANT_GORGING, gMonFrontPic_CramorantGorging),
@ -1300,6 +1329,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider), SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider), SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian),
#endif #endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg), SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
}; };
@ -1307,7 +1338,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
{ {
SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF),
SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF),
SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF), SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF),
@ -1318,10 +1349,16 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF), SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF),
SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF), SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF),
SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF), SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF),
SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF), SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF), SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF), SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF),
#endif #endif
}; };

View File

@ -387,7 +387,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(JIRACHI, gMonPalette_Jirachi), SPECIES_PAL(JIRACHI, gMonPalette_Jirachi),
SPECIES_PAL(DEOXYS, gMonPalette_Deoxys), SPECIES_PAL(DEOXYS, gMonPalette_Deoxys),
SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho), SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_PAL(TURTWIG, gMonPalette_Turtwig), SPECIES_PAL(TURTWIG, gMonPalette_Turtwig),
SPECIES_PAL(GROTLE, gMonPalette_Grotle), SPECIES_PAL(GROTLE, gMonPalette_Grotle),
SPECIES_PAL(TORTERRA, gMonPalette_Torterra), SPECIES_PAL(TORTERRA, gMonPalette_Torterra),
@ -495,6 +495,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(DARKRAI, gMonPalette_Darkrai), SPECIES_PAL(DARKRAI, gMonPalette_Darkrai),
SPECIES_PAL(SHAYMIN, gMonPalette_Shaymin), SPECIES_PAL(SHAYMIN, gMonPalette_Shaymin),
SPECIES_PAL(ARCEUS, gMonPalette_Arceus), SPECIES_PAL(ARCEUS, gMonPalette_Arceus),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_PAL(VICTINI, gMonPalette_Victini), SPECIES_PAL(VICTINI, gMonPalette_Victini),
SPECIES_PAL(SNIVY, gMonPalette_Snivy), SPECIES_PAL(SNIVY, gMonPalette_Snivy),
SPECIES_PAL(SERVINE, gMonPalette_Servine), SPECIES_PAL(SERVINE, gMonPalette_Servine),
@ -651,6 +653,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(KELDEO, gMonPalette_Keldeo), SPECIES_PAL(KELDEO, gMonPalette_Keldeo),
SPECIES_PAL(MELOETTA, gMonPalette_Meloetta), SPECIES_PAL(MELOETTA, gMonPalette_Meloetta),
SPECIES_PAL(GENESECT, gMonPalette_Genesect), SPECIES_PAL(GENESECT, gMonPalette_Genesect),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_PAL(CHESPIN, gMonPalette_Chespin), SPECIES_PAL(CHESPIN, gMonPalette_Chespin),
SPECIES_PAL(QUILLADIN, gMonPalette_Quilladin), SPECIES_PAL(QUILLADIN, gMonPalette_Quilladin),
SPECIES_PAL(CHESNAUGHT, gMonPalette_Chesnaught), SPECIES_PAL(CHESNAUGHT, gMonPalette_Chesnaught),
@ -723,6 +727,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(DIANCIE, gMonPalette_Diancie), SPECIES_PAL(DIANCIE, gMonPalette_Diancie),
SPECIES_PAL(HOOPA, gMonPalette_Hoopa), SPECIES_PAL(HOOPA, gMonPalette_Hoopa),
SPECIES_PAL(VOLCANION, gMonPalette_Volcanion), SPECIES_PAL(VOLCANION, gMonPalette_Volcanion),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_PAL(ROWLET, gMonPalette_Rowlet), SPECIES_PAL(ROWLET, gMonPalette_Rowlet),
SPECIES_PAL(DARTRIX, gMonPalette_Dartrix), SPECIES_PAL(DARTRIX, gMonPalette_Dartrix),
SPECIES_PAL(DECIDUEYE, gMonPalette_Decidueye), SPECIES_PAL(DECIDUEYE, gMonPalette_Decidueye),
@ -811,6 +817,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ZERAORA, gMonPalette_Zeraora), SPECIES_PAL(ZERAORA, gMonPalette_Zeraora),
SPECIES_PAL(MELTAN, gMonPalette_Meltan), SPECIES_PAL(MELTAN, gMonPalette_Meltan),
SPECIES_PAL(MELMETAL, gMonPalette_Melmetal), SPECIES_PAL(MELMETAL, gMonPalette_Melmetal),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_PAL(GROOKEY, gMonPalette_Grookey), SPECIES_PAL(GROOKEY, gMonPalette_Grookey),
SPECIES_PAL(THWACKEY, gMonPalette_Thwackey), SPECIES_PAL(THWACKEY, gMonPalette_Thwackey),
SPECIES_PAL(RILLABOOM, gMonPalette_Rillaboom), SPECIES_PAL(RILLABOOM, gMonPalette_Rillaboom),
@ -907,7 +915,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler), SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler),
SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil), SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil),
SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus), SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus),
#endif
SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega), SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega),
SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX), SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX),
SPECIES_PAL(CHARIZARD_MEGA_Y, gMonPalette_CharizardMegaY), SPECIES_PAL(CHARIZARD_MEGA_Y, gMonPalette_CharizardMegaY),
@ -948,13 +956,19 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(METAGROSS_MEGA, gMonPalette_MetagrossMega), SPECIES_PAL(METAGROSS_MEGA, gMonPalette_MetagrossMega),
SPECIES_PAL(LATIAS_MEGA, gMonPalette_LatiasMega), SPECIES_PAL(LATIAS_MEGA, gMonPalette_LatiasMega),
SPECIES_PAL(LATIOS_MEGA, gMonPalette_LatiosMega), SPECIES_PAL(LATIOS_MEGA, gMonPalette_LatiosMega),
#if P_NEW_POKEMON >= GEN_4
SPECIES_PAL(LOPUNNY_MEGA, gMonPalette_LopunnyMega), SPECIES_PAL(LOPUNNY_MEGA, gMonPalette_LopunnyMega),
SPECIES_PAL(GARCHOMP_MEGA, gMonPalette_GarchompMega), SPECIES_PAL(GARCHOMP_MEGA, gMonPalette_GarchompMega),
SPECIES_PAL(LUCARIO_MEGA, gMonPalette_LucarioMega), SPECIES_PAL(LUCARIO_MEGA, gMonPalette_LucarioMega),
SPECIES_PAL(ABOMASNOW_MEGA, gMonPalette_AbomasnowMega), SPECIES_PAL(ABOMASNOW_MEGA, gMonPalette_AbomasnowMega),
SPECIES_PAL(GALLADE_MEGA, gMonPalette_GalladeMega), SPECIES_PAL(GALLADE_MEGA, gMonPalette_GalladeMega),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_PAL(AUDINO_MEGA, gMonPalette_AudinoMega), SPECIES_PAL(AUDINO_MEGA, gMonPalette_AudinoMega),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_PAL(DIANCIE_MEGA, gMonPalette_DiancieMega), SPECIES_PAL(DIANCIE_MEGA, gMonPalette_DiancieMega),
#endif
SPECIES_PAL(RAYQUAZA_MEGA, gMonPalette_RayquazaMega), SPECIES_PAL(RAYQUAZA_MEGA, gMonPalette_RayquazaMega),
SPECIES_PAL(KYOGRE_PRIMAL, gMonPalette_KyogrePrimal), SPECIES_PAL(KYOGRE_PRIMAL, gMonPalette_KyogrePrimal),
@ -994,10 +1008,12 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(CORSOLA_GALARIAN, gMonPalette_CorsolaGalarian), SPECIES_PAL(CORSOLA_GALARIAN, gMonPalette_CorsolaGalarian),
SPECIES_PAL(ZIGZAGOON_GALARIAN, gMonPalette_ZigzagoonGalarian), SPECIES_PAL(ZIGZAGOON_GALARIAN, gMonPalette_ZigzagoonGalarian),
SPECIES_PAL(LINOONE_GALARIAN, gMonPalette_LinooneGalarian), SPECIES_PAL(LINOONE_GALARIAN, gMonPalette_LinooneGalarian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_PAL(DARUMAKA_GALARIAN, gMonPalette_DarumakaGalarian), SPECIES_PAL(DARUMAKA_GALARIAN, gMonPalette_DarumakaGalarian),
SPECIES_PAL(DARMANITAN_GALARIAN, gMonPalette_DarmanitanGalarian), SPECIES_PAL(DARMANITAN_GALARIAN, gMonPalette_DarmanitanGalarian),
SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian), SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian),
SPECIES_PAL(STUNFISK_GALARIAN, gMonPalette_StunfiskGalarian), SPECIES_PAL(STUNFISK_GALARIAN, gMonPalette_StunfiskGalarian),
#endif
SPECIES_PAL(GROWLITHE_HISUIAN, gMonPalette_GrowlitheHisuian), SPECIES_PAL(GROWLITHE_HISUIAN, gMonPalette_GrowlitheHisuian),
SPECIES_PAL(ARCANINE_HISUIAN, gMonPalette_ArcanineHisuian), SPECIES_PAL(ARCANINE_HISUIAN, gMonPalette_ArcanineHisuian),
@ -1005,16 +1021,22 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ELECTRODE_HISUIAN, gMonPalette_ElectrodeHisuian), SPECIES_PAL(ELECTRODE_HISUIAN, gMonPalette_ElectrodeHisuian),
SPECIES_PAL(TYPHLOSION_HISUIAN, gMonPalette_TyphlosionHisuian), SPECIES_PAL(TYPHLOSION_HISUIAN, gMonPalette_TyphlosionHisuian),
SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_QwilfishHisuian), SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_QwilfishHisuian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian), SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_SneaselHisuian),
SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian), SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian),
SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian), SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_LilligantHisuian),
SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_ZoruaHisuian), SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_ZoruaHisuian),
SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_ZoroarkHisuian), SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_ZoroarkHisuian),
SPECIES_PAL(BRAVIARY_HISUIAN, gMonPalette_BraviaryHisuian), SPECIES_PAL(BRAVIARY_HISUIAN, gMonPalette_BraviaryHisuian),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_PAL(SLIGGOO_HISUIAN, gMonPalette_SliggooHisuian), SPECIES_PAL(SLIGGOO_HISUIAN, gMonPalette_SliggooHisuian),
SPECIES_PAL(GOODRA_HISUIAN, gMonPalette_GoodraHisuian), SPECIES_PAL(GOODRA_HISUIAN, gMonPalette_GoodraHisuian),
SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_AvaluggHisuian), SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_AvaluggHisuian),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian), SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian),
#endif
SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay), SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay),
SPECIES_PAL(PIKACHU_ROCK_STAR, gMonPalette_PikachuRockStar), SPECIES_PAL(PIKACHU_ROCK_STAR, gMonPalette_PikachuRockStar),
@ -1033,7 +1055,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(PIKACHU_WORLD_CAP, gMonPalette_PikachuWorldCap), SPECIES_PAL(PIKACHU_WORLD_CAP, gMonPalette_PikachuWorldCap),
SPECIES_PAL(PICHU_SPIKY_EARED, gMonPalette_PichuSpikyEared), SPECIES_PAL(PICHU_SPIKY_EARED, gMonPalette_PichuSpikyEared),
#endif
SPECIES_PAL(UNOWN_B, gMonPalette_Unown), SPECIES_PAL(UNOWN_B, gMonPalette_Unown),
SPECIES_PAL(UNOWN_C, gMonPalette_Unown), SPECIES_PAL(UNOWN_C, gMonPalette_Unown),
SPECIES_PAL(UNOWN_D, 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_ATTACK, gMonPalette_DeoxysAttack),
SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense), SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense),
SPECIES_PAL(DEOXYS_SPEED, gMonPalette_DeoxysSpeed), 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_SANDY_CLOAK, gMonPalette_BurmySandyCloak),
SPECIES_PAL(BURMY_TRASH_CLOAK, gMonPalette_BurmyTrashCloak), SPECIES_PAL(BURMY_TRASH_CLOAK, gMonPalette_BurmyTrashCloak),
@ -1111,7 +1134,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ARCEUS_DRAGON, gMonPalette_ArceusDragon), SPECIES_PAL(ARCEUS_DRAGON, gMonPalette_ArceusDragon),
SPECIES_PAL(ARCEUS_DARK, gMonPalette_ArceusDark), SPECIES_PAL(ARCEUS_DARK, gMonPalette_ArceusDark),
SPECIES_PAL(ARCEUS_FAIRY, gMonPalette_ArceusFairy), SPECIES_PAL(ARCEUS_FAIRY, gMonPalette_ArceusFairy),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_PAL(BASCULIN_BLUE_STRIPED, gMonPalette_BasculinBlueStriped), SPECIES_PAL(BASCULIN_BLUE_STRIPED, gMonPalette_BasculinBlueStriped),
SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_BasculinWhiteStriped), SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_BasculinWhiteStriped),
@ -1129,7 +1154,6 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(TORNADUS_THERIAN, gMonPalette_TornadusTherian), SPECIES_PAL(TORNADUS_THERIAN, gMonPalette_TornadusTherian),
SPECIES_PAL(THUNDURUS_THERIAN, gMonPalette_ThundurusTherian), SPECIES_PAL(THUNDURUS_THERIAN, gMonPalette_ThundurusTherian),
SPECIES_PAL(LANDORUS_THERIAN, gMonPalette_LandorusTherian), SPECIES_PAL(LANDORUS_THERIAN, gMonPalette_LandorusTherian),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian),
SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite), SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite),
SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack), SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack),
@ -1142,7 +1166,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(GENESECT_SHOCK_DRIVE, gMonPalette_GenesectShockDrive), SPECIES_PAL(GENESECT_SHOCK_DRIVE, gMonPalette_GenesectShockDrive),
SPECIES_PAL(GENESECT_BURN_DRIVE, gMonPalette_GenesectBurnDrive), SPECIES_PAL(GENESECT_BURN_DRIVE, gMonPalette_GenesectBurnDrive),
SPECIES_PAL(GENESECT_CHILL_DRIVE, gMonPalette_GenesectChillDrive), SPECIES_PAL(GENESECT_CHILL_DRIVE, gMonPalette_GenesectChillDrive),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_PAL(GRENINJA_BATTLE_BOND, gMonPalette_Greninja), SPECIES_PAL(GRENINJA_BATTLE_BOND, gMonPalette_Greninja),
SPECIES_PAL(GRENINJA_ASH, gMonPalette_GreninjaAsh), SPECIES_PAL(GRENINJA_ASH, gMonPalette_GreninjaAsh),
@ -1212,7 +1238,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ZYGARDE_COMPLETE, gMonPalette_ZygardeComplete), SPECIES_PAL(ZYGARDE_COMPLETE, gMonPalette_ZygardeComplete),
SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound), SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom), SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom),
SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau), SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau),
SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu), SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu),
@ -1263,7 +1291,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(NECROZMA_ULTRA, gMonPalette_NecrozmaUltra), SPECIES_PAL(NECROZMA_ULTRA, gMonPalette_NecrozmaUltra),
SPECIES_PAL(MAGEARNA_ORIGINAL_COLOR, gMonPalette_MagearnaOriginalColor), SPECIES_PAL(MAGEARNA_ORIGINAL_COLOR, gMonPalette_MagearnaOriginalColor),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping), SPECIES_PAL(CRAMORANT_GULPING, gMonPalette_CramorantGulping),
SPECIES_PAL(CRAMORANT_GORGING, gMonPalette_CramorantGorging), SPECIES_PAL(CRAMORANT_GORGING, gMonPalette_CramorantGorging),
@ -1300,6 +1330,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider), SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider),
SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider), SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian),
#endif #endif
SPECIES_PAL(EGG, gMonPalette_Egg), SPECIES_PAL(EGG, gMonPalette_Egg),
}; };
@ -1307,7 +1338,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
const struct CompressedSpritePalette gMonPaletteTableFemale[] = const struct CompressedSpritePalette gMonPaletteTableFemale[] =
{ {
SPECIES_PAL(EEVEE, gMonPalette_Eevee), SPECIES_PAL(EEVEE, gMonPalette_Eevee),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_PAL(COMBEE, gMonPalette_Combee), SPECIES_PAL(COMBEE, gMonPalette_Combee),
SPECIES_PAL(STARLY, gMonPalette_Starly), SPECIES_PAL(STARLY, gMonPalette_Starly),
SPECIES_PAL(STARAVIA, gMonPalette_Staravia), SPECIES_PAL(STARAVIA, gMonPalette_Staravia),
@ -1318,10 +1349,16 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
SPECIES_PAL(SHINX, gMonPalette_Shinx), SPECIES_PAL(SHINX, gMonPalette_Shinx),
SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF), SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF),
SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF), SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF), SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF),
SPECIES_PAL(FRILLISH, gMonPalette_FrillishF), SPECIES_PAL(FRILLISH, gMonPalette_FrillishF),
SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), SPECIES_PAL(JELLICENT, gMonPalette_JellicentF),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_PAL(PYROAR, gMonPalette_PyroarF), SPECIES_PAL(PYROAR, gMonPalette_PyroarF),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF), SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF),
#endif #endif
}; };

View File

@ -387,7 +387,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi), SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi),
SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys), SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys),
SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho), 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(TURTWIG, gMonShinyPalette_Turtwig),
SPECIES_SHINY_PAL(GROTLE, gMonShinyPalette_Grotle), SPECIES_SHINY_PAL(GROTLE, gMonShinyPalette_Grotle),
SPECIES_SHINY_PAL(TORTERRA, gMonShinyPalette_Torterra), SPECIES_SHINY_PAL(TORTERRA, gMonShinyPalette_Torterra),
@ -495,6 +495,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(DARKRAI, gMonShinyPalette_Darkrai), SPECIES_SHINY_PAL(DARKRAI, gMonShinyPalette_Darkrai),
SPECIES_SHINY_PAL(SHAYMIN, gMonShinyPalette_Shaymin), SPECIES_SHINY_PAL(SHAYMIN, gMonShinyPalette_Shaymin),
SPECIES_SHINY_PAL(ARCEUS, gMonShinyPalette_Arceus), SPECIES_SHINY_PAL(ARCEUS, gMonShinyPalette_Arceus),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SHINY_PAL(VICTINI, gMonShinyPalette_Victini), SPECIES_SHINY_PAL(VICTINI, gMonShinyPalette_Victini),
SPECIES_SHINY_PAL(SNIVY, gMonShinyPalette_Snivy), SPECIES_SHINY_PAL(SNIVY, gMonShinyPalette_Snivy),
SPECIES_SHINY_PAL(SERVINE, gMonShinyPalette_Servine), SPECIES_SHINY_PAL(SERVINE, gMonShinyPalette_Servine),
@ -651,6 +653,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(KELDEO, gMonShinyPalette_Keldeo), SPECIES_SHINY_PAL(KELDEO, gMonShinyPalette_Keldeo),
SPECIES_SHINY_PAL(MELOETTA, gMonShinyPalette_Meloetta), SPECIES_SHINY_PAL(MELOETTA, gMonShinyPalette_Meloetta),
SPECIES_SHINY_PAL(GENESECT, gMonShinyPalette_Genesect), SPECIES_SHINY_PAL(GENESECT, gMonShinyPalette_Genesect),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SHINY_PAL(CHESPIN, gMonShinyPalette_Chespin), SPECIES_SHINY_PAL(CHESPIN, gMonShinyPalette_Chespin),
SPECIES_SHINY_PAL(QUILLADIN, gMonShinyPalette_Quilladin), SPECIES_SHINY_PAL(QUILLADIN, gMonShinyPalette_Quilladin),
SPECIES_SHINY_PAL(CHESNAUGHT, gMonShinyPalette_Chesnaught), SPECIES_SHINY_PAL(CHESNAUGHT, gMonShinyPalette_Chesnaught),
@ -723,6 +727,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(DIANCIE, gMonShinyPalette_Diancie), SPECIES_SHINY_PAL(DIANCIE, gMonShinyPalette_Diancie),
SPECIES_SHINY_PAL(HOOPA, gMonShinyPalette_Hoopa), SPECIES_SHINY_PAL(HOOPA, gMonShinyPalette_Hoopa),
SPECIES_SHINY_PAL(VOLCANION, gMonShinyPalette_Volcanion), SPECIES_SHINY_PAL(VOLCANION, gMonShinyPalette_Volcanion),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SHINY_PAL(ROWLET, gMonShinyPalette_Rowlet), SPECIES_SHINY_PAL(ROWLET, gMonShinyPalette_Rowlet),
SPECIES_SHINY_PAL(DARTRIX, gMonShinyPalette_Dartrix), SPECIES_SHINY_PAL(DARTRIX, gMonShinyPalette_Dartrix),
SPECIES_SHINY_PAL(DECIDUEYE, gMonShinyPalette_Decidueye), SPECIES_SHINY_PAL(DECIDUEYE, gMonShinyPalette_Decidueye),
@ -811,6 +817,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(ZERAORA, gMonShinyPalette_Zeraora), SPECIES_SHINY_PAL(ZERAORA, gMonShinyPalette_Zeraora),
SPECIES_SHINY_PAL(MELTAN, gMonShinyPalette_Meltan), SPECIES_SHINY_PAL(MELTAN, gMonShinyPalette_Meltan),
SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal), SPECIES_SHINY_PAL(MELMETAL, gMonShinyPalette_Melmetal),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SHINY_PAL(GROOKEY, gMonShinyPalette_Grookey), SPECIES_SHINY_PAL(GROOKEY, gMonShinyPalette_Grookey),
SPECIES_SHINY_PAL(THWACKEY, gMonShinyPalette_Thwackey), SPECIES_SHINY_PAL(THWACKEY, gMonShinyPalette_Thwackey),
SPECIES_SHINY_PAL(RILLABOOM, gMonShinyPalette_Rillaboom), 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(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler),
SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil), SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil),
SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus), SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus),
#endif
SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega), SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega),
SPECIES_SHINY_PAL(CHARIZARD_MEGA_X, gMonShinyPalette_CharizardMegaX), 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(METAGROSS_MEGA, gMonShinyPalette_MetagrossMega),
SPECIES_SHINY_PAL(LATIAS_MEGA, gMonShinyPalette_LatiasMega), SPECIES_SHINY_PAL(LATIAS_MEGA, gMonShinyPalette_LatiasMega),
SPECIES_SHINY_PAL(LATIOS_MEGA, gMonShinyPalette_LatiosMega), SPECIES_SHINY_PAL(LATIOS_MEGA, gMonShinyPalette_LatiosMega),
#if P_NEW_POKEMON >= GEN_4
SPECIES_SHINY_PAL(LOPUNNY_MEGA, gMonShinyPalette_LopunnyMega), SPECIES_SHINY_PAL(LOPUNNY_MEGA, gMonShinyPalette_LopunnyMega),
SPECIES_SHINY_PAL(GARCHOMP_MEGA, gMonShinyPalette_GarchompMega), SPECIES_SHINY_PAL(GARCHOMP_MEGA, gMonShinyPalette_GarchompMega),
SPECIES_SHINY_PAL(LUCARIO_MEGA, gMonShinyPalette_LucarioMega), SPECIES_SHINY_PAL(LUCARIO_MEGA, gMonShinyPalette_LucarioMega),
SPECIES_SHINY_PAL(ABOMASNOW_MEGA, gMonShinyPalette_AbomasnowMega), SPECIES_SHINY_PAL(ABOMASNOW_MEGA, gMonShinyPalette_AbomasnowMega),
SPECIES_SHINY_PAL(GALLADE_MEGA, gMonShinyPalette_GalladeMega), SPECIES_SHINY_PAL(GALLADE_MEGA, gMonShinyPalette_GalladeMega),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SHINY_PAL(AUDINO_MEGA, gMonShinyPalette_AudinoMega), SPECIES_SHINY_PAL(AUDINO_MEGA, gMonShinyPalette_AudinoMega),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SHINY_PAL(DIANCIE_MEGA, gMonShinyPalette_DiancieMega), SPECIES_SHINY_PAL(DIANCIE_MEGA, gMonShinyPalette_DiancieMega),
#endif
SPECIES_SHINY_PAL(RAYQUAZA_MEGA, gMonShinyPalette_RayquazaMega), SPECIES_SHINY_PAL(RAYQUAZA_MEGA, gMonShinyPalette_RayquazaMega),
SPECIES_SHINY_PAL(KYOGRE_PRIMAL, gMonShinyPalette_KyogrePrimal), 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(CORSOLA_GALARIAN, gMonShinyPalette_CorsolaGalarian),
SPECIES_SHINY_PAL(ZIGZAGOON_GALARIAN, gMonShinyPalette_ZigzagoonGalarian), SPECIES_SHINY_PAL(ZIGZAGOON_GALARIAN, gMonShinyPalette_ZigzagoonGalarian),
SPECIES_SHINY_PAL(LINOONE_GALARIAN, gMonShinyPalette_LinooneGalarian), SPECIES_SHINY_PAL(LINOONE_GALARIAN, gMonShinyPalette_LinooneGalarian),
#if P_NEW_POKEMON >= GEN_5
SPECIES_SHINY_PAL(DARUMAKA_GALARIAN, gMonShinyPalette_DarumakaGalarian), SPECIES_SHINY_PAL(DARUMAKA_GALARIAN, gMonShinyPalette_DarumakaGalarian),
SPECIES_SHINY_PAL(DARMANITAN_GALARIAN, gMonShinyPalette_DarmanitanGalarian), SPECIES_SHINY_PAL(DARMANITAN_GALARIAN, gMonShinyPalette_DarmanitanGalarian),
SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian), SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian),
SPECIES_SHINY_PAL(STUNFISK_GALARIAN, gMonShinyPalette_StunfiskGalarian), SPECIES_SHINY_PAL(STUNFISK_GALARIAN, gMonShinyPalette_StunfiskGalarian),
#endif
SPECIES_SHINY_PAL(GROWLITHE_HISUIAN, gMonShinyPalette_GrowlitheHisuian), SPECIES_SHINY_PAL(GROWLITHE_HISUIAN, gMonShinyPalette_GrowlitheHisuian),
SPECIES_SHINY_PAL(ARCANINE_HISUIAN, gMonShinyPalette_ArcanineHisuian), 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(TYPHLOSION_HISUIAN, gMonShinyPalette_TyphlosionHisuian),
SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_QwilfishHisuian), SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_QwilfishHisuian),
SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_SneaselHisuian), 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(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_SamurottHisuian),
SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_LilligantHisuian), SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_LilligantHisuian),
SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_ZoruaHisuian), SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_ZoruaHisuian),
SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_ZoroarkHisuian), SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_ZoroarkHisuian),
SPECIES_SHINY_PAL(BRAVIARY_HISUIAN, gMonShinyPalette_BraviaryHisuian), SPECIES_SHINY_PAL(BRAVIARY_HISUIAN, gMonShinyPalette_BraviaryHisuian),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SHINY_PAL(SLIGGOO_HISUIAN, gMonShinyPalette_SliggooHisuian), SPECIES_SHINY_PAL(SLIGGOO_HISUIAN, gMonShinyPalette_SliggooHisuian),
SPECIES_SHINY_PAL(GOODRA_HISUIAN, gMonShinyPalette_GoodraHisuian), SPECIES_SHINY_PAL(GOODRA_HISUIAN, gMonShinyPalette_GoodraHisuian),
SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_AvaluggHisuian), SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_AvaluggHisuian),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian), SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian),
#endif
SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay), SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay),
SPECIES_SHINY_PAL(PIKACHU_ROCK_STAR, gMonShinyPalette_PikachuRockStar), 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(PIKACHU_WORLD_CAP, gMonShinyPalette_PikachuWorldCap),
SPECIES_SHINY_PAL(PICHU_SPIKY_EARED, gMonShinyPalette_PichuSpikyEared), SPECIES_SHINY_PAL(PICHU_SPIKY_EARED, gMonShinyPalette_PichuSpikyEared),
#endif
SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown),
SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown),
SPECIES_SHINY_PAL(UNOWN_D, 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_ATTACK, gMonShinyPalette_DeoxysAttack),
SPECIES_SHINY_PAL(DEOXYS_DEFENSE, gMonShinyPalette_DeoxysDefense), SPECIES_SHINY_PAL(DEOXYS_DEFENSE, gMonShinyPalette_DeoxysDefense),
SPECIES_SHINY_PAL(DEOXYS_SPEED, gMonShinyPalette_DeoxysSpeed), 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_SANDY_CLOAK, gMonShinyPalette_BurmySandyCloak),
SPECIES_SHINY_PAL(BURMY_TRASH_CLOAK, gMonShinyPalette_BurmyTrashCloak), 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_DRAGON, gMonShinyPalette_ArceusDragon),
SPECIES_SHINY_PAL(ARCEUS_DARK, gMonShinyPalette_ArceusDark), SPECIES_SHINY_PAL(ARCEUS_DARK, gMonShinyPalette_ArceusDark),
SPECIES_SHINY_PAL(ARCEUS_FAIRY, gMonShinyPalette_ArceusFairy), 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_BLUE_STRIPED, gMonShinyPalette_BasculinBlueStriped),
SPECIES_SHINY_PAL(BASCULIN_WHITE_STRIPED, gMonShinyPalette_BasculinWhiteStriped), 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(TORNADUS_THERIAN, gMonShinyPalette_TornadusTherian),
SPECIES_SHINY_PAL(THUNDURUS_THERIAN, gMonShinyPalette_ThundurusTherian), SPECIES_SHINY_PAL(THUNDURUS_THERIAN, gMonShinyPalette_ThundurusTherian),
SPECIES_SHINY_PAL(LANDORUS_THERIAN, gMonShinyPalette_LandorusTherian), 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_WHITE, gMonShinyPalette_KyuremWhite),
SPECIES_SHINY_PAL(KYUREM_BLACK, gMonShinyPalette_KyuremBlack), 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_SHOCK_DRIVE, gMonShinyPalette_GenesectShockDrive),
SPECIES_SHINY_PAL(GENESECT_BURN_DRIVE, gMonShinyPalette_GenesectBurnDrive), SPECIES_SHINY_PAL(GENESECT_BURN_DRIVE, gMonShinyPalette_GenesectBurnDrive),
SPECIES_SHINY_PAL(GENESECT_CHILL_DRIVE, gMonShinyPalette_GenesectChillDrive), 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_BATTLE_BOND, gMonShinyPalette_Greninja),
SPECIES_SHINY_PAL(GRENINJA_ASH, gMonShinyPalette_GreninjaAsh), 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(ZYGARDE_COMPLETE, gMonShinyPalette_ZygardeComplete),
SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound), 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_POM_POM, gMonShinyPalette_OricorioPomPom),
SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau), SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau),
SPECIES_SHINY_PAL(ORICORIO_SENSU, gMonShinyPalette_OricorioSensu), 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(NECROZMA_ULTRA, gMonShinyPalette_NecrozmaUltra),
SPECIES_SHINY_PAL(MAGEARNA_ORIGINAL_COLOR, gMonShinyPalette_MagearnaOriginalColor), 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_GULPING, gMonShinyPalette_CramorantGulping),
SPECIES_SHINY_PAL(CRAMORANT_GORGING, gMonShinyPalette_CramorantGorging), 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_ICE_RIDER, gMonShinyPalette_CalyrexIceRider),
SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider), SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian),
#endif #endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
}; };
@ -1307,7 +1337,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
{ {
SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), 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(STARLY, gMonShinyPalette_Starly),
SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia), SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia),
SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor), SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor),
@ -1318,10 +1348,16 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee), SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF),
SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF), SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF),
SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF), SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF),
SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF), SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF), SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF),
#endif #endif
}; };

View File

@ -386,7 +386,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_RAYQUAZA] = _("Rayquaza"), [SPECIES_RAYQUAZA] = _("Rayquaza"),
[SPECIES_JIRACHI] = _("Jirachi"), [SPECIES_JIRACHI] = _("Jirachi"),
[SPECIES_DEOXYS] = _("Deoxys"), [SPECIES_DEOXYS] = _("Deoxys"),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = _("Turtwig"), [SPECIES_TURTWIG] = _("Turtwig"),
[SPECIES_GROTLE] = _("Grotle"), [SPECIES_GROTLE] = _("Grotle"),
[SPECIES_TORTERRA] = _("Torterra"), [SPECIES_TORTERRA] = _("Torterra"),
@ -494,6 +494,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_DARKRAI] = _("Darkrai"), [SPECIES_DARKRAI] = _("Darkrai"),
[SPECIES_SHAYMIN] = _("Shaymin"), [SPECIES_SHAYMIN] = _("Shaymin"),
[SPECIES_ARCEUS] = _("Arceus"), [SPECIES_ARCEUS] = _("Arceus"),
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = _("Victini"), [SPECIES_VICTINI] = _("Victini"),
[SPECIES_SNIVY] = _("Snivy"), [SPECIES_SNIVY] = _("Snivy"),
[SPECIES_SERVINE] = _("Servine"), [SPECIES_SERVINE] = _("Servine"),
@ -650,6 +652,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_KELDEO] = _("Keldeo"), [SPECIES_KELDEO] = _("Keldeo"),
[SPECIES_MELOETTA] = _("Meloetta"), [SPECIES_MELOETTA] = _("Meloetta"),
[SPECIES_GENESECT] = _("Genesect"), [SPECIES_GENESECT] = _("Genesect"),
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = _("Chespin"), [SPECIES_CHESPIN] = _("Chespin"),
[SPECIES_QUILLADIN] = _("Quilladin"), [SPECIES_QUILLADIN] = _("Quilladin"),
[SPECIES_CHESNAUGHT] = _("Chesnaught"), [SPECIES_CHESNAUGHT] = _("Chesnaught"),
@ -722,6 +726,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_DIANCIE] = _("Diancie"), [SPECIES_DIANCIE] = _("Diancie"),
[SPECIES_HOOPA] = _("Hoopa"), [SPECIES_HOOPA] = _("Hoopa"),
[SPECIES_VOLCANION] = _("Volcanion"), [SPECIES_VOLCANION] = _("Volcanion"),
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = _("Rowlet"), [SPECIES_ROWLET] = _("Rowlet"),
[SPECIES_DARTRIX] = _("Dartrix"), [SPECIES_DARTRIX] = _("Dartrix"),
[SPECIES_DECIDUEYE] = _("Decidueye"), [SPECIES_DECIDUEYE] = _("Decidueye"),
@ -810,6 +816,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ZERAORA] = _("Zeraora"), [SPECIES_ZERAORA] = _("Zeraora"),
[SPECIES_MELTAN] = _("Meltan"), [SPECIES_MELTAN] = _("Meltan"),
[SPECIES_MELMETAL] = _("Melmetal"), [SPECIES_MELMETAL] = _("Melmetal"),
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = _("Grookey"), [SPECIES_GROOKEY] = _("Grookey"),
[SPECIES_THWACKEY] = _("Thwackey"), [SPECIES_THWACKEY] = _("Thwackey"),
[SPECIES_RILLABOOM] = _("Rillaboom"), [SPECIES_RILLABOOM] = _("Rillaboom"),
@ -906,6 +914,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_SNEASLER] = _("Sneasler"), [SPECIES_SNEASLER] = _("Sneasler"),
[SPECIES_OVERQWIL] = _("Overqwil"), [SPECIES_OVERQWIL] = _("Overqwil"),
[SPECIES_ENAMORUS] = _("Enamorus"), [SPECIES_ENAMORUS] = _("Enamorus"),
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA] = _("Venusaur"), [SPECIES_VENUSAUR_MEGA] = _("Venusaur"),
@ -948,13 +957,19 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_METAGROSS_MEGA] = _("Metagross"), [SPECIES_METAGROSS_MEGA] = _("Metagross"),
[SPECIES_LATIAS_MEGA] = _("Latias"), [SPECIES_LATIAS_MEGA] = _("Latias"),
[SPECIES_LATIOS_MEGA] = _("Latios"), [SPECIES_LATIOS_MEGA] = _("Latios"),
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = _("Lopunny"), [SPECIES_LOPUNNY_MEGA] = _("Lopunny"),
[SPECIES_GARCHOMP_MEGA] = _("Garchomp"), [SPECIES_GARCHOMP_MEGA] = _("Garchomp"),
[SPECIES_LUCARIO_MEGA] = _("Lucario"), [SPECIES_LUCARIO_MEGA] = _("Lucario"),
[SPECIES_ABOMASNOW_MEGA] = _("Abomasnow"), [SPECIES_ABOMASNOW_MEGA] = _("Abomasnow"),
[SPECIES_GALLADE_MEGA] = _("Gallade"), [SPECIES_GALLADE_MEGA] = _("Gallade"),
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = _("Audino"), [SPECIES_AUDINO_MEGA] = _("Audino"),
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = _("Diancie"), [SPECIES_DIANCIE_MEGA] = _("Diancie"),
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA] = _("Rayquaza"), [SPECIES_RAYQUAZA_MEGA] = _("Rayquaza"),
[SPECIES_KYOGRE_PRIMAL] = _("Kyogre"), [SPECIES_KYOGRE_PRIMAL] = _("Kyogre"),
@ -996,10 +1011,12 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_CORSOLA_GALARIAN] = _("Corsola"), [SPECIES_CORSOLA_GALARIAN] = _("Corsola"),
[SPECIES_ZIGZAGOON_GALARIAN] = _("Zigzagoon"), [SPECIES_ZIGZAGOON_GALARIAN] = _("Zigzagoon"),
[SPECIES_LINOONE_GALARIAN] = _("Linoone"), [SPECIES_LINOONE_GALARIAN] = _("Linoone"),
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"), [SPECIES_DARUMAKA_GALARIAN] = _("Darumaka"),
[SPECIES_DARMANITAN_GALARIAN] = _("Darmanitan"), [SPECIES_DARMANITAN_GALARIAN] = _("Darmanitan"),
[SPECIES_YAMASK_GALARIAN] = _("Yamask"), [SPECIES_YAMASK_GALARIAN] = _("Yamask"),
[SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"), [SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"),
#endif
//Hisuian Forms //Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"), [SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"),
@ -1009,15 +1026,21 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"), [SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"),
[SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"), [SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"),
[SPECIES_SNEASEL_HISUIAN] = _("Sneasel"), [SPECIES_SNEASEL_HISUIAN] = _("Sneasel"),
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = _("Samurott"), [SPECIES_SAMUROTT_HISUIAN] = _("Samurott"),
[SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"), [SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"),
[SPECIES_ZORUA_HISUIAN] = _("Zorua"), [SPECIES_ZORUA_HISUIAN] = _("Zorua"),
[SPECIES_ZOROARK_HISUIAN] = _("Zoroark"), [SPECIES_ZOROARK_HISUIAN] = _("Zoroark"),
[SPECIES_BRAVIARY_HISUIAN] = _("Braviary"), [SPECIES_BRAVIARY_HISUIAN] = _("Braviary"),
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"), [SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"),
[SPECIES_GOODRA_HISUIAN] = _("Goodra"), [SPECIES_GOODRA_HISUIAN] = _("Goodra"),
[SPECIES_AVALUGG_HISUIAN] = _("Avalugg"), [SPECIES_AVALUGG_HISUIAN] = _("Avalugg"),
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"),
#endif
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"),
@ -1037,7 +1060,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"), [SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"),
// Pichu // Pichu
[SPECIES_PICHU_SPIKY_EARED] = _("Pichu"), [SPECIES_PICHU_SPIKY_EARED] = _("Pichu"),
#endif
// Unown // Unown
[SPECIES_UNOWN_B] = _("Unown"), [SPECIES_UNOWN_B] = _("Unown"),
[SPECIES_UNOWN_C] = _("Unown"), [SPECIES_UNOWN_C] = _("Unown"),
@ -1074,7 +1096,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_DEOXYS_ATTACK] = _("Deoxys"), [SPECIES_DEOXYS_ATTACK] = _("Deoxys"),
[SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"),
[SPECIES_DEOXYS_SPEED] = _("Deoxys"), [SPECIES_DEOXYS_SPEED] = _("Deoxys"),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"), [SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"),
[SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"), [SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"),
@ -1117,6 +1139,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ARCEUS_DRAGON] = _("Arceus"), [SPECIES_ARCEUS_DRAGON] = _("Arceus"),
[SPECIES_ARCEUS_DARK] = _("Arceus"), [SPECIES_ARCEUS_DARK] = _("Arceus"),
[SPECIES_ARCEUS_FAIRY] = _("Arceus"), [SPECIES_ARCEUS_FAIRY] = _("Arceus"),
#endif
#if P_NEW_POKEMON >= GEN_5
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"), [SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"),
[SPECIES_BASCULIN_WHITE_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_SHOCK_DRIVE] = _("Genesect"),
[SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"), [SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"),
[SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"), [SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"),
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND] = _("Greninja"), [SPECIES_GRENINJA_BATTLE_BOND] = _("Greninja"),
[SPECIES_GRENINJA_ASH] = _("Greninja"), [SPECIES_GRENINJA_ASH] = _("Greninja"),
@ -1218,6 +1244,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"),
// Hoopa // Hoopa
[SPECIES_HOOPA_UNBOUND] = _("Hoopa"), [SPECIES_HOOPA_UNBOUND] = _("Hoopa"),
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM] = _("Oricorio"), [SPECIES_ORICORIO_POM_POM] = _("Oricorio"),
[SPECIES_ORICORIO_PAU] = _("Oricorio"), [SPECIES_ORICORIO_PAU] = _("Oricorio"),
@ -1269,6 +1297,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_NECROZMA_ULTRA] = _("Necrozma"), [SPECIES_NECROZMA_ULTRA] = _("Necrozma"),
// Magearna // Magearna
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"), [SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"),
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING] = _("Cramorant"), [SPECIES_CRAMORANT_GULPING] = _("Cramorant"),
[SPECIES_CRAMORANT_GORGING] = _("Cramorant"), [SPECIES_CRAMORANT_GORGING] = _("Cramorant"),

View File

@ -136,7 +136,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(RALTS), SPECIES_TO_HOENN(RALTS),
SPECIES_TO_HOENN(KIRLIA), SPECIES_TO_HOENN(KIRLIA),
SPECIES_TO_HOENN(GARDEVOIR), SPECIES_TO_HOENN(GARDEVOIR),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(GALLADE), SPECIES_TO_HOENN(GALLADE),
#endif #endif
SPECIES_TO_HOENN(SURSKIT), SPECIES_TO_HOENN(SURSKIT),
@ -168,7 +168,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(GRAVELER), SPECIES_TO_HOENN(GRAVELER),
SPECIES_TO_HOENN(GOLEM), SPECIES_TO_HOENN(GOLEM),
SPECIES_TO_HOENN(NOSEPASS), SPECIES_TO_HOENN(NOSEPASS),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(PROBOPASS), SPECIES_TO_HOENN(PROBOPASS),
#endif #endif
SPECIES_TO_HOENN(SKITTY), SPECIES_TO_HOENN(SKITTY),
@ -194,7 +194,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(MINUN), SPECIES_TO_HOENN(MINUN),
SPECIES_TO_HOENN(MAGNEMITE), SPECIES_TO_HOENN(MAGNEMITE),
SPECIES_TO_HOENN(MAGNETON), SPECIES_TO_HOENN(MAGNETON),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(MAGNEZONE), SPECIES_TO_HOENN(MAGNEZONE),
#endif #endif
SPECIES_TO_HOENN(VOLTORB), SPECIES_TO_HOENN(VOLTORB),
@ -207,7 +207,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(BELLOSSOM), SPECIES_TO_HOENN(BELLOSSOM),
SPECIES_TO_HOENN(DODUO), SPECIES_TO_HOENN(DODUO),
SPECIES_TO_HOENN(DODRIO), SPECIES_TO_HOENN(DODRIO),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(BUDEW), SPECIES_TO_HOENN(BUDEW),
SPECIES_TO_HOENN(ROSELIA), SPECIES_TO_HOENN(ROSELIA),
SPECIES_TO_HOENN(ROSERADE), SPECIES_TO_HOENN(ROSERADE),
@ -269,7 +269,7 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(BANETTE), SPECIES_TO_HOENN(BANETTE),
SPECIES_TO_HOENN(DUSKULL), SPECIES_TO_HOENN(DUSKULL),
SPECIES_TO_HOENN(DUSCLOPS), SPECIES_TO_HOENN(DUSCLOPS),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(DUSKNOIR), SPECIES_TO_HOENN(DUSKNOIR),
SPECIES_TO_HOENN(TROPIUS), SPECIES_TO_HOENN(TROPIUS),
SPECIES_TO_HOENN(CHINGLING), SPECIES_TO_HOENN(CHINGLING),
@ -296,12 +296,12 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(HERACROSS), SPECIES_TO_HOENN(HERACROSS),
SPECIES_TO_HOENN(RHYHORN), SPECIES_TO_HOENN(RHYHORN),
SPECIES_TO_HOENN(RHYDON), SPECIES_TO_HOENN(RHYDON),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(RHYPERIOR), SPECIES_TO_HOENN(RHYPERIOR),
#endif #endif
SPECIES_TO_HOENN(SNORUNT), SPECIES_TO_HOENN(SNORUNT),
SPECIES_TO_HOENN(GLALIE), SPECIES_TO_HOENN(GLALIE),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_HOENN(FROSLASS), SPECIES_TO_HOENN(FROSLASS),
#endif #endif
SPECIES_TO_HOENN(SPHEAL), SPECIES_TO_HOENN(SPHEAL),
@ -725,7 +725,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(RAYQUAZA), SPECIES_TO_NATIONAL(RAYQUAZA),
SPECIES_TO_NATIONAL(JIRACHI), SPECIES_TO_NATIONAL(JIRACHI),
SPECIES_TO_NATIONAL(DEOXYS), SPECIES_TO_NATIONAL(DEOXYS),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
SPECIES_TO_NATIONAL(TURTWIG), SPECIES_TO_NATIONAL(TURTWIG),
SPECIES_TO_NATIONAL(GROTLE), SPECIES_TO_NATIONAL(GROTLE),
SPECIES_TO_NATIONAL(TORTERRA), SPECIES_TO_NATIONAL(TORTERRA),
@ -833,6 +833,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(DARKRAI), SPECIES_TO_NATIONAL(DARKRAI),
SPECIES_TO_NATIONAL(SHAYMIN), SPECIES_TO_NATIONAL(SHAYMIN),
SPECIES_TO_NATIONAL(ARCEUS), SPECIES_TO_NATIONAL(ARCEUS),
#endif
#if P_NEW_POKEMON >= GEN_5
SPECIES_TO_NATIONAL(VICTINI), SPECIES_TO_NATIONAL(VICTINI),
SPECIES_TO_NATIONAL(SNIVY), SPECIES_TO_NATIONAL(SNIVY),
SPECIES_TO_NATIONAL(SERVINE), SPECIES_TO_NATIONAL(SERVINE),
@ -989,6 +991,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(KELDEO), SPECIES_TO_NATIONAL(KELDEO),
SPECIES_TO_NATIONAL(MELOETTA), SPECIES_TO_NATIONAL(MELOETTA),
SPECIES_TO_NATIONAL(GENESECT), SPECIES_TO_NATIONAL(GENESECT),
#endif
#if P_NEW_POKEMON >= GEN_6
SPECIES_TO_NATIONAL(CHESPIN), SPECIES_TO_NATIONAL(CHESPIN),
SPECIES_TO_NATIONAL(QUILLADIN), SPECIES_TO_NATIONAL(QUILLADIN),
SPECIES_TO_NATIONAL(CHESNAUGHT), SPECIES_TO_NATIONAL(CHESNAUGHT),
@ -1061,6 +1065,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(DIANCIE), SPECIES_TO_NATIONAL(DIANCIE),
SPECIES_TO_NATIONAL(HOOPA), SPECIES_TO_NATIONAL(HOOPA),
SPECIES_TO_NATIONAL(VOLCANION), SPECIES_TO_NATIONAL(VOLCANION),
#endif
#if P_NEW_POKEMON >= GEN_7
SPECIES_TO_NATIONAL(ROWLET), SPECIES_TO_NATIONAL(ROWLET),
SPECIES_TO_NATIONAL(DARTRIX), SPECIES_TO_NATIONAL(DARTRIX),
SPECIES_TO_NATIONAL(DECIDUEYE), SPECIES_TO_NATIONAL(DECIDUEYE),
@ -1149,6 +1155,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(ZERAORA), SPECIES_TO_NATIONAL(ZERAORA),
SPECIES_TO_NATIONAL(MELTAN), SPECIES_TO_NATIONAL(MELTAN),
SPECIES_TO_NATIONAL(MELMETAL), SPECIES_TO_NATIONAL(MELMETAL),
#endif
#if P_NEW_POKEMON >= GEN_8
SPECIES_TO_NATIONAL(GROOKEY), SPECIES_TO_NATIONAL(GROOKEY),
SPECIES_TO_NATIONAL(THWACKEY), SPECIES_TO_NATIONAL(THWACKEY),
SPECIES_TO_NATIONAL(RILLABOOM), SPECIES_TO_NATIONAL(RILLABOOM),
@ -1245,6 +1253,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(SNEASLER), SPECIES_TO_NATIONAL(SNEASLER),
SPECIES_TO_NATIONAL(OVERQWIL), SPECIES_TO_NATIONAL(OVERQWIL),
SPECIES_TO_NATIONAL(ENAMORUS), SPECIES_TO_NATIONAL(ENAMORUS),
#endif
// Megas // Megas
[SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR, [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_METAGROSS_MEGA - 1] = NATIONAL_DEX_METAGROSS,
[SPECIES_LATIAS_MEGA - 1] = NATIONAL_DEX_LATIAS, [SPECIES_LATIAS_MEGA - 1] = NATIONAL_DEX_LATIAS,
[SPECIES_LATIOS_MEGA - 1] = NATIONAL_DEX_LATIOS, [SPECIES_LATIOS_MEGA - 1] = NATIONAL_DEX_LATIOS,
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA - 1] = NATIONAL_DEX_LOPUNNY, [SPECIES_LOPUNNY_MEGA - 1] = NATIONAL_DEX_LOPUNNY,
[SPECIES_GARCHOMP_MEGA - 1] = NATIONAL_DEX_GARCHOMP, [SPECIES_GARCHOMP_MEGA - 1] = NATIONAL_DEX_GARCHOMP,
[SPECIES_LUCARIO_MEGA - 1] = NATIONAL_DEX_LUCARIO, [SPECIES_LUCARIO_MEGA - 1] = NATIONAL_DEX_LUCARIO,
[SPECIES_ABOMASNOW_MEGA - 1] = NATIONAL_DEX_ABOMASNOW, [SPECIES_ABOMASNOW_MEGA - 1] = NATIONAL_DEX_ABOMASNOW,
[SPECIES_GALLADE_MEGA - 1] = NATIONAL_DEX_GALLADE, [SPECIES_GALLADE_MEGA - 1] = NATIONAL_DEX_GALLADE,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA - 1] = NATIONAL_DEX_AUDINO, [SPECIES_AUDINO_MEGA - 1] = NATIONAL_DEX_AUDINO,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA - 1] = NATIONAL_DEX_DIANCIE, [SPECIES_DIANCIE_MEGA - 1] = NATIONAL_DEX_DIANCIE,
#endif
// Special Mega + Primals // Special Mega + Primals
[SPECIES_RAYQUAZA_MEGA - 1] = NATIONAL_DEX_RAYQUAZA, [SPECIES_RAYQUAZA_MEGA - 1] = NATIONAL_DEX_RAYQUAZA,
[SPECIES_KYOGRE_PRIMAL - 1] = NATIONAL_DEX_KYOGRE, [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_CORSOLA_GALARIAN - 1] = NATIONAL_DEX_CORSOLA,
[SPECIES_ZIGZAGOON_GALARIAN - 1] = NATIONAL_DEX_ZIGZAGOON, [SPECIES_ZIGZAGOON_GALARIAN - 1] = NATIONAL_DEX_ZIGZAGOON,
[SPECIES_LINOONE_GALARIAN - 1] = NATIONAL_DEX_LINOONE, [SPECIES_LINOONE_GALARIAN - 1] = NATIONAL_DEX_LINOONE,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN - 1] = NATIONAL_DEX_DARUMAKA, [SPECIES_DARUMAKA_GALARIAN - 1] = NATIONAL_DEX_DARUMAKA,
[SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN,
[SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK, [SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK,
[SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK, [SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK,
#endif
//Hisuian Forms //Hisuian Forms
[SPECIES_GROWLITHE_HISUIAN - 1] = NATIONAL_DEX_GROWLITHE, [SPECIES_GROWLITHE_HISUIAN - 1] = NATIONAL_DEX_GROWLITHE,
[SPECIES_ARCANINE_HISUIAN - 1] = NATIONAL_DEX_ARCANINE, [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_TYPHLOSION_HISUIAN - 1] = NATIONAL_DEX_TYPHLOSION,
[SPECIES_QWILFISH_HISUIAN - 1] = NATIONAL_DEX_QWILFISH, [SPECIES_QWILFISH_HISUIAN - 1] = NATIONAL_DEX_QWILFISH,
[SPECIES_SNEASEL_HISUIAN - 1] = NATIONAL_DEX_SNEASEL, [SPECIES_SNEASEL_HISUIAN - 1] = NATIONAL_DEX_SNEASEL,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN - 1] = NATIONAL_DEX_SAMUROTT, [SPECIES_SAMUROTT_HISUIAN - 1] = NATIONAL_DEX_SAMUROTT,
[SPECIES_LILLIGANT_HISUIAN - 1] = NATIONAL_DEX_LILLIGANT, [SPECIES_LILLIGANT_HISUIAN - 1] = NATIONAL_DEX_LILLIGANT,
[SPECIES_ZORUA_HISUIAN - 1] = NATIONAL_DEX_ZORUA, [SPECIES_ZORUA_HISUIAN - 1] = NATIONAL_DEX_ZORUA,
[SPECIES_ZOROARK_HISUIAN - 1] = NATIONAL_DEX_ZOROARK, [SPECIES_ZOROARK_HISUIAN - 1] = NATIONAL_DEX_ZOROARK,
[SPECIES_BRAVIARY_HISUIAN - 1] = NATIONAL_DEX_BRAVIARY, [SPECIES_BRAVIARY_HISUIAN - 1] = NATIONAL_DEX_BRAVIARY,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN - 1] = NATIONAL_DEX_SLIGGOO, [SPECIES_SLIGGOO_HISUIAN - 1] = NATIONAL_DEX_SLIGGOO,
[SPECIES_GOODRA_HISUIAN - 1] = NATIONAL_DEX_GOODRA, [SPECIES_GOODRA_HISUIAN - 1] = NATIONAL_DEX_GOODRA,
[SPECIES_AVALUGG_HISUIAN - 1] = NATIONAL_DEX_AVALUGG, [SPECIES_AVALUGG_HISUIAN - 1] = NATIONAL_DEX_AVALUGG,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE,
#endif
// Cosplay Pikachu // Cosplay Pikachu
[SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU,
[SPECIES_PIKACHU_ROCK_STAR - 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, [SPECIES_PIKACHU_WORLD_CAP - 1] = NATIONAL_DEX_PIKACHU,
// Pichu // Pichu
[SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU, [SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU,
#endif
// Unown // Unown
[SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN, [SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN,
[SPECIES_UNOWN_C - 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_ATTACK - 1] = NATIONAL_DEX_DEOXYS,
[SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS, [SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS,
[SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS, [SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
// Burmy // Burmy
[SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY, [SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY,
[SPECIES_BURMY_TRASH_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_DRAGON - 1] = NATIONAL_DEX_ARCEUS,
[SPECIES_ARCEUS_DARK - 1] = NATIONAL_DEX_ARCEUS, [SPECIES_ARCEUS_DARK - 1] = NATIONAL_DEX_ARCEUS,
[SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS, [SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS,
#endif
#if P_NEW_POKEMON >= GEN_5
// Basculin // Basculin
[SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, [SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN,
[SPECIES_BASCULIN_WHITE_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_TORNADUS_THERIAN - 1] = NATIONAL_DEX_TORNADUS,
[SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS, [SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS,
[SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS, [SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS,
[SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS,
// Kyurem // Kyurem
[SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM, [SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM,
[SPECIES_KYUREM_WHITE - 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_SHOCK_DRIVE - 1] = NATIONAL_DEX_GENESECT,
[SPECIES_GENESECT_BURN_DRIVE - 1] = NATIONAL_DEX_GENESECT, [SPECIES_GENESECT_BURN_DRIVE - 1] = NATIONAL_DEX_GENESECT,
[SPECIES_GENESECT_CHILL_DRIVE - 1] = NATIONAL_DEX_GENESECT, [SPECIES_GENESECT_CHILL_DRIVE - 1] = NATIONAL_DEX_GENESECT,
#endif
#if P_NEW_POKEMON >= GEN_6
// Greninja // Greninja
[SPECIES_GRENINJA_BATTLE_BOND - 1] = NATIONAL_DEX_GRENINJA, [SPECIES_GRENINJA_BATTLE_BOND - 1] = NATIONAL_DEX_GRENINJA,
[SPECIES_GRENINJA_ASH - 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, [SPECIES_ZYGARDE_COMPLETE - 1] = NATIONAL_DEX_ZYGARDE,
// Hoopa // Hoopa
[SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA, [SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA,
#endif
#if P_NEW_POKEMON >= GEN_7
// Oricorio // Oricorio
[SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO, [SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO,
[SPECIES_ORICORIO_PAU - 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, [SPECIES_NECROZMA_ULTRA - 1] = NATIONAL_DEX_NECROZMA,
// Magearna // Magearna
[SPECIES_MAGEARNA_ORIGINAL_COLOR - 1] = NATIONAL_DEX_MAGEARNA, [SPECIES_MAGEARNA_ORIGINAL_COLOR - 1] = NATIONAL_DEX_MAGEARNA,
#endif
#if P_NEW_POKEMON >= GEN_8
// Cramorant // Cramorant
[SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT, [SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT,
[SPECIES_CRAMORANT_GORGING - 1] = NATIONAL_DEX_CRAMORANT, [SPECIES_CRAMORANT_GORGING - 1] = NATIONAL_DEX_CRAMORANT,
@ -1641,6 +1670,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
// Calyrex // Calyrex
[SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS,
#endif #endif
}; };
@ -1678,7 +1708,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(RALTS), HOENN_TO_NATIONAL(RALTS),
HOENN_TO_NATIONAL(KIRLIA), HOENN_TO_NATIONAL(KIRLIA),
HOENN_TO_NATIONAL(GARDEVOIR), HOENN_TO_NATIONAL(GARDEVOIR),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(GALLADE), HOENN_TO_NATIONAL(GALLADE),
#endif #endif
HOENN_TO_NATIONAL(SURSKIT), HOENN_TO_NATIONAL(SURSKIT),
@ -1710,7 +1740,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(GRAVELER), HOENN_TO_NATIONAL(GRAVELER),
HOENN_TO_NATIONAL(GOLEM), HOENN_TO_NATIONAL(GOLEM),
HOENN_TO_NATIONAL(NOSEPASS), HOENN_TO_NATIONAL(NOSEPASS),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(PROBOPASS), HOENN_TO_NATIONAL(PROBOPASS),
#endif #endif
HOENN_TO_NATIONAL(SKITTY), HOENN_TO_NATIONAL(SKITTY),
@ -1736,7 +1766,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(MINUN), HOENN_TO_NATIONAL(MINUN),
HOENN_TO_NATIONAL(MAGNEMITE), HOENN_TO_NATIONAL(MAGNEMITE),
HOENN_TO_NATIONAL(MAGNETON), HOENN_TO_NATIONAL(MAGNETON),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(MAGNEZONE), HOENN_TO_NATIONAL(MAGNEZONE),
#endif #endif
HOENN_TO_NATIONAL(VOLTORB), HOENN_TO_NATIONAL(VOLTORB),
@ -1749,7 +1779,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(BELLOSSOM), HOENN_TO_NATIONAL(BELLOSSOM),
HOENN_TO_NATIONAL(DODUO), HOENN_TO_NATIONAL(DODUO),
HOENN_TO_NATIONAL(DODRIO), HOENN_TO_NATIONAL(DODRIO),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(BUDEW), HOENN_TO_NATIONAL(BUDEW),
HOENN_TO_NATIONAL(ROSELIA), HOENN_TO_NATIONAL(ROSELIA),
HOENN_TO_NATIONAL(ROSERADE), HOENN_TO_NATIONAL(ROSERADE),
@ -1811,7 +1841,7 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(BANETTE), HOENN_TO_NATIONAL(BANETTE),
HOENN_TO_NATIONAL(DUSKULL), HOENN_TO_NATIONAL(DUSKULL),
HOENN_TO_NATIONAL(DUSCLOPS), HOENN_TO_NATIONAL(DUSCLOPS),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(DUSKNOIR), HOENN_TO_NATIONAL(DUSKNOIR),
HOENN_TO_NATIONAL(TROPIUS), HOENN_TO_NATIONAL(TROPIUS),
HOENN_TO_NATIONAL(CHINGLING), HOENN_TO_NATIONAL(CHINGLING),
@ -1838,12 +1868,12 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(HERACROSS), HOENN_TO_NATIONAL(HERACROSS),
HOENN_TO_NATIONAL(RHYHORN), HOENN_TO_NATIONAL(RHYHORN),
HOENN_TO_NATIONAL(RHYDON), HOENN_TO_NATIONAL(RHYDON),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(RHYPERIOR), HOENN_TO_NATIONAL(RHYPERIOR),
#endif #endif
HOENN_TO_NATIONAL(SNORUNT), HOENN_TO_NATIONAL(SNORUNT),
HOENN_TO_NATIONAL(GLALIE), HOENN_TO_NATIONAL(GLALIE),
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
HOENN_TO_NATIONAL(FROSLASS), HOENN_TO_NATIONAL(FROSLASS),
#endif #endif
HOENN_TO_NATIONAL(SPHEAL), 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/base_stats.h"
#include "data/pokemon/level_up_learnsets.h" #include "data/pokemon/level_up_learnsets.h"
#include "data/pokemon/teachable_learnsets.h" #include "data/pokemon/teachable_learnsets.h"
#if P_NEW_POKEMON == TRUE
#include "data/pokemon/evolution.h" #include "data/pokemon/evolution.h"
#else
#include "data/pokemon/evolution_old.h"
#endif
#include "data/pokemon/level_up_learnset_pointers.h" #include "data/pokemon/level_up_learnset_pointers.h"
#include "data/pokemon/teachable_learnset_pointers.h" #include "data/pokemon/teachable_learnset_pointers.h"
#include "data/pokemon/form_species_tables.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_JIRACHI - 1] = ANIM_SWING_CONVEX,
[SPECIES_DEOXYS - 1] = ANIM_H_PIVOT, [SPECIES_DEOXYS - 1] = ANIM_H_PIVOT,
#if P_NEW_POKEMON == TRUE
// Gen 4 // Gen 4
[SPECIES_TURTWIG - 1] = ANIM_V_SLIDE, [SPECIES_TURTWIG - 1] = ANIM_V_SLIDE,
[SPECIES_GROTLE - 1] = ANIM_H_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_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE,
[SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE, [SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE,
[SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE, [SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE,
#endif
}; };
static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
@ -2942,8 +2966,10 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
[SPECIES_SALAMENCE - 1] = 70, [SPECIES_SALAMENCE - 1] = 70,
[SPECIES_KYOGRE - 1] = 60, [SPECIES_KYOGRE - 1] = 60,
[SPECIES_RAYQUAZA - 1] = 60, [SPECIES_RAYQUAZA - 1] = 60,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_7
[SPECIES_TAPU_FINI - 1] = 5, [SPECIES_TAPU_FINI - 1] = 5,
#endif
#if P_NEW_POKEMON >= GEN_4
[SPECIES_ROTOM_FAN - 1] = 7, [SPECIES_ROTOM_FAN - 1] = 7,
#endif #endif
}; };

View File

@ -413,7 +413,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_JIRACHI] = gMonIcon_Jirachi, [SPECIES_JIRACHI] = gMonIcon_Jirachi,
[SPECIES_DEOXYS] = gMonIcon_Deoxys, [SPECIES_DEOXYS] = gMonIcon_Deoxys,
[SPECIES_CHIMECHO] = gMonIcon_Chimecho, [SPECIES_CHIMECHO] = gMonIcon_Chimecho,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_TURTWIG] = gMonIcon_Turtwig, [SPECIES_TURTWIG] = gMonIcon_Turtwig,
[SPECIES_GROTLE] = gMonIcon_Grotle, [SPECIES_GROTLE] = gMonIcon_Grotle,
[SPECIES_TORTERRA] = gMonIcon_Torterra, [SPECIES_TORTERRA] = gMonIcon_Torterra,
@ -521,6 +521,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_DARKRAI] = gMonIcon_Darkrai, [SPECIES_DARKRAI] = gMonIcon_Darkrai,
[SPECIES_SHAYMIN] = gMonIcon_Shaymin, [SPECIES_SHAYMIN] = gMonIcon_Shaymin,
[SPECIES_ARCEUS] = gMonIcon_Arceus, [SPECIES_ARCEUS] = gMonIcon_Arceus,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_VICTINI] = gMonIcon_Victini, [SPECIES_VICTINI] = gMonIcon_Victini,
[SPECIES_SNIVY] = gMonIcon_Snivy, [SPECIES_SNIVY] = gMonIcon_Snivy,
[SPECIES_SERVINE] = gMonIcon_Servine, [SPECIES_SERVINE] = gMonIcon_Servine,
@ -677,6 +679,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_KELDEO] = gMonIcon_Keldeo, [SPECIES_KELDEO] = gMonIcon_Keldeo,
[SPECIES_MELOETTA] = gMonIcon_Meloetta, [SPECIES_MELOETTA] = gMonIcon_Meloetta,
[SPECIES_GENESECT] = gMonIcon_Genesect, [SPECIES_GENESECT] = gMonIcon_Genesect,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_CHESPIN] = gMonIcon_Chespin, [SPECIES_CHESPIN] = gMonIcon_Chespin,
[SPECIES_QUILLADIN] = gMonIcon_Quilladin, [SPECIES_QUILLADIN] = gMonIcon_Quilladin,
[SPECIES_CHESNAUGHT] = gMonIcon_Chesnaught, [SPECIES_CHESNAUGHT] = gMonIcon_Chesnaught,
@ -749,6 +753,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_DIANCIE] = gMonIcon_Diancie, [SPECIES_DIANCIE] = gMonIcon_Diancie,
[SPECIES_HOOPA] = gMonIcon_Hoopa, [SPECIES_HOOPA] = gMonIcon_Hoopa,
[SPECIES_VOLCANION] = gMonIcon_Volcanion, [SPECIES_VOLCANION] = gMonIcon_Volcanion,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ROWLET] = gMonIcon_Rowlet, [SPECIES_ROWLET] = gMonIcon_Rowlet,
[SPECIES_DARTRIX] = gMonIcon_Dartrix, [SPECIES_DARTRIX] = gMonIcon_Dartrix,
[SPECIES_DECIDUEYE] = gMonIcon_Decidueye, [SPECIES_DECIDUEYE] = gMonIcon_Decidueye,
@ -837,6 +843,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_ZERAORA] = gMonIcon_Zeraora, [SPECIES_ZERAORA] = gMonIcon_Zeraora,
[SPECIES_MELTAN] = gMonIcon_Meltan, [SPECIES_MELTAN] = gMonIcon_Meltan,
[SPECIES_MELMETAL] = gMonIcon_Melmetal, [SPECIES_MELMETAL] = gMonIcon_Melmetal,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_GROOKEY] = gMonIcon_Grookey, [SPECIES_GROOKEY] = gMonIcon_Grookey,
[SPECIES_THWACKEY] = gMonIcon_Thwackey, [SPECIES_THWACKEY] = gMonIcon_Thwackey,
[SPECIES_RILLABOOM] = gMonIcon_Rillaboom, [SPECIES_RILLABOOM] = gMonIcon_Rillaboom,
@ -933,6 +941,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_SNEASLER] = gMonIcon_Sneasler, [SPECIES_SNEASLER] = gMonIcon_Sneasler,
[SPECIES_OVERQWIL] = gMonIcon_Overqwil, [SPECIES_OVERQWIL] = gMonIcon_Overqwil,
[SPECIES_ENAMORUS] = gMonIcon_Enamorus, [SPECIES_ENAMORUS] = gMonIcon_Enamorus,
#endif
[SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega,
[SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX,
[SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY,
@ -973,13 +982,19 @@ const u8 *const gMonIconTable[] =
[SPECIES_METAGROSS_MEGA] = gMonIcon_MetagrossMega, [SPECIES_METAGROSS_MEGA] = gMonIcon_MetagrossMega,
[SPECIES_LATIAS_MEGA] = gMonIcon_LatiasMega, [SPECIES_LATIAS_MEGA] = gMonIcon_LatiasMega,
[SPECIES_LATIOS_MEGA] = gMonIcon_LatiosMega, [SPECIES_LATIOS_MEGA] = gMonIcon_LatiosMega,
#if P_NEW_POKEMON >= GEN_4
[SPECIES_LOPUNNY_MEGA] = gMonIcon_LopunnyMega, [SPECIES_LOPUNNY_MEGA] = gMonIcon_LopunnyMega,
[SPECIES_GARCHOMP_MEGA] = gMonIcon_GarchompMega, [SPECIES_GARCHOMP_MEGA] = gMonIcon_GarchompMega,
[SPECIES_LUCARIO_MEGA] = gMonIcon_LucarioMega, [SPECIES_LUCARIO_MEGA] = gMonIcon_LucarioMega,
[SPECIES_ABOMASNOW_MEGA] = gMonIcon_AbomasnowMega, [SPECIES_ABOMASNOW_MEGA] = gMonIcon_AbomasnowMega,
[SPECIES_GALLADE_MEGA] = gMonIcon_GalladeMega, [SPECIES_GALLADE_MEGA] = gMonIcon_GalladeMega,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega, [SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega, [SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega,
#endif
[SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega, [SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega,
[SPECIES_KYOGRE_PRIMAL] = gMonIcon_KyogrePrimal, [SPECIES_KYOGRE_PRIMAL] = gMonIcon_KyogrePrimal,
[SPECIES_GROUDON_PRIMAL] = gMonIcon_GroudonPrimal, [SPECIES_GROUDON_PRIMAL] = gMonIcon_GroudonPrimal,
@ -1016,10 +1031,12 @@ const u8 *const gMonIconTable[] =
[SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian,
[SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian,
[SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian,
[SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian,
[SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian,
[SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian,
#endif
[SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian, [SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian,
[SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian, [SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian,
[SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian, [SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian,
@ -1027,15 +1044,21 @@ const u8 *const gMonIconTable[] =
[SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian, [SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian,
[SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian, [SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian,
[SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian,
#if P_NEW_POKEMON >= GEN_5
[SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian, [SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian,
[SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian, [SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian,
[SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian, [SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian,
[SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian, [SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian,
[SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian, [SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian,
[SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian,
[SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian,
#endif
[SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay,
[SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar,
[SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle,
@ -1051,7 +1074,6 @@ const u8 *const gMonIconTable[] =
[SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap, [SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap,
[SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark, [SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark,
[SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared, [SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared,
#endif
[SPECIES_UNOWN_B] = gMonIcon_UnownB, [SPECIES_UNOWN_B] = gMonIcon_UnownB,
[SPECIES_UNOWN_C] = gMonIcon_UnownC, [SPECIES_UNOWN_C] = gMonIcon_UnownC,
[SPECIES_UNOWN_D] = gMonIcon_UnownD, [SPECIES_UNOWN_D] = gMonIcon_UnownD,
@ -1085,7 +1107,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack, [SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack,
[SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense, [SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense,
[SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed, [SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak, [SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak,
[SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak, [SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak,
[SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak, [SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak,
@ -1119,6 +1141,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_ARCEUS_DRAGON] = gMonIcon_Arceus, [SPECIES_ARCEUS_DRAGON] = gMonIcon_Arceus,
[SPECIES_ARCEUS_DARK] = gMonIcon_Arceus, [SPECIES_ARCEUS_DARK] = gMonIcon_Arceus,
[SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped,
[SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped,
[SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode,
@ -1132,7 +1156,6 @@ const u8 *const gMonIconTable[] =
[SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian, [SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian,
[SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian, [SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian,
[SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian, [SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian,
[SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian,
[SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite, [SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite,
[SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack, [SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack,
[SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute, [SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute,
@ -1141,6 +1164,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_GENESECT_SHOCK_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_SHOCK_DRIVE] = gMonIcon_Genesect,
[SPECIES_GENESECT_BURN_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_BURN_DRIVE] = gMonIcon_Genesect,
[SPECIES_GENESECT_CHILL_DRIVE] = gMonIcon_Genesect, [SPECIES_GENESECT_CHILL_DRIVE] = gMonIcon_Genesect,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja, [SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja,
[SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh, [SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh,
[SPECIES_VIVILLON_POLAR] = gMonIcon_VivillonPolar, [SPECIES_VIVILLON_POLAR] = gMonIcon_VivillonPolar,
@ -1198,6 +1223,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde,
[SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete,
[SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom,
[SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau,
[SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu,
@ -1240,6 +1267,8 @@ const u8 *const gMonIconTable[] =
[SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings,
[SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra,
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping,
[SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging,
[SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey,
@ -1263,6 +1292,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada,
[SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider,
[SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider,
[SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian,
#endif #endif
[SPECIES_EGG] = gMonIcon_Egg, [SPECIES_EGG] = gMonIcon_Egg,
}; };
@ -1270,7 +1300,7 @@ const u8 *const gMonIconTable[] =
const u8 *const gMonIconTableFemale[] = const u8 *const gMonIconTableFemale[] =
{ {
[SPECIES_EEVEE] = gMonIcon_Eevee, [SPECIES_EEVEE] = gMonIcon_Eevee,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_STARLY] = gMonIcon_Starly, [SPECIES_STARLY] = gMonIcon_Starly,
[SPECIES_STARAVIA] = gMonIcon_Staravia, [SPECIES_STARAVIA] = gMonIcon_Staravia,
[SPECIES_STARAPTOR] = gMonIcon_Staraptor, [SPECIES_STARAPTOR] = gMonIcon_Staraptor,
@ -1281,10 +1311,16 @@ const u8 *const gMonIconTableFemale[] =
[SPECIES_COMBEE] = gMonIcon_Combee, [SPECIES_COMBEE] = gMonIcon_Combee,
[SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas,
[SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_UNFEZANT] = gMonIcon_UnfezantF, [SPECIES_UNFEZANT] = gMonIcon_UnfezantF,
[SPECIES_FRILLISH] = gMonIcon_FrillishF, [SPECIES_FRILLISH] = gMonIcon_FrillishF,
[SPECIES_JELLICENT] = gMonIcon_JellicentF, [SPECIES_JELLICENT] = gMonIcon_JellicentF,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_PYROAR] = gMonIcon_PyroarF, [SPECIES_PYROAR] = gMonIcon_PyroarF,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_BASCULEGION] = gMonIcon_BasculegionF, [SPECIES_BASCULEGION] = gMonIcon_BasculegionF,
#endif #endif
}; };
@ -1677,7 +1713,6 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_JIRACHI] = 0, [SPECIES_JIRACHI] = 0,
[SPECIES_DEOXYS] = 0, [SPECIES_DEOXYS] = 0,
[SPECIES_CHIMECHO] = 0, [SPECIES_CHIMECHO] = 0,
#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = 1, [SPECIES_TURTWIG] = 1,
[SPECIES_GROTLE] = 1, [SPECIES_GROTLE] = 1,
[SPECIES_TORTERRA] = 1, [SPECIES_TORTERRA] = 1,
@ -2315,7 +2350,6 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_PIKACHU_PARTNER_CAP] = 0, [SPECIES_PIKACHU_PARTNER_CAP] = 0,
[SPECIES_PIKACHU_WORLD_CAP] = 0, [SPECIES_PIKACHU_WORLD_CAP] = 0,
[SPECIES_PICHU_SPIKY_EARED] = 1, [SPECIES_PICHU_SPIKY_EARED] = 1,
#endif
[SPECIES_UNOWN_B ... SPECIES_UNOWN_QMARK] = 0, [SPECIES_UNOWN_B ... SPECIES_UNOWN_QMARK] = 0,
[SPECIES_CASTFORM_SUNNY] = 0, [SPECIES_CASTFORM_SUNNY] = 0,
[SPECIES_CASTFORM_RAINY] = 0, [SPECIES_CASTFORM_RAINY] = 0,
@ -2323,7 +2357,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_DEOXYS_ATTACK] = 0, [SPECIES_DEOXYS_ATTACK] = 0,
[SPECIES_DEOXYS_DEFENSE] = 0, [SPECIES_DEOXYS_DEFENSE] = 0,
[SPECIES_DEOXYS_SPEED] = 0, [SPECIES_DEOXYS_SPEED] = 0,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_BURMY_SANDY_CLOAK] = 1, [SPECIES_BURMY_SANDY_CLOAK] = 1,
[SPECIES_BURMY_TRASH_CLOAK] = 0, [SPECIES_BURMY_TRASH_CLOAK] = 0,
[SPECIES_WORMADAM_SANDY_CLOAK] = 1, [SPECIES_WORMADAM_SANDY_CLOAK] = 1,
@ -2357,6 +2391,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ARCEUS_DRAGON] = 1, [SPECIES_ARCEUS_DRAGON] = 1,
[SPECIES_ARCEUS_DARK] = 1, [SPECIES_ARCEUS_DARK] = 1,
[SPECIES_ARCEUS_FAIRY] = 1, [SPECIES_ARCEUS_FAIRY] = 1,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_BASCULIN_BLUE_STRIPED] = 0, [SPECIES_BASCULIN_BLUE_STRIPED] = 0,
[SPECIES_BASCULIN_WHITE_STRIPED] = 0, [SPECIES_BASCULIN_WHITE_STRIPED] = 0,
[SPECIES_DARMANITAN_ZEN_MODE] = 0, [SPECIES_DARMANITAN_ZEN_MODE] = 0,
@ -2370,7 +2406,6 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_TORNADUS_THERIAN] = 1, [SPECIES_TORNADUS_THERIAN] = 1,
[SPECIES_THUNDURUS_THERIAN] = 0, [SPECIES_THUNDURUS_THERIAN] = 0,
[SPECIES_LANDORUS_THERIAN] = 0, [SPECIES_LANDORUS_THERIAN] = 0,
[SPECIES_ENAMORUS_THERIAN] = 1,
[SPECIES_KYUREM_WHITE] = 0, [SPECIES_KYUREM_WHITE] = 0,
[SPECIES_KYUREM_BLACK] = 0, [SPECIES_KYUREM_BLACK] = 0,
[SPECIES_KELDEO_RESOLUTE] = 0, [SPECIES_KELDEO_RESOLUTE] = 0,
@ -2379,6 +2414,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_GENESECT_SHOCK_DRIVE] = 2, [SPECIES_GENESECT_SHOCK_DRIVE] = 2,
[SPECIES_GENESECT_BURN_DRIVE] = 2, [SPECIES_GENESECT_BURN_DRIVE] = 2,
[SPECIES_GENESECT_CHILL_DRIVE] = 2, [SPECIES_GENESECT_CHILL_DRIVE] = 2,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_GRENINJA_BATTLE_BOND] = 0, [SPECIES_GRENINJA_BATTLE_BOND] = 0,
[SPECIES_GRENINJA_ASH] = 0, [SPECIES_GRENINJA_ASH] = 0,
[SPECIES_VIVILLON_POLAR] = 0, [SPECIES_VIVILLON_POLAR] = 0,
@ -2436,6 +2473,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = 1, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = 1,
[SPECIES_ZYGARDE_COMPLETE] = 1, [SPECIES_ZYGARDE_COMPLETE] = 1,
[SPECIES_HOOPA_UNBOUND] = 0, [SPECIES_HOOPA_UNBOUND] = 0,
#endif
#if P_NEW_POKEMON >= GEN_7
[SPECIES_ORICORIO_POM_POM] = 1, [SPECIES_ORICORIO_POM_POM] = 1,
[SPECIES_ORICORIO_PAU] = 1, [SPECIES_ORICORIO_PAU] = 1,
[SPECIES_ORICORIO_SENSU] = 0, [SPECIES_ORICORIO_SENSU] = 0,
@ -2472,6 +2511,8 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_NECROZMA_DAWN_WINGS] = 0, [SPECIES_NECROZMA_DAWN_WINGS] = 0,
[SPECIES_NECROZMA_ULTRA] = 2, [SPECIES_NECROZMA_ULTRA] = 2,
[SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = 0,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_CRAMORANT_GULPING] = 0, [SPECIES_CRAMORANT_GULPING] = 0,
[SPECIES_CRAMORANT_GORGING] = 0, [SPECIES_CRAMORANT_GORGING] = 0,
[SPECIES_TOXTRICITY_LOW_KEY] = 2, [SPECIES_TOXTRICITY_LOW_KEY] = 2,
@ -2495,6 +2536,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ZARUDE_DADA] = 1, [SPECIES_ZARUDE_DADA] = 1,
[SPECIES_CALYREX_ICE_RIDER] = 0, [SPECIES_CALYREX_ICE_RIDER] = 0,
[SPECIES_CALYREX_SHADOW_RIDER] = 0, [SPECIES_CALYREX_SHADOW_RIDER] = 0,
[SPECIES_ENAMORUS_THERIAN] = 1,
#endif #endif
[SPECIES_EGG] = 1, [SPECIES_EGG] = 1,
}; };
@ -2502,7 +2544,7 @@ const u8 gMonIconPaletteIndices[] =
const u8 gMonIconPaletteIndicesFemale[] = const u8 gMonIconPaletteIndicesFemale[] =
{ {
[SPECIES_EEVEE] = 2, [SPECIES_EEVEE] = 2,
#if P_NEW_POKEMON == TRUE #if P_NEW_POKEMON >= GEN_4
[SPECIES_STARLY] = 0, [SPECIES_STARLY] = 0,
[SPECIES_STARAVIA] = 0, [SPECIES_STARAVIA] = 0,
[SPECIES_BIDOOF] = 2, [SPECIES_BIDOOF] = 2,
@ -2512,10 +2554,16 @@ const u8 gMonIconPaletteIndicesFemale[] =
[SPECIES_COMBEE] = 0, [SPECIES_COMBEE] = 0,
[SPECIES_HIPPOPOTAS] = 1, [SPECIES_HIPPOPOTAS] = 1,
[SPECIES_HIPPOWDON] = 1, [SPECIES_HIPPOWDON] = 1,
#endif
#if P_NEW_POKEMON >= GEN_5
[SPECIES_UNFEZANT] = 1, [SPECIES_UNFEZANT] = 1,
[SPECIES_FRILLISH] = 1, [SPECIES_FRILLISH] = 1,
[SPECIES_JELLICENT] = 1, [SPECIES_JELLICENT] = 1,
#endif
#if P_NEW_POKEMON >= GEN_6
[SPECIES_PYROAR] = 2, [SPECIES_PYROAR] = 2,
#endif
#if P_NEW_POKEMON >= GEN_8
[SPECIES_BASCULEGION] = 0, [SPECIES_BASCULEGION] = 0,
#endif #endif
}; };