From 19bf8de17c899ad6d33d7588939c6f3df97846e2 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Mon, 26 Jun 2017 20:12:49 -0700
Subject: [PATCH] Add gen1/2 EV checks

---
 PKHeX.Core/Legality/Analysis.cs | 1 +
 PKHeX.Core/Legality/Checks.cs   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs
index 1bb06aae3..299fbca6d 100644
--- a/PKHeX.Core/Legality/Analysis.cs
+++ b/PKHeX.Core/Legality/Analysis.cs
@@ -126,6 +126,7 @@ private void ParsePK1(PKM pk)
             }
             VerifyNickname();
             VerifyDVs();
+            VerifyEVs();
             VerifyG1OT();
             VerifyMiscG1();
         }
diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs
index 79819f283..9460dd15c 100644
--- a/PKHeX.Core/Legality/Checks.cs
+++ b/PKHeX.Core/Legality/Checks.cs
@@ -335,7 +335,7 @@ private void VerifyEVs()
             int sum = evs.Sum();
             if (sum > 0 && pkm.IsEgg)
                 AddLine(Severity.Invalid, V22, CheckIdentifier.EVs);
-            if (sum > 510)
+            if (pkm.Format >= 3 && sum > 510)
                 AddLine(Severity.Invalid, V25, CheckIdentifier.EVs);
             if (pkm.Format >= 6 && evs.Any(ev => ev > 252))
                 AddLine(Severity.Invalid, V26, CheckIdentifier.EVs);
@@ -351,6 +351,9 @@ private void VerifyEVs()
                 // Cannot EV train above 100 without increasing EXP
                 if (PKX.GetEXP(EncounterMatch.LevelMin, pkm.Species) == pkm.EXP && evs.Any(ev => ev > maxEV))
                     AddLine(Severity.Invalid, string.Format(V418, maxEV), CheckIdentifier.EVs);
+
+                if (pkm.Format < 3)
+                    return;
             }
 
             // Only one of the following can be true: 0, 508, and x%6!=0