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