From d5948b9dbef928042344bc047b8dbb08aa1d8c6b Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 12 Jan 2020 16:09:35 -0800 Subject: [PATCH] Add relearn moves to Except comparison Burn Up ho-oh is dumb --- .../Encounters/Generator/EncounterMovesetGenerator.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs index 364ff8681..81ee3b00e 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs @@ -243,8 +243,9 @@ private static IEnumerable GetStatic(PKM pk, IReadOnlyCollectio continue; } - var em = enc.Moves; - if (em != null && !needs.Except(em).Any()) + // Some rare encounters have special moves hidden in the Relearn section (Gen7 Wormhole Ho-Oh). Include relearn moves + var em = enc.Moves.Concat(enc.Relearn); + if (!needs.Except(em).Any()) yield return enc; } }