From d8acdf2aa1224b00caa26610d83f106f0751de19 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 10 Nov 2017 19:53:11 -0800 Subject: [PATCH] Fix partner pikachu sprite fix form+1 overflow (cap7 pikachu in sm accesses gumshoos1! bad!) --- PKHeX.Core/PersonalInfo/PersonalInfo.cs | 2 +- PKHeX.WinForms/Properties/Resources.Designer.cs | 4 ++-- PKHeX.WinForms/Properties/Resources.resx | 4 ++-- .../img/Pokemon Sprites/{25-7.png => 25-7c.png} | Bin 4 files changed, 5 insertions(+), 5 deletions(-) rename PKHeX.WinForms/Resources/img/Pokemon Sprites/{25-7.png => 25-7c.png} (100%) diff --git a/PKHeX.Core/PersonalInfo/PersonalInfo.cs b/PKHeX.Core/PersonalInfo/PersonalInfo.cs index 3d075e969..c8cd09e6e 100644 --- a/PKHeX.Core/PersonalInfo/PersonalInfo.cs +++ b/PKHeX.Core/PersonalInfo/PersonalInfo.cs @@ -93,7 +93,7 @@ return species; if (FormStatsIndex <= 0) // no formes present return species; - if (forme > FormeCount) // beyond range of species' formes + if (forme >= FormeCount) // beyond range of species' formes return species; return FormStatsIndex + forme - 1; diff --git a/PKHeX.WinForms/Properties/Resources.Designer.cs b/PKHeX.WinForms/Properties/Resources.Designer.cs index 8783c677c..4fc6ba3e3 100644 --- a/PKHeX.WinForms/Properties/Resources.Designer.cs +++ b/PKHeX.WinForms/Properties/Resources.Designer.cs @@ -2333,9 +2333,9 @@ namespace PKHeX.WinForms.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap _25_7 { + internal static System.Drawing.Bitmap _25_7c { get { - object obj = ResourceManager.GetObject("_25_7", resourceCulture); + object obj = ResourceManager.GetObject("_25_7c", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx index 563cc474e..f2c36c395 100644 --- a/PKHeX.WinForms/Properties/Resources.resx +++ b/PKHeX.WinForms/Properties/Resources.resx @@ -5956,8 +5956,8 @@ ..\Resources\img\Pokemon Sprites\490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-7c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Pokemon Sprites\744-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7c.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png rename to PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7c.png