From b7bef82b846653ce5578d0cb1cdb24c51768ea1e Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 14 Nov 2016 22:16:51 -0800 Subject: [PATCH] Disallow move suggestions for formats < 6 Flip requirement from gennumber to format (since the moves are learnable on said format) --- PKHeX/Legality/Analysis.cs | 2 +- PKHeX/MainWindow/Main.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX/Legality/Analysis.cs b/PKHeX/Legality/Analysis.cs index a66d4ad69..58f683af6 100644 --- a/PKHeX/Legality/Analysis.cs +++ b/PKHeX/Legality/Analysis.cs @@ -210,7 +210,7 @@ public int[] getSuggestedRelearn() } public int[] getSuggestedMoves(bool tm, bool tutor) { - if (pkm.GenNumber < 6) + if (pkm.Format < 6) return null; return Legal.getValidMoves(pkm, Tutor: tutor, Machine: tm).Skip(1).ToArray(); // skip move 0 } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 4e01369be..25accfc7a 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1784,6 +1784,9 @@ private void clickMoves(object sender, EventArgs e) { bool random = ModifierKeys == Keys.Control; int[] m = Legality.getSuggestedMoves(tm: random, tutor: random); + if (m == null) + { Util.Alert("Suggestions are not enabled for this PKM format."); return; } + if (random) Util.Shuffle(m); if (m.Length > 4)