From 9f0d6223eb9178afa09db6dee62fced11d5aa2fc Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 16 Dec 2016 09:03:36 -0800
Subject: [PATCH] Add battle box batch editor protection

should be the last of the tweakable methods
---
 PKHeX/Saves/SaveFile.cs                   | 1 +
 PKHeX/Subforms/PKM Editors/BatchEditor.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs
index c1c6a25a6..6d25818f2 100644
--- a/PKHeX/Saves/SaveFile.cs
+++ b/PKHeX/Saves/SaveFile.cs
@@ -148,6 +148,7 @@ public PKM[] BoxData
                     data[i].Identifier = $"{getBoxName(i/BoxSlotCount)}:{i%BoxSlotCount + 1:00}";
                     data[i].Box = i/BoxSlotCount + 1;
                     data[i].Slot = i%BoxSlotCount + 1;
+                    data[i].Locked = getIsSlotLocked(data[i].Box, data[i].Slot);
                 }
                 return data;
             }
diff --git a/PKHeX/Subforms/PKM Editors/BatchEditor.cs b/PKHeX/Subforms/PKM Editors/BatchEditor.cs
index a7a1db6d6..d198b0973 100644
--- a/PKHeX/Subforms/PKM Editors/BatchEditor.cs	
+++ b/PKHeX/Subforms/PKM Editors/BatchEditor.cs	
@@ -190,7 +190,7 @@ private void processSAV(PKM[] data, List<StringInstruction> Filters, List<String
             for (int i = 0; i < data.Length; i++)
             {
                 var pkm = data[i];
-                if (!pkm.Valid)
+                if (!pkm.Valid || pkm.Locked)
                 {
                     b.ReportProgress(i);
                     continue;