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.
This commit is contained in:
Kurt 2018-01-25 09:14:25 -08:00
parent 959d598d76
commit 5472f869cf
3 changed files with 3 additions and 4 deletions

View File

@ -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)

View File

@ -34,8 +34,7 @@ public static partial class Legal
/// <summary>Setting to specify if an analysis should permit data sourced from the physical cartridge era of GameBoy games.</summary>
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

View File

@ -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);
}