From 9dbc3cd41806a8011cf20ed77bfb3e9dbb971389 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 10 Mar 2020 17:53:56 -0700 Subject: [PATCH] Permit galar native species to inherit past-gen balls --- PKHeX.Core/Legality/Verifiers/BallVerifier.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/BallVerifier.cs b/PKHeX.Core/Legality/Verifiers/BallVerifier.cs index 97bdc9196..bf7301884 100644 --- a/PKHeX.Core/Legality/Verifiers/BallVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/BallVerifier.cs @@ -261,11 +261,12 @@ private CheckResult VerifyBallEggGen8(LegalityAnalysis data) if ((int)Species.Grookey <= species && species <= (int)Species.Inteleon) // G8 Starters return VerifyBallEquals(data, (int)Poke); - if (IsGalarCapture(species)) + if (IsGalarBreed(species)) { - if (!Legal.WildPokeballs8.Contains(pkm.Ball)) + if (Legal.WildPokeballs8.Contains(pkm.Ball)) + return GetValid(LBallSpeciesPass); + if (species >= (int)Species.Grookey) return GetInvalid(LBallSpecies); - return GetValid(LBallSpeciesPass); } Ball ball = (Ball)pkm.Ball; @@ -336,12 +337,10 @@ private CheckResult VerifyBallEggGen8(LegalityAnalysis data) return NONE; } - public static bool IsGalarCapture(int species) + public static bool IsGalarBreed(int species) { if ((int)Species.Grookey <= species && species <= (int)Species.Inteleon) // starter return false; - if ((int)Species.Dracozolt <= species && species <= (int)Species.Arctovish) // fossil - return false; var pt = PersonalTable.SWSH; return ((PersonalInfoSWSH)pt.GetFormeEntry(species, 0)).PokeDexIndex != 0; }