From 9127f6548a1ec9d4e5aeefdeb6fce281edbcd768 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 10 Mar 2024 23:22:37 -0500 Subject: [PATCH] Handle fixed-moveset missing move cases Stadium Eevee has less moves than if populated by initial moves; need to use the encounter moves for moveset mons. Co-Authored-By: ShadowMario3 <36941677+ShadowMario3@users.noreply.github.com> --- PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs index 934ef0562..cce93c31a 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs @@ -92,7 +92,10 @@ private static void FlagFishyMoveSlots(Span result, ReadOnlySpan moves = stackalloc ushort[4]; - GetEncounterMoves(enc, moves); + if (enc is IMoveset m) + m.Moves.CopyTo(moves); + else + GetEncounterMoves(enc, moves); // Count the amount of initial moves not present in the current list. int count = CountMissing(current, moves);