From 4e9908a53d0a01f4663fbcc15ce70550ef57c95b Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 1 Feb 2021 20:17:17 -0800 Subject: [PATCH] Remove unnecessary logic --- PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs | 3 +-- PKHeX.Core/Legality/MoveListSuggest.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs index 8b0ca83bc..1f0537efc 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs @@ -25,7 +25,7 @@ public static CheckResult[] VerifyRelearn(PKM pkm, IEncounterable enc) }; } - public static IReadOnlyList GetSuggestedRelearn(PKM pkm, IEncounterable enc, CheckResult[] relearn) + public static IReadOnlyList GetSuggestedRelearn(PKM pkm, IEncounterable enc) { if (enc.Generation < 6 || (pkm is IBattleVersion {BattleVersion: not 0})) return Array.Empty(); @@ -34,7 +34,6 @@ public static IReadOnlyList GetSuggestedRelearn(PKM pkm, IEncounterable enc { IRelearn s when s.Relearn.Count > 0 => s.Relearn, EncounterEgg e => MoveList.GetBaseEggMoves(pkm, e.Species, e.Form, e.Version, e.Level), - EncounterSlot6AO z when pkm.RelearnMove1 != 0 && z.CanDexNav => relearn.All(r => r.Valid) ? pkm.RelearnMoves : Array.Empty(), _ => Array.Empty(), }; } diff --git a/PKHeX.Core/Legality/MoveListSuggest.cs b/PKHeX.Core/Legality/MoveListSuggest.cs index 0647b700a..0e0faefc1 100644 --- a/PKHeX.Core/Legality/MoveListSuggest.cs +++ b/PKHeX.Core/Legality/MoveListSuggest.cs @@ -115,7 +115,7 @@ public static IReadOnlyList GetSuggestedRelearnMovesFromEncounter(this Lega var pkm = analysis.pkm; var enc = info.EncounterMatch; - var parsed = VerifyRelearnMoves.GetSuggestedRelearn(pkm, enc, info.Relearn); + var parsed = VerifyRelearnMoves.GetSuggestedRelearn(pkm, enc); if (parsed.Count == 0) // Always true for Origins < 6 and encounters without relearn permitted. return new int[4];