From 2b606dfc3274e5123d5e4e13a0ae40626b2d6123 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 6 Feb 2017 21:36:00 -0800 Subject: [PATCH] Cleanup fixes qr7 import --- PKHeX.WinForms/Misc/QR.cs | 2 +- PKHeX/Legality/Core.cs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PKHeX.WinForms/Misc/QR.cs b/PKHeX.WinForms/Misc/QR.cs index 4b9983f1c..5bcb177af 100644 --- a/PKHeX.WinForms/Misc/QR.cs +++ b/PKHeX.WinForms/Misc/QR.cs @@ -108,7 +108,7 @@ internal static byte[] getQRData() pkstr = pkstr.Substring(0, pkstr.IndexOf(cap, StringComparison.Ordinal)); // Trim outro try { - if (!pkstr.StartsWith("http") && pkstr.StartsWith(BadQRUrl)) // G7 + if (!pkstr.StartsWith("http") && !pkstr.StartsWith(BadQRUrl)) // G7 { string fstr = Regex.Unescape(pkstr); byte[] raw = Encoding.Unicode.GetBytes(fstr); diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index 58521965d..ebbf3b879 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -371,21 +371,21 @@ private static int getMaxSpeciesOrigin(int generation) switch (generation) { case 1: - return Legal.MaxSpeciesID_1; + return MaxSpeciesID_1; case 2: - return Legal.MaxSpeciesID_2; + return MaxSpeciesID_2; case 3: - return Legal.MaxSpeciesID_3; + return MaxSpeciesID_3; case 4: - return Legal.MaxSpeciesID_4; + return MaxSpeciesID_4; case 5: - return Legal.MaxSpeciesID_5; + return MaxSpeciesID_5; case 6: - return Legal.MaxSpeciesID_6; + return MaxSpeciesID_6; case 7: - return Legal.MaxSpeciesID_7; + return MaxSpeciesID_7; default: - return Legal.MaxSpeciesID_7; + return MaxSpeciesID_7; } }