Actually disable forms when disabling forms (#4395)

* Remove form table data when forms are disabled

* Remove erroreous edit

* Add missing G-Max checks

* Update form_species_tables.h
This commit is contained in:
sneed 2024-04-15 23:01:52 +03:00 committed by GitHub
parent e8890bc8f3
commit 634dcf5e26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 452 additions and 0 deletions

View file

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

View file

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

File diff suppressed because it is too large Load diff