From ebb1e8a70478cbba910fce0e986dfec1d7bd2a73 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 21 Aug 2018 07:46:55 -0700 Subject: [PATCH] Update 'cant hold item' message #2101 --- PKHeX.Core/Saves/Util/SaveExtensions.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Saves/Util/SaveExtensions.cs b/PKHeX.Core/Saves/Util/SaveExtensions.cs index 44b6c7657..7f0e21dd3 100644 --- a/PKHeX.Core/Saves/Util/SaveExtensions.cs +++ b/PKHeX.Core/Saves/Util/SaveExtensions.cs @@ -61,13 +61,13 @@ private static IReadOnlyList GetSaveFileErrata(this SaveFile SAV, PKM pk if (SAV.Generation > 1) { ushort held = (ushort)pkm.HeldItem; - - if (held > strings.Item.Count) + var itemstr = GameInfo.Strings.GetItemStrings(pkm.Format, (GameVersion) pkm.Version); + if (held > itemstr.Count) errata.Add($"{MsgIndexItemRange} {held}"); else if (held > SAV.MaxItemID) - errata.Add($"{MsgIndexItemGame} {strings.Item[held]}"); + errata.Add($"{MsgIndexItemGame} {itemstr[held]}"); else if (!pkm.CanHoldItem(SAV.HeldItems)) - errata.Add($"{MsgIndexItemHeld} {strings.Item[held]}"); + errata.Add($"{MsgIndexItemHeld} {itemstr[held]}"); } if (pkm.Species > strings.Species.Count)