diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs index 58940256a..24fd7ce6c 100644 --- a/PKHeX.Core/Game/GameStrings/GameStrings.cs +++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs @@ -496,7 +496,6 @@ public IReadOnlyList GetLocationList(GameVersion Version, int SaveFor case GameVersion.US: case GameVersion.UM: - case GameVersion.GO: case GameVersion.RD: case GameVersion.BU: case GameVersion.GN: @@ -509,6 +508,7 @@ public IReadOnlyList GetLocationList(GameVersion Version, int SaveFor case GameVersion.GP: case GameVersion.GE: + case GameVersion.GO: return MetGen7GG.Take(3).Concat(MetGen7GG.Skip(3).OrderByDescending(loc => loc.Value <= 54)).ToList(); // Pokémon League } diff --git a/PKHeX.Core/Game/GameUtil.cs b/PKHeX.Core/Game/GameUtil.cs index 874659e9d..03bb9d370 100644 --- a/PKHeX.Core/Game/GameUtil.cs +++ b/PKHeX.Core/Game/GameUtil.cs @@ -221,7 +221,7 @@ public static bool Contains(this GameVersion g1, GameVersion g2) case USUM: return g2 == US || g2 == UM; case GG: - return g2 == GP || g2 == GE; + return g2 == GP || g2 == GE || g2 == GO; case Gen7: return SM.Contains(g2) || USUM.Contains(g2) || GG.Contains(g2); diff --git a/PKHeX.Core/Game/GameVersion.cs b/PKHeX.Core/Game/GameVersion.cs index 4c4eeb7e3..34dbf84d4 100644 --- a/PKHeX.Core/Game/GameVersion.cs +++ b/PKHeX.Core/Game/GameVersion.cs @@ -139,7 +139,7 @@ public enum GameVersion #endregion /// - /// Pokémon Pokémon GO (Unused) + /// Pokémon GO (GO -> Lets Go transfers) /// GO = 34, diff --git a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs index acbdfa3ff..79ae41aad 100644 --- a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs +++ b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs @@ -186,7 +186,7 @@ private static LearnVersion GetIsLevelUp7(int species, int move, int form, GameV { switch (ver) { - case GP: case GE: case GG: + case GP: case GE: case GG: case GO: return LearnGG.GetIsLevelUp(species, form, move); case Any: @@ -432,7 +432,7 @@ private static List AddMovesLevelUp7(List moves, GameVersion ver, int max = 100; // Move reminder can teach any level in movepool now! switch (ver) { - case GP: case GE: case GG: + case GP: case GE: case GG: case GO: return LearnGG.AddMoves(moves, species, form, max); case Any: diff --git a/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs b/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs index 1290c3a08..6a5e0ec51 100644 --- a/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs +++ b/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs @@ -329,6 +329,7 @@ private static void AddMachine7(List r, int species, int form, GameVersion case GameVersion.GP: case GameVersion.GE: case GameVersion.GG: + case GameVersion.GO: AddMachineGG(r, species, form); return; case GameVersion.SN: diff --git a/PKHeX.Core/PKM/PKM.cs b/PKHeX.Core/PKM/PKM.cs index e77dbacdc..e00e73680 100644 --- a/PKHeX.Core/PKM/PKM.cs +++ b/PKHeX.Core/PKM/PKM.cs @@ -299,7 +299,7 @@ private void SetID7(int sid7, int tid7) public bool AO => Version == (int)GameVersion.AS || Version == (int)GameVersion.OR; public bool SM => Version == (int)GameVersion.SN || Version == (int)GameVersion.MN; public bool USUM => Version == (int)GameVersion.US || Version == (int)GameVersion.UM; - public bool GG => Version == (int)GameVersion.GP || Version == (int)GameVersion.GE; + public bool GG => Version == (int)GameVersion.GP || Version == (int)GameVersion.GE || Version == (int)GameVersion.GO; protected bool PtHGSS => Pt || HGSS; public bool VC => VC1 || VC2; public bool Gen7 => (Version >= 30 && Version <= 33) || GG;