From 2909c4afeff3cd5b61064a41a17488692ccc39da Mon Sep 17 00:00:00 2001
From: Russell Jones <questiondesk@gmail.com>
Date: Tue, 26 Feb 2019 01:26:19 +0000
Subject: [PATCH] Update _K12.cs

---
 PKHeX.Core/PKM/Shared/_K12.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/PKHeX.Core/PKM/Shared/_K12.cs b/PKHeX.Core/PKM/Shared/_K12.cs
index 44353bc92..bc89aa6b6 100644
--- a/PKHeX.Core/PKM/Shared/_K12.cs
+++ b/PKHeX.Core/PKM/Shared/_K12.cs
@@ -260,12 +260,11 @@ public override ushort[] GetStats(PersonalInfo p)
 
         protected static ushort GetStat(int BV, int IV, int EV, int LV)
         {
-            EV = (ushort)Math.Sqrt(EV) >> 2;
+            EV = (ushort)Math.Min(255, Math.Sqrt(EV) + 1) >> 2;
             return (ushort)((((2 * (BV + IV)) + EV) * LV / 100) + 5);
         }
 
-        public override int GetMovePP(int move, int ppup) => Math.Min(61, base.GetMovePP(move, ppup));
-
+        public override int GetMovePP(int move, int ppup) => GetBasePP(move) + ppup * Math.Min(7, GetBasePP(move) / 5)
         /// <summary>
         /// Applies <see cref="PKM.IVs"/> to the <see cref="PKM"/> to make it shiny.
         /// </summary>