diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs
index 2f7998f6a..14c76f4db 100644
--- a/PKHeX.Core/Legality/Core.cs
+++ b/PKHeX.Core/Legality/Core.cs
@@ -792,7 +792,7 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
         internal static bool HasVisitedB2W2(this PKM pkm) => pkm.InhabitedGeneration(5);
         internal static bool HasVisitedORAS(this PKM pkm) => pkm.InhabitedGeneration(6) && (pkm.AO || !pkm.IsUntraded);
         internal static bool HasVisitedUSUM(this PKM pkm) => pkm.InhabitedGeneration(7) && (pkm.USUM || !pkm.IsUntraded);
-        internal static bool IsMovesetRestricted(this PKM pkm) => (pkm.GG && pkm.Format == 7) || pkm.IsUntraded;
+        internal static bool IsMovesetRestricted(this PKM pkm, int gen) => (pkm.GG && gen == 7) || pkm.IsUntraded;
 
         public static bool HasMetLocationUpdatedTransfer(int originalGeneration, int currentGeneration)
         {
diff --git a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
index 951aef3b6..40107c397 100644
--- a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
+++ b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
@@ -29,7 +29,7 @@ private static readonly LearnLookup
 
         public static LearnVersion GetIsLevelUpMove(PKM pkm, int species, int form, int lvl, int generation, int move, int minlvlG1, int minlvlG2, GameVersion version = Any)
         {
-            if (pkm.IsMovesetRestricted())
+            if (pkm.IsMovesetRestricted(generation))
                 version = (GameVersion)pkm.Version;
 
             switch (generation)
@@ -263,7 +263,7 @@ private static GameVersion GetDeoxysGameVersion3(int form)
 
         public static IEnumerable<int> GetMovesLevelUp(PKM pkm, int species, int minlvlG1, int minlvlG2, int lvl, int form, GameVersion version, bool MoveReminder, int Generation)
         {
-            if (pkm.IsMovesetRestricted())
+            if (pkm.IsMovesetRestricted(Generation))
                 version = (GameVersion)pkm.Version;
             return Generation switch
             {
diff --git a/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs b/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs
index 42d8c9dff..abc96de08 100644
--- a/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs
+++ b/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs
@@ -7,7 +7,7 @@ internal static class MoveTechnicalMachine
     {
         internal static GameVersion GetIsMachineMove(PKM pkm, int species, int form, int generation, int move, GameVersion ver = GameVersion.Any, bool RemoveTransfer = false, bool allowBit = false)
         {
-            if (pkm.IsMovesetRestricted())
+            if (pkm.IsMovesetRestricted(generation))
                 ver = (GameVersion) pkm.Version;
             switch (generation)
             {
@@ -251,7 +251,7 @@ private static GameVersion GetIsMachine8(PKM pkm, int species, int move, int for
         internal static IEnumerable<int> GetTMHM(PKM pkm, int species, int form, int generation, GameVersion ver = GameVersion.Any, bool RemoveTransfer = true)
         {
             var r = new List<int>();
-            if (pkm.IsMovesetRestricted())
+            if (pkm.IsMovesetRestricted(generation))
                 ver = (GameVersion)pkm.Version;
 
             switch (generation)