From b8a5ccdf7dff0fbafb2b1658e9663d5674c124cc Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Tue, 10 Apr 2018 17:00:28 -0700
Subject: [PATCH] Simplify shedinja evo move check

Closes #1895 , re-verified with pkm provided in #1805
there's no shedinja gift, always is an evolution

seal some forms to remove virt call in constructor warning
---
 .../Legality/Encounters/Verifiers/VerifyCurrentMoves.cs   | 8 +-------
 .../Subforms/Save Editors/SAV_BoxViewer.Designer.cs       | 2 +-
 PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs     | 2 +-
 .../Subforms/Save Editors/SAV_EventFlags.Designer.cs      | 2 +-
 PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs    | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
index 1a4dd75e1..84714f367 100644
--- a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
+++ b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyCurrentMoves.cs
@@ -244,14 +244,8 @@ private static CheckMoveResult[] ParseMoves(PKM pkm, MoveParseSource source, Leg
                     return res;
             }
 
-            if (pkm.Species == 292 && info.EncounterMatch.Species != 292 && !(info.EncounterMatch is EncounterEgg))
-            {
-                // Ignore Shedinja if the Encounter was also a Shedinja, assume null Encounter as a Nincada egg
-                // Check Shedinja evolved moves from Ninjask after egg moves
-                // Those moves could also be inherited egg moves
-                if (info.Generation <= 4) // 3 or 4
+            if (pkm.Species == 292 && info.Generation <= 4)
                 ParseShedinjaEvolveMoves(pkm, res, source.CurrentMoves);
-            }
 
             for (int m = 0; m < 4; m++)
             {
diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.Designer.cs
index 06ac59414..f596efcb0 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.Designer.cs	
@@ -1,6 +1,6 @@
 namespace PKHeX.WinForms
 {
-    partial class SAV_BoxViewer
+    sealed partial class SAV_BoxViewer
     {
         /// <summary>
         /// Required designer variable.
diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs
index a6b9eea8a..59d1512eb 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs	
@@ -4,7 +4,7 @@
 
 namespace PKHeX.WinForms
 {
-    public partial class SAV_BoxViewer : Form
+    public sealed partial class SAV_BoxViewer : Form
     {
         private readonly SAVEditor parent;
         public SAV_BoxViewer(SAVEditor p, SlotChangeManager m)
diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.Designer.cs
index ad8b6afb6..6891cbe42 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.Designer.cs	
@@ -1,6 +1,6 @@
 namespace PKHeX.WinForms
 {
-    partial class SAV_EventFlags
+    sealed partial class SAV_EventFlags
     {
         /// <summary>
         /// Required designer variable.
diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs
index a30147088..08ea46fd6 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs	
@@ -10,7 +10,7 @@
 
 namespace PKHeX.WinForms
 {
-    public partial class SAV_EventFlags : Form
+    public sealed partial class SAV_EventFlags : Form
     {
         private readonly SaveFile Origin;
         private readonly SaveFile SAV;