diff --git a/PKHeX.Core/Legality/Moves/MoveEgg.cs b/PKHeX.Core/Legality/Moves/MoveEgg.cs
index 9623d44ae..deaebe2ce 100644
--- a/PKHeX.Core/Legality/Moves/MoveEgg.cs
+++ b/PKHeX.Core/Legality/Moves/MoveEgg.cs
@@ -68,13 +68,8 @@ private static int[] GetEggMoves(int gen, int species, int formnum, GameVersion
         private static int[] GetFormEggMoves(int species, int formnum, IReadOnlyList<EggMoves7> table)
         {
             var entry = table[species];
-            if (formnum > 0)
-            {
-                if (AlolanOriginForms.Contains(species))
-                    entry = table[entry.FormTableIndex + formnum - 1];
-                else if (GalarOriginForms.Contains(species))
-                    entry = table[entry.FormTableIndex + formnum - 1];
-            }
+            if (formnum > 0 && entry.FormTableIndex > species)
+                entry = table[entry.FormTableIndex + formnum - 1];
             return entry.Moves;
         }
 
diff --git a/PKHeX.Core/Legality/Tables/Tables.cs b/PKHeX.Core/Legality/Tables/Tables.cs
index 15635a3bf..22fcbe2ff 100644
--- a/PKHeX.Core/Legality/Tables/Tables.cs
+++ b/PKHeX.Core/Legality/Tables/Tables.cs
@@ -416,6 +416,7 @@ public static partial class Legal
             32, // Nidoran♂
             313, // Volbeat
             314, // Illumise
+            (int)Species.Indeedee, // male/female
         };
 
         public static readonly HashSet<int> FixedGenderFromBiGender = new HashSet<int>