From 5e22c119be1c6f4ea2d590eab3737cbc7d52f04c Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 13 Nov 2020 08:20:51 -0800 Subject: [PATCH] Continued refinements --- PKHeX.Core/Legality/Areas/EncounterArea8g.cs | 4 ++-- PKHeX.Core/Legality/Encounters/Data/EncountersGO.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8g.cs b/PKHeX.Core/Legality/Areas/EncounterArea8g.cs index 33bec92d3..9cd9fd2ac 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea8g.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea8g.cs @@ -53,7 +53,7 @@ private static IEnumerable GetSlots(EncounterArea8g area, int max continue; if (IsDisallowedDuplicateForm(species, f)) continue; - bool lgpe = (species <= 151 || species == 808 || species == 809) && ptGG[species].HasForme(f); + bool lgpe = (species <= 151 || species == 808 || species == 809) && (f == 0 || ptGG[species].HasForme(f)); var game = lgpe ? GameVersion.GG : GameVersion.SWSH; yield return GetSlot(area, species, f, game); } @@ -68,7 +68,7 @@ private static IEnumerable GetSlots(EncounterArea8g area, int max continue; if (IsDisallowedDuplicateForm(species, f)) continue; - bool lgpe = species <= 151 && ptGG[species].HasForme(f); + bool lgpe = species <= 151 && (f == 0 || ptGG[species].HasForme(f)); var game = lgpe ? GameVersion.GG : GameVersion.USUM; yield return GetSlot(area, species, f, game); } diff --git a/PKHeX.Core/Legality/Encounters/Data/EncountersGO.cs b/PKHeX.Core/Legality/Encounters/Data/EncountersGO.cs index 396fea321..4c482843c 100644 --- a/PKHeX.Core/Legality/Encounters/Data/EncountersGO.cs +++ b/PKHeX.Core/Legality/Encounters/Data/EncountersGO.cs @@ -793,7 +793,7 @@ public static bool IsShinyValid(int species, int form, Ball ball) return true; } - return UnavailableShiny.Contains(sf); + return !UnavailableShiny.Contains(sf); } } }