From cf29c912beddf84f928255209901db2d356124c7 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 15 Mar 2017 00:04:16 -0700 Subject: [PATCH] Fix gen6 typetutor order tfw nobody noticed for so long only keep tutors6 -- they're the same table. --- PKHeX/Legality/Core.cs | 3 +-- PKHeX/Legality/Tables6.cs | 2 +- PKHeX/Legality/Tables7.cs | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index e480f75cf..84676f2bf 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -1702,8 +1702,7 @@ private static IEnumerable getTutorMoves(PKM pkm, int species, int form, bo break; case 7: info = PersonalTable.SM[species]; - // Type Tutors -- Pledge moves and High BP moves switched places in G7+ - moves.AddRange(TypeTutor7.Where((t, i) => info.TypeTutors[i])); + moves.AddRange(TypeTutor6.Where((t, i) => info.TypeTutors[i])); // No special tutors in G7 break; diff --git a/PKHeX/Legality/Tables6.cs b/PKHeX/Legality/Tables6.cs index 52b77a746..3c2138dab 100644 --- a/PKHeX/Legality/Tables6.cs +++ b/PKHeX/Legality/Tables6.cs @@ -214,7 +214,7 @@ public static partial class Legal 15, 19, 57, 70, 127, }; - internal static readonly int[] TypeTutor6 = {338, 307, 308, 520, 519, 518, 434, 620}; + internal static readonly int[] TypeTutor6 = {520, 519, 518, 338, 307, 308, 434, 620}; internal static readonly int[][] Tutors_AO = { diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs index cafe5ea39..bda989dd4 100644 --- a/PKHeX/Legality/Tables7.cs +++ b/PKHeX/Legality/Tables7.cs @@ -524,8 +524,6 @@ public static partial class Legal // No HMs }; - internal static readonly int[] TypeTutor7 = {520, 519, 518, 338, 307, 308, 434, 620}; - internal static readonly int[] MovePP_SM = { 00,