Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 04:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Provide map for Z Crystals KeyItem->HeldItem

Browse source 
allows for loading sprites for the key items (they're smaller than the
key item but better than missingno sprite)
Closes #1504
This commit is contained in:
Kurt 2017-09-30 20:57:32 -07:00
parent 9700ee79ad
commit 44c0b53852
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.Core/Legality/Tables7.cs
View file

@ -102,6 +102,9 @@ namespace PKHeX.Core
internal static readonly ushort[] Pouch_ZCrystalHeld_SM = { // Piece
776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836
};
public static readonly Dictionary<int, int> ZCrystalDictionary = Pouch_ZCrystal_SM
.Zip(Pouch_ZCrystalHeld_SM, (k, v) => new { Key = (int)k, Value = (int)v })
.ToDictionary(x => x.Key, x => x.Value);
internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_SM).ToArray();
private static readonly HashSet<int> WildPokeballs7 = new HashSet<int> {

7
PKHeX.WinForms/Util/PKMUtil.cs
View file

@ -101,7 +101,12 @@ namespace PKHeX.WinForms
else if (gift.IsPokémon)
img = GetSprite(gift.ConvertToPKM(SAV));
else if (gift.IsItem)
img = (Image)(Resources.ResourceManager.GetObject("item_" + gift.ItemID) ?? Resources.unknown);
{
int item = gift.ItemID;
if (Legal.ZCrystalDictionary.TryGetValue(item, out int value))
item = value;
img = (Image)(Resources.ResourceManager.GetObject("item_" + item) ?? Resources.unknown);
}
else
img = Resources.unknown;