From c9d0811281bab4b2ae5daafebee823bde87c80d4 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 10 Jun 2018 19:38:06 -0700
Subject: [PATCH] Handle evolutions-in-eggs case for past gen (2/3)

Closes #1989
Thanks @iiippppk !

(eggs don't always come at level 1, past gen has level 5)
---
 PKHeX.Core/Legality/Core.cs                        |   4 ++--
 .../Misc/038 - タマゴ - D8E92C842F48 Evo Egg.pk3   | Bin 0 -> 80 bytes
 .../Illegal/Misc/121 ★ - EGG - 1B87 Evo Egg.pk2    | Bin 0 -> 73 bytes
 .../Illegal/Misc/199 ★ - EGG - EDB6 Evo Egg.pk2    | Bin 0 -> 73 bytes
 .../Misc/208 - タマゴ - E4466BAA9428 Evo Egg.pk3   | Bin 0 -> 80 bytes
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/Misc/038 - タマゴ - D8E92C842F48 Evo Egg.pk3
 create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/Misc/121 ★ - EGG - 1B87 Evo Egg.pk2
 create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/Misc/199 ★ - EGG - EDB6 Evo Egg.pk2
 create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/Misc/208 - タマゴ - E4466BAA9428 Evo Egg.pk3

diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs
index b2014f357..98dec6133 100644
--- a/PKHeX.Core/Legality/Core.cs
+++ b/PKHeX.Core/Legality/Core.cs
@@ -1363,10 +1363,10 @@ internal static IList<DexLevel> GetValidPreEvolutions(PKM pkm, int maxspeciesori
         {
             if (lvl < 0)
                 lvl = pkm.CurrentLevel;
-            if (lvl == 1 && pkm.IsEgg)
+            if (pkm.IsEgg && !skipChecks)
                 return new List<DexLevel>
                 {
-                    new DexLevel { Species = pkm.Species, Level = 1, MinLevel = 1 },
+                    new DexLevel { Species = pkm.Species, Level = lvl, MinLevel = lvl },
                 };
             if (pkm.Species == 292 && lvl >= 20 && (!pkm.HasOriginalMetLocation || pkm.Met_Level + 1 <= lvl))
                 return new List<DexLevel>
diff --git a/Tests/PKHeX.Tests/Legality/Illegal/Misc/038 - タマゴ - D8E92C842F48 Evo Egg.pk3 b/Tests/PKHeX.Tests/Legality/Illegal/Misc/038 - タマゴ - D8E92C842F48 Evo Egg.pk3
new file mode 100644
index 0000000000000000000000000000000000000000..dcb3957c01dca4d857db881b6ed195df7288a074
GIT binary patch
literal 80
zcmea!Z_(jmU|>kd@BV-I(*Fbd|1+|^hX96`Hy9YyfO54!%)rRNV8WmdVlha{fhh!`
N(6I2~`a*Y*003#z6|DdO

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Illegal/Misc/121 ★ - EGG - 1B87 Evo Egg.pk2 b/Tests/PKHeX.Tests/Legality/Illegal/Misc/121 ★ - EGG - 1B87 Evo Egg.pk2
new file mode 100644
index 0000000000000000000000000000000000000000..91d6f2221781e05ecbbf9b67a6f09d321a7c0b4d
GIT binary patch
literal 73
zcmZSl`@fPwF^hqLfs27*4v>O^U#pbm7#J9VJXRnU1wuX`6l4%!;0r*2mbSKlo{kof
F006#N4ln=!

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Illegal/Misc/199 ★ - EGG - EDB6 Evo Egg.pk2 b/Tests/PKHeX.Tests/Legality/Illegal/Misc/199 ★ - EGG - EDB6 Evo Egg.pk2
new file mode 100644
index 0000000000000000000000000000000000000000..04c65e35b9c21022413c4b4257822f13c1baa5d4
GIT binary patch
literal 73
zcmZSl`~Nt@Iz<Ks1}+AMS|9}lzgBT6GcYg$d8|Mz350w=$jKnUAQ*rEEp2T9T^+q`
GKoJ1kgbvRD

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Illegal/Misc/208 - タマゴ - E4466BAA9428 Evo Egg.pk3 b/Tests/PKHeX.Tests/Legality/Illegal/Misc/208 - タマゴ - E4466BAA9428 Evo Egg.pk3
new file mode 100644
index 0000000000000000000000000000000000000000..2299a900a870f3bc2c9aa21bdfd2e78885c4dfc6
GIT binary patch
literal 80
zcmdOxvMQU4fq@|*zx)5O!<YW=|If(w9s(HLo-i<60Ls+@F#{t5gCavZh{d3+0j3ay
NLW5$bx@!PP005jA6)pe(

literal 0
HcmV?d00001