From 5472f869cf01dae67d34ff6d2efcedaba6858ac6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 25 Jan 2018 09:14:25 -0800 Subject: [PATCH] Remove some crystal vc checks now legal assuming x->kor7 sets the language val based on the cart language, should be good for the kor crystal checks. --- PKHeX.Core/Legality/Checks.cs | 2 +- PKHeX.Core/Legality/Core.cs | 3 +-- PKHeX.Core/Legality/Encounters/EncounterGenerator.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index 60c9cfa90..1068108a4 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -651,7 +651,7 @@ private void VerifyG1OT() AddLine(Severity.Invalid, V39, CheckIdentifier.Trainer); } - if (pkm.OT_Gender == 1 && (pkm.Format == 2 && pkm.Met_Location == 0 || pkm.Format > 2 && !Legal.AllowGen2VCCrystal)) + if (pkm.OT_Gender == 1 && (pkm.Format == 2 && pkm.Met_Location == 0 || pkm.Format > 2)) AddLine(Severity.Invalid, V408, CheckIdentifier.Trainer); } private void VerifyG1OTWithinBounds(string str) diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index 9776618de..ce6765b0e 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -34,8 +34,7 @@ public static partial class Legal /// Setting to specify if an analysis should permit data sourced from the physical cartridge era of GameBoy games. public static bool AllowGBCartEra { get; set; } public static bool AllowGen1Tradeback { get; set; } - public static bool AllowGen2VCCrystal => false; - public static bool AllowGen2Crystal(bool Korean) => !Korean && (AllowGBCartEra || AllowGen2VCCrystal); // Pokemon Crystal was never released in Korea + public static bool AllowGen2Crystal(bool Korean) => !Korean; // Pokemon Crystal was never released in Korea public static bool AllowGen2Crystal(PKM pkm) => AllowGen2Crystal(pkm.Korean); public static bool AllowGen2MoveReminder(PKM pkm) => !pkm.Korean && AllowGBCartEra; // Pokemon Stadium 2 was never released in Korea diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs index b74111970..cd7a6f2c5 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs @@ -1573,7 +1573,7 @@ internal static IEncounterable GetVCStaticTransferEncounter(PKM pkm) { if (pkm.VC1) return GetRBYStaticTransfer(pkm.Species, pkm.Met_Level); - if (pkm.VC2 && (pkm.Version != (int)GameVersion.C || AllowGen2VCCrystal)) + if (pkm.VC2) return GetGSStaticTransfer(pkm.Species, pkm.Met_Level); return new EncounterInvalid(pkm); }