From 75d460e502066a39d72f704cca58f4ca4a60f305 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 27 Jan 2017 21:36:39 -0800
Subject: [PATCH] Revise pk6/pk7 detection

As per comments in
https://github.com/kwsch/PKHeX/commit/c401781526c62191f3e242f60b5c155946771be2
---
 PKHeX/PKM/PKMConverter.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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
         }