From 02c06d154bbb35fbce4ac196b503cd7efe7daac5 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 10 Oct 2017 19:30:55 -0700 Subject: [PATCH] Split item cap for usum prep --- PKHeX.Core/Legality/Tables7.cs | 3 ++- PKHeX.Core/PKM/PK7.cs | 2 +- PKHeX.Core/Saves/SAV7.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Tables7.cs b/PKHeX.Core/Legality/Tables7.cs index 05a195252..c03228a91 100644 --- a/PKHeX.Core/Legality/Tables7.cs +++ b/PKHeX.Core/Legality/Tables7.cs @@ -14,6 +14,7 @@ public static partial class Legal internal const int MaxSpeciesID_7_USUM = 802; internal const int MaxMoveID_7_USUM = 720; + internal const int MaxItemID_7_USUM = 920; #region Met Locations @@ -470,6 +471,6 @@ public static partial class Legal 715, // Fairy Gem }; #endregion - internal static readonly bool[] ReleasedHeldItems_7 = Enumerable.Range(0, MaxItemID_7+1).Select(i => HeldItems_SM.Contains((ushort)i) && !UnreleasedHeldItems_7.Contains(i)).ToArray(); + internal static readonly bool[] ReleasedHeldItems_7 = Enumerable.Range(0, MaxItemID_7_USUM+1).Select(i => HeldItems_SM.Contains((ushort)i) && !UnreleasedHeldItems_7.Contains(i)).ToArray(); } } diff --git a/PKHeX.Core/PKM/PK7.cs b/PKHeX.Core/PKM/PK7.cs index e4b799bc4..1591ad939 100644 --- a/PKHeX.Core/PKM/PK7.cs +++ b/PKHeX.Core/PKM/PK7.cs @@ -628,7 +628,7 @@ public void TradeMemory(bool Bank) public override int MaxMoveID => Legal.MaxMoveID_7_USUM; public override int MaxSpeciesID => Legal.MaxSpeciesID_7_USUM; public override int MaxAbilityID => Legal.MaxAbilityID_7; - public override int MaxItemID => Legal.MaxItemID_7; + public override int MaxItemID => Legal.MaxItemID_7_USUM; public override int MaxBallID => Legal.MaxBallID_7; public override int MaxGameID => Legal.MaxGameID_7; public override int MaxIV => 31; diff --git a/PKHeX.Core/Saves/SAV7.cs b/PKHeX.Core/Saves/SAV7.cs index f0f44444a..21973c25b 100644 --- a/PKHeX.Core/Saves/SAV7.cs +++ b/PKHeX.Core/Saves/SAV7.cs @@ -83,7 +83,7 @@ public SAV7(byte[] data = null) public override int MaxMoveID => SM ? Legal.MaxMoveID_7 : Legal.MaxMoveID_7_USUM; public override int MaxSpeciesID => SM ? Legal.MaxSpeciesID_7 : Legal.MaxMoveID_7_USUM; - public override int MaxItemID => Legal.MaxItemID_7; + public override int MaxItemID => SM ? Legal.MaxItemID_7 : Legal.MaxItemID_7_USUM; public override int MaxAbilityID => Legal.MaxAbilityID_7; public override int MaxBallID => Legal.MaxBallID_7; // 26 public override int MaxGameID => Legal.MaxGameID_7;