From 9f8cbf3e46bfd86c3db5ea491dbcdd87d8cb42aa Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 2 Sep 2017 08:41:36 -0700
Subject: [PATCH] Add more usum prep

Closes #1438 ; SM evo table wasn't being loaded as the gameversion was
changed to USUM.
Will see if there's any evo changes soon!
---
 PKHeX.Core/Game/GameUtil.cs                     | 4 ++++
 PKHeX.Core/Game/GameVersion.cs                  | 5 ++++-
 PKHeX.Core/Legality/Structures/EvolutionTree.cs | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/PKHeX.Core/Game/GameUtil.cs b/PKHeX.Core/Game/GameUtil.cs
index d94894afb..537bd9346 100644
--- a/PKHeX.Core/Game/GameUtil.cs
+++ b/PKHeX.Core/Game/GameUtil.cs
@@ -70,6 +70,10 @@ public static GameVersion GetMetLocationVersionGroup(GameVersion Version)
                 case GameVersion.MN:
                     return GameVersion.SM;
 
+                case GameVersion.US:
+                case GameVersion.UM:
+                    return GameVersion.USUM;
+
                 default:
                     return GameVersion.Invalid;
             }
diff --git a/PKHeX.Core/Game/GameVersion.cs b/PKHeX.Core/Game/GameVersion.cs
index df10d6901..c9e4de72c 100644
--- a/PKHeX.Core/Game/GameVersion.cs
+++ b/PKHeX.Core/Game/GameVersion.cs
@@ -105,8 +105,11 @@ public static bool Contains(this GameVersion g1, GameVersion g2)
                     return GameVersion.XY.Contains(g2) || GameVersion.ORAS.Contains(g2);
 
                 case GameVersion.SM:
-                case GameVersion.Gen7:
                     return g2 == GameVersion.SN || g2 == GameVersion.MN;
+                case GameVersion.USUM:
+                    return g2 == GameVersion.US || g2 == GameVersion.UM;
+                case GameVersion.Gen7:
+                    return GameVersion.SM.Contains(g2) || GameVersion.USUM.Contains(g2);
 
                 default: return false;
             }
diff --git a/PKHeX.Core/Legality/Structures/EvolutionTree.cs b/PKHeX.Core/Legality/Structures/EvolutionTree.cs
index c104ec42c..e49e4d5a5 100644
--- a/PKHeX.Core/Legality/Structures/EvolutionTree.cs
+++ b/PKHeX.Core/Legality/Structures/EvolutionTree.cs
@@ -129,7 +129,7 @@ public EvolutionTree(byte[][] data, GameVersion game, PersonalTable personal, in
         // There's always oddballs.
         private void FixEvoTreeManually()
         {
-            if (Game == GameVersion.SM)
+            if (Game == GameVersion.USUM)
                 FixEvoTreeSM();
         }
         private void FixEvoTreeSM()