Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-09 04:24:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Permit galar native species to inherit past-gen balls

Browse Source
This commit is contained in:
Kurt 2020-03-10 17:53:56 -07:00
parent 093ce2a020
commit 9dbc3cd418
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PKHeX.Core/Legality/Verifiers/BallVerifier.cs
View File

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