diff --git a/PKHeX.Core/Game/GameData.cs b/PKHeX.Core/Game/GameData.cs
index 0ad59761f..7f4571da2 100644
--- a/PKHeX.Core/Game/GameData.cs
+++ b/PKHeX.Core/Game/GameData.cs
@@ -51,9 +51,13 @@ public static class GameData
             { GameVersion.GS, Legal.LevelUpGS },
             { GameVersion.GSC, Legal.LevelUpC },
             { GameVersion.RS, Legal.LevelUpRS },
+            { GameVersion.RSE, Legal.LevelUpRS },
             { GameVersion.FRLG, Legal.LevelUpE },
             { GameVersion.CXD, Legal.LevelUpE },
+            { GameVersion.COLO, Legal.LevelUpE },
+            { GameVersion.XD, Legal.LevelUpE },
             { GameVersion.DP, Legal.LevelUpDP },
+            { GameVersion.DPPt, Legal.LevelUpDP },
             { GameVersion.HGSS, Legal.LevelUpHGSS },
             { GameVersion.BW, Legal.LevelUpBW },
             { GameVersion.B2W2, Legal.LevelUpB2W2 },
@@ -115,9 +119,13 @@ public static class GameData
             { GameVersion.GS, PersonalTable.GS },
             { GameVersion.GSC, PersonalTable.C },
             { GameVersion.RS, PersonalTable.RS },
+            { GameVersion.RSE, PersonalTable.RS },
             { GameVersion.FRLG, PersonalTable.E },
             { GameVersion.CXD, PersonalTable.E },
+            { GameVersion.COLO, PersonalTable.E },
+            { GameVersion.XD, PersonalTable.E },
             { GameVersion.DP, PersonalTable.DP },
+            { GameVersion.DPPt, PersonalTable.DP },
             { GameVersion.HGSS, PersonalTable.HGSS },
             { GameVersion.BW, PersonalTable.BW },
             { GameVersion.B2W2, PersonalTable.B2W2 },
diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs
index 3437d9983..fcc5da641 100644
--- a/PKHeX.Core/Legality/Analysis.cs
+++ b/PKHeX.Core/Legality/Analysis.cs
@@ -366,7 +366,7 @@ public int[] GetSuggestedMoves(bool tm, bool tutor, bool reminder)
             if (!(tm || tutor || reminder))
             {
                 var lvl = Info.Generation <= 2 && pkm.Format >= 7 ? pkm.Met_Level : pkm.CurrentLevel;
-                var ver = EncounterOriginal is IVersion v ? v.Version : (GameVersion)pkm.Version;
+                var ver = Info.Generation <= 2 && EncounterOriginal is IVersion v ? v.Version : (GameVersion)pkm.Version;
                 return MoveLevelUp.GetEncounterMoves(pkm, lvl, ver);
             }
             var evos = Info.EvoChainsAllGens;
diff --git a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
index f90e9566b..0cb0d66aa 100644
--- a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
+++ b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs
@@ -426,6 +426,8 @@ public static int[] GetEncounterMoves(PKM pk, int level, GameVersion version)
         {
             if (RBY.Contains(version))
                 return GetEncounterMoves1(pk.Species, level, version);
+            if (version <= 0)
+                version = (GameVersion)pk.Version;
             return GetEncounterMoves(pk.Species, pk.AltForm, level, version);
         }