From da2f1cbe12940570b0b3fc8752dba856f3021d57 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 27 Oct 2016 19:53:19 -0700 Subject: [PATCH] Fix z-crystal tables Bead/Piece tables were in the demo, easy mine. Add pouch sprites for Free/Z-Crystal, as well as a PC (unused) provided by Suloku in #237 --- PKHeX/Legality/Tables7.cs | 9 +- PKHeX/PKHeX.csproj | 9 + PKHeX/Properties/Resources.Designer.cs | 400 ++++++++++-------- PKHeX/Properties/Resources.resx | 9 + PKHeX/Resources/img/Bag/Bag_Free.png | Bin 0 -> 626 bytes PKHeX/Resources/img/Bag/Bag_PCItems.png | Bin 0 -> 1345 bytes PKHeX/Resources/img/Bag/Bag_Z.png | Bin 0 -> 786 bytes PKHeX/Saves/SAV7.cs | 8 +- PKHeX/Saves/Substructures/Inventory.cs | 3 +- .../Save Editors/SAV_Inventory.Designer.cs | 3 + .../Subforms/Save Editors/SAV_Inventory.resx | 98 +++-- 11 files changed, 320 insertions(+), 219 deletions(-) create mode 100644 PKHeX/Resources/img/Bag/Bag_Free.png create mode 100644 PKHeX/Resources/img/Bag/Bag_PCItems.png create mode 100644 PKHeX/Resources/img/Bag/Bag_Z.png diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs index 7cf59b873..29fd19ff8 100644 --- a/PKHeX/Legality/Tables7.cs +++ b/PKHeX/Legality/Tables7.cs @@ -22,7 +22,7 @@ public static partial class Legal internal static readonly ushort[] Pouch_Key_SM = { 216, 465, 466, 628, 629, 638, 696, 705, 706, 765, 773, - 797, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 841, 842, 843, 845, 847, 850, 857, 858, 859, 860, + 797, 841, 842, 843, 845, 847, 850, 857, 858, 859, 860, }; internal static readonly ushort[] Pouch_TMHM_SM = { // 02 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 618, 619, 620 @@ -34,10 +34,13 @@ public static partial class Legal internal static readonly ushort[] Pouch_Berries_SM = { 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212 }; - internal static readonly ushort[] Pouch_ZCrystal_SM = { + internal static readonly ushort[] Pouch_ZCrystal_SM = { // Bead + 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, + }; + 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 }; - internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystal_SM).ToArray(); + 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 EncounterStatic[] Encounter_SM = { diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index f7d6191a1..19fc500af 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -2863,6 +2863,15 @@ + + + + + + + + +