From ea81bb2c1ed6e5b5e483dd56a73c413c66e98c56 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 10 Oct 2020 14:14:02 -0700 Subject: [PATCH] Add swsh items based on DLC1 metadata --- PKHeX.Core/Legality/Tables/Tables8.cs | 6 ++++++ PKHeX.Core/PKM/Shared/IGigantamax.cs | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Tables/Tables8.cs b/PKHeX.Core/Legality/Tables/Tables8.cs index b5d6ad466..758e09c53 100644 --- a/PKHeX.Core/Legality/Tables/Tables8.cs +++ b/PKHeX.Core/Legality/Tables/Tables8.cs @@ -112,6 +112,9 @@ public static partial class Legal 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543, 1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1581, 1582, 1588, + + // DLC 2 + 1592, 1604, 1606 }; internal static readonly ushort[] Pouch_Ball_SWSH = @@ -138,6 +141,9 @@ public static partial class Legal 943, 944, 945, 946, 1074, 1075, 1076, 1077, 1080, 1081, 1100, 1255, 1266, 1267, 1269, 1270, 1271, 1278, 1583, 1584, 1585, 1586, 1587, 1589, + + // DLC 2 + 1590, 1591, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1605 }; internal static readonly ushort[] TM_SWSH = diff --git a/PKHeX.Core/PKM/Shared/IGigantamax.cs b/PKHeX.Core/PKM/Shared/IGigantamax.cs index c90d61760..6ce981bdd 100644 --- a/PKHeX.Core/PKM/Shared/IGigantamax.cs +++ b/PKHeX.Core/PKM/Shared/IGigantamax.cs @@ -53,9 +53,6 @@ public static bool CanToggleGigantamax(this IGigantamax _, int currentSpecies, i (int)Species.Venusaur, (int)Species.Charizard, (int)Species.Blastoise, - (int)Species.Rillaboom, - (int)Species.Cinderace, - (int)Species.Inteleon, (int)Species.Butterfree, (int)Species.Pikachu, (int)Species.Meowth,