diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs
index 94a7fbc18..46dc40812 100644
--- a/PKHeX/Legality/Core.cs
+++ b/PKHeX/Legality/Core.cs
@@ -912,8 +912,13 @@ private static IEnumerable<int> getEggMoves(PKM pkm, int species, int formnum)
         private static IEnumerable<int> getTutorMoves(PKM pkm, int species, int form, bool specialTutors)
         {
             PersonalInfo info = pkm.PersonalInfo;
-            // Type Tutors
-            List<int> moves = TypeTutor.Where((t, i) => info.TypeTutors[i]).ToList();
+            List<int> moves = new List<int>();
+
+            // Type Tutors -- Pledge moves and High BP moves switched places in G7+
+            if (pkm.Format <= 6)
+                moves.AddRange(TypeTutor6.Where((t, i) => info.TypeTutors[i]));
+            else if (pkm.Format >= 7)
+                moves.AddRange(TypeTutor7.Where((t, i) => info.TypeTutors[i]));
 
             // Varied Tutors
             //if (pkm.InhabitedGeneration(5) && Tutors)
diff --git a/PKHeX/Legality/Tables6.cs b/PKHeX/Legality/Tables6.cs
index f467fd6fb..ef0ec0724 100644
--- a/PKHeX/Legality/Tables6.cs
+++ b/PKHeX/Legality/Tables6.cs
@@ -208,7 +208,7 @@ public static partial class Legal
             15, 19, 57, 70, 127,
         };
 
-        internal static readonly int[] TypeTutor = {338, 307, 308, 520, 519, 518, 434, 620};
+        internal static readonly int[] TypeTutor6 = {338, 307, 308, 520, 519, 518, 434, 620};
 
         internal static readonly int[][] Tutors_AO =
         {
diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs
index 2047dba13..314b38e51 100644
--- a/PKHeX/Legality/Tables7.cs
+++ b/PKHeX/Legality/Tables7.cs
@@ -395,6 +395,8 @@ 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,