From 9e4c408ac773d7e0920dbf4e91a4b48738a121ae Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 22 Nov 2019 21:32:05 -0800
Subject: [PATCH] Fix galar form egg move fetch

Closes #2500
---
 PKHeX.Core/Legality/Moves/MoveEgg.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/PKHeX.Core/Legality/Moves/MoveEgg.cs b/PKHeX.Core/Legality/Moves/MoveEgg.cs
index 5dba5ca05..9623d44ae 100644
--- a/PKHeX.Core/Legality/Moves/MoveEgg.cs
+++ b/PKHeX.Core/Legality/Moves/MoveEgg.cs
@@ -68,8 +68,13 @@ 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 && AlolanOriginForms.Contains(species))
-                entry = table[entry.FormTableIndex + formnum - 1];
+            if (formnum > 0)
+            {
+                if (AlolanOriginForms.Contains(species))
+                    entry = table[entry.FormTableIndex + formnum - 1];
+                else if (GalarOriginForms.Contains(species))
+                    entry = table[entry.FormTableIndex + formnum - 1];
+            }
             return entry.Moves;
         }