From 7d39b70d91fc3aef9abde3a9183537c52ecfeb3c Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 16 May 2017 21:29:34 -0700 Subject: [PATCH] Fix wc7 deletion shift down logic does not apply for array writes; the setter sets empty slots to fill all required slots Closes #1142 --- PKHeX.Core/Saves/SAV6.cs | 5 ----- PKHeX.Core/Saves/SAV7.cs | 5 ----- 2 files changed, 10 deletions(-) diff --git a/PKHeX.Core/Saves/SAV6.cs b/PKHeX.Core/Saves/SAV6.cs index 065cab30b..1ea4a561c 100644 --- a/PKHeX.Core/Saves/SAV6.cs +++ b/PKHeX.Core/Saves/SAV6.cs @@ -980,11 +980,6 @@ private void setWC6(MysteryGift wc6, int index) wc6.Data.CopyTo(Data, WondercardData + index * WC6.Size); - for (int i = 0; i < GiftCountMax; i++) - if (getData(WondercardData + i * WC6.Size, WC6.Size).All(b => b == 0)) // empty - for (int j = i + 1; j < GiftCountMax - i; j++) // Shift everything down - Array.Copy(Data, WondercardData + j * WC6.Size, Data, WondercardData + (j - 1) * WC6.Size, WC6.Size); - Edited = true; } diff --git a/PKHeX.Core/Saves/SAV7.cs b/PKHeX.Core/Saves/SAV7.cs index a26da9c88..457a86315 100644 --- a/PKHeX.Core/Saves/SAV7.cs +++ b/PKHeX.Core/Saves/SAV7.cs @@ -1226,11 +1226,6 @@ private void setWC7(MysteryGift wc7, int index) wc7.Data.CopyTo(Data, WondercardData + index * WC7.Size); - for (int i = 0; i < GiftCountMax; i++) - if (getData(WondercardData + i * WC7.Size, WC7.Size).All(b => b == 0)) // empty - for (int j = i + 1; j < GiftCountMax - i; j++) // Shift everything down - Array.Copy(Data, WondercardData + j * WC7.Size, Data, WondercardData + (j - 1) * WC7.Size, WC7.Size); - Edited = true; }