From 5119ee2d39083b2bf767d521ae257cb84fd43d0e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 24 Jan 2024 20:13:07 -0300 Subject: [PATCH] Can disable follower graphics --- src/data/graphics/pokemon.h | 3 + .../object_event_pic_tables_followers.h | 3682 ++++++++++++++--- src/data/pokemon/species_info.h | 5 + src/event_object_movement.c | 6 +- 4 files changed, 3173 insertions(+), 523 deletions(-) diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index d1b3f288e6..53aede0fda 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -12,6 +12,9 @@ const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/ico #if P_FOOTPRINTS const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); #endif //P_FOOTPRINTS +//#if P_FOLLOWERS + const u32 gObjectEventPic_None[] = INCBIN_COMP("graphics/pokemon/porygon/follower.4bpp"); +//#endif //P_FOLLOWERS #if P_FAMILY_BULBASAUR const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz"); diff --git a/src/data/object_events/object_event_pic_tables_followers.h b/src/data/object_events/object_event_pic_tables_followers.h index 99b212220f..d8087c31cf 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -1,3 +1,11 @@ + +static const struct SpriteFrameImage sPicTable_None[] = { + overworld_ascending_frames(gObjectEventPic_None, 4, 4), +}; + +#if P_FOLLOWERS + +#if P_FAMILY_BULBASAUR static const struct SpriteFrameImage sPicTable_Bulbasaur[] = { overworld_ascending_frames(gObjectEventPic_Bulbasaur, 4, 4), }; @@ -7,6 +15,19 @@ static const struct SpriteFrameImage sPicTable_Ivysaur[] = { static const struct SpriteFrameImage sPicTable_Venusaur[] = { overworld_ascending_frames(gObjectEventPic_Venusaur, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_VenusaurMega[] = { + overworld_ascending_frames(gObjectEventPic_VenusaurMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_VenusaurGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_VenusaurGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_BULBASAUR + +#if P_FAMILY_CHARMANDER static const struct SpriteFrameImage sPicTable_Charmander[] = { overworld_ascending_frames(gObjectEventPic_Charmander, 4, 4), }; @@ -16,6 +37,22 @@ static const struct SpriteFrameImage sPicTable_Charmeleon[] = { static const struct SpriteFrameImage sPicTable_Charizard[] = { overworld_ascending_frames(gObjectEventPic_Charizard, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_CharizardMegaX[] = { + overworld_ascending_frames(gObjectEventPic_CharizardMegaX, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_CharizardMegaY[] = { + overworld_ascending_frames(gObjectEventPic_CharizardMegaY, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_CharizardGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_CharizardGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_CHARMANDER + +#if P_FAMILY_SQUIRTLE static const struct SpriteFrameImage sPicTable_Squirtle[] = { overworld_ascending_frames(gObjectEventPic_Squirtle, 4, 4), }; @@ -25,6 +62,19 @@ static const struct SpriteFrameImage sPicTable_Wartortle[] = { static const struct SpriteFrameImage sPicTable_Blastoise[] = { overworld_ascending_frames(gObjectEventPic_Blastoise, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_BlastoiseMega[] = { + overworld_ascending_frames(gObjectEventPic_BlastoiseMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_BlastoiseGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_BlastoiseGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_SQUIRTLE + +#if P_FAMILY_CATERPIE static const struct SpriteFrameImage sPicTable_Caterpie[] = { overworld_ascending_frames(gObjectEventPic_Caterpie, 4, 4), }; @@ -34,6 +84,14 @@ static const struct SpriteFrameImage sPicTable_Metapod[] = { static const struct SpriteFrameImage sPicTable_Butterfree[] = { overworld_ascending_frames(gObjectEventPic_Butterfree, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_ButterfreeGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_ButterfreeGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_CATERPIE + +#if P_FAMILY_WEEDLE static const struct SpriteFrameImage sPicTable_Weedle[] = { overworld_ascending_frames(gObjectEventPic_Weedle, 4, 4), }; @@ -43,6 +101,14 @@ static const struct SpriteFrameImage sPicTable_Kakuna[] = { static const struct SpriteFrameImage sPicTable_Beedrill[] = { overworld_ascending_frames(gObjectEventPic_Beedrill, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_BeedrillMega[] = { + overworld_ascending_frames(gObjectEventPic_BeedrillMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_WEEDLE + +#if P_FAMILY_PIDGEY static const struct SpriteFrameImage sPicTable_Pidgey[] = { overworld_ascending_frames(gObjectEventPic_Pidgey, 4, 4), }; @@ -52,36 +118,142 @@ static const struct SpriteFrameImage sPicTable_Pidgeotto[] = { static const struct SpriteFrameImage sPicTable_Pidgeot[] = { overworld_ascending_frames(gObjectEventPic_Pidgeot, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_PidgeotMega[] = { + overworld_ascending_frames(gObjectEventPic_PidgeotMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_PIDGEY + +#if P_FAMILY_RATTATA static const struct SpriteFrameImage sPicTable_Rattata[] = { overworld_ascending_frames(gObjectEventPic_Rattata, 4, 4), }; static const struct SpriteFrameImage sPicTable_Raticate[] = { overworld_ascending_frames(gObjectEventPic_Raticate, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_RattataAlolan[] = { + overworld_ascending_frames(gObjectEventPic_RattataAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_RaticateAlolan[] = { + overworld_ascending_frames(gObjectEventPic_RaticateAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_RATTATA + +#if P_FAMILY_SPEAROW static const struct SpriteFrameImage sPicTable_Spearow[] = { overworld_ascending_frames(gObjectEventPic_Spearow, 4, 4), }; static const struct SpriteFrameImage sPicTable_Fearow[] = { overworld_ascending_frames(gObjectEventPic_Fearow, 4, 4), }; +#endif //P_FAMILY_SPEAROW + +#if P_FAMILY_EKANS static const struct SpriteFrameImage sPicTable_Ekans[] = { overworld_ascending_frames(gObjectEventPic_Ekans, 4, 4), }; static const struct SpriteFrameImage sPicTable_Arbok[] = { overworld_ascending_frames(gObjectEventPic_Arbok, 4, 4), }; +#endif //P_FAMILY_EKANS + +#if P_FAMILY_PIKACHU +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Pichu[] = { + overworld_ascending_frames(gObjectEventPic_Pichu, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PichuSpikyEared[] = { + overworld_ascending_frames(gObjectEventPic_PichuSpikyEared, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Pikachu[] = { overworld_ascending_frames(gObjectEventPic_Pikachu, 4, 4), }; +#if P_COSPLAY_PIKACHU_FORMS +/*static const struct SpriteFrameImage sPicTable_PikachuCosplay[] = { + overworld_ascending_frames(gObjectEventPic_PikachuCosplay, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuRockStar[] = { + overworld_ascending_frames(gObjectEventPic_PikachuRockStar, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuBelle[] = { + overworld_ascending_frames(gObjectEventPic_PikachuBelle, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuPopStar[] = { + overworld_ascending_frames(gObjectEventPic_PikachuPopStar, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuPhD[] = { + overworld_ascending_frames(gObjectEventPic_PikachuPhD, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuLibre[] = { + overworld_ascending_frames(gObjectEventPic_PikachuLibre, 4, 4), +};*/ +#endif //P_COSPLAY_PIKACHU_FORMS + +#if P_CAP_PIKACHU_FORMS +/*static const struct SpriteFrameImage sPicTable_PikachuOriginalCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuOriginalCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuHoennCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuHoennCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuSinnohCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuSinnohCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuUnovaCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuUnovaCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuKalosCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuKalosCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuAlolaCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuAlolaCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuPartnerCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuPartnerCap, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PikachuWorldCap[] = { + overworld_ascending_frames(gObjectEventPic_PikachuWorldCap, 4, 4), +};*/ +#endif //P_CAP_PIKACHU_FORMS + +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_PikachuGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_PikachuGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS + static const struct SpriteFrameImage sPicTable_Raichu[] = { overworld_ascending_frames(gObjectEventPic_Raichu, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_RaichuAlolan[] = { + overworld_ascending_frames(gObjectEventPic_RaichuAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_PIKACHU + +#if P_FAMILY_SANDSHREW static const struct SpriteFrameImage sPicTable_Sandshrew[] = { overworld_ascending_frames(gObjectEventPic_Sandshrew, 4, 4), }; static const struct SpriteFrameImage sPicTable_Sandslash[] = { overworld_ascending_frames(gObjectEventPic_Sandslash, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_SandshrewAlolan[] = { + overworld_ascending_frames(gObjectEventPic_SandshrewAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_SandslashAlolan[] = { + overworld_ascending_frames(gObjectEventPic_SandslashAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_SANDSHREW + +#if P_FAMILY_NIDORAN static const struct SpriteFrameImage sPicTable_NidoranF[] = { overworld_ascending_frames(gObjectEventPic_NidoranF, 4, 4), }; @@ -100,30 +272,68 @@ static const struct SpriteFrameImage sPicTable_Nidorino[] = { static const struct SpriteFrameImage sPicTable_Nidoking[] = { overworld_ascending_frames(gObjectEventPic_Nidoking, 4, 4), }; +#endif //P_FAMILY_NIDORAN + +#if P_FAMILY_CLEFAIRY +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Cleffa[] = { + overworld_ascending_frames(gObjectEventPic_Cleffa, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Clefairy[] = { overworld_ascending_frames(gObjectEventPic_Clefairy, 4, 4), }; static const struct SpriteFrameImage sPicTable_Clefable[] = { overworld_ascending_frames(gObjectEventPic_Clefable, 4, 4), }; +#endif //P_FAMILY_CLEFAIRY + +#if P_FAMILY_VULPIX static const struct SpriteFrameImage sPicTable_Vulpix[] = { overworld_ascending_frames(gObjectEventPic_Vulpix, 4, 4), }; static const struct SpriteFrameImage sPicTable_Ninetales[] = { overworld_ascending_frames(gObjectEventPic_Ninetales, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_VulpixAlolan[] = { + overworld_ascending_frames(gObjectEventPic_VulpixAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_NinetalesAlolan[] = { + overworld_ascending_frames(gObjectEventPic_NinetalesAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_VULPIX + +#if P_FAMILY_JIGGLYPUFF +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Igglybuff[] = { + overworld_ascending_frames(gObjectEventPic_Igglybuff, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Jigglypuff[] = { overworld_ascending_frames(gObjectEventPic_Jigglypuff, 4, 4), }; static const struct SpriteFrameImage sPicTable_Wigglytuff[] = { overworld_ascending_frames(gObjectEventPic_Wigglytuff, 4, 4), }; +#endif //P_FAMILY_JIGGLYPUFF + +#if P_FAMILY_ZUBAT static const struct SpriteFrameImage sPicTable_Zubat[] = { overworld_ascending_frames(gObjectEventPic_Zubat, 4, 4), }; static const struct SpriteFrameImage sPicTable_Golbat[] = { overworld_ascending_frames(gObjectEventPic_Golbat, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Crobat[] = { + overworld_ascending_frames(gObjectEventPic_Crobat, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_ZUBAT + +#if P_FAMILY_ODDISH static const struct SpriteFrameImage sPicTable_Oddish[] = { overworld_ascending_frames(gObjectEventPic_Oddish, 4, 4), }; @@ -133,48 +343,121 @@ static const struct SpriteFrameImage sPicTable_Gloom[] = { static const struct SpriteFrameImage sPicTable_Vileplume[] = { overworld_ascending_frames(gObjectEventPic_Vileplume, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Bellossom[] = { + overworld_ascending_frames(gObjectEventPic_Bellossom, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_ODDISH + +#if P_FAMILY_PARAS static const struct SpriteFrameImage sPicTable_Paras[] = { overworld_ascending_frames(gObjectEventPic_Paras, 4, 4), }; static const struct SpriteFrameImage sPicTable_Parasect[] = { overworld_ascending_frames(gObjectEventPic_Parasect, 4, 4), }; +#endif //P_FAMILY_PARAS + +#if P_FAMILY_VENONAT static const struct SpriteFrameImage sPicTable_Venonat[] = { overworld_ascending_frames(gObjectEventPic_Venonat, 4, 4), }; static const struct SpriteFrameImage sPicTable_Venomoth[] = { overworld_ascending_frames(gObjectEventPic_Venomoth, 4, 4), }; +#endif //P_FAMILY_VENONAT + +#if P_FAMILY_DIGLETT static const struct SpriteFrameImage sPicTable_Diglett[] = { overworld_ascending_frames(gObjectEventPic_Diglett, 4, 4), }; static const struct SpriteFrameImage sPicTable_Dugtrio[] = { overworld_ascending_frames(gObjectEventPic_Dugtrio, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_DiglettAlolan[] = { + overworld_ascending_frames(gObjectEventPic_DiglettAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_DugtrioAlolan[] = { + overworld_ascending_frames(gObjectEventPic_DugtrioAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_DIGLETT + +#if P_FAMILY_MEOWTH static const struct SpriteFrameImage sPicTable_Meowth[] = { overworld_ascending_frames(gObjectEventPic_Meowth, 4, 4), }; static const struct SpriteFrameImage sPicTable_Persian[] = { overworld_ascending_frames(gObjectEventPic_Persian, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_MeowthAlolan[] = { + overworld_ascending_frames(gObjectEventPic_MeowthAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PersianAlolan[] = { + overworld_ascending_frames(gObjectEventPic_PersianAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS + +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_MeowthGalarian[] = { + overworld_ascending_frames(gObjectEventPic_MeowthGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Perrserker[] = { + overworld_ascending_frames(gObjectEventPic_Perrserker, 4, 4), +}; +#endif //P_GALARIAN_FORMS + +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_MeowthGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_MeowthGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_MEOWTH + +#if P_FAMILY_PSYDUCK static const struct SpriteFrameImage sPicTable_Psyduck[] = { overworld_ascending_frames(gObjectEventPic_Psyduck, 4, 4), }; static const struct SpriteFrameImage sPicTable_Golduck[] = { overworld_ascending_frames(gObjectEventPic_Golduck, 4, 4), }; +#endif //P_FAMILY_PSYDUCK + +#if P_FAMILY_MANKEY static const struct SpriteFrameImage sPicTable_Mankey[] = { overworld_ascending_frames(gObjectEventPic_Mankey, 4, 4), }; static const struct SpriteFrameImage sPicTable_Primeape[] = { overworld_ascending_frames(gObjectEventPic_Primeape, 4, 4), }; +#if P_GEN_9_CROSS_EVOS +/*static const struct SpriteFrameImage sPicTable_Annihilape[] = { + overworld_ascending_frames(gObjectEventPic_Annihilape, 4, 4), +};*/ +#endif //P_GEN_9_CROSS_EVOS +#endif //P_FAMILY_MANKEY + +#if P_FAMILY_GROWLITHE static const struct SpriteFrameImage sPicTable_Growlithe[] = { overworld_ascending_frames(gObjectEventPic_Growlithe, 4, 4), }; static const struct SpriteFrameImage sPicTable_Arcanine[] = { overworld_ascending_frames(gObjectEventPic_Arcanine, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_GrowlitheHisuian[] = { + overworld_ascending_frames(gObjectEventPic_GrowlitheHisuian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_ArcanineHisuian[] = { + overworld_ascending_frames(gObjectEventPic_ArcanineHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_GROWLITHE + +#if P_FAMILY_POLIWAG static const struct SpriteFrameImage sPicTable_Poliwag[] = { overworld_ascending_frames(gObjectEventPic_Poliwag, 4, 4), }; @@ -184,6 +467,15 @@ static const struct SpriteFrameImage sPicTable_Poliwhirl[] = { static const struct SpriteFrameImage sPicTable_Poliwrath[] = { overworld_ascending_frames(gObjectEventPic_Poliwrath, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Politoed[] = { + overworld_ascending_frames(gObjectEventPic_Politoed, 4, 4), +}; + +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_POLIWAG + +#if P_FAMILY_ABRA static const struct SpriteFrameImage sPicTable_Abra[] = { overworld_ascending_frames(gObjectEventPic_Abra, 4, 4), }; @@ -193,6 +485,14 @@ static const struct SpriteFrameImage sPicTable_Kadabra[] = { static const struct SpriteFrameImage sPicTable_Alakazam[] = { overworld_ascending_frames(gObjectEventPic_Alakazam, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AlakazamMega[] = { + overworld_ascending_frames(gObjectEventPic_AlakazamMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_ABRA + +#if P_FAMILY_MACHOP static const struct SpriteFrameImage sPicTable_Machop[] = { overworld_ascending_frames(gObjectEventPic_Machop, 4, 4), }; @@ -202,6 +502,14 @@ static const struct SpriteFrameImage sPicTable_Machoke[] = { static const struct SpriteFrameImage sPicTable_Machamp[] = { overworld_ascending_frames(gObjectEventPic_Machamp, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_MachampGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_MachampGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_MACHOP + +#if P_FAMILY_BELLSPROUT static const struct SpriteFrameImage sPicTable_Bellsprout[] = { overworld_ascending_frames(gObjectEventPic_Bellsprout, 4, 4), }; @@ -211,12 +519,18 @@ static const struct SpriteFrameImage sPicTable_Weepinbell[] = { static const struct SpriteFrameImage sPicTable_Victreebel[] = { overworld_ascending_frames(gObjectEventPic_Victreebel, 4, 4), }; +#endif //P_FAMILY_BELLSPROUT + +#if P_FAMILY_TENTACOOL static const struct SpriteFrameImage sPicTable_Tentacool[] = { overworld_ascending_frames(gObjectEventPic_Tentacool, 4, 4), }; static const struct SpriteFrameImage sPicTable_Tentacruel[] = { overworld_ascending_frames(gObjectEventPic_Tentacruel, 4, 4), }; +#endif //P_FAMILY_TENTACOOL + +#if P_FAMILY_GEODUDE static const struct SpriteFrameImage sPicTable_Geodude[] = { overworld_ascending_frames(gObjectEventPic_Geodude, 4, 4), }; @@ -226,51 +540,143 @@ static const struct SpriteFrameImage sPicTable_Graveler[] = { static const struct SpriteFrameImage sPicTable_Golem[] = { overworld_ascending_frames(gObjectEventPic_Golem, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_GeodudeAlolan[] = { + overworld_ascending_frames(gObjectEventPic_GeodudeAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_GravelerAlolan[] = { + overworld_ascending_frames(gObjectEventPic_GravelerAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_GolemAlolan[] = { + overworld_ascending_frames(gObjectEventPic_GolemAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_GEODUDE + +#if P_FAMILY_PONYTA static const struct SpriteFrameImage sPicTable_Ponyta[] = { overworld_ascending_frames(gObjectEventPic_Ponyta, 4, 4), }; static const struct SpriteFrameImage sPicTable_Rapidash[] = { overworld_ascending_frames(gObjectEventPic_Rapidash, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_PonytaGalarian[] = { + overworld_ascending_frames(gObjectEventPic_PonytaGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_RapidashGalarian[] = { + overworld_ascending_frames(gObjectEventPic_RapidashGalarian, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_PONYTA + +#if P_FAMILY_SLOWPOKE static const struct SpriteFrameImage sPicTable_Slowpoke[] = { overworld_ascending_frames(gObjectEventPic_Slowpoke, 4, 4), }; static const struct SpriteFrameImage sPicTable_Slowbro[] = { overworld_ascending_frames(gObjectEventPic_Slowbro, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Slowking[] = { + overworld_ascending_frames(gObjectEventPic_Slowking, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS + +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SlowbroMega[] = { + overworld_ascending_frames(gObjectEventPic_SlowbroMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS + +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_SlowpokeGalarian[] = { + overworld_ascending_frames(gObjectEventPic_SlowpokeGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_SlowbroGalarian[] = { + overworld_ascending_frames(gObjectEventPic_SlowbroGalarian, 4, 4), +}; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_SlowkingGalarian[] = { + overworld_ascending_frames(gObjectEventPic_SlowkingGalarian, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_SLOWPOKE + +#if P_FAMILY_MAGNEMITE static const struct SpriteFrameImage sPicTable_Magnemite[] = { overworld_ascending_frames(gObjectEventPic_Magnemite, 4, 4), }; static const struct SpriteFrameImage sPicTable_Magneton[] = { overworld_ascending_frames(gObjectEventPic_Magneton, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Magnezone[] = { + overworld_ascending_frames(gObjectEventPic_Magnezone, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_MAGNEMITE + +#if P_FAMILY_FARFETCHD static const struct SpriteFrameImage sPicTable_Farfetchd[] = { overworld_ascending_frames(gObjectEventPic_Farfetchd, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_FarfetchdGalarian[] = { + overworld_ascending_frames(gObjectEventPic_FarfetchdGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Sirfetchd[] = { + overworld_ascending_frames(gObjectEventPic_Sirfetchd, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_FARFETCHD + +#if P_FAMILY_DODUO static const struct SpriteFrameImage sPicTable_Doduo[] = { overworld_ascending_frames(gObjectEventPic_Doduo, 4, 4), }; static const struct SpriteFrameImage sPicTable_Dodrio[] = { overworld_ascending_frames(gObjectEventPic_Dodrio, 4, 4), }; +#endif //P_FAMILY_DODUO + +#if P_FAMILY_SEEL static const struct SpriteFrameImage sPicTable_Seel[] = { overworld_ascending_frames(gObjectEventPic_Seel, 4, 4), }; static const struct SpriteFrameImage sPicTable_Dewgong[] = { overworld_ascending_frames(gObjectEventPic_Dewgong, 4, 4), }; +#endif //P_FAMILY_SEEL + +#if P_FAMILY_GRIMER static const struct SpriteFrameImage sPicTable_Grimer[] = { overworld_ascending_frames(gObjectEventPic_Grimer, 4, 4), }; static const struct SpriteFrameImage sPicTable_Muk[] = { overworld_ascending_frames(gObjectEventPic_Muk, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_GrimerAlolan[] = { + overworld_ascending_frames(gObjectEventPic_GrimerAlolan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MukAlolan[] = { + overworld_ascending_frames(gObjectEventPic_MukAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_GRIMER + +#if P_FAMILY_SHELLDER static const struct SpriteFrameImage sPicTable_Shellder[] = { overworld_ascending_frames(gObjectEventPic_Shellder, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cloyster[] = { overworld_ascending_frames(gObjectEventPic_Cloyster, 4, 4), }; +#endif //P_FAMILY_SHELLDER + +#if P_FAMILY_GASTLY static const struct SpriteFrameImage sPicTable_Gastly[] = { overworld_ascending_frames(gObjectEventPic_Gastly, 4, 4), }; @@ -280,123 +686,385 @@ static const struct SpriteFrameImage sPicTable_Haunter[] = { static const struct SpriteFrameImage sPicTable_Gengar[] = { overworld_ascending_frames(gObjectEventPic_Gengar, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_GengarMega[] = { + overworld_ascending_frames(gObjectEventPic_GengarMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_GengarGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_GengarGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_GASTLY + +#if P_FAMILY_ONIX static const struct SpriteFrameImage sPicTable_Onix[] = { overworld_ascending_frames(gObjectEventPic_Onix, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Steelix[] = { + overworld_ascending_frames(gObjectEventPic_Steelix, 4, 4), +}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SteelixMega[] = { + overworld_ascending_frames(gObjectEventPic_SteelixMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_ONIX + +#if P_FAMILY_DROWZEE static const struct SpriteFrameImage sPicTable_Drowzee[] = { overworld_ascending_frames(gObjectEventPic_Drowzee, 4, 4), }; static const struct SpriteFrameImage sPicTable_Hypno[] = { overworld_ascending_frames(gObjectEventPic_Hypno, 4, 4), }; +#endif //P_FAMILY_DROWZEE + +#if P_FAMILY_KRABBY static const struct SpriteFrameImage sPicTable_Krabby[] = { overworld_ascending_frames(gObjectEventPic_Krabby, 4, 4), }; static const struct SpriteFrameImage sPicTable_Kingler[] = { overworld_ascending_frames(gObjectEventPic_Kingler, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_KinglerGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_KinglerGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_KRABBY + +#if P_FAMILY_VOLTORB static const struct SpriteFrameImage sPicTable_Voltorb[] = { overworld_ascending_frames(gObjectEventPic_Voltorb, 4, 4), }; static const struct SpriteFrameImage sPicTable_Electrode[] = { overworld_ascending_frames(gObjectEventPic_Electrode, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_VoltorbHisuian[] = { + overworld_ascending_frames(gObjectEventPic_VoltorbHisuian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_ElectrodeHisuian[] = { + overworld_ascending_frames(gObjectEventPic_ElectrodeHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_VOLTORB + +#if P_FAMILY_EXEGGCUTE static const struct SpriteFrameImage sPicTable_Exeggcute[] = { overworld_ascending_frames(gObjectEventPic_Exeggcute, 4, 4), }; static const struct SpriteFrameImage sPicTable_Exeggutor[] = { overworld_ascending_frames(gObjectEventPic_Exeggutor, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_ExeggutorAlolan[] = { + overworld_ascending_frames(gObjectEventPic_ExeggutorAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_EXEGGCUTE + +#if P_FAMILY_CUBONE static const struct SpriteFrameImage sPicTable_Cubone[] = { overworld_ascending_frames(gObjectEventPic_Cubone, 4, 4), }; static const struct SpriteFrameImage sPicTable_Marowak[] = { overworld_ascending_frames(gObjectEventPic_Marowak, 4, 4), }; +#if P_ALOLAN_FORMS +static const struct SpriteFrameImage sPicTable_MarowakAlolan[] = { + overworld_ascending_frames(gObjectEventPic_MarowakAlolan, 4, 4), +}; +#endif //P_ALOLAN_FORMS +#endif //P_FAMILY_CUBONE + +#if P_FAMILY_HITMONS +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Tyrogue[] = { + overworld_ascending_frames(gObjectEventPic_Tyrogue, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Hitmonlee[] = { overworld_ascending_frames(gObjectEventPic_Hitmonlee, 4, 4), }; static const struct SpriteFrameImage sPicTable_Hitmonchan[] = { overworld_ascending_frames(gObjectEventPic_Hitmonchan, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Hitmontop[] = { + overworld_ascending_frames(gObjectEventPic_Hitmontop, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_HITMONS + +#if P_FAMILY_LICKITUNG static const struct SpriteFrameImage sPicTable_Lickitung[] = { overworld_ascending_frames(gObjectEventPic_Lickitung, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Lickilicky[] = { + overworld_ascending_frames(gObjectEventPic_Lickilicky, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_LICKITUNG + +#if P_FAMILY_KOFFING static const struct SpriteFrameImage sPicTable_Koffing[] = { overworld_ascending_frames(gObjectEventPic_Koffing, 4, 4), }; static const struct SpriteFrameImage sPicTable_Weezing[] = { overworld_ascending_frames(gObjectEventPic_Weezing, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_WeezingGalarian[] = { + overworld_ascending_frames(gObjectEventPic_WeezingGalarian, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_KOFFING + +#if P_FAMILY_RHYHORN static const struct SpriteFrameImage sPicTable_Rhyhorn[] = { overworld_ascending_frames(gObjectEventPic_Rhyhorn, 4, 4), }; static const struct SpriteFrameImage sPicTable_Rhydon[] = { overworld_ascending_frames(gObjectEventPic_Rhydon, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Rhyperior[] = { + overworld_ascending_frames(gObjectEventPic_Rhyperior, 4, 4), +}; + +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_RHYHORN + +#if P_FAMILY_CHANSEY +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Happiny[] = { + overworld_ascending_frames(gObjectEventPic_Happiny, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Chansey[] = { overworld_ascending_frames(gObjectEventPic_Chansey, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Blissey[] = { + overworld_ascending_frames(gObjectEventPic_Blissey, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_CHANSEY + +#if P_FAMILY_TANGELA static const struct SpriteFrameImage sPicTable_Tangela[] = { overworld_ascending_frames(gObjectEventPic_Tangela, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Tangrowth[] = { + overworld_ascending_frames(gObjectEventPic_Tangrowth, 4, 4), +}; + +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_TANGELA + +#if P_FAMILY_KANGASKHAN static const struct SpriteFrameImage sPicTable_Kangaskhan[] = { overworld_ascending_frames(gObjectEventPic_Kangaskhan, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_KangaskhanMega[] = { + overworld_ascending_frames(gObjectEventPic_KangaskhanMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_KANGASKHAN + +#if P_FAMILY_HORSEA static const struct SpriteFrameImage sPicTable_Horsea[] = { overworld_ascending_frames(gObjectEventPic_Horsea, 4, 4), }; static const struct SpriteFrameImage sPicTable_Seadra[] = { overworld_ascending_frames(gObjectEventPic_Seadra, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Kingdra[] = { + overworld_ascending_frames(gObjectEventPic_Kingdra, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_HORSEA + +#if P_FAMILY_GOLDEEN static const struct SpriteFrameImage sPicTable_Goldeen[] = { overworld_ascending_frames(gObjectEventPic_Goldeen, 4, 4), }; static const struct SpriteFrameImage sPicTable_Seaking[] = { overworld_ascending_frames(gObjectEventPic_Seaking, 4, 4), }; +#endif //P_FAMILY_GOLDEEN + +#if P_FAMILY_STARYU static const struct SpriteFrameImage sPicTable_Staryu[] = { overworld_ascending_frames(gObjectEventPic_Staryu, 4, 4), }; static const struct SpriteFrameImage sPicTable_Starmie[] = { overworld_ascending_frames(gObjectEventPic_Starmie, 4, 4), }; +#endif //P_FAMILY_STARYU + +#if P_FAMILY_MR_MIME +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_MimeJr[] = { + overworld_ascending_frames(gObjectEventPic_MimeJr, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_MrMime[] = { overworld_ascending_frames(gObjectEventPic_MrMime, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_MrMimeGalarian[] = { + overworld_ascending_frames(gObjectEventPic_MrMimeGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MrRime[] = { + overworld_ascending_frames(gObjectEventPic_MrRime, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_MR_MIME + +#if P_FAMILY_SCYTHER static const struct SpriteFrameImage sPicTable_Scyther[] = { overworld_ascending_frames(gObjectEventPic_Scyther, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Scizor[] = { + overworld_ascending_frames(gObjectEventPic_Scizor, 4, 4), +}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_ScizorMega[] = { + overworld_ascending_frames(gObjectEventPic_ScizorMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_GEN_2_CROSS_EVOS + +#if P_GEN_8_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Kleavor[] = { + overworld_ascending_frames(gObjectEventPic_Kleavor, 4, 4), +}; +#endif //P_GEN_8_CROSS_EVOS +#endif //P_FAMILY_SCYTHER + +#if P_FAMILY_JYNX +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Smoochum[] = { + overworld_ascending_frames(gObjectEventPic_Smoochum, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Jynx[] = { overworld_ascending_frames(gObjectEventPic_Jynx, 4, 4), }; +#endif //P_FAMILY_JYNX + +#if P_FAMILY_ELECTABUZZ +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Elekid[] = { + overworld_ascending_frames(gObjectEventPic_Elekid, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Electabuzz[] = { overworld_ascending_frames(gObjectEventPic_Electabuzz, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Electivire[] = { + overworld_ascending_frames(gObjectEventPic_Electivire, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_ELECTABUZZ + +#if P_FAMILY_MAGMAR +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Magby[] = { + overworld_ascending_frames(gObjectEventPic_Magby, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Magmar[] = { overworld_ascending_frames(gObjectEventPic_Magmar, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Magmortar[] = { + overworld_ascending_frames(gObjectEventPic_Magmortar, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_MAGMAR + +#if P_FAMILY_PINSIR static const struct SpriteFrameImage sPicTable_Pinsir[] = { overworld_ascending_frames(gObjectEventPic_Pinsir, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_PinsirMega[] = { + overworld_ascending_frames(gObjectEventPic_PinsirMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_PINSIR + +#if P_FAMILY_TAUROS static const struct SpriteFrameImage sPicTable_Tauros[] = { overworld_ascending_frames(gObjectEventPic_Tauros, 4, 4), }; +#if P_PALDEAN_FORMS +/*static const struct SpriteFrameImage sPicTable_TaurosPaldeanCombatBreed[] = { + overworld_ascending_frames(gObjectEventPic_TaurosPaldeanCombatBreed, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_TaurosPaldeanBlazeBreed[] = { + overworld_ascending_frames(gObjectEventPic_TaurosPaldeanBlazeBreed, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_TaurosPaldeanAquaBreed[] = { + overworld_ascending_frames(gObjectEventPic_TaurosPaldeanAquaBreed, 4, 4), +};*/ +#endif //P_PALDEAN_FORMS +#endif //P_FAMILY_TAUROS + +#if P_FAMILY_MAGIKARP static const struct SpriteFrameImage sPicTable_Magikarp[] = { overworld_ascending_frames(gObjectEventPic_Magikarp, 4, 4), }; static const struct SpriteFrameImage sPicTable_Gyarados[] = { overworld_ascending_frames(gObjectEventPic_Gyarados, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_GyaradosMega[] = { + overworld_ascending_frames(gObjectEventPic_GyaradosMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_MAGIKARP + +#if P_FAMILY_LAPRAS static const struct SpriteFrameImage sPicTable_Lapras[] = { overworld_ascending_frames(gObjectEventPic_Lapras, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_LaprasGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_LaprasGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_LAPRAS + +#if P_FAMILY_DITTO static const struct SpriteFrameImage sPicTable_Ditto[] = { overworld_ascending_frames(gObjectEventPic_Ditto, 4, 4), }; +#endif //P_FAMILY_DITTO + +#if P_FAMILY_EEVEE static const struct SpriteFrameImage sPicTable_Eevee[] = { overworld_ascending_frames(gObjectEventPic_Eevee, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_EeveeGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_EeveeGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS + static const struct SpriteFrameImage sPicTable_Vaporeon[] = { overworld_ascending_frames(gObjectEventPic_Vaporeon, 4, 4), }; @@ -406,36 +1074,126 @@ static const struct SpriteFrameImage sPicTable_Jolteon[] = { static const struct SpriteFrameImage sPicTable_Flareon[] = { overworld_ascending_frames(gObjectEventPic_Flareon, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Espeon[] = { + overworld_ascending_frames(gObjectEventPic_Espeon, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Umbreon[] = { + overworld_ascending_frames(gObjectEventPic_Umbreon, 4, 4), +}; +#endif //P_GEN_2_CROSS_EVOS + +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Leafeon[] = { + overworld_ascending_frames(gObjectEventPic_Leafeon, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Glaceon[] = { + overworld_ascending_frames(gObjectEventPic_Glaceon, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS + +#if P_GEN_6_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Sylveon[] = { + overworld_ascending_frames(gObjectEventPic_Sylveon, 4, 4), +}; +#endif //P_GEN_6_CROSS_EVOS +#endif //P_FAMILY_EEVEE + +#if P_FAMILY_PORYGON static const struct SpriteFrameImage sPicTable_Porygon[] = { overworld_ascending_frames(gObjectEventPic_Porygon, 4, 4), }; +#if P_GEN_2_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Porygon2[] = { + overworld_ascending_frames(gObjectEventPic_Porygon2, 4, 4), +}; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_PorygonZ[] = { + overworld_ascending_frames(gObjectEventPic_PorygonZ, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_GEN_2_CROSS_EVOS +#endif //P_FAMILY_PORYGON + +#if P_FAMILY_OMANYTE static const struct SpriteFrameImage sPicTable_Omanyte[] = { overworld_ascending_frames(gObjectEventPic_Omanyte, 4, 4), }; static const struct SpriteFrameImage sPicTable_Omastar[] = { overworld_ascending_frames(gObjectEventPic_Omastar, 4, 4), }; +#endif //P_FAMILY_OMANYTE + +#if P_FAMILY_KABUTO static const struct SpriteFrameImage sPicTable_Kabuto[] = { overworld_ascending_frames(gObjectEventPic_Kabuto, 4, 4), }; static const struct SpriteFrameImage sPicTable_Kabutops[] = { overworld_ascending_frames(gObjectEventPic_Kabutops, 4, 4), }; +#endif //P_FAMILY_KABUTO + +#if P_FAMILY_AERODACTYL static const struct SpriteFrameImage sPicTable_Aerodactyl[] = { overworld_ascending_frames(gObjectEventPic_Aerodactyl, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AerodactylMega[] = { + overworld_ascending_frames(gObjectEventPic_AerodactylMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_AERODACTYL + +#if P_FAMILY_SNORLAX +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Munchlax[] = { + overworld_ascending_frames(gObjectEventPic_Munchlax, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Snorlax[] = { overworld_ascending_frames(gObjectEventPic_Snorlax, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_SnorlaxGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_SnorlaxGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_SNORLAX + +#if P_FAMILY_ARTICUNO static const struct SpriteFrameImage sPicTable_Articuno[] = { overworld_ascending_frames(gObjectEventPic_Articuno, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_ArticunoGalarian[] = { + overworld_ascending_frames(gObjectEventPic_ArticunoGalarian, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_ARTICUNO + +#if P_FAMILY_ZAPDOS static const struct SpriteFrameImage sPicTable_Zapdos[] = { overworld_ascending_frames(gObjectEventPic_Zapdos, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_ZapdosGalarian[] = { + overworld_ascending_frames(gObjectEventPic_ZapdosGalarian, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_ZAPDOS + +#if P_FAMILY_MOLTRES static const struct SpriteFrameImage sPicTable_Moltres[] = { overworld_ascending_frames(gObjectEventPic_Moltres, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_MoltresGalarian[] = { + overworld_ascending_frames(gObjectEventPic_MoltresGalarian, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_MOLTRES + +#if P_FAMILY_DRATINI static const struct SpriteFrameImage sPicTable_Dratini[] = { overworld_ascending_frames(gObjectEventPic_Dratini, 4, 4), }; @@ -445,12 +1203,29 @@ static const struct SpriteFrameImage sPicTable_Dragonair[] = { static const struct SpriteFrameImage sPicTable_Dragonite[] = { overworld_ascending_frames(gObjectEventPic_Dragonite, 4, 4), }; +#endif //P_FAMILY_DRATINI + +#if P_FAMILY_MEWTWO static const struct SpriteFrameImage sPicTable_Mewtwo[] = { overworld_ascending_frames(gObjectEventPic_Mewtwo, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_MewtwoMegaX[] = { + overworld_ascending_frames(gObjectEventPic_MewtwoMegaX, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MewtwoMegaY[] = { + overworld_ascending_frames(gObjectEventPic_MewtwoMegaY, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_MEWTWO + +#if P_FAMILY_MEW static const struct SpriteFrameImage sPicTable_Mew[] = { overworld_ascending_frames(gObjectEventPic_Mew, 4, 4), }; +#endif //P_FAMILY_MEW + +#if P_FAMILY_CHIKORITA static const struct SpriteFrameImage sPicTable_Chikorita[] = { overworld_ascending_frames(gObjectEventPic_Chikorita, 4, 4), }; @@ -460,6 +1235,9 @@ static const struct SpriteFrameImage sPicTable_Bayleef[] = { static const struct SpriteFrameImage sPicTable_Meganium[] = { overworld_ascending_frames(gObjectEventPic_Meganium, 4, 4), }; +#endif //P_FAMILY_CHIKORITA + +#if P_FAMILY_CYNDAQUIL static const struct SpriteFrameImage sPicTable_Cyndaquil[] = { overworld_ascending_frames(gObjectEventPic_Cyndaquil, 4, 4), }; @@ -469,6 +1247,14 @@ static const struct SpriteFrameImage sPicTable_Quilava[] = { static const struct SpriteFrameImage sPicTable_Typhlosion[] = { overworld_ascending_frames(gObjectEventPic_Typhlosion, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_TyphlosionHisuian[] = { + overworld_ascending_frames(gObjectEventPic_TyphlosionHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_CYNDAQUIL + +#if P_FAMILY_TOTODILE static const struct SpriteFrameImage sPicTable_Totodile[] = { overworld_ascending_frames(gObjectEventPic_Totodile, 4, 4), }; @@ -478,60 +1264,77 @@ static const struct SpriteFrameImage sPicTable_Croconaw[] = { static const struct SpriteFrameImage sPicTable_Feraligatr[] = { overworld_ascending_frames(gObjectEventPic_Feraligatr, 4, 4), }; +#endif //P_FAMILY_TOTODILE + +#if P_FAMILY_SENTRET static const struct SpriteFrameImage sPicTable_Sentret[] = { overworld_ascending_frames(gObjectEventPic_Sentret, 4, 4), }; static const struct SpriteFrameImage sPicTable_Furret[] = { overworld_ascending_frames(gObjectEventPic_Furret, 4, 4), }; +#endif //P_FAMILY_SENTRET + +#if P_FAMILY_HOOTHOOT static const struct SpriteFrameImage sPicTable_Hoothoot[] = { overworld_ascending_frames(gObjectEventPic_Hoothoot, 4, 4), }; static const struct SpriteFrameImage sPicTable_Noctowl[] = { overworld_ascending_frames(gObjectEventPic_Noctowl, 4, 4), }; +#endif //P_FAMILY_HOOTHOOT + +#if P_FAMILY_LEDYBA static const struct SpriteFrameImage sPicTable_Ledyba[] = { overworld_ascending_frames(gObjectEventPic_Ledyba, 4, 4), }; static const struct SpriteFrameImage sPicTable_Ledian[] = { overworld_ascending_frames(gObjectEventPic_Ledian, 4, 4), }; +#endif //P_FAMILY_LEDYBA + +#if P_FAMILY_SPINARAK static const struct SpriteFrameImage sPicTable_Spinarak[] = { overworld_ascending_frames(gObjectEventPic_Spinarak, 4, 4), }; static const struct SpriteFrameImage sPicTable_Ariados[] = { overworld_ascending_frames(gObjectEventPic_Ariados, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Crobat[] = { - overworld_ascending_frames(gObjectEventPic_Crobat, 4, 4), -}; +#endif //P_FAMILY_SPINARAK + +#if P_FAMILY_CHINCHOU static const struct SpriteFrameImage sPicTable_Chinchou[] = { overworld_ascending_frames(gObjectEventPic_Chinchou, 4, 4), }; static const struct SpriteFrameImage sPicTable_Lanturn[] = { overworld_ascending_frames(gObjectEventPic_Lanturn, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Pichu[] = { - overworld_ascending_frames(gObjectEventPic_Pichu, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Cleffa[] = { - overworld_ascending_frames(gObjectEventPic_Cleffa, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Igglybuff[] = { - overworld_ascending_frames(gObjectEventPic_Igglybuff, 4, 4), -}; +#endif //P_FAMILY_CHINCHOU + +#if P_FAMILY_TOGEPI static const struct SpriteFrameImage sPicTable_Togepi[] = { overworld_ascending_frames(gObjectEventPic_Togepi, 4, 4), }; static const struct SpriteFrameImage sPicTable_Togetic[] = { overworld_ascending_frames(gObjectEventPic_Togetic, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Togekiss[] = { + overworld_ascending_frames(gObjectEventPic_Togekiss, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_TOGEPI + +#if P_FAMILY_NATU static const struct SpriteFrameImage sPicTable_Natu[] = { overworld_ascending_frames(gObjectEventPic_Natu, 4, 4), }; static const struct SpriteFrameImage sPicTable_Xatu[] = { overworld_ascending_frames(gObjectEventPic_Xatu, 4, 4), }; +#endif //P_FAMILY_NATU + +#if P_FAMILY_MAREEP static const struct SpriteFrameImage sPicTable_Mareep[] = { overworld_ascending_frames(gObjectEventPic_Mareep, 4, 4), }; @@ -541,21 +1344,39 @@ static const struct SpriteFrameImage sPicTable_Flaaffy[] = { static const struct SpriteFrameImage sPicTable_Ampharos[] = { overworld_ascending_frames(gObjectEventPic_Ampharos, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Bellossom[] = { - overworld_ascending_frames(gObjectEventPic_Bellossom, 4, 4), +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AmpharosMega[] = { + overworld_ascending_frames(gObjectEventPic_AmpharosMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_MAREEP + +#if P_FAMILY_MARILL +#if P_GEN_3_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Azurill[] = { + overworld_ascending_frames(gObjectEventPic_Azurill, 4, 4), }; +#endif //P_GEN_3_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Marill[] = { overworld_ascending_frames(gObjectEventPic_Marill, 4, 4), }; static const struct SpriteFrameImage sPicTable_Azumarill[] = { overworld_ascending_frames(gObjectEventPic_Azumarill, 4, 4), }; +#endif //P_FAMILY_MARILL + +#if P_FAMILY_SUDOWOODO +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Bonsly[] = { + overworld_ascending_frames(gObjectEventPic_Bonsly, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Sudowoodo[] = { overworld_ascending_frames(gObjectEventPic_Sudowoodo, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Politoed[] = { - overworld_ascending_frames(gObjectEventPic_Politoed, 4, 4), -}; +#endif //P_FAMILY_SUDOWOODO + +#if P_FAMILY_HOPPIP static const struct SpriteFrameImage sPicTable_Hoppip[] = { overworld_ascending_frames(gObjectEventPic_Hoppip, 4, 4), }; @@ -565,39 +1386,80 @@ static const struct SpriteFrameImage sPicTable_Skiploom[] = { static const struct SpriteFrameImage sPicTable_Jumpluff[] = { overworld_ascending_frames(gObjectEventPic_Jumpluff, 4, 4), }; +#endif //P_FAMILY_HOPPIP + +#if P_FAMILY_AIPOM static const struct SpriteFrameImage sPicTable_Aipom[] = { overworld_ascending_frames(gObjectEventPic_Aipom, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Ambipom[] = { + overworld_ascending_frames(gObjectEventPic_Ambipom, 4, 4), +}; + +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_AIPOM + +#if P_FAMILY_SUNKERN static const struct SpriteFrameImage sPicTable_Sunkern[] = { overworld_ascending_frames(gObjectEventPic_Sunkern, 4, 4), }; static const struct SpriteFrameImage sPicTable_Sunflora[] = { overworld_ascending_frames(gObjectEventPic_Sunflora, 4, 4), }; +#endif //P_FAMILY_SUNKERN + +#if P_FAMILY_YANMA static const struct SpriteFrameImage sPicTable_Yanma[] = { overworld_ascending_frames(gObjectEventPic_Yanma, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Yanmega[] = { + overworld_ascending_frames(gObjectEventPic_Yanmega, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_YANMA + +#if P_FAMILY_WOOPER static const struct SpriteFrameImage sPicTable_Wooper[] = { overworld_ascending_frames(gObjectEventPic_Wooper, 4, 4), }; static const struct SpriteFrameImage sPicTable_Quagsire[] = { overworld_ascending_frames(gObjectEventPic_Quagsire, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Espeon[] = { - overworld_ascending_frames(gObjectEventPic_Espeon, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Umbreon[] = { - overworld_ascending_frames(gObjectEventPic_Umbreon, 4, 4), +#if P_PALDEAN_FORMS +/*static const struct SpriteFrameImage sPicTable_WooperPaldean[] = { + overworld_ascending_frames(gObjectEventPic_WooperPaldean, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Clodsire[] = { + overworld_ascending_frames(gObjectEventPic_Clodsire, 4, 4), +};*/ +#endif //P_PALDEAN_FORMS +#endif //P_FAMILY_WOOPER + +#if P_FAMILY_MURKROW static const struct SpriteFrameImage sPicTable_Murkrow[] = { overworld_ascending_frames(gObjectEventPic_Murkrow, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Slowking[] = { - overworld_ascending_frames(gObjectEventPic_Slowking, 4, 4), +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Honchkrow[] = { + overworld_ascending_frames(gObjectEventPic_Honchkrow, 4, 4), }; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_MURKROW + +#if P_FAMILY_MISDREAVUS static const struct SpriteFrameImage sPicTable_Misdreavus[] = { overworld_ascending_frames(gObjectEventPic_Misdreavus, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Mismagius[] = { + overworld_ascending_frames(gObjectEventPic_Mismagius, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_MISDREAVUS + +#if P_FAMILY_UNOWN static const struct SpriteFrameImage sPicTable_UnownA[] = { overworld_ascending_frames(gObjectEventPic_UnownA, 4, 4), }; @@ -682,138 +1544,276 @@ static const struct SpriteFrameImage sPicTable_UnownExclamationMark[] = { static const struct SpriteFrameImage sPicTable_UnownQuestionMark[] = { overworld_ascending_frames(gObjectEventPic_UnownQuestionMark, 4, 4), }; +#endif //P_FAMILY_UNOWN + +#if P_FAMILY_WOBBUFFET +#if P_GEN_3_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Wynaut[] = { + overworld_ascending_frames(gObjectEventPic_Wynaut, 4, 4), +}; +#endif //P_GEN_3_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Wobbuffet[] = { overworld_ascending_frames(gObjectEventPic_Wobbuffet, 4, 4), }; +#endif //P_FAMILY_WOBBUFFET + +#if P_FAMILY_GIRAFARIG static const struct SpriteFrameImage sPicTable_Girafarig[] = { overworld_ascending_frames(gObjectEventPic_Girafarig, 4, 4), }; +#if P_GEN_9_CROSS_EVOS +/*static const struct SpriteFrameImage sPicTable_Farigiraf[] = { + overworld_ascending_frames(gObjectEventPic_Farigiraf, 4, 4), +};*/ +#endif //P_GEN_9_CROSS_EVOS +#endif //P_FAMILY_GIRAFARIG + +#if P_FAMILY_PINECO static const struct SpriteFrameImage sPicTable_Pineco[] = { overworld_ascending_frames(gObjectEventPic_Pineco, 4, 4), }; static const struct SpriteFrameImage sPicTable_Forretress[] = { overworld_ascending_frames(gObjectEventPic_Forretress, 4, 4), }; +#endif //P_FAMILY_PINECO + +#if P_FAMILY_DUNSPARCE static const struct SpriteFrameImage sPicTable_Dunsparce[] = { overworld_ascending_frames(gObjectEventPic_Dunsparce, 4, 4), }; +#if P_GEN_9_CROSS_EVOS +/*static const struct SpriteFrameImage sPicTable_Dudunsparce[] = { + overworld_ascending_frames(gObjectEventPic_Dudunsparce, 4, 4), +};*/ + + +#endif //P_GEN_9_CROSS_EVOS +#endif //P_FAMILY_DUNSPARCE + +#if P_FAMILY_GLIGAR static const struct SpriteFrameImage sPicTable_Gligar[] = { overworld_ascending_frames(gObjectEventPic_Gligar, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Steelix[] = { - overworld_ascending_frames(gObjectEventPic_Steelix, 8, 8), +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Gliscor[] = { + overworld_ascending_frames(gObjectEventPic_Gliscor, 4, 4), }; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_GLIGAR + +#if P_FAMILY_SNUBBULL static const struct SpriteFrameImage sPicTable_Snubbull[] = { overworld_ascending_frames(gObjectEventPic_Snubbull, 4, 4), }; static const struct SpriteFrameImage sPicTable_Granbull[] = { overworld_ascending_frames(gObjectEventPic_Granbull, 4, 4), }; +#endif //P_FAMILY_SNUBBULL + +#if P_FAMILY_QWILFISH static const struct SpriteFrameImage sPicTable_Qwilfish[] = { overworld_ascending_frames(gObjectEventPic_Qwilfish, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Scizor[] = { - overworld_ascending_frames(gObjectEventPic_Scizor, 4, 4), +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_QwilfishHisuian[] = { + overworld_ascending_frames(gObjectEventPic_QwilfishHisuian, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Overqwil[] = { + overworld_ascending_frames(gObjectEventPic_Overqwil, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_QWILFISH + +#if P_FAMILY_SHUCKLE static const struct SpriteFrameImage sPicTable_Shuckle[] = { overworld_ascending_frames(gObjectEventPic_Shuckle, 4, 4), }; +#endif //P_FAMILY_SHUCKLE + +#if P_FAMILY_HERACROSS static const struct SpriteFrameImage sPicTable_Heracross[] = { overworld_ascending_frames(gObjectEventPic_Heracross, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_HeracrossMega[] = { + overworld_ascending_frames(gObjectEventPic_HeracrossMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_HERACROSS + +#if P_FAMILY_SNEASEL static const struct SpriteFrameImage sPicTable_Sneasel[] = { overworld_ascending_frames(gObjectEventPic_Sneasel, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Weavile[] = { + overworld_ascending_frames(gObjectEventPic_Weavile, 4, 4), +}; + +#endif //P_GEN_4_CROSS_EVOS + +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_SneaselHisuian[] = { + overworld_ascending_frames(gObjectEventPic_SneaselHisuian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Sneasler[] = { + overworld_ascending_frames(gObjectEventPic_Sneasler, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_SNEASEL + +#if P_FAMILY_TEDDIURSA static const struct SpriteFrameImage sPicTable_Teddiursa[] = { overworld_ascending_frames(gObjectEventPic_Teddiursa, 4, 4), }; static const struct SpriteFrameImage sPicTable_Ursaring[] = { overworld_ascending_frames(gObjectEventPic_Ursaring, 4, 4), }; +#if P_GEN_8_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Ursaluna[] = { + overworld_ascending_frames(gObjectEventPic_Ursaluna, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_UrsalunaBloodmoon[] = { + overworld_ascending_frames(gObjectEventPic_UrsalunaBloodmoon, 4, 4), +}; +#endif //P_GEN_8_CROSS_EVOS +#endif //P_FAMILY_TEDDIURSA + +#if P_FAMILY_SLUGMA static const struct SpriteFrameImage sPicTable_Slugma[] = { overworld_ascending_frames(gObjectEventPic_Slugma, 4, 4), }; static const struct SpriteFrameImage sPicTable_Magcargo[] = { overworld_ascending_frames(gObjectEventPic_Magcargo, 4, 4), }; +#endif //P_FAMILY_SLUGMA + +#if P_FAMILY_SWINUB static const struct SpriteFrameImage sPicTable_Swinub[] = { overworld_ascending_frames(gObjectEventPic_Swinub, 4, 4), }; static const struct SpriteFrameImage sPicTable_Piloswine[] = { overworld_ascending_frames(gObjectEventPic_Piloswine, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Mamoswine[] = { + overworld_ascending_frames(gObjectEventPic_Mamoswine, 4, 4), +}; + +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_SWINUB + +#if P_FAMILY_CORSOLA static const struct SpriteFrameImage sPicTable_Corsola[] = { overworld_ascending_frames(gObjectEventPic_Corsola, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_CorsolaGalarian[] = { + overworld_ascending_frames(gObjectEventPic_CorsolaGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Cursola[] = { + overworld_ascending_frames(gObjectEventPic_Cursola, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_CORSOLA + +#if P_FAMILY_REMORAID static const struct SpriteFrameImage sPicTable_Remoraid[] = { overworld_ascending_frames(gObjectEventPic_Remoraid, 4, 4), }; static const struct SpriteFrameImage sPicTable_Octillery[] = { overworld_ascending_frames(gObjectEventPic_Octillery, 4, 4), }; +#endif //P_FAMILY_REMORAID + +#if P_FAMILY_DELIBIRD static const struct SpriteFrameImage sPicTable_Delibird[] = { overworld_ascending_frames(gObjectEventPic_Delibird, 4, 4), }; +#endif //P_FAMILY_DELIBIRD + +#if P_FAMILY_MANTINE +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Mantyke[] = { + overworld_ascending_frames(gObjectEventPic_Mantyke, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Mantine[] = { overworld_ascending_frames(gObjectEventPic_Mantine, 4, 4), }; +#endif //P_FAMILY_MANTINE + +#if P_FAMILY_SKARMORY static const struct SpriteFrameImage sPicTable_Skarmory[] = { overworld_ascending_frames(gObjectEventPic_Skarmory, 4, 4), }; +#endif //P_FAMILY_SKARMORY + +#if P_FAMILY_HOUNDOUR static const struct SpriteFrameImage sPicTable_Houndour[] = { overworld_ascending_frames(gObjectEventPic_Houndour, 4, 4), }; static const struct SpriteFrameImage sPicTable_Houndoom[] = { overworld_ascending_frames(gObjectEventPic_Houndoom, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Kingdra[] = { - overworld_ascending_frames(gObjectEventPic_Kingdra, 4, 4), -}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_HoundoomMega[] = { + overworld_ascending_frames(gObjectEventPic_HoundoomMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_HOUNDOUR + +#if P_FAMILY_PHANPY static const struct SpriteFrameImage sPicTable_Phanpy[] = { overworld_ascending_frames(gObjectEventPic_Phanpy, 4, 4), }; static const struct SpriteFrameImage sPicTable_Donphan[] = { overworld_ascending_frames(gObjectEventPic_Donphan, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Porygon2[] = { - overworld_ascending_frames(gObjectEventPic_Porygon2, 4, 4), -}; +#endif //P_FAMILY_PHANPY + +#if P_FAMILY_STANTLER static const struct SpriteFrameImage sPicTable_Stantler[] = { overworld_ascending_frames(gObjectEventPic_Stantler, 4, 4), }; +#if P_GEN_8_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Wyrdeer[] = { + overworld_ascending_frames(gObjectEventPic_Wyrdeer, 4, 4), +}; +#endif //P_GEN_8_CROSS_EVOS +#endif //P_FAMILY_STANTLER + +#if P_FAMILY_SMEARGLE static const struct SpriteFrameImage sPicTable_Smeargle[] = { overworld_ascending_frames(gObjectEventPic_Smeargle, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Tyrogue[] = { - overworld_ascending_frames(gObjectEventPic_Tyrogue, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Hitmontop[] = { - overworld_ascending_frames(gObjectEventPic_Hitmontop, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Smoochum[] = { - overworld_ascending_frames(gObjectEventPic_Smoochum, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Elekid[] = { - overworld_ascending_frames(gObjectEventPic_Elekid, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Magby[] = { - overworld_ascending_frames(gObjectEventPic_Magby, 4, 4), -}; +#endif //P_FAMILY_SMEARGLE + +#if P_FAMILY_MILTANK static const struct SpriteFrameImage sPicTable_Miltank[] = { overworld_ascending_frames(gObjectEventPic_Miltank, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Blissey[] = { - overworld_ascending_frames(gObjectEventPic_Blissey, 4, 4), -}; +#endif //P_FAMILY_MILTANK + +#if P_FAMILY_RAIKOU static const struct SpriteFrameImage sPicTable_Raikou[] = { overworld_ascending_frames(gObjectEventPic_Raikou, 4, 4), }; +#endif //P_FAMILY_RAIKOU + +#if P_FAMILY_ENTEI static const struct SpriteFrameImage sPicTable_Entei[] = { overworld_ascending_frames(gObjectEventPic_Entei, 4, 4), }; +#endif //P_FAMILY_ENTEI + +#if P_FAMILY_SUICUNE static const struct SpriteFrameImage sPicTable_Suicune[] = { overworld_ascending_frames(gObjectEventPic_Suicune, 4, 4), }; +#endif //P_FAMILY_SUICUNE + +#if P_FAMILY_LARVITAR static const struct SpriteFrameImage sPicTable_Larvitar[] = { overworld_ascending_frames(gObjectEventPic_Larvitar, 4, 4), }; @@ -823,15 +1823,32 @@ static const struct SpriteFrameImage sPicTable_Pupitar[] = { static const struct SpriteFrameImage sPicTable_Tyranitar[] = { overworld_ascending_frames(gObjectEventPic_Tyranitar, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_TyranitarMega[] = { + overworld_ascending_frames(gObjectEventPic_TyranitarMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_LARVITAR + +#if P_FAMILY_LUGIA static const struct SpriteFrameImage sPicTable_Lugia[] = { - overworld_ascending_frames(gObjectEventPic_Lugia, 8, 8), + overworld_ascending_frames(gObjectEventPic_Lugia, 4, 4), }; +#endif //P_FAMILY_LUGIA + +#if P_FAMILY_HO_OH static const struct SpriteFrameImage sPicTable_HoOh[] = { - overworld_ascending_frames(gObjectEventPic_HoOh, 8, 8), + overworld_ascending_frames(gObjectEventPic_HoOh, 4, 4), }; +#endif //P_FAMILY_HO_OH + +#if P_FAMILY_CELEBI static const struct SpriteFrameImage sPicTable_Celebi[] = { overworld_ascending_frames(gObjectEventPic_Celebi, 4, 4), }; +#endif //P_FAMILY_CELEBI + +#if P_FAMILY_TREECKO static const struct SpriteFrameImage sPicTable_Treecko[] = { overworld_ascending_frames(gObjectEventPic_Treecko, 4, 4), }; @@ -841,6 +1858,14 @@ static const struct SpriteFrameImage sPicTable_Grovyle[] = { static const struct SpriteFrameImage sPicTable_Sceptile[] = { overworld_ascending_frames(gObjectEventPic_Sceptile, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SceptileMega[] = { + overworld_ascending_frames(gObjectEventPic_SceptileMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_TREECKO + +#if P_FAMILY_TORCHIC static const struct SpriteFrameImage sPicTable_Torchic[] = { overworld_ascending_frames(gObjectEventPic_Torchic, 4, 4), }; @@ -850,6 +1875,14 @@ static const struct SpriteFrameImage sPicTable_Combusken[] = { static const struct SpriteFrameImage sPicTable_Blaziken[] = { overworld_ascending_frames(gObjectEventPic_Blaziken, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_BlazikenMega[] = { + overworld_ascending_frames(gObjectEventPic_BlazikenMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_TORCHIC + +#if P_FAMILY_MUDKIP static const struct SpriteFrameImage sPicTable_Mudkip[] = { overworld_ascending_frames(gObjectEventPic_Mudkip, 4, 4), }; @@ -859,18 +1892,43 @@ static const struct SpriteFrameImage sPicTable_Marshtomp[] = { static const struct SpriteFrameImage sPicTable_Swampert[] = { overworld_ascending_frames(gObjectEventPic_Swampert, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SwampertMega[] = { + overworld_ascending_frames(gObjectEventPic_SwampertMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_MUDKIP + +#if P_FAMILY_POOCHYENA static const struct SpriteFrameImage sPicTable_Poochyena[] = { overworld_ascending_frames(gObjectEventPic_Poochyena, 4, 4), }; static const struct SpriteFrameImage sPicTable_Mightyena[] = { overworld_ascending_frames(gObjectEventPic_Mightyena, 4, 4), }; +#endif //P_FAMILY_POOCHYENA + +#if P_FAMILY_ZIGZAGOON static const struct SpriteFrameImage sPicTable_Zigzagoon[] = { overworld_ascending_frames(gObjectEventPic_Zigzagoon, 4, 4), }; static const struct SpriteFrameImage sPicTable_Linoone[] = { overworld_ascending_frames(gObjectEventPic_Linoone, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_ZigzagoonGalarian[] = { + overworld_ascending_frames(gObjectEventPic_ZigzagoonGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_LinooneGalarian[] = { + overworld_ascending_frames(gObjectEventPic_LinooneGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Obstagoon[] = { + overworld_ascending_frames(gObjectEventPic_Obstagoon, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_ZIGZAGOON + +#if P_FAMILY_WURMPLE static const struct SpriteFrameImage sPicTable_Wurmple[] = { overworld_ascending_frames(gObjectEventPic_Wurmple, 4, 4), }; @@ -886,6 +1944,9 @@ static const struct SpriteFrameImage sPicTable_Cascoon[] = { static const struct SpriteFrameImage sPicTable_Dustox[] = { overworld_ascending_frames(gObjectEventPic_Dustox, 4, 4), }; +#endif //P_FAMILY_WURMPLE + +#if P_FAMILY_LOTAD static const struct SpriteFrameImage sPicTable_Lotad[] = { overworld_ascending_frames(gObjectEventPic_Lotad, 4, 4), }; @@ -895,6 +1956,9 @@ static const struct SpriteFrameImage sPicTable_Lombre[] = { static const struct SpriteFrameImage sPicTable_Ludicolo[] = { overworld_ascending_frames(gObjectEventPic_Ludicolo, 4, 4), }; +#endif //P_FAMILY_LOTAD + +#if P_FAMILY_SEEDOT static const struct SpriteFrameImage sPicTable_Seedot[] = { overworld_ascending_frames(gObjectEventPic_Seedot, 4, 4), }; @@ -904,18 +1968,27 @@ static const struct SpriteFrameImage sPicTable_Nuzleaf[] = { static const struct SpriteFrameImage sPicTable_Shiftry[] = { overworld_ascending_frames(gObjectEventPic_Shiftry, 4, 4), }; +#endif //P_FAMILY_SEEDOT + +#if P_FAMILY_TAILLOW static const struct SpriteFrameImage sPicTable_Taillow[] = { overworld_ascending_frames(gObjectEventPic_Taillow, 4, 4), }; static const struct SpriteFrameImage sPicTable_Swellow[] = { overworld_ascending_frames(gObjectEventPic_Swellow, 4, 4), }; +#endif //P_FAMILY_TAILLOW + +#if P_FAMILY_WINGULL static const struct SpriteFrameImage sPicTable_Wingull[] = { overworld_ascending_frames(gObjectEventPic_Wingull, 4, 4), }; static const struct SpriteFrameImage sPicTable_Pelipper[] = { overworld_ascending_frames(gObjectEventPic_Pelipper, 4, 4), }; +#endif //P_FAMILY_WINGULL + +#if P_FAMILY_RALTS static const struct SpriteFrameImage sPicTable_Ralts[] = { overworld_ascending_frames(gObjectEventPic_Ralts, 4, 4), }; @@ -925,18 +1998,43 @@ static const struct SpriteFrameImage sPicTable_Kirlia[] = { static const struct SpriteFrameImage sPicTable_Gardevoir[] = { overworld_ascending_frames(gObjectEventPic_Gardevoir, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_GardevoirMega[] = { + overworld_ascending_frames(gObjectEventPic_GardevoirMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS + +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Gallade[] = { + overworld_ascending_frames(gObjectEventPic_Gallade, 4, 4), +}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_GalladeMega[] = { + overworld_ascending_frames(gObjectEventPic_GalladeMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_RALTS + +#if P_FAMILY_SURSKIT static const struct SpriteFrameImage sPicTable_Surskit[] = { overworld_ascending_frames(gObjectEventPic_Surskit, 4, 4), }; static const struct SpriteFrameImage sPicTable_Masquerain[] = { overworld_ascending_frames(gObjectEventPic_Masquerain, 4, 4), }; +#endif //P_FAMILY_SURSKIT + +#if P_FAMILY_SHROOMISH static const struct SpriteFrameImage sPicTable_Shroomish[] = { overworld_ascending_frames(gObjectEventPic_Shroomish, 4, 4), }; static const struct SpriteFrameImage sPicTable_Breloom[] = { overworld_ascending_frames(gObjectEventPic_Breloom, 4, 4), }; +#endif //P_FAMILY_SHROOMISH + +#if P_FAMILY_SLAKOTH static const struct SpriteFrameImage sPicTable_Slakoth[] = { overworld_ascending_frames(gObjectEventPic_Slakoth, 4, 4), }; @@ -946,6 +2044,9 @@ static const struct SpriteFrameImage sPicTable_Vigoroth[] = { static const struct SpriteFrameImage sPicTable_Slaking[] = { overworld_ascending_frames(gObjectEventPic_Slaking, 4, 4), }; +#endif //P_FAMILY_SLAKOTH + +#if P_FAMILY_NINCADA static const struct SpriteFrameImage sPicTable_Nincada[] = { overworld_ascending_frames(gObjectEventPic_Nincada, 4, 4), }; @@ -955,6 +2056,9 @@ static const struct SpriteFrameImage sPicTable_Ninjask[] = { static const struct SpriteFrameImage sPicTable_Shedinja[] = { overworld_ascending_frames(gObjectEventPic_Shedinja, 4, 4), }; +#endif //P_FAMILY_NINCADA + +#if P_FAMILY_WHISMUR static const struct SpriteFrameImage sPicTable_Whismur[] = { overworld_ascending_frames(gObjectEventPic_Whismur, 4, 4), }; @@ -964,30 +2068,60 @@ static const struct SpriteFrameImage sPicTable_Loudred[] = { static const struct SpriteFrameImage sPicTable_Exploud[] = { overworld_ascending_frames(gObjectEventPic_Exploud, 4, 4), }; +#endif //P_FAMILY_WHISMUR + +#if P_FAMILY_MAKUHITA static const struct SpriteFrameImage sPicTable_Makuhita[] = { overworld_ascending_frames(gObjectEventPic_Makuhita, 4, 4), }; static const struct SpriteFrameImage sPicTable_Hariyama[] = { overworld_ascending_frames(gObjectEventPic_Hariyama, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Azurill[] = { - overworld_ascending_frames(gObjectEventPic_Azurill, 4, 4), -}; +#endif //P_FAMILY_MAKUHITA + +#if P_FAMILY_NOSEPASS static const struct SpriteFrameImage sPicTable_Nosepass[] = { overworld_ascending_frames(gObjectEventPic_Nosepass, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Probopass[] = { + overworld_ascending_frames(gObjectEventPic_Probopass, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_NOSEPASS + +#if P_FAMILY_SKITTY static const struct SpriteFrameImage sPicTable_Skitty[] = { overworld_ascending_frames(gObjectEventPic_Skitty, 4, 4), }; static const struct SpriteFrameImage sPicTable_Delcatty[] = { overworld_ascending_frames(gObjectEventPic_Delcatty, 4, 4), }; +#endif //P_FAMILY_SKITTY + +#if P_FAMILY_SABLEYE static const struct SpriteFrameImage sPicTable_Sableye[] = { overworld_ascending_frames(gObjectEventPic_Sableye, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SableyeMega[] = { + overworld_ascending_frames(gObjectEventPic_SableyeMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_SABLEYE + +#if P_FAMILY_MAWILE static const struct SpriteFrameImage sPicTable_Mawile[] = { overworld_ascending_frames(gObjectEventPic_Mawile, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_MawileMega[] = { + overworld_ascending_frames(gObjectEventPic_MawileMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_MAWILE + +#if P_FAMILY_ARON static const struct SpriteFrameImage sPicTable_Aron[] = { overworld_ascending_frames(gObjectEventPic_Aron, 4, 4), }; @@ -997,69 +2131,147 @@ static const struct SpriteFrameImage sPicTable_Lairon[] = { static const struct SpriteFrameImage sPicTable_Aggron[] = { overworld_ascending_frames(gObjectEventPic_Aggron, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AggronMega[] = { + overworld_ascending_frames(gObjectEventPic_AggronMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_ARON + +#if P_FAMILY_MEDITITE static const struct SpriteFrameImage sPicTable_Meditite[] = { overworld_ascending_frames(gObjectEventPic_Meditite, 4, 4), }; static const struct SpriteFrameImage sPicTable_Medicham[] = { overworld_ascending_frames(gObjectEventPic_Medicham, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_MedichamMega[] = { + overworld_ascending_frames(gObjectEventPic_MedichamMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_MEDITITE + +#if P_FAMILY_ELECTRIKE static const struct SpriteFrameImage sPicTable_Electrike[] = { overworld_ascending_frames(gObjectEventPic_Electrike, 4, 4), }; static const struct SpriteFrameImage sPicTable_Manectric[] = { overworld_ascending_frames(gObjectEventPic_Manectric, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_ManectricMega[] = { + overworld_ascending_frames(gObjectEventPic_ManectricMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_ELECTRIKE + +#if P_FAMILY_PLUSLE static const struct SpriteFrameImage sPicTable_Plusle[] = { overworld_ascending_frames(gObjectEventPic_Plusle, 4, 4), }; +#endif //P_FAMILY_PLUSLE + +#if P_FAMILY_MINUN static const struct SpriteFrameImage sPicTable_Minun[] = { overworld_ascending_frames(gObjectEventPic_Minun, 4, 4), }; +#endif //P_FAMILY_MINUN + +#if P_FAMILY_VOLBEAT_ILLUMISE static const struct SpriteFrameImage sPicTable_Volbeat[] = { overworld_ascending_frames(gObjectEventPic_Volbeat, 4, 4), }; static const struct SpriteFrameImage sPicTable_Illumise[] = { overworld_ascending_frames(gObjectEventPic_Illumise, 4, 4), }; +#endif //P_FAMILY_VOLBEAT_ILLUMISE + +#if P_FAMILY_ROSELIA +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Budew[] = { + overworld_ascending_frames(gObjectEventPic_Budew, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Roselia[] = { overworld_ascending_frames(gObjectEventPic_Roselia, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Roserade[] = { + overworld_ascending_frames(gObjectEventPic_Roserade, 4, 4), +}; + +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_ROSELIA + +#if P_FAMILY_GULPIN static const struct SpriteFrameImage sPicTable_Gulpin[] = { overworld_ascending_frames(gObjectEventPic_Gulpin, 4, 4), }; static const struct SpriteFrameImage sPicTable_Swalot[] = { overworld_ascending_frames(gObjectEventPic_Swalot, 4, 4), }; +#endif //P_FAMILY_GULPIN + +#if P_FAMILY_CARVANHA static const struct SpriteFrameImage sPicTable_Carvanha[] = { overworld_ascending_frames(gObjectEventPic_Carvanha, 4, 4), }; static const struct SpriteFrameImage sPicTable_Sharpedo[] = { overworld_ascending_frames(gObjectEventPic_Sharpedo, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SharpedoMega[] = { + overworld_ascending_frames(gObjectEventPic_SharpedoMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_CARVANHA + +#if P_FAMILY_WAILMER static const struct SpriteFrameImage sPicTable_Wailmer[] = { overworld_ascending_frames(gObjectEventPic_Wailmer, 4, 4), }; static const struct SpriteFrameImage sPicTable_Wailord[] = { - overworld_ascending_frames(gObjectEventPic_Wailord, 8, 8), + overworld_ascending_frames(gObjectEventPic_Wailord, 4, 4), }; +#endif //P_FAMILY_WAILMER + +#if P_FAMILY_NUMEL static const struct SpriteFrameImage sPicTable_Numel[] = { overworld_ascending_frames(gObjectEventPic_Numel, 4, 4), }; static const struct SpriteFrameImage sPicTable_Camerupt[] = { overworld_ascending_frames(gObjectEventPic_Camerupt, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_CameruptMega[] = { + overworld_ascending_frames(gObjectEventPic_CameruptMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_NUMEL + +#if P_FAMILY_TORKOAL static const struct SpriteFrameImage sPicTable_Torkoal[] = { overworld_ascending_frames(gObjectEventPic_Torkoal, 4, 4), }; +#endif //P_FAMILY_TORKOAL + +#if P_FAMILY_SPOINK static const struct SpriteFrameImage sPicTable_Spoink[] = { overworld_ascending_frames(gObjectEventPic_Spoink, 4, 4), }; static const struct SpriteFrameImage sPicTable_Grumpig[] = { overworld_ascending_frames(gObjectEventPic_Grumpig, 4, 4), }; +#endif //P_FAMILY_SPOINK + +#if P_FAMILY_SPINDA static const struct SpriteFrameImage sPicTable_Spinda[] = { overworld_ascending_frames(gObjectEventPic_Spinda, 4, 4), }; +#endif //P_FAMILY_SPINDA + +#if P_FAMILY_TRAPINCH static const struct SpriteFrameImage sPicTable_Trapinch[] = { overworld_ascending_frames(gObjectEventPic_Trapinch, 4, 4), }; @@ -1069,66 +2281,110 @@ static const struct SpriteFrameImage sPicTable_Vibrava[] = { static const struct SpriteFrameImage sPicTable_Flygon[] = { overworld_ascending_frames(gObjectEventPic_Flygon, 4, 4), }; +#endif //P_FAMILY_TRAPINCH + +#if P_FAMILY_CACNEA static const struct SpriteFrameImage sPicTable_Cacnea[] = { overworld_ascending_frames(gObjectEventPic_Cacnea, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cacturne[] = { overworld_ascending_frames(gObjectEventPic_Cacturne, 4, 4), }; +#endif //P_FAMILY_CACNEA + +#if P_FAMILY_SWABLU static const struct SpriteFrameImage sPicTable_Swablu[] = { overworld_ascending_frames(gObjectEventPic_Swablu, 4, 4), }; static const struct SpriteFrameImage sPicTable_Altaria[] = { overworld_ascending_frames(gObjectEventPic_Altaria, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AltariaMega[] = { + overworld_ascending_frames(gObjectEventPic_AltariaMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_SWABLU + +#if P_FAMILY_ZANGOOSE static const struct SpriteFrameImage sPicTable_Zangoose[] = { overworld_ascending_frames(gObjectEventPic_Zangoose, 4, 4), }; +#endif //P_FAMILY_ZANGOOSE + +#if P_FAMILY_SEVIPER static const struct SpriteFrameImage sPicTable_Seviper[] = { overworld_ascending_frames(gObjectEventPic_Seviper, 4, 4), }; +#endif //P_FAMILY_SEVIPER + +#if P_FAMILY_LUNATONE static const struct SpriteFrameImage sPicTable_Lunatone[] = { overworld_ascending_frames(gObjectEventPic_Lunatone, 4, 4), }; +#endif //P_FAMILY_LUNATONE + +#if P_FAMILY_SOLROCK static const struct SpriteFrameImage sPicTable_Solrock[] = { overworld_ascending_frames(gObjectEventPic_Solrock, 4, 4), }; +#endif //P_FAMILY_SOLROCK + +#if P_FAMILY_BARBOACH static const struct SpriteFrameImage sPicTable_Barboach[] = { overworld_ascending_frames(gObjectEventPic_Barboach, 4, 4), }; static const struct SpriteFrameImage sPicTable_Whiscash[] = { overworld_ascending_frames(gObjectEventPic_Whiscash, 4, 4), }; +#endif //P_FAMILY_BARBOACH + +#if P_FAMILY_CORPHISH static const struct SpriteFrameImage sPicTable_Corphish[] = { overworld_ascending_frames(gObjectEventPic_Corphish, 4, 4), }; static const struct SpriteFrameImage sPicTable_Crawdaunt[] = { overworld_ascending_frames(gObjectEventPic_Crawdaunt, 4, 4), }; +#endif //P_FAMILY_CORPHISH + +#if P_FAMILY_BALTOY static const struct SpriteFrameImage sPicTable_Baltoy[] = { overworld_ascending_frames(gObjectEventPic_Baltoy, 4, 4), }; static const struct SpriteFrameImage sPicTable_Claydol[] = { overworld_ascending_frames(gObjectEventPic_Claydol, 4, 4), }; +#endif //P_FAMILY_BALTOY + +#if P_FAMILY_LILEEP static const struct SpriteFrameImage sPicTable_Lileep[] = { overworld_ascending_frames(gObjectEventPic_Lileep, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cradily[] = { overworld_ascending_frames(gObjectEventPic_Cradily, 4, 4), }; +#endif //P_FAMILY_LILEEP + +#if P_FAMILY_ANORITH static const struct SpriteFrameImage sPicTable_Anorith[] = { overworld_ascending_frames(gObjectEventPic_Anorith, 4, 4), }; static const struct SpriteFrameImage sPicTable_Armaldo[] = { overworld_ascending_frames(gObjectEventPic_Armaldo, 4, 4), }; +#endif //P_FAMILY_ANORITH + +#if P_FAMILY_FEEBAS static const struct SpriteFrameImage sPicTable_Feebas[] = { overworld_ascending_frames(gObjectEventPic_Feebas, 4, 4), }; static const struct SpriteFrameImage sPicTable_Milotic[] = { overworld_ascending_frames(gObjectEventPic_Milotic, 4, 4), }; +#endif //P_FAMILY_FEEBAS + +#if P_FAMILY_CASTFORM static const struct SpriteFrameImage sPicTable_CastformNormal[] = { overworld_ascending_frames(gObjectEventPic_CastformNormal, 4, 4), }; @@ -1141,39 +2397,91 @@ static const struct SpriteFrameImage sPicTable_CastformRainy[] = { static const struct SpriteFrameImage sPicTable_CastformSnowy[] = { overworld_ascending_frames(gObjectEventPic_CastformSnowy, 4, 4), }; +#endif //P_FAMILY_CASTFORM + +#if P_FAMILY_KECLEON static const struct SpriteFrameImage sPicTable_Kecleon[] = { overworld_ascending_frames(gObjectEventPic_Kecleon, 4, 4), }; +#endif //P_FAMILY_KECLEON + +#if P_FAMILY_SHUPPET static const struct SpriteFrameImage sPicTable_Shuppet[] = { overworld_ascending_frames(gObjectEventPic_Shuppet, 4, 4), }; static const struct SpriteFrameImage sPicTable_Banette[] = { overworld_ascending_frames(gObjectEventPic_Banette, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_BanetteMega[] = { + overworld_ascending_frames(gObjectEventPic_BanetteMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_SHUPPET + +#if P_FAMILY_DUSKULL static const struct SpriteFrameImage sPicTable_Duskull[] = { overworld_ascending_frames(gObjectEventPic_Duskull, 4, 4), }; static const struct SpriteFrameImage sPicTable_Dusclops[] = { overworld_ascending_frames(gObjectEventPic_Dusclops, 4, 4), }; +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Dusknoir[] = { + overworld_ascending_frames(gObjectEventPic_Dusknoir, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_DUSKULL + +#if P_FAMILY_TROPIUS static const struct SpriteFrameImage sPicTable_Tropius[] = { overworld_ascending_frames(gObjectEventPic_Tropius, 4, 4), }; +#endif //P_FAMILY_TROPIUS + +#if P_FAMILY_CHIMECHO +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Chingling[] = { + overworld_ascending_frames(gObjectEventPic_Chingling, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Chimecho[] = { overworld_ascending_frames(gObjectEventPic_Chimecho, 4, 4), }; +#endif //P_FAMILY_CHIMECHO + +#if P_FAMILY_ABSOL static const struct SpriteFrameImage sPicTable_Absol[] = { overworld_ascending_frames(gObjectEventPic_Absol, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Wynaut[] = { - overworld_ascending_frames(gObjectEventPic_Wynaut, 4, 4), -}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AbsolMega[] = { + overworld_ascending_frames(gObjectEventPic_AbsolMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_ABSOL + +#if P_FAMILY_SNORUNT static const struct SpriteFrameImage sPicTable_Snorunt[] = { overworld_ascending_frames(gObjectEventPic_Snorunt, 4, 4), }; static const struct SpriteFrameImage sPicTable_Glalie[] = { overworld_ascending_frames(gObjectEventPic_Glalie, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_GlalieMega[] = { + overworld_ascending_frames(gObjectEventPic_GlalieMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS + +#if P_GEN_4_CROSS_EVOS +static const struct SpriteFrameImage sPicTable_Froslass[] = { + overworld_ascending_frames(gObjectEventPic_Froslass, 4, 4), +}; +#endif //P_GEN_4_CROSS_EVOS +#endif //P_FAMILY_SNORUNT + +#if P_FAMILY_SPHEAL static const struct SpriteFrameImage sPicTable_Spheal[] = { overworld_ascending_frames(gObjectEventPic_Spheal, 4, 4), }; @@ -1183,6 +2491,9 @@ static const struct SpriteFrameImage sPicTable_Sealeo[] = { static const struct SpriteFrameImage sPicTable_Walrein[] = { overworld_ascending_frames(gObjectEventPic_Walrein, 4, 4), }; +#endif //P_FAMILY_SPHEAL + +#if P_FAMILY_CLAMPERL static const struct SpriteFrameImage sPicTable_Clamperl[] = { overworld_ascending_frames(gObjectEventPic_Clamperl, 4, 4), }; @@ -1192,12 +2503,21 @@ static const struct SpriteFrameImage sPicTable_Huntail[] = { static const struct SpriteFrameImage sPicTable_Gorebyss[] = { overworld_ascending_frames(gObjectEventPic_Gorebyss, 4, 4), }; +#endif //P_FAMILY_CLAMPERL + +#if P_FAMILY_RELICANTH static const struct SpriteFrameImage sPicTable_Relicanth[] = { overworld_ascending_frames(gObjectEventPic_Relicanth, 4, 4), }; +#endif //P_FAMILY_RELICANTH + +#if P_FAMILY_LUVDISC static const struct SpriteFrameImage sPicTable_Luvdisc[] = { overworld_ascending_frames(gObjectEventPic_Luvdisc, 4, 4), }; +#endif //P_FAMILY_LUVDISC + +#if P_FAMILY_BAGON static const struct SpriteFrameImage sPicTable_Bagon[] = { overworld_ascending_frames(gObjectEventPic_Bagon, 4, 4), }; @@ -1207,6 +2527,14 @@ static const struct SpriteFrameImage sPicTable_Shelgon[] = { static const struct SpriteFrameImage sPicTable_Salamence[] = { overworld_ascending_frames(gObjectEventPic_Salamence, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_SalamenceMega[] = { + overworld_ascending_frames(gObjectEventPic_SalamenceMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_BAGON + +#if P_FAMILY_BELDUM static const struct SpriteFrameImage sPicTable_Beldum[] = { overworld_ascending_frames(gObjectEventPic_Beldum, 4, 4), }; @@ -1216,33 +2544,93 @@ static const struct SpriteFrameImage sPicTable_Metang[] = { static const struct SpriteFrameImage sPicTable_Metagross[] = { overworld_ascending_frames(gObjectEventPic_Metagross, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_MetagrossMega[] = { + overworld_ascending_frames(gObjectEventPic_MetagrossMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_BELDUM + +#if P_FAMILY_REGIROCK static const struct SpriteFrameImage sPicTable_Regirock[] = { overworld_ascending_frames(gObjectEventPic_Regirock, 4, 4), }; +#endif //P_FAMILY_REGIROCK + +#if P_FAMILY_REGICE static const struct SpriteFrameImage sPicTable_Regice[] = { overworld_ascending_frames(gObjectEventPic_Regice, 4, 4), }; +#endif //P_FAMILY_REGICE + +#if P_FAMILY_REGISTEEL static const struct SpriteFrameImage sPicTable_Registeel[] = { overworld_ascending_frames(gObjectEventPic_Registeel, 4, 4), }; +#endif //P_FAMILY_REGISTEEL + +#if P_FAMILY_LATIAS static const struct SpriteFrameImage sPicTable_Latias[] = { overworld_ascending_frames(gObjectEventPic_Latias, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_LatiasMega[] = { + overworld_ascending_frames(gObjectEventPic_LatiasMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_LATIAS + +#if P_FAMILY_LATIOS static const struct SpriteFrameImage sPicTable_Latios[] = { overworld_ascending_frames(gObjectEventPic_Latios, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_LatiosMega[] = { + overworld_ascending_frames(gObjectEventPic_LatiosMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_LATIOS + +#if P_FAMILY_KYOGRE static const struct SpriteFrameImage sPicTable_Kyogre[] = { - overworld_ascending_frames(gObjectEventPic_Kyogre, 8, 8), + overworld_ascending_frames(gObjectEventPic_Kyogre, 4, 4), }; +#if P_PRIMAL_REVERSIONS +/*static const struct SpriteFrameImage sPicTable_KyogrePrimal[] = { + overworld_ascending_frames(gObjectEventPic_KyogrePrimal, 4, 4), +};*/ +#endif //P_PRIMAL_REVERSIONS +#endif //P_FAMILY_KYOGRE + +#if P_FAMILY_GROUDON static const struct SpriteFrameImage sPicTable_Groudon[] = { - overworld_ascending_frames(gObjectEventPic_Groudon, 8, 8), + overworld_ascending_frames(gObjectEventPic_Groudon, 4, 4), }; +#if P_PRIMAL_REVERSIONS +/*static const struct SpriteFrameImage sPicTable_GroudonPrimal[] = { + overworld_ascending_frames(gObjectEventPic_GroudonPrimal, 4, 4), +};*/ +#endif //P_PRIMAL_REVERSIONS +#endif //P_FAMILY_GROUDON + +#if P_FAMILY_RAYQUAZA static const struct SpriteFrameImage sPicTable_Rayquaza[] = { - overworld_ascending_frames(gObjectEventPic_Rayquaza, 8, 8), + overworld_ascending_frames(gObjectEventPic_Rayquaza, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_RayquazaMega[] = { + overworld_ascending_frames(gObjectEventPic_RayquazaMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_RAYQUAZA + +#if P_FAMILY_JIRACHI static const struct SpriteFrameImage sPicTable_Jirachi[] = { overworld_ascending_frames(gObjectEventPic_Jirachi, 4, 4), }; +#endif //P_FAMILY_JIRACHI + +#if P_FAMILY_DEOXYS static const struct SpriteFrameImage sPicTable_DeoxysNormal[] = { overworld_ascending_frames(gObjectEventPic_DeoxysNormal, 4, 4), }; @@ -1255,6 +2643,9 @@ static const struct SpriteFrameImage sPicTable_DeoxysDefense[] = { static const struct SpriteFrameImage sPicTable_DeoxysSpeed[] = { overworld_ascending_frames(gObjectEventPic_DeoxysSpeed, 4, 4), }; +#endif //P_FAMILY_DEOXYS + +#if P_FAMILY_TURTWIG static const struct SpriteFrameImage sPicTable_Turtwig[] = { overworld_ascending_frames(gObjectEventPic_Turtwig, 4, 4), }; @@ -1264,6 +2655,9 @@ static const struct SpriteFrameImage sPicTable_Grotle[] = { static const struct SpriteFrameImage sPicTable_Torterra[] = { overworld_ascending_frames(gObjectEventPic_Torterra, 4, 4), }; +#endif //P_FAMILY_TURTWIG + +#if P_FAMILY_CHIMCHAR static const struct SpriteFrameImage sPicTable_Chimchar[] = { overworld_ascending_frames(gObjectEventPic_Chimchar, 4, 4), }; @@ -1273,6 +2667,9 @@ static const struct SpriteFrameImage sPicTable_Monferno[] = { static const struct SpriteFrameImage sPicTable_Infernape[] = { overworld_ascending_frames(gObjectEventPic_Infernape, 4, 4), }; +#endif //P_FAMILY_CHIMCHAR + +#if P_FAMILY_PIPLUP static const struct SpriteFrameImage sPicTable_Piplup[] = { overworld_ascending_frames(gObjectEventPic_Piplup, 4, 4), }; @@ -1282,6 +2679,9 @@ static const struct SpriteFrameImage sPicTable_Prinplup[] = { static const struct SpriteFrameImage sPicTable_Empoleon[] = { overworld_ascending_frames(gObjectEventPic_Empoleon, 4, 4), }; +#endif //P_FAMILY_PIPLUP + +#if P_FAMILY_STARLY static const struct SpriteFrameImage sPicTable_Starly[] = { overworld_ascending_frames(gObjectEventPic_Starly, 4, 4), }; @@ -1291,18 +2691,27 @@ static const struct SpriteFrameImage sPicTable_Staravia[] = { static const struct SpriteFrameImage sPicTable_Staraptor[] = { overworld_ascending_frames(gObjectEventPic_Staraptor, 4, 4), }; +#endif //P_FAMILY_STARLY + +#if P_FAMILY_BIDOOF static const struct SpriteFrameImage sPicTable_Bidoof[] = { overworld_ascending_frames(gObjectEventPic_Bidoof, 4, 4), }; static const struct SpriteFrameImage sPicTable_Bibarel[] = { overworld_ascending_frames(gObjectEventPic_Bibarel, 4, 4), }; +#endif //P_FAMILY_BIDOOF + +#if P_FAMILY_KRICKETOT static const struct SpriteFrameImage sPicTable_Kricketot[] = { overworld_ascending_frames(gObjectEventPic_Kricketot, 4, 4), }; static const struct SpriteFrameImage sPicTable_Kricketune[] = { overworld_ascending_frames(gObjectEventPic_Kricketune, 4, 4), }; +#endif //P_FAMILY_KRICKETOT + +#if P_FAMILY_SHINX static const struct SpriteFrameImage sPicTable_Shinx[] = { overworld_ascending_frames(gObjectEventPic_Shinx, 4, 4), }; @@ -1312,36 +2721,39 @@ static const struct SpriteFrameImage sPicTable_Luxio[] = { static const struct SpriteFrameImage sPicTable_Luxray[] = { overworld_ascending_frames(gObjectEventPic_Luxray, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Budew[] = { - overworld_ascending_frames(gObjectEventPic_Budew, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Roserade[] = { - overworld_ascending_frames(gObjectEventPic_Roserade, 4, 4), -}; +#endif //P_FAMILY_SHINX + +#if P_FAMILY_CRANIDOS static const struct SpriteFrameImage sPicTable_Cranidos[] = { overworld_ascending_frames(gObjectEventPic_Cranidos, 4, 4), }; static const struct SpriteFrameImage sPicTable_Rampardos[] = { overworld_ascending_frames(gObjectEventPic_Rampardos, 4, 4), }; +#endif //P_FAMILY_CRANIDOS + +#if P_FAMILY_SHIELDON static const struct SpriteFrameImage sPicTable_Shieldon[] = { overworld_ascending_frames(gObjectEventPic_Shieldon, 4, 4), }; static const struct SpriteFrameImage sPicTable_Bastiodon[] = { overworld_ascending_frames(gObjectEventPic_Bastiodon, 4, 4), }; +#endif //P_FAMILY_SHIELDON + +#if P_FAMILY_BURMY static const struct SpriteFrameImage sPicTable_BurmyPlantCloak[] = { overworld_ascending_frames(gObjectEventPic_BurmyPlantCloak, 4, 4), }; -static const struct SpriteFrameImage sPicTable_WormadamPlantCloak[] = { - overworld_ascending_frames(gObjectEventPic_WormadamPlantCloak, 4, 4), -}; static const struct SpriteFrameImage sPicTable_BurmySandyCloak[] = { overworld_ascending_frames(gObjectEventPic_BurmySandyCloak, 4, 4), }; static const struct SpriteFrameImage sPicTable_BurmyTrashCloak[] = { overworld_ascending_frames(gObjectEventPic_BurmyTrashCloak, 4, 4), }; +static const struct SpriteFrameImage sPicTable_WormadamPlantCloak[] = { + overworld_ascending_frames(gObjectEventPic_WormadamPlantCloak, 4, 4), +}; static const struct SpriteFrameImage sPicTable_WormadamSandyCloak[] = { overworld_ascending_frames(gObjectEventPic_WormadamSandyCloak, 4, 4), }; @@ -1351,6 +2763,9 @@ static const struct SpriteFrameImage sPicTable_WormadamTrashCloak[] = { static const struct SpriteFrameImage sPicTable_Mothim[] = { overworld_ascending_frames(gObjectEventPic_Mothim, 4, 4), }; +#endif //P_FAMILY_BURMY + +#if P_FAMILY_COMBEE static const struct SpriteFrameImage sPicTable_Combee[] = { overworld_ascending_frames(gObjectEventPic_Combee, 4, 4), }; @@ -1360,90 +2775,113 @@ static const struct SpriteFrameImage sPicTable_CombeeF[] = { static const struct SpriteFrameImage sPicTable_Vespiquen[] = { overworld_ascending_frames(gObjectEventPic_Vespiquen, 4, 4), }; +#endif //P_FAMILY_COMBEE + +#if P_FAMILY_PACHIRISU static const struct SpriteFrameImage sPicTable_Pachirisu[] = { overworld_ascending_frames(gObjectEventPic_Pachirisu, 4, 4), }; +#endif //P_FAMILY_PACHIRISU + +#if P_FAMILY_BUIZEL static const struct SpriteFrameImage sPicTable_Buizel[] = { overworld_ascending_frames(gObjectEventPic_Buizel, 4, 4), }; static const struct SpriteFrameImage sPicTable_Floatzel[] = { overworld_ascending_frames(gObjectEventPic_Floatzel, 4, 4), }; +#endif //P_FAMILY_BUIZEL + +#if P_FAMILY_CHERUBI static const struct SpriteFrameImage sPicTable_Cherubi[] = { overworld_ascending_frames(gObjectEventPic_Cherubi, 4, 4), }; static const struct SpriteFrameImage sPicTable_CherrimOvercast[] = { overworld_ascending_frames(gObjectEventPic_CherrimOvercast, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_CherrimSunshine[] = { + overworld_ascending_frames(gObjectEventPic_CherrimSunshine, 4, 4), +};*/ +#endif //P_FAMILY_CHERUBI + +#if P_FAMILY_SHELLOS static const struct SpriteFrameImage sPicTable_ShellosWestSea[] = { overworld_ascending_frames(gObjectEventPic_ShellosWestSea, 4, 4), }; -static const struct SpriteFrameImage sPicTable_GastrodonWestSea[] = { - overworld_ascending_frames(gObjectEventPic_GastrodonWestSea, 4, 4), -}; static const struct SpriteFrameImage sPicTable_ShellosEastSea[] = { overworld_ascending_frames(gObjectEventPic_ShellosEastSea, 4, 4), }; +static const struct SpriteFrameImage sPicTable_GastrodonWestSea[] = { + overworld_ascending_frames(gObjectEventPic_GastrodonWestSea, 4, 4), +}; static const struct SpriteFrameImage sPicTable_GastrodonEastSea[] = { overworld_ascending_frames(gObjectEventPic_GastrodonEastSea, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Ambipom[] = { - overworld_ascending_frames(gObjectEventPic_Ambipom, 4, 4), -}; +#endif //P_FAMILY_SHELLOS + +#if P_FAMILY_DRIFLOON static const struct SpriteFrameImage sPicTable_Drifloon[] = { overworld_ascending_frames(gObjectEventPic_Drifloon, 4, 4), }; static const struct SpriteFrameImage sPicTable_Drifblim[] = { overworld_ascending_frames(gObjectEventPic_Drifblim, 4, 4), }; +#endif //P_FAMILY_DRIFLOON + +#if P_FAMILY_BUNEARY static const struct SpriteFrameImage sPicTable_Buneary[] = { overworld_ascending_frames(gObjectEventPic_Buneary, 4, 4), }; static const struct SpriteFrameImage sPicTable_Lopunny[] = { overworld_ascending_frames(gObjectEventPic_Lopunny, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Mismagius[] = { - overworld_ascending_frames(gObjectEventPic_Mismagius, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Honchkrow[] = { - overworld_ascending_frames(gObjectEventPic_Honchkrow, 4, 4), -}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_LopunnyMega[] = { + overworld_ascending_frames(gObjectEventPic_LopunnyMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_BUNEARY + +#if P_FAMILY_GLAMEOW static const struct SpriteFrameImage sPicTable_Glameow[] = { overworld_ascending_frames(gObjectEventPic_Glameow, 4, 4), }; static const struct SpriteFrameImage sPicTable_Purugly[] = { overworld_ascending_frames(gObjectEventPic_Purugly, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Chingling[] = { - overworld_ascending_frames(gObjectEventPic_Chingling, 4, 4), -}; +#endif //P_FAMILY_GLAMEOW + +#if P_FAMILY_STUNKY static const struct SpriteFrameImage sPicTable_Stunky[] = { overworld_ascending_frames(gObjectEventPic_Stunky, 4, 4), }; static const struct SpriteFrameImage sPicTable_Skuntank[] = { overworld_ascending_frames(gObjectEventPic_Skuntank, 4, 4), }; +#endif //P_FAMILY_STUNKY + +#if P_FAMILY_BRONZOR static const struct SpriteFrameImage sPicTable_Bronzor[] = { overworld_ascending_frames(gObjectEventPic_Bronzor, 4, 4), }; static const struct SpriteFrameImage sPicTable_Bronzong[] = { overworld_ascending_frames(gObjectEventPic_Bronzong, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Bonsly[] = { - overworld_ascending_frames(gObjectEventPic_Bonsly, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_MimeJr[] = { - overworld_ascending_frames(gObjectEventPic_MimeJr, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Happiny[] = { - overworld_ascending_frames(gObjectEventPic_Happiny, 4, 4), -}; +#endif //P_FAMILY_BRONZOR + +#if P_FAMILY_CHATOT static const struct SpriteFrameImage sPicTable_Chatot[] = { overworld_ascending_frames(gObjectEventPic_Chatot, 4, 4), }; +#endif //P_FAMILY_CHATOT + +#if P_FAMILY_SPIRITOMB static const struct SpriteFrameImage sPicTable_Spiritomb[] = { overworld_ascending_frames(gObjectEventPic_Spiritomb, 4, 4), }; +#endif //P_FAMILY_SPIRITOMB + +#if P_FAMILY_GIBLE static const struct SpriteFrameImage sPicTable_Gible[] = { overworld_ascending_frames(gObjectEventPic_Gible, 4, 4), }; @@ -1453,19 +2891,32 @@ static const struct SpriteFrameImage sPicTable_Gabite[] = { static const struct SpriteFrameImage sPicTable_Garchomp[] = { overworld_ascending_frames(gObjectEventPic_Garchomp, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Munchlax[] = { - overworld_ascending_frames(gObjectEventPic_Munchlax, 4, 4), -}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_GarchompMega[] = { + overworld_ascending_frames(gObjectEventPic_GarchompMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_GIBLE + +#if P_FAMILY_RIOLU static const struct SpriteFrameImage sPicTable_Riolu[] = { overworld_ascending_frames(gObjectEventPic_Riolu, 4, 4), }; static const struct SpriteFrameImage sPicTable_Lucario[] = { overworld_ascending_frames(gObjectEventPic_Lucario, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_LucarioMega[] = { + overworld_ascending_frames(gObjectEventPic_LucarioMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_RIOLU + +#if P_FAMILY_HIPPOPOTAS static const struct SpriteFrameImage sPicTable_Hippopotas[] = { overworld_ascending_frames(gObjectEventPic_Hippopotas, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Hippopotas_f[] = { +static const struct SpriteFrameImage sPicTable_HippopotasF[] = { overworld_ascending_frames(gObjectEventPic_HippopotasF, 4, 4), }; static const struct SpriteFrameImage sPicTable_Hippowdon[] = { @@ -1474,189 +2925,228 @@ static const struct SpriteFrameImage sPicTable_Hippowdon[] = { static const struct SpriteFrameImage sPicTable_HippowdonF[] = { overworld_ascending_frames(gObjectEventPic_HippowdonF, 4, 4), }; +#endif //P_FAMILY_HIPPOPOTAS + +#if P_FAMILY_SKORUPI static const struct SpriteFrameImage sPicTable_Skorupi[] = { overworld_ascending_frames(gObjectEventPic_Skorupi, 4, 4), }; static const struct SpriteFrameImage sPicTable_Drapion[] = { overworld_ascending_frames(gObjectEventPic_Drapion, 4, 4), }; +#endif //P_FAMILY_SKORUPI + +#if P_FAMILY_CROAGUNK static const struct SpriteFrameImage sPicTable_Croagunk[] = { overworld_ascending_frames(gObjectEventPic_Croagunk, 4, 4), }; static const struct SpriteFrameImage sPicTable_Toxicroak[] = { overworld_ascending_frames(gObjectEventPic_Toxicroak, 4, 4), }; +#endif //P_FAMILY_CROAGUNK + +#if P_FAMILY_CARNIVINE static const struct SpriteFrameImage sPicTable_Carnivine[] = { overworld_ascending_frames(gObjectEventPic_Carnivine, 4, 4), }; +#endif //P_FAMILY_CARNIVINE + +#if P_FAMILY_FINNEON static const struct SpriteFrameImage sPicTable_Finneon[] = { overworld_ascending_frames(gObjectEventPic_Finneon, 4, 4), }; static const struct SpriteFrameImage sPicTable_Lumineon[] = { overworld_ascending_frames(gObjectEventPic_Lumineon, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Mantyke[] = { - overworld_ascending_frames(gObjectEventPic_Mantyke, 4, 4), -}; +#endif //P_FAMILY_FINNEON + +#if P_FAMILY_SNOVER static const struct SpriteFrameImage sPicTable_Snover[] = { overworld_ascending_frames(gObjectEventPic_Snover, 4, 4), }; static const struct SpriteFrameImage sPicTable_Abomasnow[] = { overworld_ascending_frames(gObjectEventPic_Abomasnow, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Weavile[] = { - overworld_ascending_frames(gObjectEventPic_Weavile, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Magnezone[] = { - overworld_ascending_frames(gObjectEventPic_Magnezone, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Lickilicky[] = { - overworld_ascending_frames(gObjectEventPic_Lickilicky, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Rhyperior[] = { - overworld_ascending_frames(gObjectEventPic_Rhyperior, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Tangrowth[] = { - overworld_ascending_frames(gObjectEventPic_Tangrowth, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Electivire[] = { - overworld_ascending_frames(gObjectEventPic_Electivire, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Magmortar[] = { - overworld_ascending_frames(gObjectEventPic_Magmortar, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Togekiss[] = { - overworld_ascending_frames(gObjectEventPic_Togekiss, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Yanmega[] = { - overworld_ascending_frames(gObjectEventPic_Yanmega, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Leafeon[] = { - overworld_ascending_frames(gObjectEventPic_Leafeon, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Glaceon[] = { - overworld_ascending_frames(gObjectEventPic_Glaceon, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Gliscor[] = { - overworld_ascending_frames(gObjectEventPic_Gliscor, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Mamoswine[] = { - overworld_ascending_frames(gObjectEventPic_Mamoswine, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_PorygonZ[] = { - overworld_ascending_frames(gObjectEventPic_PorygonZ, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Gallade[] = { - overworld_ascending_frames(gObjectEventPic_Gallade, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Probopass[] = { - overworld_ascending_frames(gObjectEventPic_Probopass, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Dusknoir[] = { - overworld_ascending_frames(gObjectEventPic_Dusknoir, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_Froslass[] = { - overworld_ascending_frames(gObjectEventPic_Froslass, 4, 4), -}; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AbomasnowMega[] = { + overworld_ascending_frames(gObjectEventPic_AbomasnowMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_SNOVER + +#if P_FAMILY_ROTOM static const struct SpriteFrameImage sPicTable_Rotom[] = { overworld_ascending_frames(gObjectEventPic_Rotom, 4, 4), }; +static const struct SpriteFrameImage sPicTable_RotomHeat[] = { + overworld_ascending_frames(gObjectEventPic_RotomHeat, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_RotomWash[] = { + overworld_ascending_frames(gObjectEventPic_RotomWash, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_RotomFrost[] = { + overworld_ascending_frames(gObjectEventPic_RotomFrost, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_RotomFan[] = { + overworld_ascending_frames(gObjectEventPic_RotomFan, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_RotomMow[] = { + overworld_ascending_frames(gObjectEventPic_RotomMow, 4, 4), +}; +#endif //P_FAMILY_ROTOM + +#if P_FAMILY_UXIE static const struct SpriteFrameImage sPicTable_Uxie[] = { overworld_ascending_frames(gObjectEventPic_Uxie, 4, 4), }; +#endif //P_FAMILY_UXIE + +#if P_FAMILY_MESPRIT static const struct SpriteFrameImage sPicTable_Mesprit[] = { overworld_ascending_frames(gObjectEventPic_Mesprit, 4, 4), }; +#endif //P_FAMILY_MESPRIT + +#if P_FAMILY_AZELF static const struct SpriteFrameImage sPicTable_Azelf[] = { overworld_ascending_frames(gObjectEventPic_Azelf, 4, 4), }; +#endif //P_FAMILY_AZELF + +#if P_FAMILY_DIALGA static const struct SpriteFrameImage sPicTable_Dialga[] = { - overworld_ascending_frames(gObjectEventPic_Dialga, 8, 8), + overworld_ascending_frames(gObjectEventPic_Dialga, 4, 4), }; +static const struct SpriteFrameImage sPicTable_DialgaOrigin[] = { + overworld_ascending_frames(gObjectEventPic_DialgaOrigin, 4, 4), +}; +#endif //P_FAMILY_DIALGA + +#if P_FAMILY_PALKIA static const struct SpriteFrameImage sPicTable_Palkia[] = { - overworld_ascending_frames(gObjectEventPic_Palkia, 8, 8), + overworld_ascending_frames(gObjectEventPic_Palkia, 4, 4), }; +static const struct SpriteFrameImage sPicTable_PalkiaOrigin[] = { + overworld_ascending_frames(gObjectEventPic_PalkiaOrigin, 4, 4), +}; +#endif //P_FAMILY_PALKIA + +#if P_FAMILY_HEATRAN static const struct SpriteFrameImage sPicTable_Heatran[] = { overworld_ascending_frames(gObjectEventPic_Heatran, 4, 4), }; +#endif //P_FAMILY_HEATRAN + +#if P_FAMILY_REGIGIGAS static const struct SpriteFrameImage sPicTable_Regigigas[] = { - overworld_ascending_frames(gObjectEventPic_Regigigas, 8, 8), + overworld_ascending_frames(gObjectEventPic_Regigigas, 4, 4), }; +#endif //P_FAMILY_REGIGIGAS + +#if P_FAMILY_GIRATINA static const struct SpriteFrameImage sPicTable_GiratinaAltered[] = { - overworld_ascending_frames(gObjectEventPic_GiratinaAltered, 8, 8), + overworld_ascending_frames(gObjectEventPic_GiratinaAltered, 4, 4), }; +static const struct SpriteFrameImage sPicTable_GiratinaOrigin[] = { + overworld_ascending_frames(gObjectEventPic_GiratinaOrigin, 4, 4), +}; +#endif //P_FAMILY_GIRATINA + +#if P_FAMILY_CRESSELIA static const struct SpriteFrameImage sPicTable_Cresselia[] = { overworld_ascending_frames(gObjectEventPic_Cresselia, 4, 4), }; +#endif //P_FAMILY_CRESSELIA + +#if P_FAMILY_MANAPHY static const struct SpriteFrameImage sPicTable_Phione[] = { overworld_ascending_frames(gObjectEventPic_Phione, 4, 4), }; static const struct SpriteFrameImage sPicTable_Manaphy[] = { overworld_ascending_frames(gObjectEventPic_Manaphy, 4, 4), }; +#endif //P_FAMILY_MANAPHY + +#if P_FAMILY_DARKRAI static const struct SpriteFrameImage sPicTable_Darkrai[] = { overworld_ascending_frames(gObjectEventPic_Darkrai, 4, 4), }; +#endif //P_FAMILY_DARKRAI + +#if P_FAMILY_SHAYMIN static const struct SpriteFrameImage sPicTable_ShayminLand[] = { overworld_ascending_frames(gObjectEventPic_ShayminLand, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_ShayminSky[] = { + overworld_ascending_frames(gObjectEventPic_ShayminSky, 4, 4), +};*/ +#endif //P_FAMILY_SHAYMIN + +#if P_FAMILY_ARCEUS + static const struct SpriteFrameImage sPicTable_ArceusNormal[] = { - overworld_ascending_frames(gObjectEventPic_ArceusNormal, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusNormal, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusFighting[] = { - overworld_ascending_frames(gObjectEventPic_ArceusFighting, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusFighting, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusFlying[] = { - overworld_ascending_frames(gObjectEventPic_ArceusFlying, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusFlying, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusPoison[] = { - overworld_ascending_frames(gObjectEventPic_ArceusPoison, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusPoison, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusGround[] = { - overworld_ascending_frames(gObjectEventPic_ArceusGround, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusGround, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusRock[] = { - overworld_ascending_frames(gObjectEventPic_ArceusRock, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusRock, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusBug[] = { - overworld_ascending_frames(gObjectEventPic_ArceusBug, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusBug, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusGhost[] = { - overworld_ascending_frames(gObjectEventPic_ArceusGhost, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusGhost, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusSteel[] = { - overworld_ascending_frames(gObjectEventPic_ArceusSteel, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusSteel, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusFire[] = { - overworld_ascending_frames(gObjectEventPic_ArceusFire, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusFire, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusWater[] = { - overworld_ascending_frames(gObjectEventPic_ArceusWater, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusWater, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusGrass[] = { - overworld_ascending_frames(gObjectEventPic_ArceusGrass, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusGrass, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusElectric[] = { - overworld_ascending_frames(gObjectEventPic_ArceusElectric, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusElectric, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusPsychic[] = { - overworld_ascending_frames(gObjectEventPic_ArceusPsychic, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusPsychic, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusIce[] = { - overworld_ascending_frames(gObjectEventPic_ArceusIce, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusIce, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusDragon[] = { - overworld_ascending_frames(gObjectEventPic_ArceusDragon, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusDragon, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusDark[] = { - overworld_ascending_frames(gObjectEventPic_ArceusDark, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusDark, 4, 4), }; static const struct SpriteFrameImage sPicTable_ArceusFairy[] = { - overworld_ascending_frames(gObjectEventPic_ArceusFairy, 8, 8), + overworld_ascending_frames(gObjectEventPic_ArceusFairy, 4, 4), }; +#endif //P_FAMILY_ARCEUS + +#if P_FAMILY_VICTINI static const struct SpriteFrameImage sPicTable_Victini[] = { overworld_ascending_frames(gObjectEventPic_Victini, 4, 4), }; +#endif //P_FAMILY_VICTINI + +#if P_FAMILY_SNIVY static const struct SpriteFrameImage sPicTable_Snivy[] = { overworld_ascending_frames(gObjectEventPic_Snivy, 4, 4), }; @@ -1666,6 +3156,9 @@ static const struct SpriteFrameImage sPicTable_Servine[] = { static const struct SpriteFrameImage sPicTable_Serperior[] = { overworld_ascending_frames(gObjectEventPic_Serperior, 4, 4), }; +#endif //P_FAMILY_SNIVY + +#if P_FAMILY_TEPIG static const struct SpriteFrameImage sPicTable_Tepig[] = { overworld_ascending_frames(gObjectEventPic_Tepig, 4, 4), }; @@ -1675,6 +3168,9 @@ static const struct SpriteFrameImage sPicTable_Pignite[] = { static const struct SpriteFrameImage sPicTable_Emboar[] = { overworld_ascending_frames(gObjectEventPic_Emboar, 4, 4), }; +#endif //P_FAMILY_TEPIG + +#if P_FAMILY_OSHAWOTT static const struct SpriteFrameImage sPicTable_Oshawott[] = { overworld_ascending_frames(gObjectEventPic_Oshawott, 4, 4), }; @@ -1684,12 +3180,23 @@ static const struct SpriteFrameImage sPicTable_Dewott[] = { static const struct SpriteFrameImage sPicTable_Samurott[] = { overworld_ascending_frames(gObjectEventPic_Samurott, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_SamurottHisuian[] = { + overworld_ascending_frames(gObjectEventPic_SamurottHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_OSHAWOTT + +#if P_FAMILY_PATRAT static const struct SpriteFrameImage sPicTable_Patrat[] = { overworld_ascending_frames(gObjectEventPic_Patrat, 4, 4), }; static const struct SpriteFrameImage sPicTable_Watchog[] = { overworld_ascending_frames(gObjectEventPic_Watchog, 4, 4), }; +#endif //P_FAMILY_PATRAT + +#if P_FAMILY_LILLIPUP static const struct SpriteFrameImage sPicTable_Lillipup[] = { overworld_ascending_frames(gObjectEventPic_Lillipup, 4, 4), }; @@ -1699,54 +3206,79 @@ static const struct SpriteFrameImage sPicTable_Herdier[] = { static const struct SpriteFrameImage sPicTable_Stoutland[] = { overworld_ascending_frames(gObjectEventPic_Stoutland, 4, 4), }; +#endif //P_FAMILY_LILLIPUP + +#if P_FAMILY_PURRLOIN static const struct SpriteFrameImage sPicTable_Purrloin[] = { overworld_ascending_frames(gObjectEventPic_Purrloin, 4, 4), }; static const struct SpriteFrameImage sPicTable_Liepard[] = { overworld_ascending_frames(gObjectEventPic_Liepard, 4, 4), }; +#endif //P_FAMILY_PURRLOIN + +#if P_FAMILY_PANSAGE static const struct SpriteFrameImage sPicTable_Pansage[] = { overworld_ascending_frames(gObjectEventPic_Pansage, 4, 4), }; static const struct SpriteFrameImage sPicTable_Simisage[] = { overworld_ascending_frames(gObjectEventPic_Simisage, 4, 4), }; +#endif //P_FAMILY_PANSAGE + +#if P_FAMILY_PANSEAR static const struct SpriteFrameImage sPicTable_Pansear[] = { overworld_ascending_frames(gObjectEventPic_Pansear, 4, 4), }; static const struct SpriteFrameImage sPicTable_Simisear[] = { overworld_ascending_frames(gObjectEventPic_Simisear, 4, 4), }; +#endif //P_FAMILY_PANSEAR + +#if P_FAMILY_PANPOUR static const struct SpriteFrameImage sPicTable_Panpour[] = { overworld_ascending_frames(gObjectEventPic_Panpour, 4, 4), }; static const struct SpriteFrameImage sPicTable_Simipour[] = { overworld_ascending_frames(gObjectEventPic_Simipour, 4, 4), }; +#endif //P_FAMILY_PANPOUR + +#if P_FAMILY_MUNNA static const struct SpriteFrameImage sPicTable_Munna[] = { overworld_ascending_frames(gObjectEventPic_Munna, 4, 4), }; static const struct SpriteFrameImage sPicTable_Musharna[] = { overworld_ascending_frames(gObjectEventPic_Musharna, 4, 4), }; +#endif //P_FAMILY_MUNNA + +#if P_FAMILY_PIDOVE static const struct SpriteFrameImage sPicTable_Pidove[] = { overworld_ascending_frames(gObjectEventPic_Pidove, 4, 4), }; static const struct SpriteFrameImage sPicTable_Tranquill[] = { overworld_ascending_frames(gObjectEventPic_Tranquill, 4, 4), }; + static const struct SpriteFrameImage sPicTable_Unfezant[] = { overworld_ascending_frames(gObjectEventPic_Unfezant, 4, 4), }; static const struct SpriteFrameImage sPicTable_UnfezantF[] = { overworld_ascending_frames(gObjectEventPic_UnfezantF, 4, 4), }; +#endif //P_FAMILY_PIDOVE + +#if P_FAMILY_BLITZLE static const struct SpriteFrameImage sPicTable_Blitzle[] = { overworld_ascending_frames(gObjectEventPic_Blitzle, 4, 4), }; static const struct SpriteFrameImage sPicTable_Zebstrika[] = { overworld_ascending_frames(gObjectEventPic_Zebstrika, 4, 4), }; +#endif //P_FAMILY_BLITZLE + +#if P_FAMILY_ROGGENROLA static const struct SpriteFrameImage sPicTable_Roggenrola[] = { overworld_ascending_frames(gObjectEventPic_Roggenrola, 4, 4), }; @@ -1756,21 +3288,38 @@ static const struct SpriteFrameImage sPicTable_Boldore[] = { static const struct SpriteFrameImage sPicTable_Gigalith[] = { overworld_ascending_frames(gObjectEventPic_Gigalith, 4, 4), }; +#endif //P_FAMILY_ROGGENROLA + +#if P_FAMILY_WOOBAT static const struct SpriteFrameImage sPicTable_Woobat[] = { overworld_ascending_frames(gObjectEventPic_Woobat, 4, 4), }; static const struct SpriteFrameImage sPicTable_Swoobat[] = { overworld_ascending_frames(gObjectEventPic_Swoobat, 4, 4), }; +#endif //P_FAMILY_WOOBAT + +#if P_FAMILY_DRILBUR static const struct SpriteFrameImage sPicTable_Drilbur[] = { overworld_ascending_frames(gObjectEventPic_Drilbur, 4, 4), }; static const struct SpriteFrameImage sPicTable_Excadrill[] = { overworld_ascending_frames(gObjectEventPic_Excadrill, 4, 4), }; +#endif //P_FAMILY_DRILBUR + +#if P_FAMILY_AUDINO static const struct SpriteFrameImage sPicTable_Audino[] = { overworld_ascending_frames(gObjectEventPic_Audino, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_AudinoMega[] = { + overworld_ascending_frames(gObjectEventPic_AudinoMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_AUDINO + +#if P_FAMILY_TIMBURR static const struct SpriteFrameImage sPicTable_Timburr[] = { overworld_ascending_frames(gObjectEventPic_Timburr, 4, 4), }; @@ -1780,6 +3329,9 @@ static const struct SpriteFrameImage sPicTable_Gurdurr[] = { static const struct SpriteFrameImage sPicTable_Conkeldurr[] = { overworld_ascending_frames(gObjectEventPic_Conkeldurr, 4, 4), }; +#endif //P_FAMILY_TIMBURR + +#if P_FAMILY_TYMPOLE static const struct SpriteFrameImage sPicTable_Tympole[] = { overworld_ascending_frames(gObjectEventPic_Tympole, 4, 4), }; @@ -1789,12 +3341,21 @@ static const struct SpriteFrameImage sPicTable_Palpitoad[] = { static const struct SpriteFrameImage sPicTable_Seismitoad[] = { overworld_ascending_frames(gObjectEventPic_Seismitoad, 4, 4), }; +#endif //P_FAMILY_TYMPOLE + +#if P_FAMILY_THROH static const struct SpriteFrameImage sPicTable_Throh[] = { overworld_ascending_frames(gObjectEventPic_Throh, 4, 4), }; +#endif //P_FAMILY_THROH + +#if P_FAMILY_SAWK static const struct SpriteFrameImage sPicTable_Sawk[] = { overworld_ascending_frames(gObjectEventPic_Sawk, 4, 4), }; +#endif //P_FAMILY_SAWK + +#if P_FAMILY_SEWADDLE static const struct SpriteFrameImage sPicTable_Sewaddle[] = { overworld_ascending_frames(gObjectEventPic_Sewaddle, 4, 4), }; @@ -1804,6 +3365,9 @@ static const struct SpriteFrameImage sPicTable_Swadloon[] = { static const struct SpriteFrameImage sPicTable_Leavanny[] = { overworld_ascending_frames(gObjectEventPic_Leavanny, 4, 4), }; +#endif //P_FAMILY_SEWADDLE + +#if P_FAMILY_VENIPEDE static const struct SpriteFrameImage sPicTable_Venipede[] = { overworld_ascending_frames(gObjectEventPic_Venipede, 4, 4), }; @@ -1813,24 +3377,39 @@ static const struct SpriteFrameImage sPicTable_Whirlipede[] = { static const struct SpriteFrameImage sPicTable_Scolipede[] = { overworld_ascending_frames(gObjectEventPic_Scolipede, 4, 4), }; +#endif //P_FAMILY_VENIPEDE + +#if P_FAMILY_COTTONEE static const struct SpriteFrameImage sPicTable_Cottonee[] = { overworld_ascending_frames(gObjectEventPic_Cottonee, 4, 4), }; static const struct SpriteFrameImage sPicTable_Whimsicott[] = { overworld_ascending_frames(gObjectEventPic_Whimsicott, 4, 4), }; +#endif //P_FAMILY_COTTONEE + +#if P_FAMILY_PETILIL static const struct SpriteFrameImage sPicTable_Petilil[] = { overworld_ascending_frames(gObjectEventPic_Petilil, 4, 4), }; static const struct SpriteFrameImage sPicTable_Lilligant[] = { overworld_ascending_frames(gObjectEventPic_Lilligant, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_LilligantHisuian[] = { + overworld_ascending_frames(gObjectEventPic_LilligantHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_PETILIL + +#if P_FAMILY_BASCULIN static const struct SpriteFrameImage sPicTable_BasculinRedStriped[] = { overworld_ascending_frames(gObjectEventPic_BasculinRedStriped, 4, 4), }; static const struct SpriteFrameImage sPicTable_BasculinBlueStriped[] = { overworld_ascending_frames(gObjectEventPic_BasculinBlueStriped, 4, 4), }; +#if P_HISUIAN_FORMS static const struct SpriteFrameImage sPicTable_BasculinWhiteStriped[] = { overworld_ascending_frames(gObjectEventPic_BasculinWhiteStriped, 4, 4), }; @@ -1840,6 +3419,10 @@ static const struct SpriteFrameImage sPicTable_BasculegionMale[] = { static const struct SpriteFrameImage sPicTable_BasculegionFemale[] = { overworld_ascending_frames(gObjectEventPic_BasculegionFemale, 4, 4), }; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_BASCULIN + +#if P_FAMILY_SANDILE static const struct SpriteFrameImage sPicTable_Sandile[] = { overworld_ascending_frames(gObjectEventPic_Sandile, 4, 4), }; @@ -1849,66 +3432,137 @@ static const struct SpriteFrameImage sPicTable_Krokorok[] = { static const struct SpriteFrameImage sPicTable_Krookodile[] = { overworld_ascending_frames(gObjectEventPic_Krookodile, 4, 4), }; +#endif //P_FAMILY_SANDILE + +#if P_FAMILY_DARUMAKA static const struct SpriteFrameImage sPicTable_Darumaka[] = { overworld_ascending_frames(gObjectEventPic_Darumaka, 4, 4), }; static const struct SpriteFrameImage sPicTable_DarmanitanStandardMode[] = { overworld_ascending_frames(gObjectEventPic_DarmanitanStandardMode, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_DarmanitanZenMode[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanZenMode, 4, 4), +};*/ +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_DarumakaGalarian[] = { + overworld_ascending_frames(gObjectEventPic_DarumakaGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_DarmanitanGalarianStandardMode[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanGalarianStandardMode, 4, 4), +}; +/*static const struct SpriteFrameImage sPicTable_DarmanitanGalarianZenMode[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanGalarianZenMode, 4, 4), +};*/ +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_DARUMAKA + +#if P_FAMILY_MARACTUS static const struct SpriteFrameImage sPicTable_Maractus[] = { overworld_ascending_frames(gObjectEventPic_Maractus, 4, 4), }; +#endif //P_FAMILY_MARACTUS + +#if P_FAMILY_DWEBBLE static const struct SpriteFrameImage sPicTable_Dwebble[] = { overworld_ascending_frames(gObjectEventPic_Dwebble, 4, 4), }; static const struct SpriteFrameImage sPicTable_Crustle[] = { overworld_ascending_frames(gObjectEventPic_Crustle, 4, 4), }; +#endif //P_FAMILY_DWEBBLE + +#if P_FAMILY_SCRAGGY static const struct SpriteFrameImage sPicTable_Scraggy[] = { overworld_ascending_frames(gObjectEventPic_Scraggy, 4, 4), }; static const struct SpriteFrameImage sPicTable_Scrafty[] = { overworld_ascending_frames(gObjectEventPic_Scrafty, 4, 4), }; +#endif //P_FAMILY_SCRAGGY + +#if P_FAMILY_SIGILYPH static const struct SpriteFrameImage sPicTable_Sigilyph[] = { overworld_ascending_frames(gObjectEventPic_Sigilyph, 4, 4), }; +#endif //P_FAMILY_SIGILYPH + +#if P_FAMILY_YAMASK static const struct SpriteFrameImage sPicTable_Yamask[] = { overworld_ascending_frames(gObjectEventPic_Yamask, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cofagrigus[] = { overworld_ascending_frames(gObjectEventPic_Cofagrigus, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_YamaskGalarian[] = { + overworld_ascending_frames(gObjectEventPic_YamaskGalarian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Runerigus[] = { + overworld_ascending_frames(gObjectEventPic_Runerigus, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_YAMASK + +#if P_FAMILY_TIRTOUGA static const struct SpriteFrameImage sPicTable_Tirtouga[] = { overworld_ascending_frames(gObjectEventPic_Tirtouga, 4, 4), }; static const struct SpriteFrameImage sPicTable_Carracosta[] = { overworld_ascending_frames(gObjectEventPic_Carracosta, 4, 4), }; +#endif //P_FAMILY_TIRTOUGA + +#if P_FAMILY_ARCHEN static const struct SpriteFrameImage sPicTable_Archen[] = { overworld_ascending_frames(gObjectEventPic_Archen, 4, 4), }; static const struct SpriteFrameImage sPicTable_Archeops[] = { overworld_ascending_frames(gObjectEventPic_Archeops, 4, 4), }; +#endif //P_FAMILY_ARCHEN + +#if P_FAMILY_TRUBBISH static const struct SpriteFrameImage sPicTable_Trubbish[] = { overworld_ascending_frames(gObjectEventPic_Trubbish, 4, 4), }; static const struct SpriteFrameImage sPicTable_Garbodor[] = { overworld_ascending_frames(gObjectEventPic_Garbodor, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_GarbodorGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_GarbodorGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_TRUBBISH + +#if P_FAMILY_ZORUA static const struct SpriteFrameImage sPicTable_Zorua[] = { overworld_ascending_frames(gObjectEventPic_Zorua, 4, 4), }; static const struct SpriteFrameImage sPicTable_Zoroark[] = { overworld_ascending_frames(gObjectEventPic_Zoroark, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_ZoruaHisuian[] = { + overworld_ascending_frames(gObjectEventPic_ZoruaHisuian, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_ZoroarkHisuian[] = { + overworld_ascending_frames(gObjectEventPic_ZoroarkHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_ZORUA + +#if P_FAMILY_MINCCINO static const struct SpriteFrameImage sPicTable_Minccino[] = { overworld_ascending_frames(gObjectEventPic_Minccino, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cinccino[] = { overworld_ascending_frames(gObjectEventPic_Cinccino, 4, 4), }; +#endif //P_FAMILY_MINCCINO + +#if P_FAMILY_GOTHITA static const struct SpriteFrameImage sPicTable_Gothita[] = { overworld_ascending_frames(gObjectEventPic_Gothita, 4, 4), }; @@ -1918,6 +3572,9 @@ static const struct SpriteFrameImage sPicTable_Gothorita[] = { static const struct SpriteFrameImage sPicTable_Gothitelle[] = { overworld_ascending_frames(gObjectEventPic_Gothitelle, 4, 4), }; +#endif //P_FAMILY_GOTHITA + +#if P_FAMILY_SOLOSIS static const struct SpriteFrameImage sPicTable_Solosis[] = { overworld_ascending_frames(gObjectEventPic_Solosis, 4, 4), }; @@ -1927,12 +3584,18 @@ static const struct SpriteFrameImage sPicTable_Duosion[] = { static const struct SpriteFrameImage sPicTable_Reuniclus[] = { overworld_ascending_frames(gObjectEventPic_Reuniclus, 4, 4), }; +#endif //P_FAMILY_SOLOSIS + +#if P_FAMILY_DUCKLETT static const struct SpriteFrameImage sPicTable_Ducklett[] = { overworld_ascending_frames(gObjectEventPic_Ducklett, 4, 4), }; static const struct SpriteFrameImage sPicTable_Swanna[] = { overworld_ascending_frames(gObjectEventPic_Swanna, 4, 4), }; +#endif //P_FAMILY_DUCKLETT + +#if P_FAMILY_VANILLITE static const struct SpriteFrameImage sPicTable_Vanillite[] = { overworld_ascending_frames(gObjectEventPic_Vanillite, 4, 4), }; @@ -1942,45 +3605,61 @@ static const struct SpriteFrameImage sPicTable_Vanillish[] = { static const struct SpriteFrameImage sPicTable_Vanilluxe[] = { overworld_ascending_frames(gObjectEventPic_Vanilluxe, 4, 4), }; +#endif //P_FAMILY_VANILLITE + +#if P_FAMILY_DEERLING + static const struct SpriteFrameImage sPicTable_DeerlingSpring[] = { overworld_ascending_frames(gObjectEventPic_DeerlingSpring, 4, 4), }; -static const struct SpriteFrameImage sPicTable_DeerlingAutumn[] = { - overworld_ascending_frames(gObjectEventPic_DeerlingAutumn, 4, 4), -}; static const struct SpriteFrameImage sPicTable_DeerlingSummer[] = { overworld_ascending_frames(gObjectEventPic_DeerlingSummer, 4, 4), }; +static const struct SpriteFrameImage sPicTable_DeerlingAutumn[] = { + overworld_ascending_frames(gObjectEventPic_DeerlingAutumn, 4, 4), +}; static const struct SpriteFrameImage sPicTable_DeerlingWinter[] = { overworld_ascending_frames(gObjectEventPic_DeerlingWinter, 4, 4), }; static const struct SpriteFrameImage sPicTable_SawsbuckSpring[] = { overworld_ascending_frames(gObjectEventPic_SawsbuckSpring, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SawsbuckAutumn[] = { - overworld_ascending_frames(gObjectEventPic_SawsbuckAutumn, 4, 4), -}; static const struct SpriteFrameImage sPicTable_SawsbuckSummer[] = { overworld_ascending_frames(gObjectEventPic_SawsbuckSummer, 4, 4), }; +static const struct SpriteFrameImage sPicTable_SawsbuckAutumn[] = { + overworld_ascending_frames(gObjectEventPic_SawsbuckAutumn, 4, 4), +}; static const struct SpriteFrameImage sPicTable_SawsbuckWinter[] = { overworld_ascending_frames(gObjectEventPic_SawsbuckWinter, 4, 4), }; +#endif //P_FAMILY_DEERLING + +#if P_FAMILY_EMOLGA static const struct SpriteFrameImage sPicTable_Emolga[] = { overworld_ascending_frames(gObjectEventPic_Emolga, 4, 4), }; +#endif //P_FAMILY_EMOLGA + +#if P_FAMILY_KARRABLAST static const struct SpriteFrameImage sPicTable_Karrablast[] = { overworld_ascending_frames(gObjectEventPic_Karrablast, 4, 4), }; static const struct SpriteFrameImage sPicTable_Escavalier[] = { overworld_ascending_frames(gObjectEventPic_Escavalier, 4, 4), }; +#endif //P_FAMILY_KARRABLAST + +#if P_FAMILY_FOONGUS static const struct SpriteFrameImage sPicTable_Foongus[] = { overworld_ascending_frames(gObjectEventPic_Foongus, 4, 4), }; static const struct SpriteFrameImage sPicTable_Amoonguss[] = { overworld_ascending_frames(gObjectEventPic_Amoonguss, 4, 4), }; +#endif //P_FAMILY_FOONGUS + +#if P_FAMILY_FRILLISH static const struct SpriteFrameImage sPicTable_Frillish[] = { overworld_ascending_frames(gObjectEventPic_Frillish, 4, 4), }; @@ -1993,21 +3672,33 @@ static const struct SpriteFrameImage sPicTable_Jellicent[] = { static const struct SpriteFrameImage sPicTable_JellicentF[] = { overworld_ascending_frames(gObjectEventPic_JellicentF, 4, 4), }; +#endif //P_FAMILY_FRILLISH + +#if P_FAMILY_ALOMOMOLA static const struct SpriteFrameImage sPicTable_Alomomola[] = { overworld_ascending_frames(gObjectEventPic_Alomomola, 4, 4), }; +#endif //P_FAMILY_ALOMOMOLA + +#if P_FAMILY_JOLTIK static const struct SpriteFrameImage sPicTable_Joltik[] = { overworld_ascending_frames(gObjectEventPic_Joltik, 4, 4), }; static const struct SpriteFrameImage sPicTable_Galvantula[] = { overworld_ascending_frames(gObjectEventPic_Galvantula, 4, 4), }; +#endif //P_FAMILY_JOLTIK + +#if P_FAMILY_FERROSEED static const struct SpriteFrameImage sPicTable_Ferroseed[] = { overworld_ascending_frames(gObjectEventPic_Ferroseed, 4, 4), }; static const struct SpriteFrameImage sPicTable_Ferrothorn[] = { overworld_ascending_frames(gObjectEventPic_Ferrothorn, 4, 4), }; +#endif //P_FAMILY_FERROSEED + +#if P_FAMILY_KLINK static const struct SpriteFrameImage sPicTable_Klink[] = { overworld_ascending_frames(gObjectEventPic_Klink, 4, 4), }; @@ -2017,6 +3708,9 @@ static const struct SpriteFrameImage sPicTable_Klang[] = { static const struct SpriteFrameImage sPicTable_Klinklang[] = { overworld_ascending_frames(gObjectEventPic_Klinklang, 4, 4), }; +#endif //P_FAMILY_KLINK + +#if P_FAMILY_TYNAMO static const struct SpriteFrameImage sPicTable_Tynamo[] = { overworld_ascending_frames(gObjectEventPic_Tynamo, 4, 4), }; @@ -2026,12 +3720,18 @@ static const struct SpriteFrameImage sPicTable_Eelektrik[] = { static const struct SpriteFrameImage sPicTable_Eelektross[] = { overworld_ascending_frames(gObjectEventPic_Eelektross, 4, 4), }; +#endif //P_FAMILY_TYNAMO + +#if P_FAMILY_ELGYEM static const struct SpriteFrameImage sPicTable_Elgyem[] = { overworld_ascending_frames(gObjectEventPic_Elgyem, 4, 4), }; static const struct SpriteFrameImage sPicTable_Beheeyem[] = { overworld_ascending_frames(gObjectEventPic_Beheeyem, 4, 4), }; +#endif //P_FAMILY_ELGYEM + +#if P_FAMILY_LITWICK static const struct SpriteFrameImage sPicTable_Litwick[] = { overworld_ascending_frames(gObjectEventPic_Litwick, 4, 4), }; @@ -2041,6 +3741,9 @@ static const struct SpriteFrameImage sPicTable_Lampent[] = { static const struct SpriteFrameImage sPicTable_Chandelure[] = { overworld_ascending_frames(gObjectEventPic_Chandelure, 4, 4), }; +#endif //P_FAMILY_LITWICK + +#if P_FAMILY_AXEW static const struct SpriteFrameImage sPicTable_Axew[] = { overworld_ascending_frames(gObjectEventPic_Axew, 4, 4), }; @@ -2050,66 +3753,123 @@ static const struct SpriteFrameImage sPicTable_Fraxure[] = { static const struct SpriteFrameImage sPicTable_Haxorus[] = { overworld_ascending_frames(gObjectEventPic_Haxorus, 4, 4), }; +#endif //P_FAMILY_AXEW + +#if P_FAMILY_CUBCHOO static const struct SpriteFrameImage sPicTable_Cubchoo[] = { overworld_ascending_frames(gObjectEventPic_Cubchoo, 4, 4), }; static const struct SpriteFrameImage sPicTable_Beartic[] = { overworld_ascending_frames(gObjectEventPic_Beartic, 4, 4), }; +#endif //P_FAMILY_CUBCHOO + +#if P_FAMILY_CRYOGONAL static const struct SpriteFrameImage sPicTable_Cryogonal[] = { overworld_ascending_frames(gObjectEventPic_Cryogonal, 4, 4), }; +#endif //P_FAMILY_CRYOGONAL + +#if P_FAMILY_SHELMET static const struct SpriteFrameImage sPicTable_Shelmet[] = { overworld_ascending_frames(gObjectEventPic_Shelmet, 4, 4), }; static const struct SpriteFrameImage sPicTable_Accelgor[] = { overworld_ascending_frames(gObjectEventPic_Accelgor, 4, 4), }; +#endif //P_FAMILY_SHELMET + +#if P_FAMILY_STUNFISK static const struct SpriteFrameImage sPicTable_Stunfisk[] = { overworld_ascending_frames(gObjectEventPic_Stunfisk, 4, 4), }; +#if P_GALARIAN_FORMS +static const struct SpriteFrameImage sPicTable_StunfiskGalarian[] = { + overworld_ascending_frames(gObjectEventPic_StunfiskGalarian, 4, 4), +}; +#endif //P_GALARIAN_FORMS +#endif //P_FAMILY_STUNFISK + +#if P_FAMILY_MIENFOO static const struct SpriteFrameImage sPicTable_Mienfoo[] = { overworld_ascending_frames(gObjectEventPic_Mienfoo, 4, 4), }; static const struct SpriteFrameImage sPicTable_Mienshao[] = { overworld_ascending_frames(gObjectEventPic_Mienshao, 4, 4), }; +#endif //P_FAMILY_MIENFOO + +#if P_FAMILY_DRUDDIGON static const struct SpriteFrameImage sPicTable_Druddigon[] = { overworld_ascending_frames(gObjectEventPic_Druddigon, 4, 4), }; +#endif //P_FAMILY_DRUDDIGON + +#if P_FAMILY_GOLETT static const struct SpriteFrameImage sPicTable_Golett[] = { overworld_ascending_frames(gObjectEventPic_Golett, 4, 4), }; static const struct SpriteFrameImage sPicTable_Golurk[] = { overworld_ascending_frames(gObjectEventPic_Golurk, 4, 4), }; +#endif //P_FAMILY_GOLETT + +#if P_FAMILY_PAWNIARD static const struct SpriteFrameImage sPicTable_Pawniard[] = { overworld_ascending_frames(gObjectEventPic_Pawniard, 4, 4), }; static const struct SpriteFrameImage sPicTable_Bisharp[] = { overworld_ascending_frames(gObjectEventPic_Bisharp, 4, 4), }; +#if P_GEN_9_CROSS_EVOS +/*static const struct SpriteFrameImage sPicTable_Kingambit[] = { + overworld_ascending_frames(gObjectEventPic_Kingambit, 4, 4), +};*/ +#endif //P_GEN_9_CROSS_EVOS +#endif //P_FAMILY_PAWNIARD + +#if P_FAMILY_BOUFFALANT static const struct SpriteFrameImage sPicTable_Bouffalant[] = { overworld_ascending_frames(gObjectEventPic_Bouffalant, 4, 4), }; +#endif //P_FAMILY_BOUFFALANT + +#if P_FAMILY_RUFFLET static const struct SpriteFrameImage sPicTable_Rufflet[] = { overworld_ascending_frames(gObjectEventPic_Rufflet, 4, 4), }; static const struct SpriteFrameImage sPicTable_Braviary[] = { overworld_ascending_frames(gObjectEventPic_Braviary, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_BraviaryHisuian[] = { + overworld_ascending_frames(gObjectEventPic_BraviaryHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_RUFFLET + +#if P_FAMILY_VULLABY static const struct SpriteFrameImage sPicTable_Vullaby[] = { overworld_ascending_frames(gObjectEventPic_Vullaby, 4, 4), }; static const struct SpriteFrameImage sPicTable_Mandibuzz[] = { overworld_ascending_frames(gObjectEventPic_Mandibuzz, 4, 4), }; +#endif //P_FAMILY_VULLABY + +#if P_FAMILY_HEATMOR static const struct SpriteFrameImage sPicTable_Heatmor[] = { overworld_ascending_frames(gObjectEventPic_Heatmor, 4, 4), }; +#endif //P_FAMILY_HEATMOR + +#if P_FAMILY_DURANT static const struct SpriteFrameImage sPicTable_Durant[] = { overworld_ascending_frames(gObjectEventPic_Durant, 4, 4), }; +#endif //P_FAMILY_DURANT + +#if P_FAMILY_DEINO static const struct SpriteFrameImage sPicTable_Deino[] = { overworld_ascending_frames(gObjectEventPic_Deino, 4, 4), }; @@ -2119,48 +3879,129 @@ static const struct SpriteFrameImage sPicTable_Zweilous[] = { static const struct SpriteFrameImage sPicTable_Hydreigon[] = { overworld_ascending_frames(gObjectEventPic_Hydreigon, 4, 4), }; +#endif //P_FAMILY_DEINO + +#if P_FAMILY_LARVESTA static const struct SpriteFrameImage sPicTable_Larvesta[] = { overworld_ascending_frames(gObjectEventPic_Larvesta, 4, 4), }; static const struct SpriteFrameImage sPicTable_Volcarona[] = { overworld_ascending_frames(gObjectEventPic_Volcarona, 4, 4), }; +#endif //P_FAMILY_LARVESTA + +#if P_FAMILY_COBALION static const struct SpriteFrameImage sPicTable_Cobalion[] = { overworld_ascending_frames(gObjectEventPic_Cobalion, 4, 4), }; +#endif //P_FAMILY_COBALION + +#if P_FAMILY_TERRAKION static const struct SpriteFrameImage sPicTable_Terrakion[] = { overworld_ascending_frames(gObjectEventPic_Terrakion, 4, 4), }; +#endif //P_FAMILY_TERRAKION + +#if P_FAMILY_VIRIZION static const struct SpriteFrameImage sPicTable_Virizion[] = { overworld_ascending_frames(gObjectEventPic_Virizion, 4, 4), }; +#endif //P_FAMILY_VIRIZION + +#if P_FAMILY_TORNADUS + static const struct SpriteFrameImage sPicTable_TornadusIncarnate[] = { overworld_ascending_frames(gObjectEventPic_TornadusIncarnate, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_TornadusTherian[] = { + overworld_ascending_frames(gObjectEventPic_TornadusTherian, 4, 4), +};*/ +#endif //P_FAMILY_TORNADUS + +#if P_FAMILY_THUNDURUS + static const struct SpriteFrameImage sPicTable_ThundurusIncarnate[] = { overworld_ascending_frames(gObjectEventPic_ThundurusIncarnate, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_ThundurusTherian[] = { + overworld_ascending_frames(gObjectEventPic_ThundurusTherian, 4, 4), +};*/ +#endif //P_FAMILY_THUNDURUS + +#if P_FAMILY_RESHIRAM static const struct SpriteFrameImage sPicTable_Reshiram[] = { - overworld_ascending_frames(gObjectEventPic_Reshiram, 8, 8), + overworld_ascending_frames(gObjectEventPic_Reshiram, 4, 4), }; +#endif //P_FAMILY_RESHIRAM + +#if P_FAMILY_ZEKROM static const struct SpriteFrameImage sPicTable_Zekrom[] = { - overworld_ascending_frames(gObjectEventPic_Zekrom, 8, 8), + overworld_ascending_frames(gObjectEventPic_Zekrom, 4, 4), }; +#endif //P_FAMILY_ZEKROM + +#if P_FAMILY_LANDORUS + static const struct SpriteFrameImage sPicTable_LandorusIncarnate[] = { overworld_ascending_frames(gObjectEventPic_LandorusIncarnate, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Kyurem[] = { - overworld_ascending_frames(gObjectEventPic_Kyurem, 8, 8), +/*static const struct SpriteFrameImage sPicTable_LandorusTherian[] = { + overworld_ascending_frames(gObjectEventPic_LandorusTherian, 4, 4), +};*/ +#endif //P_FAMILY_LANDORUS + +#if P_FAMILY_ENAMORUS +static const struct SpriteFrameImage sPicTable_EnamorusIncarnate[] = { + overworld_ascending_frames(gObjectEventPic_EnamorusIncarnate, 4, 4), }; +static const struct SpriteFrameImage sPicTable_EnamorusTherian[] = { + overworld_ascending_frames(gObjectEventPic_EnamorusTherian, 4, 4), +}; +#endif //P_FAMILY_ENAMORUS + +#if P_FAMILY_KYUREM +static const struct SpriteFrameImage sPicTable_Kyurem[] = { + overworld_ascending_frames(gObjectEventPic_Kyurem, 4, 4), +}; +#if P_FUSION_FORMS +/*static const struct SpriteFrameImage sPicTable_KyuremWhite[] = { + overworld_ascending_frames(gObjectEventPic_KyuremWhite, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_KyuremBlack[] = { + overworld_ascending_frames(gObjectEventPic_KyuremBlack, 4, 4), +};*/ +#endif //P_FUSION_FORMS +#endif //P_FAMILY_KYUREM + +#if P_FAMILY_KELDEO static const struct SpriteFrameImage sPicTable_KeldeoOrdinary[] = { overworld_ascending_frames(gObjectEventPic_KeldeoOrdinary, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_KeldeoResolute[] = { + overworld_ascending_frames(gObjectEventPic_KeldeoResolute, 4, 4), +};*/ +#endif //P_FAMILY_KELDEO + +#if P_FAMILY_MELOETTA static const struct SpriteFrameImage sPicTable_MeloettaAria[] = { overworld_ascending_frames(gObjectEventPic_MeloettaAria, 4, 4), }; +static const struct SpriteFrameImage sPicTable_MeloettaPirouette[] = { + overworld_ascending_frames(gObjectEventPic_MeloettaPirouette, 4, 4), +}; +#endif //P_FAMILY_MELOETTA + +#if P_FAMILY_GENESECT static const struct SpriteFrameImage sPicTable_Genesect[] = { overworld_ascending_frames(gObjectEventPic_Genesect, 4, 4), }; + + + + +#endif //P_FAMILY_GENESECT + +#if P_FAMILY_CHESPIN static const struct SpriteFrameImage sPicTable_Chespin[] = { overworld_ascending_frames(gObjectEventPic_Chespin, 4, 4), }; @@ -2170,6 +4011,9 @@ static const struct SpriteFrameImage sPicTable_Quilladin[] = { static const struct SpriteFrameImage sPicTable_Chesnaught[] = { overworld_ascending_frames(gObjectEventPic_Chesnaught, 4, 4), }; +#endif //P_FAMILY_CHESPIN + +#if P_FAMILY_FENNEKIN static const struct SpriteFrameImage sPicTable_Fennekin[] = { overworld_ascending_frames(gObjectEventPic_Fennekin, 4, 4), }; @@ -2179,6 +4023,9 @@ static const struct SpriteFrameImage sPicTable_Braixen[] = { static const struct SpriteFrameImage sPicTable_Delphox[] = { overworld_ascending_frames(gObjectEventPic_Delphox, 4, 4), }; +#endif //P_FAMILY_FENNEKIN + +#if P_FAMILY_FROAKIE static const struct SpriteFrameImage sPicTable_Froakie[] = { overworld_ascending_frames(gObjectEventPic_Froakie, 4, 4), }; @@ -2188,12 +4035,21 @@ static const struct SpriteFrameImage sPicTable_Frogadier[] = { static const struct SpriteFrameImage sPicTable_Greninja[] = { overworld_ascending_frames(gObjectEventPic_Greninja, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_GreninjaAsh[] = { + overworld_ascending_frames(gObjectEventPic_GreninjaAsh, 4, 4), +};*/ +#endif //P_FAMILY_FROAKIE + +#if P_FAMILY_BUNNELBY static const struct SpriteFrameImage sPicTable_Bunnelby[] = { overworld_ascending_frames(gObjectEventPic_Bunnelby, 4, 4), }; static const struct SpriteFrameImage sPicTable_Diggersby[] = { overworld_ascending_frames(gObjectEventPic_Diggersby, 4, 4), }; +#endif //P_FAMILY_BUNNELBY + +#if P_FAMILY_FLETCHLING static const struct SpriteFrameImage sPicTable_Fletchling[] = { overworld_ascending_frames(gObjectEventPic_Fletchling, 4, 4), }; @@ -2203,6 +4059,9 @@ static const struct SpriteFrameImage sPicTable_Fletchinder[] = { static const struct SpriteFrameImage sPicTable_Talonflame[] = { overworld_ascending_frames(gObjectEventPic_Talonflame, 4, 4), }; +#endif //P_FAMILY_FLETCHLING + +#if P_FAMILY_SCATTERBUG static const struct SpriteFrameImage sPicTable_Scatterbug[] = { overworld_ascending_frames(gObjectEventPic_Scatterbug, 4, 4), }; @@ -2227,6 +4086,9 @@ static const struct SpriteFrameImage sPicTable_VivillonGarden[] = { static const struct SpriteFrameImage sPicTable_VivillonElegant[] = { overworld_ascending_frames(gObjectEventPic_VivillonElegant, 4, 4), }; +static const struct SpriteFrameImage sPicTable_VivillonMeadow[] = { + overworld_ascending_frames(gObjectEventPic_VivillonMeadow, 4, 4), +}; static const struct SpriteFrameImage sPicTable_VivillonModern[] = { overworld_ascending_frames(gObjectEventPic_VivillonModern, 4, 4), }; @@ -2266,9 +4128,9 @@ static const struct SpriteFrameImage sPicTable_VivillonFancy[] = { static const struct SpriteFrameImage sPicTable_VivillonPokeBall[] = { overworld_ascending_frames(gObjectEventPic_VivillonPokeBall, 4, 4), }; -static const struct SpriteFrameImage sPicTable_VivillonMeadow[] = { - overworld_ascending_frames(gObjectEventPic_VivillonMeadow, 4, 4), -}; +#endif //P_FAMILY_SCATTERBUG + +#if P_FAMILY_LITLEO static const struct SpriteFrameImage sPicTable_Litleo[] = { overworld_ascending_frames(gObjectEventPic_Litleo, 4, 4), }; @@ -2278,18 +4140,22 @@ static const struct SpriteFrameImage sPicTable_Pyroar[] = { static const struct SpriteFrameImage sPicTable_PyroarF[] = { overworld_ascending_frames(gObjectEventPic_PyroarF, 4, 4), }; +#endif //P_FAMILY_LITLEO + +#if P_FAMILY_FLABEBE + static const struct SpriteFrameImage sPicTable_FlabebeRedFlower[] = { overworld_ascending_frames(gObjectEventPic_FlabebeRedFlower, 4, 4), }; static const struct SpriteFrameImage sPicTable_FlabebeYellowFlower[] = { overworld_ascending_frames(gObjectEventPic_FlabebeYellowFlower, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlabebeBlueFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlabebeBlueFlower, 4, 4), -}; static const struct SpriteFrameImage sPicTable_FlabebeOrangeFlower[] = { overworld_ascending_frames(gObjectEventPic_FlabebeOrangeFlower, 4, 4), }; +static const struct SpriteFrameImage sPicTable_FlabebeBlueFlower[] = { + overworld_ascending_frames(gObjectEventPic_FlabebeBlueFlower, 4, 4), +}; static const struct SpriteFrameImage sPicTable_FlabebeWhiteFlower[] = { overworld_ascending_frames(gObjectEventPic_FlabebeWhiteFlower, 4, 4), }; @@ -2299,12 +4165,12 @@ static const struct SpriteFrameImage sPicTable_FloetteRedFlower[] = { static const struct SpriteFrameImage sPicTable_FloetteYellowFlower[] = { overworld_ascending_frames(gObjectEventPic_FloetteYellowFlower, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteBlueFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteBlueFlower, 4, 4), -}; static const struct SpriteFrameImage sPicTable_FloetteOrangeFlower[] = { overworld_ascending_frames(gObjectEventPic_FloetteOrangeFlower, 4, 4), }; +static const struct SpriteFrameImage sPicTable_FloetteBlueFlower[] = { + overworld_ascending_frames(gObjectEventPic_FloetteBlueFlower, 4, 4), +}; static const struct SpriteFrameImage sPicTable_FloetteWhiteFlower[] = { overworld_ascending_frames(gObjectEventPic_FloetteWhiteFlower, 4, 4), }; @@ -2317,27 +4183,36 @@ static const struct SpriteFrameImage sPicTable_FlorgesRedFlower[] = { static const struct SpriteFrameImage sPicTable_FlorgesYellowFlower[] = { overworld_ascending_frames(gObjectEventPic_FlorgesYellowFlower, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlorgesBlueFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlorgesBlueFlower, 4, 4), -}; static const struct SpriteFrameImage sPicTable_FlorgesOrangeFlower[] = { overworld_ascending_frames(gObjectEventPic_FlorgesOrangeFlower, 4, 4), }; +static const struct SpriteFrameImage sPicTable_FlorgesBlueFlower[] = { + overworld_ascending_frames(gObjectEventPic_FlorgesBlueFlower, 4, 4), +}; static const struct SpriteFrameImage sPicTable_FlorgesWhiteFlower[] = { overworld_ascending_frames(gObjectEventPic_FlorgesWhiteFlower, 4, 4), }; +#endif //P_FAMILY_FLABEBE + +#if P_FAMILY_SKIDDO static const struct SpriteFrameImage sPicTable_Skiddo[] = { overworld_ascending_frames(gObjectEventPic_Skiddo, 4, 4), }; static const struct SpriteFrameImage sPicTable_Gogoat[] = { overworld_ascending_frames(gObjectEventPic_Gogoat, 4, 4), }; +#endif //P_FAMILY_SKIDDO + +#if P_FAMILY_PANCHAM static const struct SpriteFrameImage sPicTable_Pancham[] = { overworld_ascending_frames(gObjectEventPic_Pancham, 4, 4), }; static const struct SpriteFrameImage sPicTable_Pangoro[] = { overworld_ascending_frames(gObjectEventPic_Pangoro, 4, 4), }; +#endif //P_FAMILY_PANCHAM + +#if P_FAMILY_FURFROU static const struct SpriteFrameImage sPicTable_FurfrouNatural[] = { overworld_ascending_frames(gObjectEventPic_FurfrouNatural, 4, 4), }; @@ -2368,6 +4243,9 @@ static const struct SpriteFrameImage sPicTable_FurfrouKabukiTrim[] = { static const struct SpriteFrameImage sPicTable_FurfrouPharaohTrim[] = { overworld_ascending_frames(gObjectEventPic_FurfrouPharaohTrim, 4, 4), }; +#endif //P_FAMILY_FURFROU + +#if P_FAMILY_ESPURR static const struct SpriteFrameImage sPicTable_Espurr[] = { overworld_ascending_frames(gObjectEventPic_Espurr, 4, 4), }; @@ -2377,823 +4255,1076 @@ static const struct SpriteFrameImage sPicTable_MeowsticMale[] = { static const struct SpriteFrameImage sPicTable_MeowsticFemale[] = { overworld_ascending_frames(gObjectEventPic_MeowsticFemale, 4, 4), }; +#endif //P_FAMILY_ESPURR + +#if P_FAMILY_HONEDGE static const struct SpriteFrameImage sPicTable_Honedge[] = { overworld_ascending_frames(gObjectEventPic_Honedge, 4, 4), }; static const struct SpriteFrameImage sPicTable_Doublade[] = { overworld_ascending_frames(gObjectEventPic_Doublade, 4, 4), }; + static const struct SpriteFrameImage sPicTable_AegislashShield[] = { overworld_ascending_frames(gObjectEventPic_AegislashShield, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_AegislashBlade[] = { + overworld_ascending_frames(gObjectEventPic_AegislashBlade, 4, 4), +};*/ +#endif //P_FAMILY_HONEDGE + +#if P_FAMILY_SPRITZEE static const struct SpriteFrameImage sPicTable_Spritzee[] = { overworld_ascending_frames(gObjectEventPic_Spritzee, 4, 4), }; static const struct SpriteFrameImage sPicTable_Aromatisse[] = { overworld_ascending_frames(gObjectEventPic_Aromatisse, 4, 4), }; +#endif //P_FAMILY_SPRITZEE + +#if P_FAMILY_SWIRLIX static const struct SpriteFrameImage sPicTable_Swirlix[] = { overworld_ascending_frames(gObjectEventPic_Swirlix, 4, 4), }; static const struct SpriteFrameImage sPicTable_Slurpuff[] = { overworld_ascending_frames(gObjectEventPic_Slurpuff, 4, 4), }; +#endif //P_FAMILY_SWIRLIX + +#if P_FAMILY_INKAY static const struct SpriteFrameImage sPicTable_Inkay[] = { overworld_ascending_frames(gObjectEventPic_Inkay, 4, 4), }; static const struct SpriteFrameImage sPicTable_Malamar[] = { overworld_ascending_frames(gObjectEventPic_Malamar, 4, 4), }; +#endif //P_FAMILY_INKAY + +#if P_FAMILY_BINACLE static const struct SpriteFrameImage sPicTable_Binacle[] = { overworld_ascending_frames(gObjectEventPic_Binacle, 4, 4), }; static const struct SpriteFrameImage sPicTable_Barbaracle[] = { overworld_ascending_frames(gObjectEventPic_Barbaracle, 4, 4), }; +#endif //P_FAMILY_BINACLE + +#if P_FAMILY_SKRELP static const struct SpriteFrameImage sPicTable_Skrelp[] = { overworld_ascending_frames(gObjectEventPic_Skrelp, 4, 4), }; static const struct SpriteFrameImage sPicTable_Dragalge[] = { overworld_ascending_frames(gObjectEventPic_Dragalge, 4, 4), }; +#endif //P_FAMILY_SKRELP + +#if P_FAMILY_CLAUNCHER static const struct SpriteFrameImage sPicTable_Clauncher[] = { overworld_ascending_frames(gObjectEventPic_Clauncher, 4, 4), }; static const struct SpriteFrameImage sPicTable_Clawitzer[] = { overworld_ascending_frames(gObjectEventPic_Clawitzer, 4, 4), }; +#endif //P_FAMILY_CLAUNCHER + +#if P_FAMILY_HELIOPTILE static const struct SpriteFrameImage sPicTable_Helioptile[] = { overworld_ascending_frames(gObjectEventPic_Helioptile, 4, 4), }; static const struct SpriteFrameImage sPicTable_Heliolisk[] = { overworld_ascending_frames(gObjectEventPic_Heliolisk, 4, 4), }; +#endif //P_FAMILY_HELIOPTILE + +#if P_FAMILY_TYRUNT static const struct SpriteFrameImage sPicTable_Tyrunt[] = { overworld_ascending_frames(gObjectEventPic_Tyrunt, 4, 4), }; static const struct SpriteFrameImage sPicTable_Tyrantrum[] = { overworld_ascending_frames(gObjectEventPic_Tyrantrum, 4, 4), }; +#endif //P_FAMILY_TYRUNT + +#if P_FAMILY_AMAURA static const struct SpriteFrameImage sPicTable_Amaura[] = { overworld_ascending_frames(gObjectEventPic_Amaura, 4, 4), }; static const struct SpriteFrameImage sPicTable_Aurorus[] = { overworld_ascending_frames(gObjectEventPic_Aurorus, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Sylveon[] = { - overworld_ascending_frames(gObjectEventPic_Sylveon, 4, 4), -}; +#endif //P_FAMILY_AMAURA + +#if P_FAMILY_HAWLUCHA static const struct SpriteFrameImage sPicTable_Hawlucha[] = { overworld_ascending_frames(gObjectEventPic_Hawlucha, 4, 4), }; +#endif //P_FAMILY_HAWLUCHA + +#if P_FAMILY_DEDENNE static const struct SpriteFrameImage sPicTable_Dedenne[] = { overworld_ascending_frames(gObjectEventPic_Dedenne, 4, 4), }; +#endif //P_FAMILY_DEDENNE + +#if P_FAMILY_CARBINK static const struct SpriteFrameImage sPicTable_Carbink[] = { overworld_ascending_frames(gObjectEventPic_Carbink, 4, 4), }; +#endif //P_FAMILY_CARBINK + +#if P_FAMILY_GOOMY static const struct SpriteFrameImage sPicTable_Goomy[] = { overworld_ascending_frames(gObjectEventPic_Goomy, 4, 4), }; static const struct SpriteFrameImage sPicTable_Sliggoo[] = { overworld_ascending_frames(gObjectEventPic_Sliggoo, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_SliggooHisuian[] = { + overworld_ascending_frames(gObjectEventPic_SliggooHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS + static const struct SpriteFrameImage sPicTable_Goodra[] = { overworld_ascending_frames(gObjectEventPic_Goodra, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_GoodraHisuian[] = { + overworld_ascending_frames(gObjectEventPic_GoodraHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_GOOMY + +#if P_FAMILY_KLEFKI static const struct SpriteFrameImage sPicTable_Klefki[] = { overworld_ascending_frames(gObjectEventPic_Klefki, 4, 4), }; +#endif //P_FAMILY_KLEFKI + +#if P_FAMILY_PHANTUMP static const struct SpriteFrameImage sPicTable_Phantump[] = { overworld_ascending_frames(gObjectEventPic_Phantump, 4, 4), }; static const struct SpriteFrameImage sPicTable_Trevenant[] = { overworld_ascending_frames(gObjectEventPic_Trevenant, 4, 4), }; +#endif //P_FAMILY_PHANTUMP + +#if P_FAMILY_PUMPKABOO + static const struct SpriteFrameImage sPicTable_PumpkabooAverage[] = { overworld_ascending_frames(gObjectEventPic_PumpkabooAverage, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_PumpkabooSmall[] = { + overworld_ascending_frames(gObjectEventPic_PumpkabooSmall, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PumpkabooLarge[] = { + overworld_ascending_frames(gObjectEventPic_PumpkabooLarge, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PumpkabooSuper[] = { + overworld_ascending_frames(gObjectEventPic_PumpkabooSuper, 4, 4), +};*/ + static const struct SpriteFrameImage sPicTable_GourgeistAverage[] = { overworld_ascending_frames(gObjectEventPic_GourgeistAverage, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_GourgeistSmall[] = { + overworld_ascending_frames(gObjectEventPic_GourgeistSmall, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_GourgeistLarge[] = { + overworld_ascending_frames(gObjectEventPic_GourgeistLarge, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_GourgeistSuper[] = { + overworld_ascending_frames(gObjectEventPic_GourgeistSuper, 4, 4), +};*/ +#endif //P_FAMILY_PUMPKABOO + +#if P_FAMILY_BERGMITE static const struct SpriteFrameImage sPicTable_Bergmite[] = { overworld_ascending_frames(gObjectEventPic_Bergmite, 4, 4), }; static const struct SpriteFrameImage sPicTable_Avalugg[] = { overworld_ascending_frames(gObjectEventPic_Avalugg, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_AvaluggHisuian[] = { + overworld_ascending_frames(gObjectEventPic_AvaluggHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_BERGMITE + +#if P_FAMILY_NOIBAT static const struct SpriteFrameImage sPicTable_Noibat[] = { overworld_ascending_frames(gObjectEventPic_Noibat, 4, 4), }; static const struct SpriteFrameImage sPicTable_Noivern[] = { overworld_ascending_frames(gObjectEventPic_Noivern, 4, 4), }; +#endif //P_FAMILY_NOIBAT + +#if P_FAMILY_XERNEAS + static const struct SpriteFrameImage sPicTable_XerneasNeutral[] = { - overworld_ascending_frames(gObjectEventPic_XerneasNeutral, 8, 8), + overworld_ascending_frames(gObjectEventPic_XerneasNeutral, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_XerneasActive[] = { + overworld_ascending_frames(gObjectEventPic_XerneasActive, 4, 4), +};*/ +#endif //P_FAMILY_XERNEAS + +#if P_FAMILY_YVELTAL static const struct SpriteFrameImage sPicTable_Yveltal[] = { - overworld_ascending_frames(gObjectEventPic_Yveltal, 8, 8), + overworld_ascending_frames(gObjectEventPic_Yveltal, 4, 4), }; +#endif //P_FAMILY_YVELTAL + +#if P_FAMILY_ZYGARDE + static const struct SpriteFrameImage sPicTable_Zygarde50[] = { - overworld_ascending_frames(gObjectEventPic_Zygarde50, 8, 8), + overworld_ascending_frames(gObjectEventPic_Zygarde50, 4, 4), }; + //const u32 gObjectEventPic_Zygarde10[] = INCBIN_COMP("graphics/pokemon/zygarde/10_percent/follower.4bpp"); + //const u32 gObjectEventPic_ZygardeComplete[] = INCBIN_COMP("graphics/pokemon/zygarde/complete/follower.4bpp"); +#endif //P_FAMILY_ZYGARDE + +#if P_FAMILY_DIANCIE static const struct SpriteFrameImage sPicTable_Diancie[] = { overworld_ascending_frames(gObjectEventPic_Diancie, 4, 4), }; +#if P_MEGA_EVOLUTIONS +/*static const struct SpriteFrameImage sPicTable_DiancieMega[] = { + overworld_ascending_frames(gObjectEventPic_DiancieMega, 4, 4), +};*/ +#endif //P_MEGA_EVOLUTIONS +#endif //P_FAMILY_DIANCIE + +#if P_FAMILY_HOOPA static const struct SpriteFrameImage sPicTable_HoopaConfined[] = { overworld_ascending_frames(gObjectEventPic_HoopaConfined, 4, 4), }; static const struct SpriteFrameImage sPicTable_HoopaUnbound[] = { - overworld_ascending_frames(gObjectEventPic_HoopaUnbound, 8, 8), + overworld_ascending_frames(gObjectEventPic_HoopaUnbound, 4, 4), }; +#endif //P_FAMILY_HOOPA + +#if P_FAMILY_VOLCANION static const struct SpriteFrameImage sPicTable_Volcanion[] = { overworld_ascending_frames(gObjectEventPic_Volcanion, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PichuSpikyEared[] = { - overworld_ascending_frames(gObjectEventPic_PichuSpikyEared, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RotomHeat[] = { - overworld_ascending_frames(gObjectEventPic_RotomHeat, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RotomWash[] = { - overworld_ascending_frames(gObjectEventPic_RotomWash, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RotomFrost[] = { - overworld_ascending_frames(gObjectEventPic_RotomFrost, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RotomFan[] = { - overworld_ascending_frames(gObjectEventPic_RotomFan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RotomMow[] = { - overworld_ascending_frames(gObjectEventPic_RotomMow, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_GiratinaOrigin[] = { - overworld_ascending_frames(gObjectEventPic_GiratinaOrigin, 8, 8), -}; -static const struct SpriteFrameImage sPicTable_MeloettaPirouette[] = { - overworld_ascending_frames(gObjectEventPic_MeloettaPirouette, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RattataAlolan[] = { - overworld_ascending_frames(gObjectEventPic_RattataAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RaticateAlolan[] = { - overworld_ascending_frames(gObjectEventPic_RaticateAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_RaichuAlolan[] = { - overworld_ascending_frames(gObjectEventPic_RaichuAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_SandshrewAlolan[] = { - overworld_ascending_frames(gObjectEventPic_SandshrewAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_SandslashAlolan[] = { - overworld_ascending_frames(gObjectEventPic_SandslashAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_VulpixAlolan[] = { - overworld_ascending_frames(gObjectEventPic_VulpixAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_NinetalesAlolan[] = { - overworld_ascending_frames(gObjectEventPic_NinetalesAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_DiglettAlolan[] = { - overworld_ascending_frames(gObjectEventPic_DiglettAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_DugtrioAlolan[] = { - overworld_ascending_frames(gObjectEventPic_DugtrioAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_MeowthAlolan[] = { - overworld_ascending_frames(gObjectEventPic_MeowthAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_PersianAlolan[] = { - overworld_ascending_frames(gObjectEventPic_PersianAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_GeodudeAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GeodudeAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_GravelerAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GravelerAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_GolemAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GolemAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_GrimerAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GrimerAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_MukAlolan[] = { - overworld_ascending_frames(gObjectEventPic_MukAlolan, 4, 4), -}; -static const struct SpriteFrameImage sPicTable_ExeggutorAlolan[] = { - overworld_ascending_frames(gObjectEventPic_ExeggutorAlolan, 8, 8), -}; -static const struct SpriteFrameImage sPicTable_MarowakAlolan[] = { - overworld_ascending_frames(gObjectEventPic_MarowakAlolan, 4, 4), -}; +#endif //P_FAMILY_VOLCANION +#if P_FAMILY_ROWLET static const struct SpriteFrameImage sPicTable_Rowlet[] = { overworld_ascending_frames(gObjectEventPic_Rowlet, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Dartrix[] = { overworld_ascending_frames(gObjectEventPic_Dartrix, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Decidueye[] = { overworld_ascending_frames(gObjectEventPic_Decidueye, 4, 4), }; +#if P_HISUIAN_FORMS +static const struct SpriteFrameImage sPicTable_DecidueyeHisuian[] = { + overworld_ascending_frames(gObjectEventPic_DecidueyeHisuian, 4, 4), +}; +#endif //P_HISUIAN_FORMS +#endif //P_FAMILY_ROWLET - - +#if P_FAMILY_LITTEN static const struct SpriteFrameImage sPicTable_Litten[] = { overworld_ascending_frames(gObjectEventPic_Litten, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Torracat[] = { overworld_ascending_frames(gObjectEventPic_Torracat, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Incineroar[] = { overworld_ascending_frames(gObjectEventPic_Incineroar, 4, 4), }; +#endif //P_FAMILY_LITTEN +#if P_FAMILY_POPPLIO static const struct SpriteFrameImage sPicTable_Popplio[] = { overworld_ascending_frames(gObjectEventPic_Popplio, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Brionne[] = { overworld_ascending_frames(gObjectEventPic_Brionne, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Primarina[] = { overworld_ascending_frames(gObjectEventPic_Primarina, 4, 4), }; +#endif //P_FAMILY_POPPLIO +#if P_FAMILY_PIKIPEK static const struct SpriteFrameImage sPicTable_Pikipek[] = { overworld_ascending_frames(gObjectEventPic_Pikipek, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Trumbeak[] = { overworld_ascending_frames(gObjectEventPic_Trumbeak, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Toucannon[] = { overworld_ascending_frames(gObjectEventPic_Toucannon, 4, 4), }; +#endif //P_FAMILY_PIKIPEK +#if P_FAMILY_YUNGOOS static const struct SpriteFrameImage sPicTable_Yungoos[] = { overworld_ascending_frames(gObjectEventPic_Yungoos, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Gumshoos[] = { overworld_ascending_frames(gObjectEventPic_Gumshoos, 4, 4), }; +#endif //P_FAMILY_YUNGOOS +#if P_FAMILY_GRUBBIN static const struct SpriteFrameImage sPicTable_Grubbin[] = { overworld_ascending_frames(gObjectEventPic_Grubbin, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Charjabug[] = { overworld_ascending_frames(gObjectEventPic_Charjabug, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Vikavolt[] = { overworld_ascending_frames(gObjectEventPic_Vikavolt, 4, 4), }; +#endif //P_FAMILY_GRUBBIN +#if P_FAMILY_CRABRAWLER static const struct SpriteFrameImage sPicTable_Crabrawler[] = { overworld_ascending_frames(gObjectEventPic_Crabrawler, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Crabominable[] = { overworld_ascending_frames(gObjectEventPic_Crabominable, 4, 4), }; +#endif //P_FAMILY_CRABRAWLER + +#if P_FAMILY_ORICORIO static const struct SpriteFrameImage sPicTable_OricorioBaile[] = { overworld_ascending_frames(gObjectEventPic_OricorioBaile, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_OricorioPomPom[] = { + overworld_ascending_frames(gObjectEventPic_OricorioPomPom, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_OricorioPau[] = { + overworld_ascending_frames(gObjectEventPic_OricorioPau, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_OricorioSensu[] = { + overworld_ascending_frames(gObjectEventPic_OricorioSensu, 4, 4), +};*/ +#endif //P_FAMILY_ORICORIO +#if P_FAMILY_CUTIEFLY static const struct SpriteFrameImage sPicTable_Cutiefly[] = { overworld_ascending_frames(gObjectEventPic_Cutiefly, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Ribombee[] = { overworld_ascending_frames(gObjectEventPic_Ribombee, 4, 4), }; +#endif //P_FAMILY_CUTIEFLY +#if P_FAMILY_ROCKRUFF static const struct SpriteFrameImage sPicTable_Rockruff[] = { overworld_ascending_frames(gObjectEventPic_Rockruff, 4, 4), }; - static const struct SpriteFrameImage sPicTable_LycanrocMidday[] = { overworld_ascending_frames(gObjectEventPic_LycanrocMidday, 4, 4), }; - -static const struct SpriteFrameImage sPicTable_LycanrocDusk[] = { - overworld_ascending_frames(gObjectEventPic_LycanrocDusk, 4, 4), -}; - static const struct SpriteFrameImage sPicTable_LycanrocMidnight[] = { overworld_ascending_frames(gObjectEventPic_LycanrocMidnight, 4, 4), }; +static const struct SpriteFrameImage sPicTable_LycanrocDusk[] = { + overworld_ascending_frames(gObjectEventPic_LycanrocDusk, 4, 4), +}; +#endif //P_FAMILY_ROCKRUFF + +#if P_FAMILY_WISHIWASHI static const struct SpriteFrameImage sPicTable_WishiwashiSolo[] = { overworld_ascending_frames(gObjectEventPic_WishiwashiSolo, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_WishiwashiSchool[] = { + overworld_ascending_frames(gObjectEventPic_WishiwashiSchool, 4, 4), +};*/ +#endif //P_FAMILY_WISHIWASHI +#if P_FAMILY_MAREANIE static const struct SpriteFrameImage sPicTable_Mareanie[] = { overworld_ascending_frames(gObjectEventPic_Mareanie, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Toxapex[] = { overworld_ascending_frames(gObjectEventPic_Toxapex, 4, 4), }; +#endif //P_FAMILY_MAREANIE +#if P_FAMILY_MUDBRAY static const struct SpriteFrameImage sPicTable_Mudbray[] = { overworld_ascending_frames(gObjectEventPic_Mudbray, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Mudsdale[] = { overworld_ascending_frames(gObjectEventPic_Mudsdale, 4, 4), }; +#endif //P_FAMILY_MUDBRAY +#if P_FAMILY_DEWPIDER static const struct SpriteFrameImage sPicTable_Dewpider[] = { overworld_ascending_frames(gObjectEventPic_Dewpider, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Araquanid[] = { overworld_ascending_frames(gObjectEventPic_Araquanid, 4, 4), }; +#endif //P_FAMILY_DEWPIDER +#if P_FAMILY_FOMANTIS static const struct SpriteFrameImage sPicTable_Fomantis[] = { overworld_ascending_frames(gObjectEventPic_Fomantis, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Lurantis[] = { overworld_ascending_frames(gObjectEventPic_Lurantis, 4, 4), }; +#endif //P_FAMILY_FOMANTIS +#if P_FAMILY_MORELULL static const struct SpriteFrameImage sPicTable_Morelull[] = { overworld_ascending_frames(gObjectEventPic_Morelull, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Shiinotic[] = { overworld_ascending_frames(gObjectEventPic_Shiinotic, 4, 4), }; +#endif //P_FAMILY_MORELULL +#if P_FAMILY_SALANDIT static const struct SpriteFrameImage sPicTable_Salandit[] = { overworld_ascending_frames(gObjectEventPic_Salandit, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Salazzle[] = { overworld_ascending_frames(gObjectEventPic_Salazzle, 4, 4), }; +#endif //P_FAMILY_SALANDIT +#if P_FAMILY_STUFFUL static const struct SpriteFrameImage sPicTable_Stufful[] = { overworld_ascending_frames(gObjectEventPic_Stufful, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Bewear[] = { overworld_ascending_frames(gObjectEventPic_Bewear, 4, 4), }; +#endif //P_FAMILY_STUFFUL +#if P_FAMILY_BOUNSWEET static const struct SpriteFrameImage sPicTable_Bounsweet[] = { overworld_ascending_frames(gObjectEventPic_Bounsweet, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Steenee[] = { overworld_ascending_frames(gObjectEventPic_Steenee, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Tsareena[] = { overworld_ascending_frames(gObjectEventPic_Tsareena, 4, 4), }; +#endif //P_FAMILY_BOUNSWEET +#if P_FAMILY_COMFEY static const struct SpriteFrameImage sPicTable_Comfey[] = { overworld_ascending_frames(gObjectEventPic_Comfey, 4, 4), }; +#endif //P_FAMILY_COMFEY +#if P_FAMILY_ORANGURU static const struct SpriteFrameImage sPicTable_Oranguru[] = { overworld_ascending_frames(gObjectEventPic_Oranguru, 4, 4), }; +#endif //P_FAMILY_ORANGURU +#if P_FAMILY_PASSIMIAN static const struct SpriteFrameImage sPicTable_Passimian[] = { overworld_ascending_frames(gObjectEventPic_Passimian, 4, 4), }; +#endif //P_FAMILY_PASSIMIAN +#if P_FAMILY_WIMPOD static const struct SpriteFrameImage sPicTable_Wimpod[] = { overworld_ascending_frames(gObjectEventPic_Wimpod, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Golisopod[] = { overworld_ascending_frames(gObjectEventPic_Golisopod, 4, 4), }; +#endif //P_FAMILY_WIMPOD +#if P_FAMILY_SANDYGAST static const struct SpriteFrameImage sPicTable_Sandygast[] = { overworld_ascending_frames(gObjectEventPic_Sandygast, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Palossand[] = { overworld_ascending_frames(gObjectEventPic_Palossand, 4, 4), }; +#endif //P_FAMILY_SANDYGAST +#if P_FAMILY_PYUKUMUKU static const struct SpriteFrameImage sPicTable_Pyukumuku[] = { overworld_ascending_frames(gObjectEventPic_Pyukumuku, 4, 4), }; +#endif //P_FAMILY_PYUKUMUKU +#if P_FAMILY_TYPE_NULL static const struct SpriteFrameImage sPicTable_TypeNull[] = { overworld_ascending_frames(gObjectEventPic_TypeNull, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Silvally[] = { overworld_ascending_frames(gObjectEventPic_Silvally, 4, 4), }; +#endif //P_FAMILY_TYPE_NULL +#if P_FAMILY_MINIOR static const struct SpriteFrameImage sPicTable_MiniorMeteor[] = { overworld_ascending_frames(gObjectEventPic_MiniorMeteor, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_MiniorCoreRed[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreRed, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MiniorCoreOrange[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreOrange, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MiniorCoreYellow[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreYellow, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MiniorCoreGreen[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreGreen, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MiniorCoreBlue[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreBlue, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MiniorCoreIndigo[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreIndigo, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MiniorCoreViolet[] = { + overworld_ascending_frames(gObjectEventPic_MiniorCoreViolet, 4, 4), +};*/ +#endif //P_FAMILY_MINIOR +#if P_FAMILY_KOMALA static const struct SpriteFrameImage sPicTable_Komala[] = { overworld_ascending_frames(gObjectEventPic_Komala, 4, 4), }; +#endif //P_FAMILY_KOMALA +#if P_FAMILY_TURTONATOR static const struct SpriteFrameImage sPicTable_Turtonator[] = { overworld_ascending_frames(gObjectEventPic_Turtonator, 4, 4), }; +#endif //P_FAMILY_TURTONATOR +#if P_FAMILY_TOGEDEMARU static const struct SpriteFrameImage sPicTable_Togedemaru[] = { overworld_ascending_frames(gObjectEventPic_Togedemaru, 4, 4), }; +#endif //P_FAMILY_TOGEDEMARU +#if P_FAMILY_MIMIKYU static const struct SpriteFrameImage sPicTable_MimikyuDisguised[] = { overworld_ascending_frames(gObjectEventPic_MimikyuDisguised, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_MimikyuBusted[] = { + overworld_ascending_frames(gObjectEventPic_MimikyuBusted, 4, 4), +};*/ +#endif //P_FAMILY_MIMIKYU +#if P_FAMILY_BRUXISH static const struct SpriteFrameImage sPicTable_Bruxish[] = { overworld_ascending_frames(gObjectEventPic_Bruxish, 4, 4), }; +#endif //P_FAMILY_BRUXISH +#if P_FAMILY_DRAMPA static const struct SpriteFrameImage sPicTable_Drampa[] = { overworld_ascending_frames(gObjectEventPic_Drampa, 4, 4), }; +#endif //P_FAMILY_DRAMPA +#if P_FAMILY_DHELMISE static const struct SpriteFrameImage sPicTable_Dhelmise[] = { overworld_ascending_frames(gObjectEventPic_Dhelmise, 4, 4), }; +#endif //P_FAMILY_DHELMISE +#if P_FAMILY_JANGMO_O static const struct SpriteFrameImage sPicTable_JangmoO[] = { overworld_ascending_frames(gObjectEventPic_JangmoO, 4, 4), }; - static const struct SpriteFrameImage sPicTable_HakamoO[] = { overworld_ascending_frames(gObjectEventPic_HakamoO, 4, 4), }; - static const struct SpriteFrameImage sPicTable_KommoO[] = { overworld_ascending_frames(gObjectEventPic_KommoO, 4, 4), }; +#endif //P_FAMILY_JANGMO_O +#if P_FAMILY_TAPU_KOKO static const struct SpriteFrameImage sPicTable_TapuKoko[] = { overworld_ascending_frames(gObjectEventPic_TapuKoko, 4, 4), }; +#endif //P_FAMILY_TAPU_KOKO +#if P_FAMILY_TAPU_LELE static const struct SpriteFrameImage sPicTable_TapuLele[] = { overworld_ascending_frames(gObjectEventPic_TapuLele, 4, 4), }; +#endif //P_FAMILY_TAPU_LELE +#if P_FAMILY_TAPU_BULU static const struct SpriteFrameImage sPicTable_TapuBulu[] = { overworld_ascending_frames(gObjectEventPic_TapuBulu, 4, 4), }; +#endif //P_FAMILY_TAPU_BULU +#if P_FAMILY_TAPU_FINI static const struct SpriteFrameImage sPicTable_TapuFini[] = { overworld_ascending_frames(gObjectEventPic_TapuFini, 4, 4), }; +#endif //P_FAMILY_TAPU_FINI +#if P_FAMILY_COSMOG static const struct SpriteFrameImage sPicTable_Cosmog[] = { overworld_ascending_frames(gObjectEventPic_Cosmog, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Cosmoem[] = { overworld_ascending_frames(gObjectEventPic_Cosmoem, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Solgaleo[] = { overworld_ascending_frames(gObjectEventPic_Solgaleo, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Lunala[] = { overworld_ascending_frames(gObjectEventPic_Lunala, 4, 4), }; +#endif //P_FAMILY_COSMOG +#if P_FAMILY_NIHILEGO static const struct SpriteFrameImage sPicTable_Nihilego[] = { overworld_ascending_frames(gObjectEventPic_Nihilego, 4, 4), }; +#endif //P_FAMILY_NIHILEGO +#if P_FAMILY_BUZZWOLE static const struct SpriteFrameImage sPicTable_Buzzwole[] = { overworld_ascending_frames(gObjectEventPic_Buzzwole, 4, 4), }; +#endif //P_FAMILY_BUZZWOLE +#if P_FAMILY_PHEROMOSA static const struct SpriteFrameImage sPicTable_Pheromosa[] = { overworld_ascending_frames(gObjectEventPic_Pheromosa, 4, 4), }; +#endif //P_FAMILY_PHEROMOSA +#if P_FAMILY_XURKITREE static const struct SpriteFrameImage sPicTable_Xurkitree[] = { overworld_ascending_frames(gObjectEventPic_Xurkitree, 4, 4), }; +#endif //P_FAMILY_XURKITREE +#if P_FAMILY_CELESTEELA static const struct SpriteFrameImage sPicTable_Celesteela[] = { overworld_ascending_frames(gObjectEventPic_Celesteela, 4, 4), }; +#endif //P_FAMILY_CELESTEELA +#if P_FAMILY_KARTANA static const struct SpriteFrameImage sPicTable_Kartana[] = { overworld_ascending_frames(gObjectEventPic_Kartana, 4, 4), }; +#endif //P_FAMILY_KARTANA +#if P_FAMILY_GUZZLORD static const struct SpriteFrameImage sPicTable_Guzzlord[] = { overworld_ascending_frames(gObjectEventPic_Guzzlord, 4, 4), }; +#endif //P_FAMILY_GUZZLORD +#if P_FAMILY_NECROZMA static const struct SpriteFrameImage sPicTable_Necrozma[] = { overworld_ascending_frames(gObjectEventPic_Necrozma, 4, 4), }; +#if P_FUSION_FORMS static const struct SpriteFrameImage sPicTable_NecrozmaDuskMane[] = { overworld_ascending_frames(gObjectEventPic_NecrozmaDuskMane, 4, 4), }; - static const struct SpriteFrameImage sPicTable_NecrozmaDawnWings[] = { overworld_ascending_frames(gObjectEventPic_NecrozmaDawnWings, 4, 4), }; +#if P_ULTRA_BURST_FORMS +/*static const struct SpriteFrameImage sPicTable_NecrozmaUltra[] = { + overworld_ascending_frames(gObjectEventPic_NecrozmaUltra, 4, 4), +};*/ +#endif //P_ULTRA_BURST_FORMS +#endif //P_FUSION_FORMS +#endif //P_FAMILY_NECROZMA +#if P_FAMILY_MAGEARNA static const struct SpriteFrameImage sPicTable_Magearna[] = { overworld_ascending_frames(gObjectEventPic_Magearna, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_MagearnaOriginalColor[] = { + overworld_ascending_frames(gObjectEventPic_MagearnaOriginalColor, 4, 4), +};*/ +#endif //P_FAMILY_MAGEARNA +#if P_FAMILY_MARSHADOW static const struct SpriteFrameImage sPicTable_Marshadow[] = { overworld_ascending_frames(gObjectEventPic_Marshadow, 4, 4), }; +#endif //P_FAMILY_MARSHADOW +#if P_FAMILY_POIPOLE static const struct SpriteFrameImage sPicTable_Poipole[] = { overworld_ascending_frames(gObjectEventPic_Poipole, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Naganadel[] = { overworld_ascending_frames(gObjectEventPic_Naganadel, 4, 4), }; +#endif //P_FAMILY_POIPOLE +#if P_FAMILY_STAKATAKA static const struct SpriteFrameImage sPicTable_Stakataka[] = { overworld_ascending_frames(gObjectEventPic_Stakataka, 4, 4), }; +#endif //P_FAMILY_STAKATAKA +#if P_FAMILY_BLACEPHALON static const struct SpriteFrameImage sPicTable_Blacephalon[] = { overworld_ascending_frames(gObjectEventPic_Blacephalon, 4, 4), }; +#endif //P_FAMILY_BLACEPHALON +#if P_FAMILY_ZERAORA static const struct SpriteFrameImage sPicTable_Zeraora[] = { overworld_ascending_frames(gObjectEventPic_Zeraora, 4, 4), }; +#endif //P_FAMILY_ZERAORA +#if P_FAMILY_MELTAN static const struct SpriteFrameImage sPicTable_Meltan[] = { overworld_ascending_frames(gObjectEventPic_Meltan, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Melmetal[] = { overworld_ascending_frames(gObjectEventPic_Melmetal, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_MelmetalGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_MelmetalGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_MELTAN +#if P_FAMILY_GROOKEY static const struct SpriteFrameImage sPicTable_Grookey[] = { overworld_ascending_frames(gObjectEventPic_Grookey, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Thwackey[] = { overworld_ascending_frames(gObjectEventPic_Thwackey, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Rillaboom[] = { overworld_ascending_frames(gObjectEventPic_Rillaboom, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_RillaboomGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_RillaboomGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_GROOKEY +#if P_FAMILY_SCORBUNNY static const struct SpriteFrameImage sPicTable_Scorbunny[] = { overworld_ascending_frames(gObjectEventPic_Scorbunny, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Raboot[] = { overworld_ascending_frames(gObjectEventPic_Raboot, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Cinderace[] = { overworld_ascending_frames(gObjectEventPic_Cinderace, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_CinderaceGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_CinderaceGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_SCORBUNNY +#if P_FAMILY_SOBBLE static const struct SpriteFrameImage sPicTable_Sobble[] = { overworld_ascending_frames(gObjectEventPic_Sobble, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Drizzile[] = { overworld_ascending_frames(gObjectEventPic_Drizzile, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Inteleon[] = { overworld_ascending_frames(gObjectEventPic_Inteleon, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_InteleonGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_InteleonGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_SOBBLE +#if P_FAMILY_SKWOVET static const struct SpriteFrameImage sPicTable_Skwovet[] = { overworld_ascending_frames(gObjectEventPic_Skwovet, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Greedent[] = { overworld_ascending_frames(gObjectEventPic_Greedent, 4, 4), }; +#endif //P_FAMILY_SKWOVET +#if P_FAMILY_ROOKIDEE static const struct SpriteFrameImage sPicTable_Rookidee[] = { overworld_ascending_frames(gObjectEventPic_Rookidee, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Corvisquire[] = { overworld_ascending_frames(gObjectEventPic_Corvisquire, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Corviknight[] = { overworld_ascending_frames(gObjectEventPic_Corviknight, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_CorviknightGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_CorviknightGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_ROOKIDEE +#if P_FAMILY_BLIPBUG static const struct SpriteFrameImage sPicTable_Blipbug[] = { overworld_ascending_frames(gObjectEventPic_Blipbug, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Dottler[] = { overworld_ascending_frames(gObjectEventPic_Dottler, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Orbeetle[] = { overworld_ascending_frames(gObjectEventPic_Orbeetle, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_OrbeetleGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_OrbeetleGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_BLIPBUG +#if P_FAMILY_NICKIT static const struct SpriteFrameImage sPicTable_Nickit[] = { overworld_ascending_frames(gObjectEventPic_Nickit, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Thievul[] = { overworld_ascending_frames(gObjectEventPic_Thievul, 4, 4), }; +#endif //P_FAMILY_NICKIT +#if P_FAMILY_GOSSIFLEUR static const struct SpriteFrameImage sPicTable_Gossifleur[] = { overworld_ascending_frames(gObjectEventPic_Gossifleur, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Eldegoss[] = { overworld_ascending_frames(gObjectEventPic_Eldegoss, 4, 4), }; +#endif //P_FAMILY_GOSSIFLEUR +#if P_FAMILY_WOOLOO static const struct SpriteFrameImage sPicTable_Wooloo[] = { overworld_ascending_frames(gObjectEventPic_Wooloo, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Dubwool[] = { overworld_ascending_frames(gObjectEventPic_Dubwool, 4, 4), }; +#endif //P_FAMILY_WOOLOO +#if P_FAMILY_CHEWTLE static const struct SpriteFrameImage sPicTable_Chewtle[] = { overworld_ascending_frames(gObjectEventPic_Chewtle, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Drednaw[] = { overworld_ascending_frames(gObjectEventPic_Drednaw, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_DrednawGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_DrednawGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_CHEWTLE +#if P_FAMILY_YAMPER static const struct SpriteFrameImage sPicTable_Yamper[] = { overworld_ascending_frames(gObjectEventPic_Yamper, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Boltund[] = { overworld_ascending_frames(gObjectEventPic_Boltund, 4, 4), }; +#endif //P_FAMILY_YAMPER +#if P_FAMILY_ROLYCOLY static const struct SpriteFrameImage sPicTable_Rolycoly[] = { overworld_ascending_frames(gObjectEventPic_Rolycoly, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Carkol[] = { overworld_ascending_frames(gObjectEventPic_Carkol, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Coalossal[] = { overworld_ascending_frames(gObjectEventPic_Coalossal, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_CoalossalGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_CoalossalGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_ROLYCOLY +#if P_FAMILY_APPLIN static const struct SpriteFrameImage sPicTable_Applin[] = { overworld_ascending_frames(gObjectEventPic_Applin, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Flapple[] = { overworld_ascending_frames(gObjectEventPic_Flapple, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_FlappleGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_FlappleGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS static const struct SpriteFrameImage sPicTable_Appletun[] = { overworld_ascending_frames(gObjectEventPic_Appletun, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_AppletunGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_AppletunGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#if P_GEN_9_CROSS_EVOS +/*static const struct SpriteFrameImage sPicTable_Dipplin[] = { + overworld_ascending_frames(gObjectEventPic_Dipplin, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Hydrapple[] = { + overworld_ascending_frames(gObjectEventPic_Hydrapple, 4, 4), +};*/ +#endif //P_GEN_9_CROSS_EVOS +#endif //P_FAMILY_APPLIN + +#if P_FAMILY_SILICOBRA static const struct SpriteFrameImage sPicTable_Silicobra[] = { overworld_ascending_frames(gObjectEventPic_Silicobra, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Sandaconda[] = { overworld_ascending_frames(gObjectEventPic_Sandaconda, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_SandacondaGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_SandacondaGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_SILICOBRA +#if P_FAMILY_CRAMORANT static const struct SpriteFrameImage sPicTable_Cramorant[] = { overworld_ascending_frames(gObjectEventPic_Cramorant, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_CramorantGulping[] = { + overworld_ascending_frames(gObjectEventPic_CramorantGulping, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_CramorantGorging[] = { + overworld_ascending_frames(gObjectEventPic_CramorantGorging, 4, 4), +};*/ +#endif //P_FAMILY_CRAMORANT +#if P_FAMILY_ARROKUDA static const struct SpriteFrameImage sPicTable_Arrokuda[] = { overworld_ascending_frames(gObjectEventPic_Arrokuda, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Barraskewda[] = { overworld_ascending_frames(gObjectEventPic_Barraskewda, 4, 4), }; +#endif //P_FAMILY_ARROKUDA +#if P_FAMILY_TOXEL static const struct SpriteFrameImage sPicTable_Toxel[] = { overworld_ascending_frames(gObjectEventPic_Toxel, 4, 4), }; - static const struct SpriteFrameImage sPicTable_ToxtricityAmped[] = { overworld_ascending_frames(gObjectEventPic_ToxtricityAmped, 4, 4), }; - static const struct SpriteFrameImage sPicTable_ToxtricityLowKey[] = { overworld_ascending_frames(gObjectEventPic_ToxtricityLowKey, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_ToxtricityGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_ToxtricityGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_TOXEL +#if P_FAMILY_SIZZLIPEDE static const struct SpriteFrameImage sPicTable_Sizzlipede[] = { overworld_ascending_frames(gObjectEventPic_Sizzlipede, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Centiskorch[] = { overworld_ascending_frames(gObjectEventPic_Centiskorch, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_CentiskorchGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_CentiskorchGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_SIZZLIPEDE +#if P_FAMILY_CLOBBOPUS static const struct SpriteFrameImage sPicTable_Clobbopus[] = { overworld_ascending_frames(gObjectEventPic_Clobbopus, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Grapploct[] = { overworld_ascending_frames(gObjectEventPic_Grapploct, 4, 4), }; +#endif //P_FAMILY_CLOBBOPUS +#if P_FAMILY_SINISTEA static const struct SpriteFrameImage sPicTable_Sinistea[] = { overworld_ascending_frames(gObjectEventPic_Sinistea, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Polteageist[] = { overworld_ascending_frames(gObjectEventPic_Polteageist, 4, 4), }; +#endif //P_FAMILY_SINISTEA +#if P_FAMILY_HATENNA static const struct SpriteFrameImage sPicTable_Hatenna[] = { overworld_ascending_frames(gObjectEventPic_Hatenna, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Hattrem[] = { overworld_ascending_frames(gObjectEventPic_Hattrem, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Hatterene[] = { overworld_ascending_frames(gObjectEventPic_Hatterene, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_HattereneGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_HattereneGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_HATENNA +#if P_FAMILY_IMPIDIMP static const struct SpriteFrameImage sPicTable_Impidimp[] = { overworld_ascending_frames(gObjectEventPic_Impidimp, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Morgrem[] = { overworld_ascending_frames(gObjectEventPic_Morgrem, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Grimmsnarl[] = { overworld_ascending_frames(gObjectEventPic_Grimmsnarl, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_GrimmsnarlGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_GrimmsnarlGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_IMPIDIMP -static const struct SpriteFrameImage sPicTable_Obstagoon[] = { - overworld_ascending_frames(gObjectEventPic_Obstagoon, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_Perrserker[] = { - overworld_ascending_frames(gObjectEventPic_Perrserker, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_Cursola[] = { - overworld_ascending_frames(gObjectEventPic_Cursola, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_Sirfetchd[] = { - overworld_ascending_frames(gObjectEventPic_Sirfetchd, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_MrRime[] = { - overworld_ascending_frames(gObjectEventPic_MrRime, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_Runerigus[] = { - overworld_ascending_frames(gObjectEventPic_Runerigus, 4, 4), -}; - +#if P_FAMILY_MILCERY static const struct SpriteFrameImage sPicTable_Milcery[] = { overworld_ascending_frames(gObjectEventPic_Milcery, 4, 4), }; @@ -3201,310 +5332,821 @@ static const struct SpriteFrameImage sPicTable_Milcery[] = { static const struct SpriteFrameImage sPicTable_AlcremieStrawberryVanillaCream[] = { overworld_ascending_frames(gObjectEventPic_AlcremieStrawberryVanillaCream, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_AlcremieGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_AlcremieGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_MILCERY +#if P_FAMILY_FALINKS static const struct SpriteFrameImage sPicTable_Falinks[] = { overworld_ascending_frames(gObjectEventPic_Falinks, 4, 4), }; +#endif //P_FAMILY_FALINKS +#if P_FAMILY_PINCURCHIN static const struct SpriteFrameImage sPicTable_Pincurchin[] = { overworld_ascending_frames(gObjectEventPic_Pincurchin, 4, 4), }; +#endif //P_FAMILY_PINCURCHIN +#if P_FAMILY_SNOM static const struct SpriteFrameImage sPicTable_Snom[] = { overworld_ascending_frames(gObjectEventPic_Snom, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Frosmoth[] = { overworld_ascending_frames(gObjectEventPic_Frosmoth, 4, 4), }; +#endif //P_FAMILY_SNOM +#if P_FAMILY_STONJOURNER static const struct SpriteFrameImage sPicTable_Stonjourner[] = { overworld_ascending_frames(gObjectEventPic_Stonjourner, 4, 4), }; +#endif //P_FAMILY_STONJOURNER +#if P_FAMILY_EISCUE static const struct SpriteFrameImage sPicTable_EiscueIceFace[] = { overworld_ascending_frames(gObjectEventPic_EiscueIceFace, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_EiscueNoiceFace[] = { + overworld_ascending_frames(gObjectEventPic_EiscueNoiceFace, 4, 4), +};*/ +#endif //P_FAMILY_EISCUE +#if P_FAMILY_INDEEDEE static const struct SpriteFrameImage sPicTable_IndeedeeMale[] = { overworld_ascending_frames(gObjectEventPic_IndeedeeMale, 4, 4), }; +static const struct SpriteFrameImage sPicTable_IndeedeeFemale[] = { + overworld_ascending_frames(gObjectEventPic_IndeedeeFemale, 4, 4), +}; +#endif //P_FAMILY_INDEEDEE +#if P_FAMILY_MORPEKO static const struct SpriteFrameImage sPicTable_MorpekoFullBelly[] = { overworld_ascending_frames(gObjectEventPic_MorpekoFullBelly, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_MorpekoHangry[] = { + overworld_ascending_frames(gObjectEventPic_MorpekoHangry, 4, 4), +};*/ +#endif //P_FAMILY_MORPEKO +#if P_FAMILY_CUFANT static const struct SpriteFrameImage sPicTable_Cufant[] = { overworld_ascending_frames(gObjectEventPic_Cufant, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Copperajah[] = { overworld_ascending_frames(gObjectEventPic_Copperajah, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_CopperajahGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_CopperajahGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_CUFANT +#if P_FAMILY_DRACOZOLT static const struct SpriteFrameImage sPicTable_Dracozolt[] = { overworld_ascending_frames(gObjectEventPic_Dracozolt, 4, 4), }; +#endif //P_FAMILY_DRACOZOLT +#if P_FAMILY_ARCTOZOLT static const struct SpriteFrameImage sPicTable_Arctozolt[] = { overworld_ascending_frames(gObjectEventPic_Arctozolt, 4, 4), }; +#endif //P_FAMILY_ARCTOZOLT +#if P_FAMILY_DRACOVISH static const struct SpriteFrameImage sPicTable_Dracovish[] = { overworld_ascending_frames(gObjectEventPic_Dracovish, 4, 4), }; +#endif //P_FAMILY_DRACOVISH +#if P_FAMILY_ARCTOVISH static const struct SpriteFrameImage sPicTable_Arctovish[] = { overworld_ascending_frames(gObjectEventPic_Arctovish, 4, 4), }; +#endif //P_FAMILY_ARCTOVISH +#if P_FAMILY_DURALUDON static const struct SpriteFrameImage sPicTable_Duraludon[] = { overworld_ascending_frames(gObjectEventPic_Duraludon, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_DuraludonGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_DuraludonGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#if P_GEN_9_CROSS_EVOS +/*static const struct SpriteFrameImage sPicTable_Archaludon[] = { + overworld_ascending_frames(gObjectEventPic_Archaludon, 4, 4), +};*/ +#endif //P_GEN_9_CROSS_EVOS +#endif //P_FAMILY_DURALUDON + +#if P_FAMILY_DREEPY static const struct SpriteFrameImage sPicTable_Dreepy[] = { overworld_ascending_frames(gObjectEventPic_Dreepy, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Drakloak[] = { overworld_ascending_frames(gObjectEventPic_Drakloak, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Dragapult[] = { overworld_ascending_frames(gObjectEventPic_Dragapult, 4, 4), }; +#endif //P_FAMILY_DREEPY +#if P_FAMILY_ZACIAN static const struct SpriteFrameImage sPicTable_ZacianHeroOfManyBattles[] = { overworld_ascending_frames(gObjectEventPic_ZacianHeroOfManyBattles, 4, 4), }; - static const struct SpriteFrameImage sPicTable_ZacianCrownedSword[] = { overworld_ascending_frames(gObjectEventPic_ZacianCrownedSword, 4, 4), }; +#endif //P_FAMILY_ZACIAN +#if P_FAMILY_ZAMAZENTA static const struct SpriteFrameImage sPicTable_ZamazentaHeroOfManyBattles[] = { overworld_ascending_frames(gObjectEventPic_ZamazentaHeroOfManyBattles, 4, 4), }; - static const struct SpriteFrameImage sPicTable_ZamazentaCrownedShield[] = { overworld_ascending_frames(gObjectEventPic_ZamazentaCrownedShield, 4, 4), }; -static const struct SpriteFrameImage sPicTable_Eternatus[] = { - overworld_ascending_frames(gObjectEventPic_Eternatus, 8, 8), -}; +#endif //P_FAMILY_ZAMAZENTA +#if P_FAMILY_ETERNATUS +static const struct SpriteFrameImage sPicTable_Eternatus[] = { + overworld_ascending_frames(gObjectEventPic_Eternatus, 4, 4), +}; +/*static const struct SpriteFrameImage sPicTable_EternatusEternamax[] = { + overworld_ascending_frames(gObjectEventPic_EternatusEternamax, 4, 4), +};*/ +#endif //P_FAMILY_ETERNATUS + +#if P_FAMILY_KUBFU static const struct SpriteFrameImage sPicTable_Kubfu[] = { overworld_ascending_frames(gObjectEventPic_Kubfu, 4, 4), }; - static const struct SpriteFrameImage sPicTable_Urshifu[] = { overworld_ascending_frames(gObjectEventPic_Urshifu, 4, 4), }; +#if P_GIGANTAMAX_FORMS +/*static const struct SpriteFrameImage sPicTable_UrshifuSingleStrikeStyleGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_UrshifuSingleStrikeStyleGigantamax, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_UrshifuRapidStrikeStyleGigantamax[] = { + overworld_ascending_frames(gObjectEventPic_UrshifuRapidStrikeStyleGigantamax, 4, 4), +};*/ +#endif //P_GIGANTAMAX_FORMS +#endif //P_FAMILY_KUBFU + +#if P_FAMILY_ZARUDE static const struct SpriteFrameImage sPicTable_Zarude[] = { overworld_ascending_frames(gObjectEventPic_Zarude, 4, 4), }; +/*static const struct SpriteFrameImage sPicTable_ZarudeDada[] = { + overworld_ascending_frames(gObjectEventPic_ZarudeDada, 4, 4), +};*/ +#endif //P_FAMILY_ZARUDE +#if P_FAMILY_REGIELEKI static const struct SpriteFrameImage sPicTable_Regieleki[] = { overworld_ascending_frames(gObjectEventPic_Regieleki, 4, 4), }; +#endif //P_FAMILY_REGIELEKI +#if P_FAMILY_REGIDRAGO static const struct SpriteFrameImage sPicTable_Regidrago[] = { overworld_ascending_frames(gObjectEventPic_Regidrago, 4, 4), }; +#endif //P_FAMILY_REGIDRAGO +#if P_FAMILY_GLASTRIER static const struct SpriteFrameImage sPicTable_Glastrier[] = { overworld_ascending_frames(gObjectEventPic_Glastrier, 4, 4), }; +#endif //P_FAMILY_GLASTRIER +#if P_FAMILY_SPECTRIER static const struct SpriteFrameImage sPicTable_Spectrier[] = { overworld_ascending_frames(gObjectEventPic_Spectrier, 4, 4), }; +#endif //P_FAMILY_SPECTRIER +#if P_FAMILY_CALYREX static const struct SpriteFrameImage sPicTable_Calyrex[] = { overworld_ascending_frames(gObjectEventPic_Calyrex, 4, 4), }; - -static const struct SpriteFrameImage sPicTable_MeowthGalarian[] = { - overworld_ascending_frames(gObjectEventPic_MeowthGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_PonytaGalarian[] = { - overworld_ascending_frames(gObjectEventPic_PonytaGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_RapidashGalarian[] = { - overworld_ascending_frames(gObjectEventPic_RapidashGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_SlowpokeGalarian[] = { - overworld_ascending_frames(gObjectEventPic_SlowpokeGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_SlowbroGalarian[] = { - overworld_ascending_frames(gObjectEventPic_SlowbroGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_FarfetchdGalarian[] = { - overworld_ascending_frames(gObjectEventPic_FarfetchdGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_WeezingGalarian[] = { - overworld_ascending_frames(gObjectEventPic_WeezingGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_MrMimeGalarian[] = { - overworld_ascending_frames(gObjectEventPic_MrMimeGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_ArticunoGalarian[] = { - overworld_ascending_frames(gObjectEventPic_ArticunoGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_MoltresGalarian[] = { - overworld_ascending_frames(gObjectEventPic_MoltresGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_SlowkingGalarian[] = { - overworld_ascending_frames(gObjectEventPic_SlowkingGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_CorsolaGalarian[] = { - overworld_ascending_frames(gObjectEventPic_CorsolaGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_ZigzagoonGalarian[] = { - overworld_ascending_frames(gObjectEventPic_ZigzagoonGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_LinooneGalarian[] = { - overworld_ascending_frames(gObjectEventPic_LinooneGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_DarumakaGalarian[] = { - overworld_ascending_frames(gObjectEventPic_DarumakaGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_DarmanitanGalarianStandardMode[] = { - overworld_ascending_frames(gObjectEventPic_DarmanitanGalarianStandardMode, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_YamaskGalarian[] = { - overworld_ascending_frames(gObjectEventPic_YamaskGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_StunfiskGalarian[] = { - overworld_ascending_frames(gObjectEventPic_StunfiskGalarian, 4, 4), -}; - -static const struct SpriteFrameImage sPicTable_ZapdosGalarian[] = { - overworld_ascending_frames(gObjectEventPic_ZapdosGalarian, 4, 4), -}; - +#if P_FUSION_FORMS static const struct SpriteFrameImage sPicTable_CalyrexIceRider[] = { overworld_ascending_frames(gObjectEventPic_CalyrexIceRider, 4, 4), }; +#endif //P_FUSION_FORMS +#if P_FUSION_FORMS static const struct SpriteFrameImage sPicTable_CalyrexShadowRider[] = { overworld_ascending_frames(gObjectEventPic_CalyrexShadowRider, 4, 4), }; +#endif //P_FUSION_FORMS +#endif //P_FAMILY_CALYREX -static const struct SpriteFrameImage sPicTable_Wyrdeer[] = { - overworld_ascending_frames(gObjectEventPic_Wyrdeer, 4, 4), +#if P_FAMILY_SPRIGATITO +/*static const struct SpriteFrameImage sPicTable_Sprigatito[] = { + overworld_ascending_frames(gObjectEventPic_Sprigatito, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Floragato[] = { + overworld_ascending_frames(gObjectEventPic_Floragato, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Meowscarada[] = { + overworld_ascending_frames(gObjectEventPic_Meowscarada, 4, 4), +};*/ +#endif //P_FAMILY_SPRIGATITO -static const struct SpriteFrameImage sPicTable_Kleavor[] = { - overworld_ascending_frames(gObjectEventPic_Kleavor, 4, 4), +#if P_FAMILY_FUECOCO +/*static const struct SpriteFrameImage sPicTable_Fuecoco[] = { + overworld_ascending_frames(gObjectEventPic_Fuecoco, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Crocalor[] = { + overworld_ascending_frames(gObjectEventPic_Crocalor, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Skeledirge[] = { + overworld_ascending_frames(gObjectEventPic_Skeledirge, 4, 4), +};*/ +#endif //P_FAMILY_FUECOCO -static const struct SpriteFrameImage sPicTable_Ursaluna[] = { - overworld_ascending_frames(gObjectEventPic_Ursaluna, 4, 4), +#if P_FAMILY_QUAXLY +/*static const struct SpriteFrameImage sPicTable_Quaxly[] = { + overworld_ascending_frames(gObjectEventPic_Quaxly, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Quaxwell[] = { + overworld_ascending_frames(gObjectEventPic_Quaxwell, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Quaquaval[] = { + overworld_ascending_frames(gObjectEventPic_Quaquaval, 4, 4), +};*/ +#endif //P_FAMILY_QUAXLY -static const struct SpriteFrameImage sPicTable_SneaselHisuian[] = { - overworld_ascending_frames(gObjectEventPic_SneaselHisuian, 4, 4), +#if P_FAMILY_LECHONK +/*static const struct SpriteFrameImage sPicTable_Lechonk[] = { + overworld_ascending_frames(gObjectEventPic_Lechonk, 4, 4), }; +static const struct SpriteFrameImage sPicTable_OinkologneMale[] = { + overworld_ascending_frames(gObjectEventPic_OinkologneMale, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_OinkologneFemale[] = { + overworld_ascending_frames(gObjectEventPic_OinkologneFemale, 4, 4), +};*/ +#endif //P_FAMILY_LECHONK -static const struct SpriteFrameImage sPicTable_Sneasler[] = { - overworld_ascending_frames(gObjectEventPic_Sneasler, 4, 4), +#if P_FAMILY_TAROUNTULA +/*static const struct SpriteFrameImage sPicTable_Tarountula[] = { + overworld_ascending_frames(gObjectEventPic_Tarountula, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Spidops[] = { + overworld_ascending_frames(gObjectEventPic_Spidops, 4, 4), +};*/ +#endif //P_FAMILY_TAROUNTULA -static const struct SpriteFrameImage sPicTable_Overqwil[] = { - overworld_ascending_frames(gObjectEventPic_Overqwil, 4, 4), +#if P_FAMILY_NYMBLE +/*static const struct SpriteFrameImage sPicTable_Nymble[] = { + overworld_ascending_frames(gObjectEventPic_Nymble, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Lokix[] = { + overworld_ascending_frames(gObjectEventPic_Lokix, 4, 4), +};*/ +#endif //P_FAMILY_NYMBLE -static const struct SpriteFrameImage sPicTable_EnamorusIncarnate[] = { - overworld_ascending_frames(gObjectEventPic_EnamorusIncarnate, 8, 8), +#if P_FAMILY_PAWMI +/*static const struct SpriteFrameImage sPicTable_Pawmi[] = { + overworld_ascending_frames(gObjectEventPic_Pawmi, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Pawmo[] = { + overworld_ascending_frames(gObjectEventPic_Pawmo, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Pawmot[] = { + overworld_ascending_frames(gObjectEventPic_Pawmot, 4, 4), +};*/ +#endif //P_FAMILY_PAWMI -static const struct SpriteFrameImage sPicTable_EnamorusTherian[] = { - overworld_ascending_frames(gObjectEventPic_EnamorusTherian, 8, 8), +#if P_FAMILY_TANDEMAUS +/*static const struct SpriteFrameImage sPicTable_Tandemaus[] = { + overworld_ascending_frames(gObjectEventPic_Tandemaus, 4, 4), }; +static const struct SpriteFrameImage sPicTable_MausholdFamilyOfThree[] = { + overworld_ascending_frames(gObjectEventPic_MausholdFamilyOfThree, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_MausholdFamilyOfFour[] = { + overworld_ascending_frames(gObjectEventPic_MausholdFamilyOfFour, 4, 4), +};*/ +#endif //P_FAMILY_TANDEMAUS -static const struct SpriteFrameImage sPicTable_GrowlitheHisuian[] = { - overworld_ascending_frames(gObjectEventPic_GrowlitheHisuian, 4, 4), +#if P_FAMILY_FIDOUGH +/*static const struct SpriteFrameImage sPicTable_Fidough[] = { + overworld_ascending_frames(gObjectEventPic_Fidough, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Dachsbun[] = { + overworld_ascending_frames(gObjectEventPic_Dachsbun, 4, 4), +};*/ +#endif //P_FAMILY_FIDOUGH -static const struct SpriteFrameImage sPicTable_ArcanineHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ArcanineHisuian, 4, 4), +#if P_FAMILY_SMOLIV +/*static const struct SpriteFrameImage sPicTable_Smoliv[] = { + overworld_ascending_frames(gObjectEventPic_Smoliv, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Dolliv[] = { + overworld_ascending_frames(gObjectEventPic_Dolliv, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Arboliva[] = { + overworld_ascending_frames(gObjectEventPic_Arboliva, 4, 4), +};*/ +#endif //P_FAMILY_SMOLIV -static const struct SpriteFrameImage sPicTable_VoltorbHisuian[] = { - overworld_ascending_frames(gObjectEventPic_VoltorbHisuian, 4, 4), +#if P_FAMILY_SQUAWKABILLY +/*static const struct SpriteFrameImage sPicTable_SquawkabillyGreenPlumage[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyGreenPlumage, 4, 4), }; +static const struct SpriteFrameImage sPicTable_SquawkabillyBluePlumage[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyBluePlumage, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_SquawkabillyYellowPlumage[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyYellowPlumage, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_SquawkabillyWhitePlumage[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyWhitePlumage, 4, 4), +};*/ +#endif //P_FAMILY_SQUAWKABILLY -static const struct SpriteFrameImage sPicTable_ElectrodeHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ElectrodeHisuian, 4, 4), +#if P_FAMILY_NACLI +/*static const struct SpriteFrameImage sPicTable_Nacli[] = { + overworld_ascending_frames(gObjectEventPic_Nacli, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Naclstack[] = { + overworld_ascending_frames(gObjectEventPic_Naclstack, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Garganacl[] = { + overworld_ascending_frames(gObjectEventPic_Garganacl, 4, 4), +};*/ +#endif //P_FAMILY_NACLI -static const struct SpriteFrameImage sPicTable_BraviaryHisuian[] = { - overworld_ascending_frames(gObjectEventPic_BraviaryHisuian, 4, 4), +#if P_FAMILY_CHARCADET +/*static const struct SpriteFrameImage sPicTable_Charcadet[] = { + overworld_ascending_frames(gObjectEventPic_Charcadet, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Armarouge[] = { + overworld_ascending_frames(gObjectEventPic_Armarouge, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Ceruledge[] = { + overworld_ascending_frames(gObjectEventPic_Ceruledge, 4, 4), +};*/ +#endif //P_FAMILY_CHARCADET -static const struct SpriteFrameImage sPicTable_QwilfishHisuian[] = { - overworld_ascending_frames(gObjectEventPic_QwilfishHisuian, 4, 4), +#if P_FAMILY_TADBULB +/*static const struct SpriteFrameImage sPicTable_Tadbulb[] = { + overworld_ascending_frames(gObjectEventPic_Tadbulb, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Bellibolt[] = { + overworld_ascending_frames(gObjectEventPic_Bellibolt, 4, 4), +};*/ +#endif //P_FAMILY_TADBULB -static const struct SpriteFrameImage sPicTable_ZoruaHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ZoruaHisuian, 4, 4), +#if P_FAMILY_WATTREL +/*static const struct SpriteFrameImage sPicTable_Wattrel[] = { + overworld_ascending_frames(gObjectEventPic_Wattrel, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Kilowattrel[] = { + overworld_ascending_frames(gObjectEventPic_Kilowattrel, 4, 4), +};*/ +#endif //P_FAMILY_WATTREL -static const struct SpriteFrameImage sPicTable_ZoroarkHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ZoroarkHisuian, 4, 4), +#if P_FAMILY_MASCHIFF +/*static const struct SpriteFrameImage sPicTable_Maschiff[] = { + overworld_ascending_frames(gObjectEventPic_Maschiff, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Mabosstiff[] = { + overworld_ascending_frames(gObjectEventPic_Mabosstiff, 4, 4), +};*/ +#endif //P_FAMILY_MASCHIFF -static const struct SpriteFrameImage sPicTable_SliggooHisuian[] = { - overworld_ascending_frames(gObjectEventPic_SliggooHisuian, 4, 4), +#if P_FAMILY_SHROODLE +/*static const struct SpriteFrameImage sPicTable_Shroodle[] = { + overworld_ascending_frames(gObjectEventPic_Shroodle, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Grafaiai[] = { + overworld_ascending_frames(gObjectEventPic_Grafaiai, 4, 4), +};*/ +#endif //P_FAMILY_SHROODLE -static const struct SpriteFrameImage sPicTable_GoodraHisuian[] = { - overworld_ascending_frames(gObjectEventPic_GoodraHisuian, 4, 4), +#if P_FAMILY_BRAMBLIN +/*static const struct SpriteFrameImage sPicTable_Bramblin[] = { + overworld_ascending_frames(gObjectEventPic_Bramblin, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Brambleghast[] = { + overworld_ascending_frames(gObjectEventPic_Brambleghast, 4, 4), +};*/ +#endif //P_FAMILY_BRAMBLIN -static const struct SpriteFrameImage sPicTable_AvaluggHisuian[] = { - overworld_ascending_frames(gObjectEventPic_AvaluggHisuian, 4, 4), +#if P_FAMILY_TOEDSCOOL +/*static const struct SpriteFrameImage sPicTable_Toedscool[] = { + overworld_ascending_frames(gObjectEventPic_Toedscool, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Toedscruel[] = { + overworld_ascending_frames(gObjectEventPic_Toedscruel, 4, 4), +};*/ +#endif //P_FAMILY_TOEDSCOOL -static const struct SpriteFrameImage sPicTable_DecidueyeHisuian[] = { - overworld_ascending_frames(gObjectEventPic_DecidueyeHisuian, 4, 4), -}; +#if P_FAMILY_KLAWF +/*static const struct SpriteFrameImage sPicTable_Klawf[] = { + overworld_ascending_frames(gObjectEventPic_Klawf, 4, 4), +};*/ +#endif //P_FAMILY_KLAWF -static const struct SpriteFrameImage sPicTable_TyphlosionHisuian[] = { - overworld_ascending_frames(gObjectEventPic_TyphlosionHisuian, 4, 4), +#if P_FAMILY_CAPSAKID +/*static const struct SpriteFrameImage sPicTable_Capsakid[] = { + overworld_ascending_frames(gObjectEventPic_Capsakid, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Scovillain[] = { + overworld_ascending_frames(gObjectEventPic_Scovillain, 4, 4), +};*/ +#endif //P_FAMILY_CAPSAKID -static const struct SpriteFrameImage sPicTable_SamurottHisuian[] = { - overworld_ascending_frames(gObjectEventPic_SamurottHisuian, 4, 4), +#if P_FAMILY_RELLOR +/*static const struct SpriteFrameImage sPicTable_Rellor[] = { + overworld_ascending_frames(gObjectEventPic_Rellor, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Rabsca[] = { + overworld_ascending_frames(gObjectEventPic_Rabsca, 4, 4), +};*/ +#endif //P_FAMILY_RELLOR -static const struct SpriteFrameImage sPicTable_LilligantHisuian[] = { - overworld_ascending_frames(gObjectEventPic_LilligantHisuian, 4, 4), +#if P_FAMILY_FLITTLE +/*static const struct SpriteFrameImage sPicTable_Flittle[] = { + overworld_ascending_frames(gObjectEventPic_Flittle, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Espathra[] = { + overworld_ascending_frames(gObjectEventPic_Espathra, 4, 4), +};*/ +#endif //P_FAMILY_FLITTLE -static const struct SpriteFrameImage sPicTable_DialgaOrigin[] = { - overworld_ascending_frames(gObjectEventPic_DialgaOrigin, 8, 8), +#if P_FAMILY_TINKATINK +/*static const struct SpriteFrameImage sPicTable_Tinkatink[] = { + overworld_ascending_frames(gObjectEventPic_Tinkatink, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Tinkatuff[] = { + overworld_ascending_frames(gObjectEventPic_Tinkatuff, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Tinkaton[] = { + overworld_ascending_frames(gObjectEventPic_Tinkaton, 4, 4), +};*/ +#endif //P_FAMILY_TINKATINK -static const struct SpriteFrameImage sPicTable_PalkiaOrigin[] = { - overworld_ascending_frames(gObjectEventPic_PalkiaOrigin, 8, 8), +#if P_FAMILY_WIGLETT +/*static const struct SpriteFrameImage sPicTable_Wiglett[] = { + overworld_ascending_frames(gObjectEventPic_Wiglett, 4, 4), }; +static const struct SpriteFrameImage sPicTable_Wugtrio[] = { + overworld_ascending_frames(gObjectEventPic_Wugtrio, 4, 4), +};*/ +#endif //P_FAMILY_WIGLETT + +#if P_FAMILY_BOMBIRDIER +/*static const struct SpriteFrameImage sPicTable_Bombirdier[] = { + overworld_ascending_frames(gObjectEventPic_Bombirdier, 4, 4), +};*/ +#endif //P_FAMILY_BOMBIRDIER + +#if P_FAMILY_FINIZEN +/*static const struct SpriteFrameImage sPicTable_Finizen[] = { + overworld_ascending_frames(gObjectEventPic_Finizen, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PalafinZero[] = { + overworld_ascending_frames(gObjectEventPic_PalafinZero, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_PalafinHero[] = { + overworld_ascending_frames(gObjectEventPic_PalafinHero, 4, 4), +};*/ +#endif //P_FAMILY_FINIZEN + +#if P_FAMILY_VAROOM +/*static const struct SpriteFrameImage sPicTable_Varoom[] = { + overworld_ascending_frames(gObjectEventPic_Varoom, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Revavroom[] = { + overworld_ascending_frames(gObjectEventPic_Revavroom, 4, 4), +};*/ +#endif //P_FAMILY_VAROOM + +#if P_FAMILY_CYCLIZAR +/*static const struct SpriteFrameImage sPicTable_Cyclizar[] = { + overworld_ascending_frames(gObjectEventPic_Cyclizar, 4, 4), +};*/ +#endif //P_FAMILY_CYCLIZAR + +#if P_FAMILY_ORTHWORM +/*static const struct SpriteFrameImage sPicTable_Orthworm[] = { + overworld_ascending_frames(gObjectEventPic_Orthworm, 4, 4), +};*/ +#endif //P_FAMILY_ORTHWORM + +#if P_FAMILY_GLIMMET +/*static const struct SpriteFrameImage sPicTable_Glimmet[] = { + overworld_ascending_frames(gObjectEventPic_Glimmet, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Glimmora[] = { + overworld_ascending_frames(gObjectEventPic_Glimmora, 4, 4), +};*/ +#endif //P_FAMILY_GLIMMET + +#if P_FAMILY_GREAVARD +/*static const struct SpriteFrameImage sPicTable_Greavard[] = { + overworld_ascending_frames(gObjectEventPic_Greavard, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Houndstone[] = { + overworld_ascending_frames(gObjectEventPic_Houndstone, 4, 4), +};*/ +#endif //P_FAMILY_GREAVARD + +#if P_FAMILY_FLAMIGO +/*static const struct SpriteFrameImage sPicTable_Flamigo[] = { + overworld_ascending_frames(gObjectEventPic_Flamigo, 4, 4), +};*/ +#endif //P_FAMILY_FLAMIGO + +#if P_FAMILY_CETODDLE +/*static const struct SpriteFrameImage sPicTable_Cetoddle[] = { + overworld_ascending_frames(gObjectEventPic_Cetoddle, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Cetitan[] = { + overworld_ascending_frames(gObjectEventPic_Cetitan, 4, 4), +};*/ +#endif //P_FAMILY_CETODDLE + +#if P_FAMILY_VELUZA +/*static const struct SpriteFrameImage sPicTable_Veluza[] = { + overworld_ascending_frames(gObjectEventPic_Veluza, 4, 4), +};*/ +#endif //P_FAMILY_VELUZA + +#if P_FAMILY_DONDOZO +/*static const struct SpriteFrameImage sPicTable_Dondozo[] = { + overworld_ascending_frames(gObjectEventPic_Dondozo, 4, 4), +};*/ +#endif //P_FAMILY_DONDOZO + +#if P_FAMILY_TATSUGIRI +/*static const struct SpriteFrameImage sPicTable_TatsugiriCurly[] = { + overworld_ascending_frames(gObjectEventPic_TatsugiriCurly, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_TatsugiriDroopy[] = { + overworld_ascending_frames(gObjectEventPic_TatsugiriDroopy, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_TatsugiriStretchy[] = { + overworld_ascending_frames(gObjectEventPic_TatsugiriStretchy, 4, 4), +};*/ +#endif //P_FAMILY_DONDOZO + +#if P_FAMILY_GREAT_TUSK +/*static const struct SpriteFrameImage sPicTable_GreatTusk[] = { + overworld_ascending_frames(gObjectEventPic_GreatTusk, 4, 4), +};*/ +#endif //P_FAMILY_GREAT_TUSK + +#if P_FAMILY_SCREAM_TAIL +/*static const struct SpriteFrameImage sPicTable_ScreamTail[] = { + overworld_ascending_frames(gObjectEventPic_ScreamTail, 4, 4), +};*/ +#endif //P_FAMILY_SCREAM_TAIL + +#if P_FAMILY_BRUTE_BONNET +/*static const struct SpriteFrameImage sPicTable_BruteBonnet[] = { + overworld_ascending_frames(gObjectEventPic_BruteBonnet, 4, 4), +};*/ +#endif //P_FAMILY_BRUTE_BONNET + +#if P_FAMILY_FLUTTER_MANE +/*static const struct SpriteFrameImage sPicTable_FlutterMane[] = { + overworld_ascending_frames(gObjectEventPic_FlutterMane, 4, 4), +};*/ +#endif //P_FAMILY_FLUTTER_MANE + +#if P_FAMILY_SLITHER_WING +/*static const struct SpriteFrameImage sPicTable_SlitherWing[] = { + overworld_ascending_frames(gObjectEventPic_SlitherWing, 4, 4), +};*/ +#endif //P_FAMILY_SLITHER_WING + +#if P_FAMILY_SANDY_SHOCKS +/*static const struct SpriteFrameImage sPicTable_SandyShocks[] = { + overworld_ascending_frames(gObjectEventPic_SandyShocks, 4, 4), +};*/ +#endif //P_FAMILY_SANDY_SHOCKS + +#if P_FAMILY_IRON_TREADS +/*static const struct SpriteFrameImage sPicTable_IronTreads[] = { + overworld_ascending_frames(gObjectEventPic_IronTreads, 4, 4), +};*/ +#endif //P_FAMILY_IRON_TREADS + +#if P_FAMILY_IRON_BUNDLE +/*static const struct SpriteFrameImage sPicTable_IronBundle[] = { + overworld_ascending_frames(gObjectEventPic_IronBundle, 4, 4), +};*/ +#endif //P_FAMILY_IRON_BUNDLE + +#if P_FAMILY_IRON_HANDS +/*static const struct SpriteFrameImage sPicTable_IronHands[] = { + overworld_ascending_frames(gObjectEventPic_IronHands, 4, 4), +};*/ +#endif //P_FAMILY_IRON_HANDS + +#if P_FAMILY_IRON_JUGULIS +/*static const struct SpriteFrameImage sPicTable_IronJugulis[] = { + overworld_ascending_frames(gObjectEventPic_IronJugulis, 4, 4), +};*/ +#endif //P_FAMILY_IRON_JUGULIS + +#if P_FAMILY_IRON_MOTH +/*static const struct SpriteFrameImage sPicTable_IronMoth[] = { + overworld_ascending_frames(gObjectEventPic_IronMoth, 4, 4), +};*/ +#endif //P_FAMILY_IRON_MOTH + +#if P_FAMILY_IRON_THORNS +/*static const struct SpriteFrameImage sPicTable_IronThorns[] = { + overworld_ascending_frames(gObjectEventPic_IronThorns, 4, 4), +};*/ +#endif //P_FAMILY_IRON_THORNS + +#if P_FAMILY_FRIGIBAX +/*static const struct SpriteFrameImage sPicTable_Frigibax[] = { + overworld_ascending_frames(gObjectEventPic_Frigibax, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Arctibax[] = { + overworld_ascending_frames(gObjectEventPic_Arctibax, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Baxcalibur[] = { + overworld_ascending_frames(gObjectEventPic_Baxcalibur, 4, 4), +};*/ +#endif //P_FAMILY_FRIGIBAX + +#if P_FAMILY_GIMMIGHOUL +/*static const struct SpriteFrameImage sPicTable_GimmighoulChest[] = { + overworld_ascending_frames(gObjectEventPic_GimmighoulChest, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_GimmighoulRoaming[] = { + overworld_ascending_frames(gObjectEventPic_GimmighoulRoaming, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Gholdengo[] = { + overworld_ascending_frames(gObjectEventPic_Gholdengo, 4, 4), +};*/ +#endif //P_FAMILY_GIMMIGHOUL + +#if P_FAMILY_WO_CHIEN +/*static const struct SpriteFrameImage sPicTable_WoChien[] = { + overworld_ascending_frames(gObjectEventPic_WoChien, 4, 4), +};*/ +#endif //P_FAMILY_WO_CHIEN + +#if P_FAMILY_CHIEN_PAO +/*static const struct SpriteFrameImage sPicTable_ChienPao[] = { + overworld_ascending_frames(gObjectEventPic_ChienPao, 4, 4), +};*/ +#endif //P_FAMILY_CHIEN_PAO + +#if P_FAMILY_TING_LU +/*static const struct SpriteFrameImage sPicTable_TingLu[] = { + overworld_ascending_frames(gObjectEventPic_TingLu, 4, 4), +};*/ +#endif //P_FAMILY_TING_LU + +#if P_FAMILY_CHI_YU +/*static const struct SpriteFrameImage sPicTable_ChiYu[] = { + overworld_ascending_frames(gObjectEventPic_ChiYu, 4, 4), +};*/ +#endif //P_FAMILY_CHI_YU + +#if P_FAMILY_ROARING_MOON +/*static const struct SpriteFrameImage sPicTable_RoaringMoon[] = { + overworld_ascending_frames(gObjectEventPic_RoaringMoon, 4, 4), +};*/ +#endif //P_FAMILY_ROARING_MOON + +#if P_FAMILY_IRON_VALIANT +/*static const struct SpriteFrameImage sPicTable_IronValiant[] = { + overworld_ascending_frames(gObjectEventPic_IronValiant, 4, 4), +};*/ +#endif //P_FAMILY_IRON_VALIANT + +#if P_FAMILY_KORAIDON +/*static const struct SpriteFrameImage sPicTable_Koraidon[] = { + overworld_ascending_frames(gObjectEventPic_Koraidon, 4, 4), +};*/ +#endif //P_FAMILY_KORAIDON + +#if P_FAMILY_MIRAIDON +/*static const struct SpriteFrameImage sPicTable_Miraidon[] = { + overworld_ascending_frames(gObjectEventPic_Miraidon, 4, 4), +};*/ +#endif //P_FAMILY_MIRAIDON + +#if P_FAMILY_WALKING_WAKE +/*static const struct SpriteFrameImage sPicTable_WalkingWake[] = { + overworld_ascending_frames(gObjectEventPic_WalkingWake, 4, 4), +};*/ +#endif //P_FAMILY_WALKING_WAKE + +#if P_FAMILY_IRON_LEAVES +/*static const struct SpriteFrameImage sPicTable_IronLeaves[] = { + overworld_ascending_frames(gObjectEventPic_IronLeaves, 4, 4), +};*/ +#endif //P_FAMILY_IRON_LEAVES + +#if P_FAMILY_POLTCHAGEIST +/*static const struct SpriteFrameImage sPicTable_Poltchageist[] = { + overworld_ascending_frames(gObjectEventPic_Poltchageist, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_Sinistcha[] = { + overworld_ascending_frames(gObjectEventPic_Sinistcha, 4, 4), +};*/ +#endif //P_FAMILY_POLTCHAGEIST + +#if P_FAMILY_OKIDOGI +/*static const struct SpriteFrameImage sPicTable_Okidogi[] = { + overworld_ascending_frames(gObjectEventPic_Okidogi, 4, 4), +};*/ +#endif //P_FAMILY_OKIDOGI + +#if P_FAMILY_MUNKIDORI +/*static const struct SpriteFrameImage sPicTable_Munkidori[] = { + overworld_ascending_frames(gObjectEventPic_Munkidori, 4, 4), +};*/ +#endif //P_FAMILY_MUNKIDORI + +#if P_FAMILY_FEZANDIPITI +/*static const struct SpriteFrameImage sPicTable_Fezandipiti[] = { + overworld_ascending_frames(gObjectEventPic_Fezandipiti, 4, 4), +};*/ +#endif //P_FAMILY_FEZANDIPITI + +#if P_FAMILY_OGERPON +/*static const struct SpriteFrameImage sPicTable_OgerponTealMask[] = { + overworld_ascending_frames(gObjectEventPic_OgerponTealMask, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_OgerponWellspringMask[] = { + overworld_ascending_frames(gObjectEventPic_OgerponWellspringMask, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_OgerponHearthflameMask[] = { + overworld_ascending_frames(gObjectEventPic_OgerponHearthflameMask, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_OgerponCornerstoneMask[] = { + overworld_ascending_frames(gObjectEventPic_OgerponCornerstoneMask, 4, 4), +};*/ +#endif //P_FAMILY_OGERPON + +#if P_FAMILY_GOUGING_FIRE +/*static const struct SpriteFrameImage sPicTable_GougingFire[] = { + overworld_ascending_frames(gObjectEventPic_GougingFire, 4, 4), +};*/ +#endif //P_FAMILY_GOUGING_FIRE + +#if P_FAMILY_RAGING_BOLT +/*static const struct SpriteFrameImage sPicTable_RagingBolt[] = { + overworld_ascending_frames(gObjectEventPic_RagingBolt, 4, 4), +};*/ +#endif //P_FAMILY_RAGING_BOLT + +#if P_FAMILY_IRON_BOULDER +/*static const struct SpriteFrameImage sPicTable_IronBoulder[] = { + overworld_ascending_frames(gObjectEventPic_IronBoulder, 4, 4), +};*/ +#endif //P_FAMILY_IRON_BOULDER + +#if P_FAMILY_IRON_CROWN +/*static const struct SpriteFrameImage sPicTable_IronCrown[] = { + overworld_ascending_frames(gObjectEventPic_IronCrown, 4, 4), +};*/ +#endif //P_FAMILY_IRON_CROWN + +#if P_FAMILY_TERAPAGOS +/*static const struct SpriteFrameImage sPicTable_TerapagosNormal[] = { + overworld_ascending_frames(gObjectEventPic_TerapagosNormal, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_TerapagosTerastal[] = { + overworld_ascending_frames(gObjectEventPic_TerapagosTerastal, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_TerapagosStellar[] = { + overworld_ascending_frames(gObjectEventPic_TerapagosStellar, 4, 4), +};*/ +#endif //P_FAMILY_TERAPAGOS + +#if P_FAMILY_PECHARUNT +/*static const struct SpriteFrameImage sPicTable_Pecharunt[] = { + overworld_ascending_frames(gObjectEventPic_Pecharunt, 4, 4), +};*/ +#endif //P_FAMILY_PECHARUNT + +#endif //P_FOLLOWERS \ No newline at end of file diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 70bd426e12..69abdbfcef 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -229,6 +229,7 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _( // Set .compressed = OW_GFX_COMPRESS #define COMP OW_GFX_COMPRESS +#if P_FOLLOWERS #define FOLLOWER(name, _size, shadow, _tracks) \ .followerData = { \ .tileTag = TAG_NONE, \ @@ -248,6 +249,9 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _( .images = sPicTable_##name, \ .affineAnims = gDummySpriteAffineAnimTable, \ }, +#else +#define FOLLOWER(name, _size, shadow, _tracks) +#endif // Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female. // 255 (MON_GENDERLESS) is reserved for genderless Pokémon. @@ -284,6 +288,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .backAnimId = BACK_ANIM_NONE, PALETTES(CircledQuestionMark), ICON(QuestionMark, 0), + .followerData = {TAG_NONE, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, COMP, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_None, gDummySpriteAffineAnimTable}, LEARNSETS(None), }, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 42553dfe34..31d0e4ae38 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1781,14 +1781,14 @@ static const struct ObjectEventGraphicsInfo * SpeciesToGraphicsInfo(u16 species, if (OW_GFX_COMPRESS) { if (graphicsInfo->tileTag == 0 && species < NUM_SPECIES) - return &gSpeciesInfo[SPECIES_PORYGON].followerData; + return &gSpeciesInfo[SPECIES_NONE].followerData; else if (graphicsInfo->tileTag != TAG_NONE && species >= NUM_SPECIES) - return &gSpeciesInfo[SPECIES_PORYGON].followerData; + return &gSpeciesInfo[SPECIES_NONE].followerData; else return graphicsInfo; } else - return graphicsInfo->tileTag == TAG_NONE ? graphicsInfo : &gSpeciesInfo[SPECIES_PORYGON].followerData; + return graphicsInfo->tileTag == TAG_NONE ? graphicsInfo : &gSpeciesInfo[SPECIES_NONE].followerData; } // Find, or load, the palette for the specified pokemon info