From 2467fd95ad7b455b4fb965dddaa1672501fad7d7 Mon Sep 17 00:00:00 2001
From: ReignOfComputer <roc@reignofcomputer.com>
Date: Tue, 31 Jan 2017 20:13:29 +0800
Subject: [PATCH 1/2] Fix Fishing Stat Record (#784)

Should be 007 not 006.
---
 PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs
index f76dda78f..0b72141bc 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs	
@@ -392,7 +392,7 @@ private void changeStatVal(object sender, EventArgs e)
             {001, "Times Saved"},
             {004, "Wild Pokémon Battles"},
             {006, "Pokemon Caught"},
-            {006, "Pokemon Caught Fishing"},
+            {007, "Pokemon Caught Fishing"},
             {008, "Eggs Hatched"},
             {009, "Pokemon Evolved"},
             {011, "Link Trades"},

From 3eb85757324a3afe1699a72373303d894e6672b8 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Tue, 31 Jan 2017 04:50:57 -0800
Subject: [PATCH 2/2] Remove unnecessary checks

Closes #785
It's cleared on 6->7 (no more Amie) but is used the same way by Refresh.
EncounterType is checking the virtual property (=> 0) thus unnecessary.
---
 PKHeX/Legality/Checks.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs
index 2d680cf6e..6dd5b13c7 100644
--- a/PKHeX/Legality/Checks.cs
+++ b/PKHeX/Legality/Checks.cs
@@ -1156,16 +1156,6 @@ private CheckResult verifyHistory()
             
             if (pkm.HT_Gender > 1)
                 return new CheckResult(Severity.Invalid, $"HT Gender invalid {pkm.HT_Gender}.", CheckIdentifier.History);
-
-            if (pkm.Format >= 7) // Cleared Values
-            {
-                if (pkm.EncounterType != 0)
-                    return new CheckResult(Severity.Invalid, $"EncounterType invalid {pkm.EncounterType}.", CheckIdentifier.History);
-                if (pkm.Enjoyment != 0)
-                    return new CheckResult(Severity.Invalid, $"Enjoyment invalid {pkm.Enjoyment}.", CheckIdentifier.History);
-                if (pkm.Fullness != 0)
-                    return new CheckResult(Severity.Invalid, $"Fullness invalid {pkm.Fullness}.", CheckIdentifier.History);
-            }
             
             MysteryGift mg = EncounterMatch as MysteryGift;
             WC6 MatchedWC6 = EncounterMatch as WC6;