From 40d2f71e10926c107d38005dcfc50bc1e48a521b Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 22 Jun 2018 23:33:42 -0700
Subject: [PATCH] Sanity check suggested current moves

invalid formes can trip up gen1/2 origin encounter moves, just double
check when suggesting.

Closes #2018
---
 PKHeX.Core/Editing/CommonEdits.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/PKHeX.Core/Editing/CommonEdits.cs b/PKHeX.Core/Editing/CommonEdits.cs
index 7261deba9..a14774b55 100644
--- a/PKHeX.Core/Editing/CommonEdits.cs
+++ b/PKHeX.Core/Editing/CommonEdits.cs
@@ -606,6 +606,10 @@ public static int[] GetMoveSet(this PKM pkm, bool random = false, LegalityAnalys
             int[] m = la.GetSuggestedMoves(tm: random, tutor: random, reminder: random);
             if (m == null)
                 return pkm.Moves;
+
+            if (!m.All(z => la.AllSuggestedMovesAndRelearn.Contains(z)))
+                m = m.Intersect(la.AllSuggestedMovesAndRelearn).ToArray();
+
             if (random)
                 Util.Shuffle(m);