From 5ad8a4e5a43b65921db05f08186e46f8f6d32de0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 11 Jun 2018 20:23:28 -0700 Subject: [PATCH] Return version-sensitive moves for nonspecial fetch Closes #1998 , GetValidMoves returns moves without sensitivity for current version for pre gen6 moves... can resolve that later. --- PKHeX.Core/Legality/Analysis.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index 8986c8f1d..7ae353887 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -363,6 +363,8 @@ namespace PKHeX.Core return new int[4]; if (pkm.IsEgg && pkm.Format <= 5) // pre relearn return Legal.GetBaseEggMoves(pkm, pkm.Species, (GameVersion)pkm.Version, pkm.CurrentLevel); + if (!(tm || tutor || reminder)) + return MoveLevelUp.GetEncounterMoves(pkm, pkm.CurrentLevel, (GameVersion)pkm.Version); return Legal.GetValidMoves(pkm, Info.EvoChainsAllGens, Tutor: tutor, Machine: tm, MoveReminder: reminder).Skip(1).ToArray(); // skip move 0 } public EncounterStatic GetSuggestedMetInfo() => EncounterSuggestion.GetSuggestedMetInfo(pkm);