diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs
index 1e7bae5ef..45e763260 100644
--- a/PKHeX.Core/Legality/Core.cs
+++ b/PKHeX.Core/Legality/Core.cs
@@ -1686,11 +1686,8 @@ internal static EncounterStatic[] GetEncounterStaticTable(PKM pkm, GameVersion g
                     if (pkm.Format != 2)
                         return StaticGSC;
 
-                    if (pkm.HasOriginalMetLocation || pkm.IsEgg && AllowGen2Crystal)
+                    if (pkm.HasOriginalMetLocation)
                         return StaticC;
-                    if (pkm.Species > 151 && !FutureEvolutionsGen1.Contains(pkm.Species))
-                        return StaticGS;
-
                     return StaticGSC;
 
                 case GameVersion.R: return StaticR;
diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
index 80cbf0c47..26f9cfeb1 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
@@ -106,6 +106,8 @@ private static IEnumerable<GBEncounterData> GenerateRawEncounters12(PKM pkm, Gam
                     deferred.Add(s);
                     continue;
                 }
+                if (game == GameVersion.GSC && !s.EggEncounter && s.Version == GameVersion.C && !pkm.HasOriginalMetLocation)
+                    continue;
                 yield return new GBEncounterData(pkm, gen, s, game);
             }
             foreach (var e in GetValidWildEncounters(pkm, game))