diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs
index 5cab713c2..77e00be51 100644
--- a/PKHeX.Core/Legality/Core.cs
+++ b/PKHeX.Core/Legality/Core.cs
@@ -367,7 +367,6 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
                 case 7:
                     switch (ver)
                     {
-                        case GameVersion.Any:
                         case GameVersion.SN:
                         case GameVersion.MN:
                         case GameVersion.SM:
@@ -376,10 +375,9 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
                                     break;
                                 int index = PersonalTable.SM.GetFormeIndex(species, form);
                                 r.AddRange(LevelUpSM[index].GetMoves(lvl));
-                                if (ver == GameVersion.Any) // Fall Through
-                                    goto case GameVersion.USUM;
                                 break;
                             }
+                        case GameVersion.Any:
                         case GameVersion.US:
                         case GameVersion.UM:
                         case GameVersion.USUM:
@@ -388,6 +386,8 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
                             if (index == 0)
                                 return r;
                             r.AddRange(LevelUpUSUM[index].GetMoves(lvl));
+                            if (ver == GameVersion.Any) // Fall Through
+                                goto case GameVersion.SM;
                             break;
                         }
                     }
@@ -1937,7 +1937,6 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
                 case 7:
                     switch (ver)
                     {
-                        case GameVersion.Any:
                         case GameVersion.SN: case GameVersion.MN: case GameVersion.SM:
                         {
                             if (species > MaxSpeciesID_7)
@@ -1955,10 +1954,9 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
                                 PersonalInfo pi = PersonalTable.SM.GetFormeEntry(species, form);
                                 r.AddRange(TMHM_SM.Where((t, m) => pi.TMHM[m]));
                             }
-                            if (ver == GameVersion.Any) // Fall Through
-                                goto case GameVersion.USUM;
                             break;
                         }
+                        case GameVersion.Any:
                         case GameVersion.US: case GameVersion.UM: case GameVersion.USUM:
                         {
                             int index = PersonalTable.USUM.GetFormeIndex(species, form);
@@ -1974,6 +1972,8 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
                                 PersonalInfo pi = PersonalTable.USUM.GetFormeEntry(species, form);
                                 r.AddRange(TMHM_SM.Where((t, m) => pi.TMHM[m]));
                             }
+                            if (ver == GameVersion.Any) // Fall Through
+                                goto case GameVersion.SM;
                             break;
                         }
                     }