diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index e389ca8b9..58d6b2e67 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -131,15 +131,6 @@ private static bool checkPK6is7(PK6 pk) { if (pk.Version > Legal.MaxGameID_6) return true; - if (pk.Geo1_Country != 0) - return false; - - int lvl = pk.CurrentLevel; - if (lvl < 100 && pk.EncounterType != 0) - return false; - if (pk.EncounterType > 24) - return true; - if (pk.Enjoyment != 0 || pk.Fullness != 0) return false; @@ -155,6 +146,12 @@ private static bool checkPK6is7(PK6 pk) if (pk.HeldItem > Legal.MaxItemID_6_AO) return true; + int lvl = pk.CurrentLevel; + if (lvl < 100 && pk.EncounterType != 0) + return false; + if (pk.EncounterType > 24) + return true; + return false; // 6 }