diff --git a/PKHeX.Core/Legality/Moves/MoveTutor.cs b/PKHeX.Core/Legality/Moves/MoveTutor.cs
index 4452ac816..c78d4a56b 100644
--- a/PKHeX.Core/Legality/Moves/MoveTutor.cs
+++ b/PKHeX.Core/Legality/Moves/MoveTutor.cs
@@ -27,7 +27,7 @@ public static GameVersion GetIsTutorMove(PKM pkm, int species, int form, int gen
         private static GameVersion GetIsTutor1(PKM pkm, int species, int move)
         {
             // Surf Pikachu via Stadium
-            if (move != 57 || ParseSettings.AllowGBCartEra)
+            if (move != (int)Move.Surf || ParseSettings.AllowGBCartEra)
                 return NONE;
             if (pkm.Format < 3 && species is (int)Species.Pikachu or (int)Species.Raichu)
                 return GameVersion.Stadium;
diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs
index 6e9aeedab..d60b366b8 100644
--- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs
@@ -140,7 +140,7 @@ private CheckResult VerifyForm(LegalityAnalysis data)
                     }
 
                 // Form doesn't exist in SM; cannot originate from that game.
-                case Lillipup when enc.Generation == 7 && form == 1 && pkm.SM:
+                case Rockruff when enc.Generation == 7 && form == 1 && pkm.SM:
                 case Lycanroc when enc.Generation == 7 && form == 2 && pkm.SM:
                     return GetInvalid(LFormInvalidGame);
 
diff --git a/PKHeX.Core/Resources/byte/personal/personal_swsh b/PKHeX.Core/Resources/byte/personal/personal_swsh
index 67eda404e..b80c71d6b 100644
Binary files a/PKHeX.Core/Resources/byte/personal/personal_swsh and b/PKHeX.Core/Resources/byte/personal/personal_swsh differ