From c3e0d5339cfafa27fdfbd8e58c6cf90745e20fe9 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 16 Oct 2017 17:33:09 -0700 Subject: [PATCH] Fix jp gen2 save detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- PKHeX.Core/Saves/SaveUtil.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PKHeX.Core/Saves/SaveUtil.cs b/PKHeX.Core/Saves/SaveUtil.cs index e45c729be..fb65577b4 100644 --- a/PKHeX.Core/Saves/SaveUtil.cs +++ b/PKHeX.Core/Saves/SaveUtil.cs @@ -148,9 +148,9 @@ internal static GameVersion GetIsG2SAV(byte[] data) /// True if a valid international save, False otherwise. 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 @@ private static GameVersion GetIsG2SAVU(byte[] data) /// True if a valid Japanese save, False otherwise. 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 @@ internal static GameVersion GetIsG2SAVJ(byte[] data) /// True if a valid Korean save, False otherwise. 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; }