From f60f36081a53e6beac6c0c03d18ca513595b4e25 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 30 May 2017 18:28:06 -0700 Subject: [PATCH] Fix relearnmove suggestion for set relearn moves --- PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs | 7 ------- PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs b/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs index f16f6d720..5b6ff4b54 100644 --- a/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs +++ b/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs @@ -173,15 +173,8 @@ private static CheckResult[] parseMovesSpecialMoveset(PKM pkm, int[] Moves, Lega var emptyegg = new int[0]; CheckResult[] res = parseMoves(pkm, Moves, SpecialMoves, emptyegg, emptyegg, empty, new int[0], new int[0], false, info); if (res.Any(r => !r.Valid)) - { - info.RelearnBase = new int[4]; return res; - } - if (pkm.GenNumber >= 6 && info.EncounterMatch is MysteryGift z) - info.RelearnBase = z.RelearnMoves; - else - info.RelearnBase = new int[4]; return res; } private static CheckResult[] parseMovesRelearn(PKM pkm, int[] Moves, LegalInfo info) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 0a6d89d3c..1609b88e7 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -743,6 +743,7 @@ private void clickMoves(object sender, EventArgs e) else if (sender == GB_RelearnMoves) { int[] m = Legality.getSuggestedRelearn(); + if (m.All(z => z == 0)) if (!pkm.WasEgg && !pkm.WasEvent && !pkm.WasEventEgg && !pkm.WasLink) { var encounter = Legality.getSuggestedMetInfo();