diff --git a/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs b/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs index 15a57390e..c7d6295cb 100644 --- a/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs +++ b/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs @@ -41,6 +41,8 @@ internal static EncounterArea[] GetEncounterTables(GameVersion game) case GameVersion.MN: return GetEncounterTables("sm", "mn"); case GameVersion.US: return GetEncounterTables("uu", "us"); case GameVersion.UM: return GetEncounterTables("uu", "um"); + case GameVersion.GP: return GetEncounterTables("gg", "gp"); + case GameVersion.GE: return GetEncounterTables("gg", "ge"); } return null; // bad request } diff --git a/PKHeX.Core/Legality/Tables7.cs b/PKHeX.Core/Legality/Tables7.cs index 98df508cb..b59f5ff42 100644 --- a/PKHeX.Core/Legality/Tables7.cs +++ b/PKHeX.Core/Legality/Tables7.cs @@ -185,7 +185,7 @@ public static partial class Legal 718, // Regular - 023, 086, 108, 138, 140, 163, 177, 179, 190, 204, + 023, 086, 108, 122, 138, 140, 163, 177, 179, 190, 204, 206, 214, 223, 228, 238, 246, 303, 309, 341, 343, 345, 347, 352, 353, 357, 366, 427, 439, 458, 550, 559, 570, 572, 592, 605, 619, 621, 622, 624, 636, @@ -328,7 +328,7 @@ public static partial class Legal 782, // USUM Additions - 023, 086, 108, 163, 177, 179, 190, 204, + 023, 086, 108, 122, 163, 177, 179, 190, 204, 206, 214, 223, 228, 238, 246, 303, 309, 341, 343, 352, 353, 357, 366, 427, 439, 458, 550, 559, 570, 572, 592, 605, 619, 621, 622, 624, 636, diff --git a/PKHeX.Core/Legality/Verifiers/BallVerifier.cs b/PKHeX.Core/Legality/Verifiers/BallVerifier.cs index b4f330157..df48a03d8 100644 --- a/PKHeX.Core/Legality/Verifiers/BallVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/BallVerifier.cs @@ -233,7 +233,7 @@ private CheckResult VerifyBallEggGen7(LegalityAnalysis data) { if (species == 669 && pkm.AltForm == 3 && pkm.AbilityNumber == 4) return GetInvalid(V122); // Can't obtain Flabébé-Blue with Hidden Ability in wild - if ((species > 731 && species <= 785) || (Legal.PastGenAlolanNatives.Contains(species) && !Legal.PastGenAlolanNativesUncapturable.Contains(species))) + if ((species > 731 && species <= 785) || (Legal.AlolanCaptureOffspring.Contains(species) && !Legal.PastGenAlolanNativesUncapturable.Contains(species))) return GetValid(V123); if (Legal.PastGenAlolanScans.Contains(species)) return GetValid(V123);