diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index 282ea29d3adb..4d26837b2800 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -1,5 +1,6 @@ const struct Fusion *const gFusionTablePointers[NUM_SPECIES] = { +#if P_FUSION_FORMS #if P_FAMILY_KYUREM [SPECIES_KYUREM] = sKyuremFusionTable, #if P_FAMILY_RESHIRAM @@ -31,4 +32,5 @@ const struct Fusion *const gFusionTablePointers[NUM_SPECIES] = [SPECIES_GLASTRIER] = sCalyrexFusionTable, #endif //P_FAMILY_GLASTRIER #endif //P_FAMILY_CALYREX +#endif //P_FUSION_FORMS }; diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index d285ad85f4b3..5edd6f42b55c 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -1,24 +1,36 @@ #if P_FAMILY_BULBASAUR static const struct FormChange sVenusaurFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_VENUSAUR_MEGA, ITEM_VENUSAURITE}, +#endif +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_VENUSAUR_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_BULBASAUR #if P_FAMILY_CHARMANDER static const struct FormChange sCharizardFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_CHARIZARD_MEGA_X, ITEM_CHARIZARDITE_X}, {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_CHARIZARD_MEGA_Y, ITEM_CHARIZARDITE_Y}, +#endif +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CHARIZARD_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CHARMANDER #if P_FAMILY_SQUIRTLE static const struct FormChange sBlastoiseFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_BLASTOISE_MEGA, ITEM_BLASTOISINITE}, +#endif +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BLASTOISE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SQUIRTLE @@ -26,21 +38,27 @@ static const struct FormChange sBlastoiseFormChangeTable[] = { #if P_FAMILY_CATERPIE static const struct FormChange sButterfreeFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BUTTERFREE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CATERPIE #if P_FAMILY_WEEDLE static const struct FormChange sBeedrillFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_BEEDRILL_MEGA, ITEM_BEEDRILLITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_WEEDLE #if P_FAMILY_PIDGEY static const struct FormChange sPidgeotFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_PIDGEOT_MEGA, ITEM_PIDGEOTITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_PIDGEY @@ -48,7 +66,9 @@ static const struct FormChange sPidgeotFormChangeTable[] = { #if P_FAMILY_PIKACHU static const struct FormChange sPikachuFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_PIKACHU_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_PIKACHU @@ -56,14 +76,18 @@ static const struct FormChange sPikachuFormChangeTable[] = #if P_FAMILY_MEOWTH static const struct FormChange sMeowthFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MEOWTH_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MEOWTH #if P_FAMILY_ABRA static const struct FormChange sAlakazamFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_ALAKAZAM_MEGA, ITEM_ALAKAZITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_ABRA @@ -71,22 +95,30 @@ static const struct FormChange sAlakazamFormChangeTable[] = { #if P_FAMILY_MACHOP static const struct FormChange sMachampFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MACHAMP_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MACHOP #if P_FAMILY_SLOWPOKE static const struct FormChange sSlowbroFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SLOWBRO_MEGA, ITEM_SLOWBRONITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SLOWPOKE #if P_FAMILY_GASTLY static const struct FormChange sGengarFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GENGAR_MEGA, ITEM_GENGARITE}, +#endif +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GENGAR_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_GASTLY @@ -94,7 +126,9 @@ static const struct FormChange sGengarFormChangeTable[] = { #if P_FAMILY_ONIX #if P_GEN_2_CROSS_EVOS static const struct FormChange sSteelixFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_STEELIX_MEGA, ITEM_STEELIXITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_GEN_2_CROSS_EVOS @@ -103,14 +137,18 @@ static const struct FormChange sSteelixFormChangeTable[] = { #if P_FAMILY_KRABBY static const struct FormChange sKinglerFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_KINGLER_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_KRABBY #if P_FAMILY_KANGASKHAN static const struct FormChange sKangaskhanFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_KANGASKHAN_MEGA, ITEM_KANGASKHANITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_KANGASKHAN @@ -118,7 +156,9 @@ static const struct FormChange sKangaskhanFormChangeTable[] = { #if P_FAMILY_SCYTHER #if P_GEN_2_CROSS_EVOS static const struct FormChange sScizorFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SCIZOR_MEGA, ITEM_SCIZORITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_GEN_2_CROSS_EVOS @@ -126,112 +166,144 @@ static const struct FormChange sScizorFormChangeTable[] = { #if P_FAMILY_PINSIR static const struct FormChange sPinsirFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_PINSIR_MEGA, ITEM_PINSIRITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_PINSIR #if P_FAMILY_MAGIKARP static const struct FormChange sGyaradosFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GYARADOS_MEGA, ITEM_GYARADOSITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MAGIKARP #if P_FAMILY_LAPRAS static const struct FormChange sLaprasFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_LAPRAS_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_LAPRAS #if P_FAMILY_EEVEE static const struct FormChange sEeveeFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_EEVEE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_EEVEE #if P_FAMILY_AERODACTYL static const struct FormChange sAerodactylFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_AERODACTYL_MEGA, ITEM_AERODACTYLITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_AERODACTYL #if P_FAMILY_SNORLAX static const struct FormChange sSnorlaxFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_SNORLAX_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SNORLAX #if P_FAMILY_MEWTWO static const struct FormChange sMewtwoFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_MEWTWO_MEGA_X, ITEM_MEWTWONITE_X}, {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_MEWTWO_MEGA_Y, ITEM_MEWTWONITE_Y}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MEWTWO #if P_FAMILY_MAREEP static const struct FormChange sAmpharosFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_AMPHAROS_MEGA, ITEM_AMPHAROSITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MAREEP #if P_FAMILY_HERACROSS static const struct FormChange sHeracrossFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_HERACROSS_MEGA, ITEM_HERACRONITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_HERACROSS #if P_FAMILY_HOUNDOUR static const struct FormChange sHoundoomFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_HOUNDOOM_MEGA, ITEM_HOUNDOOMINITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_HOUNDOUR #if P_FAMILY_LARVITAR static const struct FormChange sTyranitarFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_TYRANITAR_MEGA, ITEM_TYRANITARITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_LARVITAR #if P_FAMILY_TREECKO static const struct FormChange sSceptileFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SCEPTILE_MEGA, ITEM_SCEPTILITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_TREECKO #if P_FAMILY_TORCHIC static const struct FormChange sBlazikenFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_BLAZIKEN_MEGA, ITEM_BLAZIKENITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_TORCHIC #if P_FAMILY_MUDKIP static const struct FormChange sSwampertFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SWAMPERT_MEGA, ITEM_SWAMPERTITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MUDKIP #if P_FAMILY_RALTS static const struct FormChange sGardevoirFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GARDEVOIR_MEGA, ITEM_GARDEVOIRITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #if P_GEN_4_CROSS_EVOS static const struct FormChange sGalladeFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GALLADE_MEGA, ITEM_GALLADITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_GEN_4_CROSS_EVOS @@ -239,77 +311,99 @@ static const struct FormChange sGalladeFormChangeTable[] = { #if P_FAMILY_SABLEYE static const struct FormChange sSableyeFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SABLEYE_MEGA, ITEM_SABLENITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SABLEYE #if P_FAMILY_MAWILE static const struct FormChange sMawileFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_MAWILE_MEGA, ITEM_MAWILITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MAWILE #if P_FAMILY_ARON static const struct FormChange sAggronFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_AGGRON_MEGA, ITEM_AGGRONITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_ARON #if P_FAMILY_MEDITITE static const struct FormChange sMedichamFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_MEDICHAM_MEGA, ITEM_MEDICHAMITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MEDITITE #if P_FAMILY_ELECTRIKE static const struct FormChange sManectricFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_MANECTRIC_MEGA, ITEM_MANECTITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_ELECTRIKE #if P_FAMILY_CARVANHA static const struct FormChange sSharpedoFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SHARPEDO_MEGA, ITEM_SHARPEDONITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CARVANHA #if P_FAMILY_NUMEL static const struct FormChange sCameruptFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_CAMERUPT_MEGA, ITEM_CAMERUPTITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_NUMEL #if P_FAMILY_SWABLU static const struct FormChange sAltariaFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_ALTARIA_MEGA, ITEM_ALTARIANITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SWABLU #if P_FAMILY_SHUPPET static const struct FormChange sBanetteFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_BANETTE_MEGA, ITEM_BANETTITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SHUPPET #if P_FAMILY_ABSOL static const struct FormChange sAbsolFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_ABSOL_MEGA, ITEM_ABSOLITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_ABSOL #if P_FAMILY_SNORUNT static const struct FormChange sGlalieFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GLALIE_MEGA, ITEM_GLALITITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SNORUNT @@ -338,49 +432,63 @@ static const struct FormChange sCastformFormChangeTable[] = { #if P_FAMILY_BAGON static const struct FormChange sSalamenceFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_SALAMENCE_MEGA, ITEM_SALAMENCITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_BAGON #if P_FAMILY_BELDUM static const struct FormChange sMetagrossFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_METAGROSS_MEGA, ITEM_METAGROSSITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_BELDUM #if P_FAMILY_LATIAS static const struct FormChange sLatiasFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_LATIAS_MEGA, ITEM_LATIASITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_LATIAS #if P_FAMILY_LATIOS static const struct FormChange sLatiosFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_LATIOS_MEGA, ITEM_LATIOSITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_LATIOS #if P_FAMILY_KYOGRE static const struct FormChange sKyogreFormChangeTable[] = { +#if P_PRIMAL_REVERSIONS {FORM_CHANGE_BATTLE_PRIMAL_REVERSION, SPECIES_KYOGRE_PRIMAL, ITEM_BLUE_ORB}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_KYOGRE #if P_FAMILY_GROUDON static const struct FormChange sGroudonFormChangeTable[] = { +#if P_PRIMAL_REVERSIONS {FORM_CHANGE_BATTLE_PRIMAL_REVERSION, SPECIES_GROUDON_PRIMAL, ITEM_RED_ORB}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_GROUDON #if P_FAMILY_RAYQUAZA static const struct FormChange sRayquazaFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_MOVE, SPECIES_RAYQUAZA_MEGA, MOVE_DRAGON_ASCENT}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_RAYQUAZA @@ -441,28 +549,36 @@ static const struct FormChange sCherrimFormChangeTable[] = { #if P_FAMILY_BUNEARY static const struct FormChange sLopunnyFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_LOPUNNY_MEGA, ITEM_LOPUNNITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_BUNEARY #if P_FAMILY_GIBLE static const struct FormChange sGarchompFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_GARCHOMP_MEGA, ITEM_GARCHOMPITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_GIBLE #if P_FAMILY_RIOLU static const struct FormChange sLucarioFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_LUCARIO_MEGA, ITEM_LUCARIONITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_RIOLU #if P_FAMILY_SNOVER static const struct FormChange sAbomasnowFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_ABOMASNOW_MEGA, ITEM_ABOMASITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SNOVER @@ -559,7 +675,9 @@ static const struct FormChange sArceusFormChangeTable[] = { #if P_FAMILY_AUDINO static const struct FormChange sAudinoFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_AUDINO_MEGA, ITEM_AUDINITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_AUDINO @@ -587,7 +705,9 @@ static const struct FormChange sDarmanitanGalarianFormChangeTable[] = { #if P_FAMILY_TRUBBISH static const struct FormChange sGarbodorFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GARBODOR_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_TRUBBISH @@ -712,7 +832,9 @@ static const struct FormChange sZygardeCompleteFormChangeTable[] = { #if P_FAMILY_DIANCIE static const struct FormChange sDiancieFormChangeTable[] = { +#if P_MEGA_EVOLUTIONS {FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM, SPECIES_DIANCIE_MEGA, ITEM_DIANCITE}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_DIANCIE @@ -851,11 +973,15 @@ static const struct Fusion sNecrozmaFusionTable[] = { }; static const struct FormChange sNecrozmaDuskManeFormChangeTable[] = { +#if P_ULTRA_BURST_FORMS {FORM_CHANGE_BATTLE_ULTRA_BURST, SPECIES_NECROZMA_ULTRA, ITEM_ULTRANECROZIUM_Z}, +#endif {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sNecrozmaDawnWingsFormChangeTable[] = { +#if P_ULTRA_BURST_FORMS {FORM_CHANGE_BATTLE_ULTRA_BURST, SPECIES_NECROZMA_ULTRA, ITEM_ULTRANECROZIUM_Z}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_NECROZMA @@ -863,7 +989,9 @@ static const struct FormChange sNecrozmaDawnWingsFormChangeTable[] = { #if P_FAMILY_MELTAN static const struct FormChange sMelmetalFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_MELMETAL_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MELTAN @@ -871,7 +999,9 @@ static const struct FormChange sMelmetalFormChangeTable[] = #if P_FAMILY_GROOKEY static const struct FormChange sRillaboomFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_RILLABOOM_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_GROOKEY @@ -879,7 +1009,9 @@ static const struct FormChange sRillaboomFormChangeTable[] = #if P_FAMILY_SCORBUNNY static const struct FormChange sCinderaceFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CINDERACE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SCORBUNNY @@ -887,7 +1019,9 @@ static const struct FormChange sCinderaceFormChangeTable[] = #if P_FAMILY_SOBBLE static const struct FormChange sInteleonFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_INTELEON_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SOBBLE @@ -895,7 +1029,9 @@ static const struct FormChange sInteleonFormChangeTable[] = #if P_FAMILY_ROOKIDEE static const struct FormChange sCorviknightFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CORVIKNIGHT_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_ROOKIDEE @@ -903,7 +1039,9 @@ static const struct FormChange sCorviknightFormChangeTable[] = #if P_FAMILY_BLIPBUG static const struct FormChange sOrbeetleFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_ORBEETLE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_BLIPBUG @@ -911,7 +1049,9 @@ static const struct FormChange sOrbeetleFormChangeTable[] = #if P_FAMILY_CHEWTLE static const struct FormChange sDrednawFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_DREDNAW_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CHEWTLE @@ -919,7 +1059,9 @@ static const struct FormChange sDrednawFormChangeTable[] = #if P_FAMILY_ROLYCOLY static const struct FormChange sCoalossalFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_COALOSSAL_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_ROLYCOLY @@ -927,13 +1069,17 @@ static const struct FormChange sCoalossalFormChangeTable[] = #if P_FAMILY_APPLIN static const struct FormChange sFlappleFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_FLAPPLE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sAppletunFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_APPLETUN_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_APPLIN @@ -941,7 +1087,9 @@ static const struct FormChange sAppletunFormChangeTable[] = #if P_FAMILY_SILICOBRA static const struct FormChange sSandacondaFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_SANDACONDA_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SILICOBRA @@ -960,13 +1108,17 @@ static const struct FormChange sCramorantFormChangeTable[] = { #if P_FAMILY_TOXEL static const struct FormChange sToxtricityAmpedFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_TOXTRICITY_AMPED_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sToxtricityLowKeyFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_TOXEL @@ -974,7 +1126,9 @@ static const struct FormChange sToxtricityLowKeyFormChangeTable[] = #if P_FAMILY_SIZZLIPEDE static const struct FormChange sCentiskorchFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_CENTISKORCH_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SIZZLIPEDE @@ -982,7 +1136,9 @@ static const struct FormChange sCentiskorchFormChangeTable[] = #if P_FAMILY_HATENNA static const struct FormChange sHattereneFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_HATTERENE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_HATENNA @@ -990,7 +1146,9 @@ static const struct FormChange sHattereneFormChangeTable[] = #if P_FAMILY_IMPIDIMP static const struct FormChange sGrimmsnarlFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_GRIMMSNARL_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_IMPIDIMP @@ -998,7 +1156,9 @@ static const struct FormChange sGrimmsnarlFormChangeTable[] = #if P_FAMILY_MILCERY static const struct FormChange sAlcremieFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_ALCREMIE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_MILCERY @@ -1024,14 +1184,18 @@ static const struct FormChange sMorpekoFormChangeTable[] = { #if P_FAMILY_CUFANT static const struct FormChange sCopperajahFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_COPPERAJAH_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_CUFANT #if P_FAMILY_DURALUDON static const struct FormChange sDuraludonFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_DURALUDON_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_DURALUDON @@ -1054,12 +1218,16 @@ static const struct FormChange sZamazentaFormChangeTable[] = { #if P_FAMILY_KUBFU static const struct FormChange sUrshifuSingleStrikeFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; static const struct FormChange sUrshifuRapidStrikeFormChangeTable[] = { +#if P_GIGANTAMAX_FORMS {FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX}, +#endif {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_KUBFU @@ -1101,7 +1269,9 @@ static const struct FormChange sOgerponFormChangeTable[] = { #if P_FAMILY_TERAPAGOS static const struct FormChange sTerapagosFormChangeTable[] = { {FORM_CHANGE_BEGIN_BATTLE, SPECIES_TERAPAGOS_TERASTAL}, //needs to be tied to the ability +#if P_TERA_FORMS //{FORM_CHANGE_TERASTALLIZATION, SPECIES_TERAPAGOS_STELLAR}, +#endif {FORM_CHANGE_END_BATTLE, SPECIES_TERAPAGOS_NORMAL}, {FORM_CHANGE_TERMINATOR}, }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 736a7abe701e..9ae2c3ebdb89 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1,8 +1,12 @@ #if P_FAMILY_BULBASAUR static const u16 sVenusaurFormSpeciesIdTable[] = { SPECIES_VENUSAUR, +#if P_MEGA_EVOLUTIONS SPECIES_VENUSAUR_MEGA, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_VENUSAUR_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_BULBASAUR @@ -10,9 +14,13 @@ static const u16 sVenusaurFormSpeciesIdTable[] = { #if P_FAMILY_CHARMANDER static const u16 sCharizardFormSpeciesIdTable[] = { SPECIES_CHARIZARD, +#if P_MEGA_EVOLUTIONS SPECIES_CHARIZARD_MEGA_X, SPECIES_CHARIZARD_MEGA_Y, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_CHARIZARD_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CHARMANDER @@ -20,8 +28,12 @@ static const u16 sCharizardFormSpeciesIdTable[] = { #if P_FAMILY_SQUIRTLE static const u16 sBlastoiseFormSpeciesIdTable[] = { SPECIES_BLASTOISE, +#if P_MEGA_EVOLUTIONS SPECIES_BLASTOISE_MEGA, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_BLASTOISE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SQUIRTLE @@ -29,7 +41,9 @@ static const u16 sBlastoiseFormSpeciesIdTable[] = { #if P_FAMILY_CATERPIE static const u16 sButterfreeFormSpeciesIdTable[] = { SPECIES_BUTTERFREE, +#if P_GIGANTAMAX_FORMS SPECIES_BUTTERFREE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CATERPIE @@ -37,7 +51,9 @@ static const u16 sButterfreeFormSpeciesIdTable[] = { #if P_FAMILY_WEEDLE static const u16 sBeedrillFormSpeciesIdTable[] = { SPECIES_BEEDRILL, +#if P_MEGA_EVOLUTIONS SPECIES_BEEDRILL_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_WEEDLE @@ -45,7 +61,9 @@ static const u16 sBeedrillFormSpeciesIdTable[] = { #if P_FAMILY_PIDGEY static const u16 sPidgeotFormSpeciesIdTable[] = { SPECIES_PIDGEOT, +#if P_MEGA_EVOLUTIONS SPECIES_PIDGEOT_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_PIDGEY @@ -53,14 +71,18 @@ static const u16 sPidgeotFormSpeciesIdTable[] = { #if P_FAMILY_RATTATA static const u16 sRattataFormSpeciesIdTable[] = { SPECIES_RATTATA, +#if P_ALOLAN_FORMS SPECIES_RATTATA_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sRaticateFormSpeciesIdTable[] = { SPECIES_RATICATE, +#if P_ALOLAN_FORMS SPECIES_RATICATE_ALOLAN, SPECIES_RATICATE_ALOLAN_TOTEM, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_RATTATA @@ -76,12 +98,15 @@ static const u16 sPichuFormSpeciesIdTable[] = { static const u16 sPikachuFormSpeciesIdTable[] = { SPECIES_PIKACHU, +#if P_COSPLAY_PIKACHU_FORMS SPECIES_PIKACHU_COSPLAY, SPECIES_PIKACHU_ROCK_STAR, SPECIES_PIKACHU_BELLE, SPECIES_PIKACHU_POP_STAR, SPECIES_PIKACHU_PH_D, SPECIES_PIKACHU_LIBRE, +#endif +#if P_CAP_PIKACHU_FORMS SPECIES_PIKACHU_ORIGINAL_CAP, SPECIES_PIKACHU_HOENN_CAP, SPECIES_PIKACHU_SINNOH_CAP, @@ -90,14 +115,19 @@ static const u16 sPikachuFormSpeciesIdTable[] = { SPECIES_PIKACHU_ALOLA_CAP, SPECIES_PIKACHU_PARTNER_CAP, SPECIES_PIKACHU_WORLD_CAP, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_PIKACHU_GIGANTAMAX, +#endif SPECIES_PIKACHU_PARTNER, FORM_SPECIES_END, }; static const u16 sRaichuFormSpeciesIdTable[] = { SPECIES_RAICHU, +#if P_ALOLAN_FORMS SPECIES_RAICHU_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_PIKACHU @@ -105,13 +135,17 @@ static const u16 sRaichuFormSpeciesIdTable[] = { #if P_FAMILY_SANDSHREW static const u16 sSandshrewFormSpeciesIdTable[] = { SPECIES_SANDSHREW, +#if P_ALOLAN_FORMS SPECIES_SANDSHREW_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sSandslashFormSpeciesIdTable[] = { SPECIES_SANDSLASH, +#if P_ALOLAN_FORMS SPECIES_SANDSLASH_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SANDSHREW @@ -119,13 +153,17 @@ static const u16 sSandslashFormSpeciesIdTable[] = { #if P_FAMILY_VULPIX static const u16 sVulpixFormSpeciesIdTable[] = { SPECIES_VULPIX, +#if P_ALOLAN_FORMS SPECIES_VULPIX_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sNinetalesFormSpeciesIdTable[] = { SPECIES_NINETALES, +#if P_ALOLAN_FORMS SPECIES_NINETALES_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_VULPIX @@ -133,13 +171,17 @@ static const u16 sNinetalesFormSpeciesIdTable[] = { #if P_FAMILY_DIGLETT static const u16 sDiglettFormSpeciesIdTable[] = { SPECIES_DIGLETT, +#if P_ALOLAN_FORMS SPECIES_DIGLETT_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sDugtrioFormSpeciesIdTable[] = { SPECIES_DUGTRIO, +#if P_ALOLAN_FORMS SPECIES_DUGTRIO_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_DIGLETT @@ -147,15 +189,23 @@ static const u16 sDugtrioFormSpeciesIdTable[] = { #if P_FAMILY_MEOWTH static const u16 sMeowthFormSpeciesIdTable[] = { SPECIES_MEOWTH, +#if P_ALOLAN_FORMS SPECIES_MEOWTH_ALOLAN, +#endif +#if P_GALARIAN_FORMS SPECIES_MEOWTH_GALARIAN, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_MEOWTH_GIGANTAMAX, +#endif FORM_SPECIES_END, }; static const u16 sPersianFormSpeciesIdTable[] = { SPECIES_PERSIAN, +#if P_ALOLAN_FORMS SPECIES_PERSIAN_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MEOWTH @@ -163,13 +213,17 @@ static const u16 sPersianFormSpeciesIdTable[] = { #if P_FAMILY_GROWLITHE static const u16 sGrowlitheFormSpeciesIdTable[] = { SPECIES_GROWLITHE, +#if P_HISUIAN_FORMS SPECIES_GROWLITHE_HISUIAN, +#endif FORM_SPECIES_END, }; static const u16 sArcanineFormSpeciesIdTable[] = { SPECIES_ARCANINE, +#if P_HISUIAN_FORMS SPECIES_ARCANINE_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GROWLITHE @@ -177,7 +231,9 @@ static const u16 sArcanineFormSpeciesIdTable[] = { #if P_FAMILY_ABRA static const u16 sAlakazamFormSpeciesIdTable[] = { SPECIES_ALAKAZAM, +#if P_MEGA_EVOLUTIONS SPECIES_ALAKAZAM_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ABRA @@ -185,7 +241,9 @@ static const u16 sAlakazamFormSpeciesIdTable[] = { #if P_FAMILY_MACHOP static const u16 sMachampFormSpeciesIdTable[] = { SPECIES_MACHAMP, +#if P_GIGANTAMAX_FORMS SPECIES_MACHAMP_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MACHOP @@ -193,19 +251,25 @@ static const u16 sMachampFormSpeciesIdTable[] = { #if P_FAMILY_GEODUDE static const u16 sGeodudeFormSpeciesIdTable[] = { SPECIES_GEODUDE, +#if P_ALOLAN_FORMS SPECIES_GEODUDE_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sGravelerFormSpeciesIdTable[] = { SPECIES_GRAVELER, +#if P_ALOLAN_FORMS SPECIES_GRAVELER_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sGolemFormSpeciesIdTable[] = { SPECIES_GOLEM, +#if P_ALOLAN_FORMS SPECIES_GOLEM_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GEODUDE @@ -213,13 +277,17 @@ static const u16 sGolemFormSpeciesIdTable[] = { #if P_FAMILY_PONYTA static const u16 sPonytaFormSpeciesIdTable[] = { SPECIES_PONYTA, +#if P_GALARIAN_FORMS SPECIES_PONYTA_GALARIAN, +#endif FORM_SPECIES_END, }; static const u16 sRapidashFormSpeciesIdTable[] = { SPECIES_RAPIDASH, +#if P_GALARIAN_FORMS SPECIES_RAPIDASH_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_PONYTA @@ -227,21 +295,29 @@ static const u16 sRapidashFormSpeciesIdTable[] = { #if P_FAMILY_SLOWPOKE static const u16 sSlowpokeFormSpeciesIdTable[] = { SPECIES_SLOWPOKE, +#if P_GALARIAN_FORMS SPECIES_SLOWPOKE_GALARIAN, +#endif FORM_SPECIES_END, }; static const u16 sSlowbroFormSpeciesIdTable[] = { SPECIES_SLOWBRO, +#if P_MEGA_EVOLUTIONS SPECIES_SLOWBRO_MEGA, +#endif +#if P_GALARIAN_FORMS SPECIES_SLOWBRO_GALARIAN, +#endif FORM_SPECIES_END, }; #if P_GEN_2_CROSS_EVOS static const u16 sSlowkingFormSpeciesIdTable[] = { SPECIES_SLOWKING, +#if P_GALARIAN_FORMS SPECIES_SLOWKING_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_GEN_2_CROSS_EVOS @@ -250,7 +326,9 @@ static const u16 sSlowkingFormSpeciesIdTable[] = { #if P_FAMILY_FARFETCHD static const u16 sFarfetchdFormSpeciesIdTable[] = { SPECIES_FARFETCHD, +#if P_GALARIAN_FORMS SPECIES_FARFETCHD_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_FARFETCHD @@ -258,13 +336,17 @@ static const u16 sFarfetchdFormSpeciesIdTable[] = { #if P_FAMILY_GRIMER static const u16 sGrimerFormSpeciesIdTable[] = { SPECIES_GRIMER, +#if P_ALOLAN_FORMS SPECIES_GRIMER_ALOLAN, +#endif FORM_SPECIES_END, }; static const u16 sMukFormSpeciesIdTable[] = { SPECIES_MUK, +#if P_ALOLAN_FORMS SPECIES_MUK_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GRIMER @@ -272,8 +354,12 @@ static const u16 sMukFormSpeciesIdTable[] = { #if P_FAMILY_GASTLY static const u16 sGengarFormSpeciesIdTable[] = { SPECIES_GENGAR, +#if P_MEGA_EVOLUTIONS SPECIES_GENGAR_MEGA, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_GENGAR_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GASTLY @@ -282,7 +368,9 @@ static const u16 sGengarFormSpeciesIdTable[] = { #if P_GEN_2_CROSS_EVOS static const u16 sSteelixFormSpeciesIdTable[] = { SPECIES_STEELIX, +#if P_MEGA_EVOLUTIONS SPECIES_STEELIX_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_GEN_2_CROSS_EVOS @@ -291,7 +379,9 @@ static const u16 sSteelixFormSpeciesIdTable[] = { #if P_FAMILY_KRABBY static const u16 sKinglerFormSpeciesIdTable[] = { SPECIES_KINGLER, +#if P_GIGANTAMAX_FORMS SPECIES_KINGLER_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_KRABBY @@ -299,13 +389,17 @@ static const u16 sKinglerFormSpeciesIdTable[] = { #if P_FAMILY_VOLTORB static const u16 sVoltorbFormSpeciesIdTable[] = { SPECIES_VOLTORB, +#if P_HISUIAN_FORMS SPECIES_VOLTORB_HISUIAN, +#endif FORM_SPECIES_END, }; static const u16 sElectrodeFormSpeciesIdTable[] = { SPECIES_ELECTRODE, +#if P_HISUIAN_FORMS SPECIES_ELECTRODE_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_VOLTORB @@ -313,7 +407,9 @@ static const u16 sElectrodeFormSpeciesIdTable[] = { #if P_FAMILY_EXEGGCUTE static const u16 sExeggutorFormSpeciesIdTable[] = { SPECIES_EXEGGUTOR, +#if P_ALOLAN_FORMS SPECIES_EXEGGUTOR_ALOLAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_EXEGGCUTE @@ -321,8 +417,10 @@ static const u16 sExeggutorFormSpeciesIdTable[] = { #if P_FAMILY_CUBONE static const u16 sMarowakFormSpeciesIdTable[] = { SPECIES_MAROWAK, +#if P_ALOLAN_FORMS SPECIES_MAROWAK_ALOLAN, SPECIES_MAROWAK_ALOLAN_TOTEM, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CUBONE @@ -330,7 +428,9 @@ static const u16 sMarowakFormSpeciesIdTable[] = { #if P_FAMILY_KOFFING static const u16 sWeezingFormSpeciesIdTable[] = { SPECIES_WEEZING, +#if P_GALARIAN_FORMS SPECIES_WEEZING_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_KOFFING @@ -338,7 +438,9 @@ static const u16 sWeezingFormSpeciesIdTable[] = { #if P_FAMILY_KANGASKHAN static const u16 sKangaskhanFormSpeciesIdTable[] = { SPECIES_KANGASKHAN, +#if P_MEGA_EVOLUTIONS SPECIES_KANGASKHAN_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_KANGASKHAN @@ -346,7 +448,9 @@ static const u16 sKangaskhanFormSpeciesIdTable[] = { #if P_FAMILY_MR_MIME static const u16 sMrMimeFormSpeciesIdTable[] = { SPECIES_MR_MIME, +#if P_GALARIAN_FORMS SPECIES_MR_MIME_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MR_MIME @@ -355,7 +459,9 @@ static const u16 sMrMimeFormSpeciesIdTable[] = { #if P_GEN_2_CROSS_EVOS static const u16 sScizorFormSpeciesIdTable[] = { SPECIES_SCIZOR, +#if P_MEGA_EVOLUTIONS SPECIES_SCIZOR_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_GEN_2_CROSS_EVOS @@ -364,7 +470,9 @@ static const u16 sScizorFormSpeciesIdTable[] = { #if P_FAMILY_PINSIR static const u16 sPinsirFormSpeciesIdTable[] = { SPECIES_PINSIR, +#if P_MEGA_EVOLUTIONS SPECIES_PINSIR_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_PINSIR @@ -372,9 +480,11 @@ static const u16 sPinsirFormSpeciesIdTable[] = { #if P_FAMILY_TAUROS static const u16 sTaurosFormSpeciesIdTable[] = { SPECIES_TAUROS, +#if P_PALDEAN_FORMS SPECIES_TAUROS_PALDEAN_COMBAT_BREED, SPECIES_TAUROS_PALDEAN_BLAZE_BREED, SPECIES_TAUROS_PALDEAN_AQUA_BREED, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_TAUROS @@ -382,7 +492,9 @@ static const u16 sTaurosFormSpeciesIdTable[] = { #if P_FAMILY_MAGIKARP static const u16 sGyaradosFormSpeciesIdTable[] = { SPECIES_GYARADOS, +#if P_MEGA_EVOLUTIONS SPECIES_GYARADOS_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MAGIKARP @@ -390,7 +502,9 @@ static const u16 sGyaradosFormSpeciesIdTable[] = { #if P_FAMILY_LAPRAS static const u16 sLaprasFormSpeciesIdTable[] = { SPECIES_LAPRAS, +#if P_GIGANTAMAX_FORMS SPECIES_LAPRAS_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_LAPRAS @@ -398,7 +512,9 @@ static const u16 sLaprasFormSpeciesIdTable[] = { #if P_FAMILY_EEVEE static const u16 sEeveeFormSpeciesIdTable[] = { SPECIES_EEVEE, +#if P_GIGANTAMAX_FORMS SPECIES_EEVEE_GIGANTAMAX, +#endif SPECIES_EEVEE_PARTNER, FORM_SPECIES_END, }; @@ -407,7 +523,9 @@ static const u16 sEeveeFormSpeciesIdTable[] = { #if P_FAMILY_AERODACTYL static const u16 sAerodactylFormSpeciesIdTable[] = { SPECIES_AERODACTYL, +#if P_MEGA_EVOLUTIONS SPECIES_AERODACTYL_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_AERODACTYL @@ -415,7 +533,9 @@ static const u16 sAerodactylFormSpeciesIdTable[] = { #if P_FAMILY_SNORLAX static const u16 sSnorlaxFormSpeciesIdTable[] = { SPECIES_SNORLAX, +#if P_GIGANTAMAX_FORMS SPECIES_SNORLAX_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SNORLAX @@ -423,7 +543,9 @@ static const u16 sSnorlaxFormSpeciesIdTable[] = { #if P_FAMILY_ARTICUNO static const u16 sArticunoFormSpeciesIdTable[] = { SPECIES_ARTICUNO, +#if P_GALARIAN_FORMS SPECIES_ARTICUNO_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ARTICUNO @@ -431,7 +553,9 @@ static const u16 sArticunoFormSpeciesIdTable[] = { #if P_FAMILY_ZAPDOS static const u16 sZapdosFormSpeciesIdTable[] = { SPECIES_ZAPDOS, +#if P_GALARIAN_FORMS SPECIES_ZAPDOS_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ZAPDOS @@ -439,7 +563,9 @@ static const u16 sZapdosFormSpeciesIdTable[] = { #if P_FAMILY_MOLTRES static const u16 sMoltresFormSpeciesIdTable[] = { SPECIES_MOLTRES, +#if P_GALARIAN_FORMS SPECIES_MOLTRES_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MOLTRES @@ -447,8 +573,10 @@ static const u16 sMoltresFormSpeciesIdTable[] = { #if P_FAMILY_MEWTWO static const u16 sMewtwoFormSpeciesIdTable[] = { SPECIES_MEWTWO, +#if P_MEGA_EVOLUTIONS SPECIES_MEWTWO_MEGA_X, SPECIES_MEWTWO_MEGA_Y, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MEWTWO @@ -456,7 +584,9 @@ static const u16 sMewtwoFormSpeciesIdTable[] = { #if P_FAMILY_CYNDAQUIL static const u16 sTyphlosionFormSpeciesIdTable[] = { SPECIES_TYPHLOSION, +#if P_HISUIAN_FORMS SPECIES_TYPHLOSION_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CYNDAQUIL @@ -464,7 +594,9 @@ static const u16 sTyphlosionFormSpeciesIdTable[] = { #if P_FAMILY_MAREEP static const u16 sAmpharosFormSpeciesIdTable[] = { SPECIES_AMPHAROS, +#if P_MEGA_EVOLUTIONS SPECIES_AMPHAROS_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MAREEP @@ -472,7 +604,9 @@ static const u16 sAmpharosFormSpeciesIdTable[] = { #if P_FAMILY_WOOPER static const u16 sWooperFormSpeciesIdTable[] = { SPECIES_WOOPER, +#if P_PALDEAN_FORMS SPECIES_WOOPER_PALDEAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_WOOPER @@ -522,7 +656,9 @@ static const u16 sDudunsparceFormSpeciesIdTable[] = { #if P_FAMILY_QWILFISH static const u16 sQwilfishFormSpeciesIdTable[] = { SPECIES_QWILFISH, +#if P_HISUIAN_FORMS SPECIES_QWILFISH_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_QWILFISH @@ -530,7 +666,9 @@ static const u16 sQwilfishFormSpeciesIdTable[] = { #if P_FAMILY_HERACROSS static const u16 sHeracrossFormSpeciesIdTable[] = { SPECIES_HERACROSS, +#if P_MEGA_EVOLUTIONS SPECIES_HERACROSS_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_HERACROSS @@ -538,7 +676,9 @@ static const u16 sHeracrossFormSpeciesIdTable[] = { #if P_FAMILY_SNEASEL static const u16 sSneaselFormSpeciesIdTable[] = { SPECIES_SNEASEL, +#if P_HISUIAN_FORMS SPECIES_SNEASEL_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SNEASEL @@ -554,7 +694,9 @@ static const u16 sUrsalunaFormSpeciesIdTable[] = { #if P_FAMILY_CORSOLA static const u16 sCorsolaFormSpeciesIdTable[] = { SPECIES_CORSOLA, +#if P_GALARIAN_FORMS SPECIES_CORSOLA_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CORSOLA @@ -562,7 +704,9 @@ static const u16 sCorsolaFormSpeciesIdTable[] = { #if P_FAMILY_HOUNDOUR static const u16 sHoundoomFormSpeciesIdTable[] = { SPECIES_HOUNDOOM, +#if P_MEGA_EVOLUTIONS SPECIES_HOUNDOOM_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_HOUNDOUR @@ -570,7 +714,9 @@ static const u16 sHoundoomFormSpeciesIdTable[] = { #if P_FAMILY_LARVITAR static const u16 sTyranitarFormSpeciesIdTable[] = { SPECIES_TYRANITAR, +#if P_MEGA_EVOLUTIONS SPECIES_TYRANITAR_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_LARVITAR @@ -578,7 +724,9 @@ static const u16 sTyranitarFormSpeciesIdTable[] = { #if P_FAMILY_TREECKO static const u16 sSceptileFormSpeciesIdTable[] = { SPECIES_SCEPTILE, +#if P_MEGA_EVOLUTIONS SPECIES_SCEPTILE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_TREECKO @@ -586,7 +734,9 @@ static const u16 sSceptileFormSpeciesIdTable[] = { #if P_FAMILY_TORCHIC static const u16 sBlazikenFormSpeciesIdTable[] = { SPECIES_BLAZIKEN, +#if P_MEGA_EVOLUTIONS SPECIES_BLAZIKEN_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_TORCHIC @@ -594,7 +744,9 @@ static const u16 sBlazikenFormSpeciesIdTable[] = { #if P_FAMILY_MUDKIP static const u16 sSwampertFormSpeciesIdTable[] = { SPECIES_SWAMPERT, +#if P_MEGA_EVOLUTIONS SPECIES_SWAMPERT_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MUDKIP @@ -602,13 +754,17 @@ static const u16 sSwampertFormSpeciesIdTable[] = { #if P_FAMILY_ZIGZAGOON static const u16 sZigzagoonFormSpeciesIdTable[] = { SPECIES_ZIGZAGOON, +#if P_GALARIAN_FORMS SPECIES_ZIGZAGOON_GALARIAN, +#endif FORM_SPECIES_END, }; static const u16 sLinooneFormSpeciesIdTable[] = { SPECIES_LINOONE, +#if P_GALARIAN_FORMS SPECIES_LINOONE_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ZIGZAGOON @@ -616,14 +772,18 @@ static const u16 sLinooneFormSpeciesIdTable[] = { #if P_FAMILY_RALTS static const u16 sGardevoirFormSpeciesIdTable[] = { SPECIES_GARDEVOIR, +#if P_MEGA_EVOLUTIONS SPECIES_GARDEVOIR_MEGA, +#endif FORM_SPECIES_END, }; #if P_GEN_4_CROSS_EVOS static const u16 sGalladeFormSpeciesIdTable[] = { SPECIES_GALLADE, +#if P_MEGA_EVOLUTIONS SPECIES_GALLADE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_GEN_4_CROSS_EVOS @@ -632,7 +792,9 @@ static const u16 sGalladeFormSpeciesIdTable[] = { #if P_FAMILY_SABLEYE static const u16 sSableyeFormSpeciesIdTable[] = { SPECIES_SABLEYE, +#if P_MEGA_EVOLUTIONS SPECIES_SABLEYE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SABLEYE @@ -640,7 +802,9 @@ static const u16 sSableyeFormSpeciesIdTable[] = { #if P_FAMILY_MAWILE static const u16 sMawileFormSpeciesIdTable[] = { SPECIES_MAWILE, +#if P_MEGA_EVOLUTIONS SPECIES_MAWILE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MAWILE @@ -648,7 +812,9 @@ static const u16 sMawileFormSpeciesIdTable[] = { #if P_FAMILY_ARON static const u16 sAggronFormSpeciesIdTable[] = { SPECIES_AGGRON, +#if P_MEGA_EVOLUTIONS SPECIES_AGGRON_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ARON @@ -656,7 +822,9 @@ static const u16 sAggronFormSpeciesIdTable[] = { #if P_FAMILY_MEDITITE static const u16 sMedichamFormSpeciesIdTable[] = { SPECIES_MEDICHAM, +#if P_MEGA_EVOLUTIONS SPECIES_MEDICHAM_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MEDITITE @@ -664,7 +832,9 @@ static const u16 sMedichamFormSpeciesIdTable[] = { #if P_FAMILY_ELECTRIKE static const u16 sManectricFormSpeciesIdTable[] = { SPECIES_MANECTRIC, +#if P_MEGA_EVOLUTIONS SPECIES_MANECTRIC_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ELECTRIKE @@ -672,7 +842,9 @@ static const u16 sManectricFormSpeciesIdTable[] = { #if P_FAMILY_CARVANHA static const u16 sSharpedoFormSpeciesIdTable[] = { SPECIES_SHARPEDO, +#if P_MEGA_EVOLUTIONS SPECIES_SHARPEDO_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CARVANHA @@ -680,7 +852,9 @@ static const u16 sSharpedoFormSpeciesIdTable[] = { #if P_FAMILY_NUMEL static const u16 sCameruptFormSpeciesIdTable[] = { SPECIES_CAMERUPT, +#if P_MEGA_EVOLUTIONS SPECIES_CAMERUPT_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_NUMEL @@ -688,7 +862,9 @@ static const u16 sCameruptFormSpeciesIdTable[] = { #if P_FAMILY_SWABLU static const u16 sAltariaFormSpeciesIdTable[] = { SPECIES_ALTARIA, +#if P_MEGA_EVOLUTIONS SPECIES_ALTARIA_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SWABLU @@ -706,7 +882,9 @@ static const u16 sCastformFormSpeciesIdTable[] = { #if P_FAMILY_SHUPPET static const u16 sBanetteFormSpeciesIdTable[] = { SPECIES_BANETTE, +#if P_MEGA_EVOLUTIONS SPECIES_BANETTE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SHUPPET @@ -714,7 +892,9 @@ static const u16 sBanetteFormSpeciesIdTable[] = { #if P_FAMILY_ABSOL static const u16 sAbsolFormSpeciesIdTable[] = { SPECIES_ABSOL, +#if P_MEGA_EVOLUTIONS SPECIES_ABSOL_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ABSOL @@ -722,7 +902,9 @@ static const u16 sAbsolFormSpeciesIdTable[] = { #if P_FAMILY_SNORUNT static const u16 sGlalieFormSpeciesIdTable[] = { SPECIES_GLALIE, +#if P_MEGA_EVOLUTIONS SPECIES_GLALIE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SNORUNT @@ -730,7 +912,9 @@ static const u16 sGlalieFormSpeciesIdTable[] = { #if P_FAMILY_BAGON static const u16 sSalamenceFormSpeciesIdTable[] = { SPECIES_SALAMENCE, +#if P_MEGA_EVOLUTIONS SPECIES_SALAMENCE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_BAGON @@ -738,7 +922,9 @@ static const u16 sSalamenceFormSpeciesIdTable[] = { #if P_FAMILY_BELDUM static const u16 sMetagrossFormSpeciesIdTable[] = { SPECIES_METAGROSS, +#if P_MEGA_EVOLUTIONS SPECIES_METAGROSS_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_BELDUM @@ -746,7 +932,9 @@ static const u16 sMetagrossFormSpeciesIdTable[] = { #if P_FAMILY_LATIAS static const u16 sLatiasFormSpeciesIdTable[] = { SPECIES_LATIAS, +#if P_MEGA_EVOLUTIONS SPECIES_LATIAS_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_LATIAS @@ -754,7 +942,9 @@ static const u16 sLatiasFormSpeciesIdTable[] = { #if P_FAMILY_LATIOS static const u16 sLatiosFormSpeciesIdTable[] = { SPECIES_LATIOS, +#if P_MEGA_EVOLUTIONS SPECIES_LATIOS_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_LATIOS @@ -762,7 +952,9 @@ static const u16 sLatiosFormSpeciesIdTable[] = { #if P_FAMILY_KYOGRE static const u16 sKyogreFormSpeciesIdTable[] = { SPECIES_KYOGRE, +#if P_PRIMAL_REVERSIONS SPECIES_KYOGRE_PRIMAL, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_KYOGRE @@ -770,7 +962,9 @@ static const u16 sKyogreFormSpeciesIdTable[] = { #if P_FAMILY_GROUDON static const u16 sGroudonFormSpeciesIdTable[] = { SPECIES_GROUDON, +#if P_PRIMAL_REVERSIONS SPECIES_GROUDON_PRIMAL, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GROUDON @@ -778,7 +972,9 @@ static const u16 sGroudonFormSpeciesIdTable[] = { #if P_FAMILY_RAYQUAZA static const u16 sRayquazaFormSpeciesIdTable[] = { SPECIES_RAYQUAZA, +#if P_MEGA_EVOLUTIONS SPECIES_RAYQUAZA_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_RAYQUAZA @@ -841,7 +1037,9 @@ static const u16 sGastrodonFormSpeciesIdTable[] = { #if P_FAMILY_BUNEARY static const u16 sLopunnyFormSpeciesIdTable[] = { SPECIES_LOPUNNY, +#if P_MEGA_EVOLUTIONS SPECIES_LOPUNNY_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_BUNEARY @@ -849,7 +1047,9 @@ static const u16 sLopunnyFormSpeciesIdTable[] = { #if P_FAMILY_GIBLE static const u16 sGarchompFormSpeciesIdTable[] = { SPECIES_GARCHOMP, +#if P_MEGA_EVOLUTIONS SPECIES_GARCHOMP_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GIBLE @@ -857,7 +1057,9 @@ static const u16 sGarchompFormSpeciesIdTable[] = { #if P_FAMILY_RIOLU static const u16 sLucarioFormSpeciesIdTable[] = { SPECIES_LUCARIO, +#if P_MEGA_EVOLUTIONS SPECIES_LUCARIO_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_RIOLU @@ -865,7 +1067,9 @@ static const u16 sLucarioFormSpeciesIdTable[] = { #if P_FAMILY_SNOVER static const u16 sAbomasnowFormSpeciesIdTable[] = { SPECIES_ABOMASNOW, +#if P_MEGA_EVOLUTIONS SPECIES_ABOMASNOW_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SNOVER @@ -941,7 +1145,9 @@ static const u16 sArceusFormSpeciesIdTable[] = { #if P_FAMILY_OSHAWOTT static const u16 sSamurottFormSpeciesIdTable[] = { SPECIES_SAMUROTT, +#if P_HISUIAN_FORMS SPECIES_SAMUROTT_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_OSHAWOTT @@ -949,7 +1155,9 @@ static const u16 sSamurottFormSpeciesIdTable[] = { #if P_FAMILY_AUDINO static const u16 sAudinoFormSpeciesIdTable[] = { SPECIES_AUDINO, +#if P_MEGA_EVOLUTIONS SPECIES_AUDINO_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_AUDINO @@ -957,7 +1165,9 @@ static const u16 sAudinoFormSpeciesIdTable[] = { #if P_FAMILY_PETILIL static const u16 sLilligantFormSpeciesIdTable[] = { SPECIES_LILLIGANT, +#if P_HISUIAN_FORMS SPECIES_LILLIGANT_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_PETILIL @@ -980,15 +1190,19 @@ static const u16 sBasculegionFormSpeciesIdTable[] = { #if P_FAMILY_DARUMAKA static const u16 sDarumakaFormSpeciesIdTable[] = { SPECIES_DARUMAKA, +#if P_GALARIAN_FORMS SPECIES_DARUMAKA_GALARIAN, +#endif FORM_SPECIES_END, }; static const u16 sDarmanitanFormSpeciesIdTable[] = { SPECIES_DARMANITAN_STANDARD_MODE, SPECIES_DARMANITAN_ZEN_MODE, +#if P_GALARIAN_FORMS SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE, SPECIES_DARMANITAN_GALARIAN_ZEN_MODE, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_DARUMAKA @@ -996,7 +1210,9 @@ static const u16 sDarmanitanFormSpeciesIdTable[] = { #if P_FAMILY_YAMASK static const u16 sYamaskFormSpeciesIdTable[] = { SPECIES_YAMASK, +#if P_GALARIAN_FORMS SPECIES_YAMASK_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_YAMASK @@ -1004,7 +1220,9 @@ static const u16 sYamaskFormSpeciesIdTable[] = { #if P_FAMILY_TRUBBISH static const u16 sGarbodorFormSpeciesIdTable[] = { SPECIES_GARBODOR, +#if P_GIGANTAMAX_FORMS SPECIES_GARBODOR_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_TRUBBISH @@ -1012,13 +1230,17 @@ static const u16 sGarbodorFormSpeciesIdTable[] = { #if P_FAMILY_ZORUA static const u16 sZoruaFormSpeciesIdTable[] = { SPECIES_ZORUA, +#if P_HISUIAN_FORMS SPECIES_ZORUA_HISUIAN, +#endif FORM_SPECIES_END, }; static const u16 sZoroarkFormSpeciesIdTable[] = { SPECIES_ZOROARK, +#if P_HISUIAN_FORMS SPECIES_ZOROARK_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ZORUA @@ -1044,7 +1266,9 @@ static const u16 sSawsbuckFormSpeciesIdTable[] = { #if P_FAMILY_STUNFISK static const u16 sStunfiskFormSpeciesIdTable[] = { SPECIES_STUNFISK, +#if P_GALARIAN_FORMS SPECIES_STUNFISK_GALARIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_STUNFISK @@ -1052,7 +1276,9 @@ static const u16 sStunfiskFormSpeciesIdTable[] = { #if P_FAMILY_RUFFLET static const u16 sBraviaryFormSpeciesIdTable[] = { SPECIES_BRAVIARY, +#if P_HISUIAN_FORMS SPECIES_BRAVIARY_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_RUFFLET @@ -1265,13 +1491,17 @@ static const u16 sAegislashFormSpeciesIdTable[] = { #if P_FAMILY_GOOMY static const u16 sSliggooFormSpeciesIdTable[] = { SPECIES_SLIGGOO, +#if P_HISUIAN_FORMS SPECIES_SLIGGOO_HISUIAN, +#endif FORM_SPECIES_END, }; static const u16 sGoodraFormSpeciesIdTable[] = { SPECIES_GOODRA, +#if P_HISUIAN_FORMS SPECIES_GOODRA_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GOOMY @@ -1297,7 +1527,9 @@ static const u16 sGourgeistFormSpeciesIdTable[] = { #if P_FAMILY_BERGMITE static const u16 sAvaluggFormSpeciesIdTable[] = { SPECIES_AVALUGG, +#if P_HISUIAN_FORMS SPECIES_AVALUGG_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_BERGMITE @@ -1324,7 +1556,9 @@ static const u16 sZygardeFormSpeciesIdTable[] = { #if P_FAMILY_DIANCIE static const u16 sDiancieFormSpeciesIdTable[] = { SPECIES_DIANCIE, +#if P_MEGA_EVOLUTIONS SPECIES_DIANCIE_MEGA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_DIANCIE @@ -1340,7 +1574,9 @@ static const u16 sHoopaFormSpeciesIdTable[] = { #if P_FAMILY_ROWLET static const u16 sDecidueyeFormSpeciesIdTable[] = { SPECIES_DECIDUEYE, +#if P_HISUIAN_FORMS SPECIES_DECIDUEYE_HISUIAN, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ROWLET @@ -1501,7 +1737,9 @@ static const u16 sNecrozmaFormSpeciesIdTable[] = { SPECIES_NECROZMA, SPECIES_NECROZMA_DUSK_MANE, SPECIES_NECROZMA_DAWN_WINGS, +#if P_ULTRA_BURST_FORMS SPECIES_NECROZMA_ULTRA, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_NECROZMA @@ -1517,7 +1755,9 @@ static const u16 sMagearnaFormSpeciesIdTable[] = { #if P_FAMILY_MELTAN static const u16 sMelmetalFormSpeciesIdTable[] = { SPECIES_MELMETAL, +#if P_GIGANTAMAX_FORMS SPECIES_MELMETAL_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MELTAN @@ -1525,7 +1765,9 @@ static const u16 sMelmetalFormSpeciesIdTable[] = { #if P_FAMILY_GROOKEY static const u16 sRillaboomFormSpeciesIdTable[] = { SPECIES_RILLABOOM, +#if P_GIGANTAMAX_FORMS SPECIES_RILLABOOM_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_GROOKEY @@ -1533,7 +1775,9 @@ static const u16 sRillaboomFormSpeciesIdTable[] = { #if P_FAMILY_SCORBUNNY static const u16 sCinderaceFormSpeciesIdTable[] = { SPECIES_CINDERACE, +#if P_GIGANTAMAX_FORMS SPECIES_CINDERACE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SCORBUNNY @@ -1541,7 +1785,9 @@ static const u16 sCinderaceFormSpeciesIdTable[] = { #if P_FAMILY_SOBBLE static const u16 sInteleonFormSpeciesIdTable[] = { SPECIES_INTELEON, +#if P_GIGANTAMAX_FORMS SPECIES_INTELEON_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SOBBLE @@ -1549,7 +1795,9 @@ static const u16 sInteleonFormSpeciesIdTable[] = { #if P_FAMILY_ROOKIDEE static const u16 sCorviknightFormSpeciesIdTable[] = { SPECIES_CORVIKNIGHT, +#if P_GIGANTAMAX_FORMS SPECIES_CORVIKNIGHT_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ROOKIDEE @@ -1557,7 +1805,9 @@ static const u16 sCorviknightFormSpeciesIdTable[] = { #if P_FAMILY_BLIPBUG static const u16 sOrbeetleFormSpeciesIdTable[] = { SPECIES_ORBEETLE, +#if P_GIGANTAMAX_FORMS SPECIES_ORBEETLE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_BLIPBUG @@ -1565,7 +1815,9 @@ static const u16 sOrbeetleFormSpeciesIdTable[] = { #if P_FAMILY_CHEWTLE static const u16 sDrednawFormSpeciesIdTable[] = { SPECIES_DREDNAW, +#if P_GIGANTAMAX_FORMS SPECIES_DREDNAW_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CHEWTLE @@ -1573,7 +1825,9 @@ static const u16 sDrednawFormSpeciesIdTable[] = { #if P_FAMILY_ROLYCOLY static const u16 sCoalossalFormSpeciesIdTable[] = { SPECIES_COALOSSAL, +#if P_GIGANTAMAX_FORMS SPECIES_COALOSSAL_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_ROLYCOLY @@ -1581,13 +1835,17 @@ static const u16 sCoalossalFormSpeciesIdTable[] = { #if P_FAMILY_APPLIN static const u16 sFlappleFormSpeciesIdTable[] = { SPECIES_FLAPPLE, +#if P_GIGANTAMAX_FORMS SPECIES_FLAPPLE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; static const u16 sAppletunFormSpeciesIdTable[] = { SPECIES_APPLETUN, +#if P_GIGANTAMAX_FORMS SPECIES_APPLETUN_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_APPLIN @@ -1595,7 +1853,9 @@ static const u16 sAppletunFormSpeciesIdTable[] = { #if P_FAMILY_SILICOBRA static const u16 sSandacondaFormSpeciesIdTable[] = { SPECIES_SANDACONDA, +#if P_GIGANTAMAX_FORMS SPECIES_SANDACONDA_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SILICOBRA @@ -1613,8 +1873,12 @@ static const u16 sCramorantFormSpeciesIdTable[] = { static const u16 sToxtricityFormSpeciesIdTable[] = { SPECIES_TOXTRICITY_AMPED, SPECIES_TOXTRICITY_LOW_KEY, +#if P_GIGANTAMAX_FORMS SPECIES_TOXTRICITY_AMPED_GIGANTAMAX, +#endif +#if P_GIGANTAMAX_FORMS SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_TOXEL @@ -1622,7 +1886,9 @@ static const u16 sToxtricityFormSpeciesIdTable[] = { #if P_FAMILY_SIZZLIPEDE static const u16 sCentiskorchFormSpeciesIdTable[] = { SPECIES_CENTISKORCH, +#if P_GIGANTAMAX_FORMS SPECIES_CENTISKORCH_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_SIZZLIPEDE @@ -1644,7 +1910,9 @@ static const u16 sPolteageistFormSpeciesIdTable[] = { #if P_FAMILY_HATENNA static const u16 sHattereneFormSpeciesIdTable[] = { SPECIES_HATTERENE, +#if P_GIGANTAMAX_FORMS SPECIES_HATTERENE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_HATENNA @@ -1652,7 +1920,9 @@ static const u16 sHattereneFormSpeciesIdTable[] = { #if P_FAMILY_IMPIDIMP static const u16 sGrimmsnarlFormSpeciesIdTable[] = { SPECIES_GRIMMSNARL, +#if P_GIGANTAMAX_FORMS SPECIES_GRIMMSNARL_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_IMPIDIMP @@ -1722,7 +1992,9 @@ static const u16 sAlcremieFormSpeciesIdTable[] = { SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL, SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL, SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL, +#if P_GIGANTAMAX_FORMS SPECIES_ALCREMIE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_MILCERY @@ -1754,7 +2026,9 @@ static const u16 sMorpekoFormSpeciesIdTable[] = { #if P_FAMILY_CUFANT static const u16 sCopperajahFormSpeciesIdTable[] = { SPECIES_COPPERAJAH, +#if P_GIGANTAMAX_FORMS SPECIES_COPPERAJAH_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_CUFANT @@ -1762,7 +2036,9 @@ static const u16 sCopperajahFormSpeciesIdTable[] = { #if P_FAMILY_DURALUDON static const u16 sDuraludonFormSpeciesIdTable[] = { SPECIES_DURALUDON, +#if P_GIGANTAMAX_FORMS SPECIES_DURALUDON_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_DURALUDON @@ -1795,8 +2071,10 @@ static const u16 sEternatusFormSpeciesIdTable[] = { static const u16 sUrshifuFormSpeciesIdTable[] = { SPECIES_URSHIFU_SINGLE_STRIKE_STYLE, SPECIES_URSHIFU_RAPID_STRIKE_STYLE, +#if P_GIGANTAMAX_FORMS SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX, SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_KUBFU @@ -1891,7 +2169,9 @@ static const u16 sOgerponFormSpeciesIdTable[] = { static const u16 sTerapagosFormSpeciesIdTable[] = { SPECIES_TERAPAGOS_NORMAL, SPECIES_TERAPAGOS_TERASTAL, +#if P_TERA_FORMS SPECIES_TERAPAGOS_STELLAR, +#endif FORM_SPECIES_END, }; #endif //P_FAMILY_TERAPAGOS