diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs
index b979e904d..f0836b3e4 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs
@@ -36,8 +36,8 @@ protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteri
                 pk.SetRandomEC();
                 return;
             }
-            if (symbol)
-                Overworld8RNG.ApplyDetails(pk, c, c.Shiny);
+            // Don't bother honoring shiny state.
+            Overworld8RNG.ApplyDetails(pk, c, Shiny.Random);
         }
 
         public OverworldCorrelation8Requirement GetRequirement(PKM pk)
diff --git a/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs
index 411d62262..79b5e6c47 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs
@@ -168,7 +168,7 @@ private static int[] GetNeededMoves(PKM pk, IEnumerable<int> moves, IReadOnlyLis
 
             var gens = GenerationTraversal.GetVisitedGenerationOrder(pk, origin);
             var canlearn = gens.SelectMany(z => GetMovesForGeneration(pk, chain, z));
-            if (origin == 1)
+            if (origin is (1 or 2)) // gb initial moves
             {
                 foreach (var evo in chain)
                 {