From 41b1aaeb191d796a5bcd79f9814960e5baf84a3b Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Mon, 6 Sep 2021 11:43:42 -0700
Subject: [PATCH] Search mystery gift relearn moves for needed moves

Add to encountertrades searcher, for futureproofing

solves gen8 mg searching volt tackle pikachu
---
 .../Encounters/Generator/Moveset/EncounterMovesetGenerator.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs
index 80ee753e2..aead23381 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs
@@ -291,7 +291,7 @@ private static IEnumerable<MysteryGift> GetGifts(PKM pk, IReadOnlyCollection<int
                     yield return gift;
                     continue;
                 }
-                var em = gift.Moves;
+                var em = gift.Moves.Concat(gift.Relearn);
                 if (!needs.Except(em).Any())
                     yield return gift;
             }
@@ -373,6 +373,8 @@ private static IEnumerable<EncounterTrade> GetTrades(PKM pk, IReadOnlyCollection
                 IEnumerable<int> em = trade.Moves;
                 if (trade.Generation <= 2)
                     em = em.Concat(MoveLevelUp.GetEncounterMoves(trade.Species, 0, trade.Level, trade.Version));
+                else if (trade is IRelearn { Relearn: { Count: not 0 } } r)
+                    em = em.Concat(r.Relearn);
                 if (!needs.Except(em).Any())
                     yield return trade;
             }