Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 14:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revise pk6/pk7 detection

Browse source 
As per comments in
c401781526
This commit is contained in:
Kurt 2017-01-27 21:36:39 -08:00
parent e9cd03d72f
commit 75d460e502
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
PKHeX/PKM/PKMConverter.cs
View file

@ -131,15 +131,6 @@ namespace PKHeX.Core
{ {
if (pk.Version > Legal.MaxGameID_6) if (pk.Version > Legal.MaxGameID_6)
return true; 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) if (pk.Enjoyment != 0 || pk.Fullness != 0)
return false; return false;
@ -155,6 +146,12 @@ namespace PKHeX.Core
if (pk.HeldItem > Legal.MaxItemID_6_AO) if (pk.HeldItem > Legal.MaxItemID_6_AO)
return true; return true;
int lvl = pk.CurrentLevel;
if (lvl < 100 && pk.EncounterType != 0)
return false;
if (pk.EncounterType > 24)
return true;
return false; // 6 return false; // 6
} }