Fill data for placeholder species (rh-hideout#4281)

* Absolute IDs * Mothim internal forms * Scatterbug/Spewpa internal forms * Fixed Mothim not having form tables * Totem Alolan Raticate * Moved shared dex text to its own folder * Totem Mimikyu * Added missing empty third-ability fields * Totem Gumshoos + missing totem flags * Renamed files to better match their contents * Fixed Disguise on Totem Mimikyu * Totem Vikavolt/Alolan Marowak + missing Gumshoos form table * Totem Ribombee/Araquanid/Lurantis/Salazzle * Totem Togedemaru/Kommo-O * Partner Pikachu/Eevee * Reintroduced shinyLocked species flag for convenience * Revert "Reintroduced shinyLocked species flag for convenience" This reverts commit 3e07bd3.
Pawkkie · May 16, 2024 · 0007c59 · 0007c59
1 parent b1d2034
commit 0007c59
Show file tree

Hide file tree

Showing 22 changed files with 2,515 additions and 1,632 deletions.
diff --git a/include/constants/species.h b/include/constants/species.h
diff --git a/include/pokemon.h b/include/pokemon.h
@@ -426,6 +426,7 @@ struct SpeciesInfo /*0x8C*/
  /* 0x7A */ u32 isLegendary:1;
             u32 isMythical:1;
             u32 isUltraBeast:1;
+            u32 isTotem:1;
             u32 isParadoxForm:1;
             u32 isMegaEvolution:1;
             u32 isPrimalReversion:1;

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
@@ -3743,7 +3743,8 @@ bool32 ShouldUseZMove(u32 battlerAtk, u32 battlerDef, u32 chosenMove)
     {
         u8 effectiveness;
 
-        if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU_DISGUISED)
+        if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE
+            && (gBattleMons[battlerDef].species == SPECIES_MIMIKYU_DISGUISED || gBattleMons[battlerDef].species == SPECIES_MIMIKYU_TOTEM_DISGUISED))
             return FALSE; // Don't waste a Z-Move busting disguise
         if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE_ICE_FACE && IS_MOVE_PHYSICAL(chosenMove))
             return FALSE; // Don't waste a Z-Move busting Ice Face

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
@@ -2324,7 +2324,10 @@ static void Cmd_datahpupdate(void)
             u32 side = GetBattlerSide(battler);
             if (gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] == SPECIES_NONE)
                 gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] = gBattleMons[battler].species;
-            gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
+            if (gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
+                gBattleMons[battler].species = SPECIES_MIMIKYU_TOTEM_BUSTED;
+            else
+                gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
             BattleScriptPush(cmd->nextInstr);
             gBattlescriptCurrInstr = BattleScript_TargetFormChange;
             return;
@@ -14599,7 +14602,7 @@ bool32 DoesSubstituteBlockMove(u32 battlerAtk, u32 battlerDef, u32 move)
 
 bool32 DoesDisguiseBlockMove(u32 battlerAtk, u32 battlerDef, u32 move)
 {
-    if (gBattleMons[battlerDef].species != SPECIES_MIMIKYU_DISGUISED
+    if (!(gBattleMons[battlerDef].species == SPECIES_MIMIKYU_DISGUISED || gBattleMons[battlerDef].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
         || gBattleMons[battlerDef].status2 & STATUS2_TRANSFORMED
         || IS_MOVE_STATUS(move)
         || gHitMarker & HITMARKER_IGNORE_DISGUISE

diff --git a/src/battle_z_move.c b/src/battle_z_move.c
@@ -57,45 +57,47 @@ static void ZMoveSelectionDisplayMoveType(u16 zMove, u32 battler);
 // Const Data
 static const struct SignatureZMove sSignatureZMoves[] =
 {
-    {SPECIES_PIKACHU_COSPLAY,       ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-    {SPECIES_PIKACHU_ROCK_STAR,     ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-    {SPECIES_PIKACHU_BELLE,         ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-    {SPECIES_PIKACHU_POP_STAR,      ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-    {SPECIES_PIKACHU_PH_D,          ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-    {SPECIES_PIKACHU_LIBRE,         ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-
-    {SPECIES_RAICHU_ALOLAN,         ITEM_ALORAICHIUM_Z,        MOVE_THUNDERBOLT,         MOVE_STOKED_SPARKSURFER},
-    {SPECIES_DECIDUEYE,             ITEM_DECIDIUM_Z,           MOVE_SPIRIT_SHACKLE,      MOVE_SINISTER_ARROW_RAID},
-    {SPECIES_INCINEROAR,            ITEM_INCINIUM_Z,           MOVE_DARKEST_LARIAT,      MOVE_MALICIOUS_MOONSAULT},
-    {SPECIES_KOMMO_O,               ITEM_KOMMONIUM_Z,          MOVE_CLANGING_SCALES,     MOVE_CLANGOROUS_SOULBLAZE},
-    {SPECIES_LUNALA,                ITEM_LUNALIUM_Z,           MOVE_MOONGEIST_BEAM,      MOVE_MENACING_MOONRAZE_MAELSTROM},
-    {SPECIES_NECROZMA_DAWN_WINGS,   ITEM_LUNALIUM_Z,           MOVE_MOONGEIST_BEAM,      MOVE_MENACING_MOONRAZE_MAELSTROM},
-    {SPECIES_LYCANROC_MIDDAY,       ITEM_LYCANIUM_Z,           MOVE_STONE_EDGE,          MOVE_SPLINTERED_STORMSHARDS},
-    {SPECIES_LYCANROC_MIDNIGHT,     ITEM_LYCANIUM_Z,           MOVE_STONE_EDGE,          MOVE_SPLINTERED_STORMSHARDS},
-    {SPECIES_LYCANROC_DUSK,         ITEM_LYCANIUM_Z,           MOVE_STONE_EDGE,          MOVE_SPLINTERED_STORMSHARDS},
-    {SPECIES_MARSHADOW,             ITEM_MARSHADIUM_Z,         MOVE_SPECTRAL_THIEF,      MOVE_SOUL_STEALING_7_STAR_STRIKE},
-    {SPECIES_MIMIKYU_DISGUISED,     ITEM_MIMIKIUM_Z,           MOVE_PLAY_ROUGH,          MOVE_LETS_SNUGGLE_FOREVER},
-    {SPECIES_MIMIKYU_BUSTED,        ITEM_MIMIKIUM_Z,           MOVE_PLAY_ROUGH,          MOVE_LETS_SNUGGLE_FOREVER},
-    {SPECIES_PIKACHU_ORIGINAL_CAP,  ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_HOENN_CAP,     ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_SINNOH_CAP,    ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_UNOVA_CAP,     ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_KALOS_CAP,     ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_ALOLA_CAP,     ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_PARTNER_CAP,   ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PIKACHU_WORLD_CAP,     ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
-    {SPECIES_PRIMARINA,             ITEM_PRIMARIUM_Z,          MOVE_SPARKLING_ARIA,      MOVE_OCEANIC_OPERETTA},
-    {SPECIES_SOLGALEO,              ITEM_SOLGANIUM_Z,          MOVE_SUNSTEEL_STRIKE,     MOVE_SEARING_SUNRAZE_SMASH},
-    {SPECIES_NECROZMA_DUSK_MANE,    ITEM_SOLGANIUM_Z,          MOVE_SUNSTEEL_STRIKE,     MOVE_SEARING_SUNRAZE_SMASH},
-    {SPECIES_TAPU_KOKO,             ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
-    {SPECIES_TAPU_BULU,             ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
-    {SPECIES_TAPU_LELE,             ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
-    {SPECIES_TAPU_FINI,             ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
-    {SPECIES_NECROZMA_ULTRA,        ITEM_ULTRANECROZIUM_Z,     MOVE_PHOTON_GEYSER,       MOVE_LIGHT_THAT_BURNS_THE_SKY},
-    {SPECIES_MEW,                   ITEM_MEWNIUM_Z,            MOVE_PSYCHIC,             MOVE_GENESIS_SUPERNOVA},
-    {SPECIES_PIKACHU,               ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
-    {SPECIES_EEVEE,                 ITEM_EEVIUM_Z,             MOVE_LAST_RESORT,         MOVE_EXTREME_EVOBOOST},
-    {SPECIES_SNORLAX,               ITEM_SNORLIUM_Z,           MOVE_GIGA_IMPACT,         MOVE_PULVERIZING_PANCAKE},
+    {SPECIES_PIKACHU_COSPLAY,         ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+    {SPECIES_PIKACHU_ROCK_STAR,       ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+    {SPECIES_PIKACHU_BELLE,           ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+    {SPECIES_PIKACHU_POP_STAR,        ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+    {SPECIES_PIKACHU_PH_D,            ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+    {SPECIES_PIKACHU_LIBRE,           ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+
+    {SPECIES_RAICHU_ALOLAN,           ITEM_ALORAICHIUM_Z,        MOVE_THUNDERBOLT,         MOVE_STOKED_SPARKSURFER},
+    {SPECIES_DECIDUEYE,               ITEM_DECIDIUM_Z,           MOVE_SPIRIT_SHACKLE,      MOVE_SINISTER_ARROW_RAID},
+    {SPECIES_INCINEROAR,              ITEM_INCINIUM_Z,           MOVE_DARKEST_LARIAT,      MOVE_MALICIOUS_MOONSAULT},
+    {SPECIES_KOMMO_O,                 ITEM_KOMMONIUM_Z,          MOVE_CLANGING_SCALES,     MOVE_CLANGOROUS_SOULBLAZE},
+    {SPECIES_LUNALA,                  ITEM_LUNALIUM_Z,           MOVE_MOONGEIST_BEAM,      MOVE_MENACING_MOONRAZE_MAELSTROM},
+    {SPECIES_NECROZMA_DAWN_WINGS,     ITEM_LUNALIUM_Z,           MOVE_MOONGEIST_BEAM,      MOVE_MENACING_MOONRAZE_MAELSTROM},
+    {SPECIES_LYCANROC_MIDDAY,         ITEM_LYCANIUM_Z,           MOVE_STONE_EDGE,          MOVE_SPLINTERED_STORMSHARDS},
+    {SPECIES_LYCANROC_MIDNIGHT,       ITEM_LYCANIUM_Z,           MOVE_STONE_EDGE,          MOVE_SPLINTERED_STORMSHARDS},
+    {SPECIES_LYCANROC_DUSK,           ITEM_LYCANIUM_Z,           MOVE_STONE_EDGE,          MOVE_SPLINTERED_STORMSHARDS},
+    {SPECIES_MARSHADOW,               ITEM_MARSHADIUM_Z,         MOVE_SPECTRAL_THIEF,      MOVE_SOUL_STEALING_7_STAR_STRIKE},
+    {SPECIES_MIMIKYU_DISGUISED,       ITEM_MIMIKIUM_Z,           MOVE_PLAY_ROUGH,          MOVE_LETS_SNUGGLE_FOREVER},
+    {SPECIES_MIMIKYU_BUSTED,          ITEM_MIMIKIUM_Z,           MOVE_PLAY_ROUGH,          MOVE_LETS_SNUGGLE_FOREVER},
+    {SPECIES_MIMIKYU_TOTEM_DISGUISED, ITEM_MIMIKIUM_Z,           MOVE_PLAY_ROUGH,          MOVE_LETS_SNUGGLE_FOREVER},
+    {SPECIES_MIMIKYU_TOTEM_BUSTED,    ITEM_MIMIKIUM_Z,           MOVE_PLAY_ROUGH,          MOVE_LETS_SNUGGLE_FOREVER},
+    {SPECIES_PIKACHU_ORIGINAL_CAP,    ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_HOENN_CAP,       ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_SINNOH_CAP,      ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_UNOVA_CAP,       ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_KALOS_CAP,       ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_ALOLA_CAP,       ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_PARTNER_CAP,     ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PIKACHU_WORLD_CAP,       ITEM_PIKASHUNIUM_Z,        MOVE_THUNDERBOLT,         MOVE_10000000_VOLT_THUNDERBOLT},
+    {SPECIES_PRIMARINA,               ITEM_PRIMARIUM_Z,          MOVE_SPARKLING_ARIA,      MOVE_OCEANIC_OPERETTA},
+    {SPECIES_SOLGALEO,                ITEM_SOLGANIUM_Z,          MOVE_SUNSTEEL_STRIKE,     MOVE_SEARING_SUNRAZE_SMASH},
+    {SPECIES_NECROZMA_DUSK_MANE,      ITEM_SOLGANIUM_Z,          MOVE_SUNSTEEL_STRIKE,     MOVE_SEARING_SUNRAZE_SMASH},
+    {SPECIES_TAPU_KOKO,               ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
+    {SPECIES_TAPU_BULU,               ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
+    {SPECIES_TAPU_LELE,               ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
+    {SPECIES_TAPU_FINI,               ITEM_TAPUNIUM_Z,           MOVE_NATURES_MADNESS,     MOVE_GUARDIAN_OF_ALOLA},
+    {SPECIES_NECROZMA_ULTRA,          ITEM_ULTRANECROZIUM_Z,     MOVE_PHOTON_GEYSER,       MOVE_LIGHT_THAT_BURNS_THE_SKY},
+    {SPECIES_MEW,                     ITEM_MEWNIUM_Z,            MOVE_PSYCHIC,             MOVE_GENESIS_SUPERNOVA},
+    {SPECIES_PIKACHU,                 ITEM_PIKANIUM_Z,           MOVE_VOLT_TACKLE,         MOVE_CATASTROPIKA},
+    {SPECIES_EEVEE,                   ITEM_EEVIUM_Z,             MOVE_LAST_RESORT,         MOVE_EXTREME_EVOBOOST},
+    {SPECIES_SNORLAX,                 ITEM_SNORLIUM_Z,           MOVE_GIGA_IMPACT,         MOVE_PULVERIZING_PANCAKE},
 };
 
 static const u8 sText_ResetStats[] = _("Reset Lowered Stats");

diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h
@@ -835,6 +835,12 @@ static const struct FormChange sMimikyuFormChangeTable[] = {
     {FORM_CHANGE_END_BATTLE,    SPECIES_MIMIKYU_DISGUISED},
     {FORM_CHANGE_TERMINATOR},
 };
+
+static const struct FormChange sMimikyuTotemFormChangeTable[] = {
+    {FORM_CHANGE_FAINT,         SPECIES_MIMIKYU_TOTEM_DISGUISED},
+    {FORM_CHANGE_END_BATTLE,    SPECIES_MIMIKYU_TOTEM_DISGUISED},
+    {FORM_CHANGE_TERMINATOR},
+};
 #endif //P_FAMILY_MIMIKYU
 
 #if P_FAMILY_NECROZMA

diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h
@@ -60,6 +60,7 @@ static const u16 sRattataFormSpeciesIdTable[] = {
 static const u16 sRaticateFormSpeciesIdTable[] = {
     SPECIES_RATICATE,
     SPECIES_RATICATE_ALOLAN,
+    SPECIES_RATICATE_ALOLAN_TOTEM,
     FORM_SPECIES_END,
 };
 #endif //P_FAMILY_RATTATA
@@ -90,6 +91,7 @@ static const u16 sPikachuFormSpeciesIdTable[] = {
     SPECIES_PIKACHU_PARTNER_CAP,
     SPECIES_PIKACHU_WORLD_CAP,
     SPECIES_PIKACHU_GIGANTAMAX,
+    SPECIES_PIKACHU_PARTNER,
     FORM_SPECIES_END,
 };
 
@@ -320,6 +322,7 @@ static const u16 sExeggutorFormSpeciesIdTable[] = {
 static const u16 sMarowakFormSpeciesIdTable[] = {
     SPECIES_MAROWAK,
     SPECIES_MAROWAK_ALOLAN,
+    SPECIES_MAROWAK_ALOLAN_TOTEM,
     FORM_SPECIES_END,
 };
 #endif //P_FAMILY_CUBONE
@@ -396,6 +399,7 @@ static const u16 sLaprasFormSpeciesIdTable[] = {
 static const u16 sEeveeFormSpeciesIdTable[] = {
     SPECIES_EEVEE,
     SPECIES_EEVEE_GIGANTAMAX,
+    SPECIES_EEVEE_PARTNER,
     FORM_SPECIES_END,
 };
 #endif //P_FAMILY_EEVEE
@@ -803,6 +807,13 @@ static const u16 sWormadamFormSpeciesIdTable[] = {
     SPECIES_WORMADAM_TRASH_CLOAK,
     FORM_SPECIES_END,
 };
+
+static const u16 sMothimFormSpeciesIdTable[] = {
+    SPECIES_MOTHIM_PLANT_CLOAK,
+    SPECIES_MOTHIM_SANDY_CLOAK,
+    SPECIES_MOTHIM_TRASH_CLOAK,
+    FORM_SPECIES_END,
+};
 #endif //P_FAMILY_BURMY
 
 #if P_FAMILY_CHERUBI
@@ -1116,6 +1127,54 @@ static const u16 sGreninjaFormSpeciesIdTable[] = {
 #endif //P_FAMILY_FROAKIE
 
 #if P_FAMILY_SCATTERBUG
+static const u16 sScatterbugFormSpeciesIdTable[] = {
+    SPECIES_SCATTERBUG_ICY_SNOW,
+    SPECIES_SCATTERBUG_POLAR,
+    SPECIES_SCATTERBUG_TUNDRA,
+    SPECIES_SCATTERBUG_CONTINENTAL,
+    SPECIES_SCATTERBUG_GARDEN,
+    SPECIES_SCATTERBUG_ELEGANT,
+    SPECIES_SCATTERBUG_MEADOW,
+    SPECIES_SCATTERBUG_MODERN,
+    SPECIES_SCATTERBUG_MARINE,
+    SPECIES_SCATTERBUG_ARCHIPELAGO,
+    SPECIES_SCATTERBUG_HIGH_PLAINS,
+    SPECIES_SCATTERBUG_SANDSTORM,
+    SPECIES_SCATTERBUG_RIVER,
+    SPECIES_SCATTERBUG_MONSOON,
+    SPECIES_SCATTERBUG_SAVANNA,
+    SPECIES_SCATTERBUG_SUN,
+    SPECIES_SCATTERBUG_OCEAN,
+    SPECIES_SCATTERBUG_JUNGLE,
+    SPECIES_SCATTERBUG_FANCY,
+    SPECIES_SCATTERBUG_POKE_BALL,
+    FORM_SPECIES_END,
+};
+
+static const u16 sSpewpaFormSpeciesIdTable[] = {
+    SPECIES_SPEWPA_ICY_SNOW,
+    SPECIES_SPEWPA_POLAR,
+    SPECIES_SPEWPA_TUNDRA,
+    SPECIES_SPEWPA_CONTINENTAL,
+    SPECIES_SPEWPA_GARDEN,
+    SPECIES_SPEWPA_ELEGANT,
+    SPECIES_SPEWPA_MEADOW,
+    SPECIES_SPEWPA_MODERN,
+    SPECIES_SPEWPA_MARINE,
+    SPECIES_SPEWPA_ARCHIPELAGO,
+    SPECIES_SPEWPA_HIGH_PLAINS,
+    SPECIES_SPEWPA_SANDSTORM,
+    SPECIES_SPEWPA_RIVER,
+    SPECIES_SPEWPA_MONSOON,
+    SPECIES_SPEWPA_SAVANNA,
+    SPECIES_SPEWPA_SUN,
+    SPECIES_SPEWPA_OCEAN,
+    SPECIES_SPEWPA_JUNGLE,
+    SPECIES_SPEWPA_FANCY,
+    SPECIES_SPEWPA_POKE_BALL,
+    FORM_SPECIES_END,
+};
+
 static const u16 sVivillonFormSpeciesIdTable[] = {
     SPECIES_VIVILLON_ICY_SNOW,
     SPECIES_VIVILLON_POLAR,
@@ -1286,6 +1345,22 @@ static const u16 sDecidueyeFormSpeciesIdTable[] = {
 };
 #endif //P_FAMILY_ROWLET
 
+#if P_FAMILY_YUNGOOS
+static const u16 sGumshoosFormSpeciesIdTable[] = {
+    SPECIES_GUMSHOOS,
+    SPECIES_GUMSHOOS_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_YUNGOOS
+
+#if P_FAMILY_GRUBBIN
+static const u16 sVikavoltFormSpeciesIdTable[] = {
+    SPECIES_VIKAVOLT,
+    SPECIES_VIKAVOLT_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_GRUBBIN
+
 #if P_FAMILY_ORICORIO
 static const u16 sOricorioFormSpeciesIdTable[] = {
     SPECIES_ORICORIO_BAILE,
@@ -1296,6 +1371,14 @@ static const u16 sOricorioFormSpeciesIdTable[] = {
 };
 #endif //P_FAMILY_ORICORIO
 
+#if P_FAMILY_CUTIEFLY
+static const u16 sRibombeeFormSpeciesIdTable[] = {
+    SPECIES_RIBOMBEE,
+    SPECIES_RIBOMBEE_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_CUTIEFLY
+
 #if P_FAMILY_ROCKRUFF
 static const u16 sRockruffFormSpeciesIdTable[] = {
     SPECIES_ROCKRUFF,
@@ -1319,6 +1402,30 @@ static const u16 sWishiwashiFormSpeciesIdTable[] = {
 };
 #endif //P_FAMILY_WISHIWASHI
 
+#if P_FAMILY_DEWPIDER
+static const u16 sAraquanidFormSpeciesIdTable[] = {
+    SPECIES_ARAQUANID,
+    SPECIES_ARAQUANID_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_DEWPIDER
+
+#if P_FAMILY_FOMANTIS
+static const u16 sLurantisFormSpeciesIdTable[] = {
+    SPECIES_LURANTIS,
+    SPECIES_LURANTIS_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_FOMANTIS
+
+#if P_FAMILY_SALANDIT
+static const u16 sSalanditFormSpeciesIdTable[] = {
+    SPECIES_SALAZZLE,
+    SPECIES_SALAZZLE_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_FOMANTIS
+
 #if P_FAMILY_TYPE_NULL
 static const u16 sSilvallyFormSpeciesIdTable[] = {
     SPECIES_SILVALLY_NORMAL,
@@ -1363,14 +1470,32 @@ static const u16 sMiniorFormSpeciesIdTable[] = {
 };
 #endif //P_FAMILY_MINIOR
 
+#if P_FAMILY_TOGEDEMARU
+static const u16 sTogedemaruFormSpeciesIdTable[] = {
+    SPECIES_TOGEDEMARU,
+    SPECIES_TOGEDEMARU_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_TOGEDEMARU
+
 #if P_FAMILY_MIMIKYU
 static const u16 sMimikyuFormSpeciesIdTable[] = {
     SPECIES_MIMIKYU_DISGUISED,
     SPECIES_MIMIKYU_BUSTED,
+    SPECIES_MIMIKYU_TOTEM_DISGUISED,
+    SPECIES_MIMIKYU_TOTEM_BUSTED,
     FORM_SPECIES_END,
 };
 #endif //P_FAMILY_MIMIKYU
 
+#if P_FAMILY_JANGMO_O
+static const u16 sKommoOFormSpeciesIdTable[] = {
+    SPECIES_KOMMO_O,
+    SPECIES_KOMMO_O_TOTEM,
+    FORM_SPECIES_END,
+};
+#endif //P_FAMILY_JANGMO_O
+
 #if P_FAMILY_NECROZMA
 static const u16 sNecrozmaFormSpeciesIdTable[] = {
     SPECIES_NECROZMA,