diff --git a/PKHeX/Legality/Tables.cs b/PKHeX/Legality/Tables.cs
new file mode 100644
index 000000000..9e7a7f191
--- /dev/null
+++ b/PKHeX/Legality/Tables.cs
@@ -0,0 +1,33 @@
+namespace PKHeX
+{
+ public static partial class Legal
+ {
+ internal static readonly int[] Items_Ball =
+ {
+ 000, 001, 002, 003, 004, 005, 006, 007, 008, 009, 010, 011, 012,
+ 013, 014, 015, 016, 492, 493, 494, 495, 496, 497, 498, 499, 576,
+ };
+ internal static readonly int[] Items_CommonBall = { 4, 3, 2, 1 };
+ internal static readonly int[] Items_UncommonBall =
+ {
+ 7, 576, 13, 492, 497, 14, 495, 493, 496, 494, 11, 498, 8, 6,
+ 12, 15, 9, 5, 499, 10, 16
+ };
+
+ #region Games
+
+ internal static readonly int[] Games_7sm = { 30, 31 };
+ internal static readonly int[] Games_6xy = { 24, 25 };
+ internal static readonly int[] Games_6oras = { 26, 27 };
+ internal static readonly int[] Games_5 = { 20, 21, 22, 23 };
+ internal static readonly int[] Games_4 = { 10, 11, };
+ internal static readonly int[] Games_4e = { 12 };
+ internal static readonly int[] Games_4r = { 7, 8 };
+ internal static readonly int[] Games_3 = { 1, 2 };
+ internal static readonly int[] Games_3e = { 3 };
+ internal static readonly int[] Games_3r = { 4, 5 };
+ internal static readonly int[] Games_3s = { 15 };
+
+ #endregion
+ }
+}
diff --git a/PKHeX/Legality/Tables6.cs b/PKHeX/Legality/Tables6.cs
index cb4acfac4..3a30854c7 100644
--- a/PKHeX/Legality/Tables6.cs
+++ b/PKHeX/Legality/Tables6.cs
@@ -8,33 +8,6 @@ public static partial class Legal
// PKHeX Valid Array Storage
- internal static readonly int[] Items_Ball =
- {
- 000, 001, 002, 003, 004, 005, 006, 007, 008, 009, 010, 011, 012,
- 013, 014, 015, 016, 492, 493, 494, 495, 496, 497, 498, 499, 576,
- };
- internal static readonly int[] Items_CommonBall = {4, 3, 2, 1};
- internal static readonly int[] Items_UncommonBall =
- {
- 7, 576, 13, 492, 497, 14, 495, 493, 496, 494, 11, 498, 8, 6,
- 12, 15, 9, 5, 499, 10, 16
- };
-
- #region Games
-
- internal static readonly int[] Games_6xy = {24, 25};
- internal static readonly int[] Games_6oras = {26, 27};
- internal static readonly int[] Games_5 = {20, 21, 22, 23};
- internal static readonly int[] Games_4 = {10, 11,};
- internal static readonly int[] Games_4e = {12};
- internal static readonly int[] Games_4r = {7, 8};
- internal static readonly int[] Games_3 = {1, 2};
- internal static readonly int[] Games_3e = {3};
- internal static readonly int[] Games_3r = {4, 5};
- internal static readonly int[] Games_3s = {15};
-
- #endregion
-
#region Met Locations
internal static readonly int[] Met_BW2c = {0, 60002, 30003};
@@ -848,6 +821,9 @@ public static partial class Legal
};
internal static readonly int[] Ban_Gen3Ball =
{
+ 252, 255, 258, //1 - Treeko, Torchic, Mudkip
+ 253, 256, 259, //2
+ 254, 257, 260, //3
387, 390, 393, //1 - Turtwig, Chimchar, Piplup
388, 391, 394, //2
389, 392, 395, //3
@@ -861,6 +837,9 @@ public static partial class Legal
152, 155, 158, //1 - Chikorita, Cyndaquil, Totodile
153, 156, 159, //2
154, 157, 160, //3
+ 252, 255, 258, //1 - Treeko, Torchic, Mudkip
+ 253, 256, 259, //2
+ 254, 257, 260, //3
387, 390, 393, //1 - Turtwig, Chimchar, Piplup
388, 391, 394, //2
389, 392, 395, //3
diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index 2a20bf4d8..356d61b7d 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -1432,7 +1432,7 @@ private void InitializeLanguage()
SpeciesDataSource = Util.getCBList(specieslist, null);
NatureDataSource = Util.getCBList(natures, null);
AbilityDataSource = Util.getCBList(abilitylist, null);
- VersionDataSource = Util.getCBList(gamelist, Legal.Games_6oras, Legal.Games_6xy, Legal.Games_5, Legal.Games_4, Legal.Games_4e, Legal.Games_4r, Legal.Games_3, Legal.Games_3e, Legal.Games_3r, Legal.Games_3s);
+ VersionDataSource = Util.getCBList(gamelist, Legal.Games_7sm, Legal.Games_6oras, Legal.Games_6xy, Legal.Games_5, Legal.Games_4, Legal.Games_4e, Legal.Games_4r, Legal.Games_3, Legal.Games_3e, Legal.Games_3r, Legal.Games_3s);
MoveDataSource = Util.getCBList(movelist, null);
diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj
index 6d9bc587c..f7d6191a1 100644
--- a/PKHeX/PKHeX.csproj
+++ b/PKHeX/PKHeX.csproj
@@ -100,6 +100,7 @@
+