Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-21 23:02:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix jp gen2 save detection

Browse source 
simplification commit was dyslexic on JP/EN.
20 <-> 30 (EN 20, JP 30 is the correct count)

https://bulbapedia.bulbagarden.net/wiki/Pokémon_Storage_System#Core_series_games

pk2 structure is smaller for jp (smaller strings), thus has 30 cap.
International has 20.
This commit is contained in:
Kurt 2017-10-16 17:33:09 -07:00
parent 4d91aad876
commit c3e0d5339c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PKHeX.Core/Saves/SaveUtil.cs
View file

@ -148,9 +148,9 @@ namespace PKHeX.Core
/// <returns>True if a valid international save, False otherwise.</returns>
private static GameVersion GetIsG2SAVU(byte[] data)
{
if (IsG12ListValid(data, 0x288A, 30) && IsG12ListValid(data, 0x2D6C, 30))
if (IsG12ListValid(data, 0x288A, 20) && IsG12ListValid(data, 0x2D6C, 20))
return GameVersion.GS;
if (IsG12ListValid(data, 0x2865, 30) && IsG12ListValid(data, 0x2D10, 30))
if (IsG12ListValid(data, 0x2865, 20) && IsG12ListValid(data, 0x2D10, 20))
return GameVersion.C;
return GameVersion.Invalid;
}
@ -159,11 +159,11 @@ namespace PKHeX.Core
/// <returns>True if a valid Japanese save, False otherwise.</returns>
internal static GameVersion GetIsG2SAVJ(byte[] data)
{
if (!IsG12ListValid(data, 0x2D10, 20))
if (!IsG12ListValid(data, 0x2D10, 30))
return GameVersion.Invalid;
if (IsG12ListValid(data, 0x283E, 20))
if (IsG12ListValid(data, 0x283E, 30))
return GameVersion.GS;
if (IsG12ListValid(data, 0x281A, 20))
if (IsG12ListValid(data, 0x281A, 30))
return GameVersion.C;
return GameVersion.Invalid;
}
@ -172,7 +172,7 @@ namespace PKHeX.Core
/// <returns>True if a valid Korean save, False otherwise.</returns>
internal static GameVersion GetIsG2SAVK(byte[] data)
{
if (IsG12ListValid(data, 0x2DAE, 30) && IsG12ListValid(data, 0x28CC, 30))
if (IsG12ListValid(data, 0x2DAE, 20) && IsG12ListValid(data, 0x28CC, 20))
return GameVersion.GS;
return GameVersion.Invalid;
}