From e6bf2909a719efb60a8ed1ce0631f08e08bc93f0 Mon Sep 17 00:00:00 2001
From: Kaphotics <kaphotics@gmail.com>
Date: Wed, 14 Sep 2016 09:00:58 -0700
Subject: [PATCH] Box Slot Count to variable

Closes #270
---
 PKHeX/MainWindow/Main.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index 58e75dbd1..a4510d480 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -639,7 +639,7 @@ private void openFile(byte[] input, string path, string ext)
             }
             #endregion
             #region PC/Box Data
-            else if (BitConverter.ToUInt16(input, 4) == 0 && BitConverter.ToUInt32(input, 8) > 0 && PKX.getIsPKM(input.Length / 30 / SAV.BoxCount) || PKX.getIsPKM(input.Length / 30))
+            else if (BitConverter.ToUInt16(input, 4) == 0 && BitConverter.ToUInt32(input, 8) > 0 && PKX.getIsPKM(input.Length / SAV.BoxSlotCount / SAV.BoxCount) || PKX.getIsPKM(input.Length / SAV.BoxSlotCount))
             {
                 if (SAV.setPCBin(input))
                     Util.Alert("PC Binary loaded.");
@@ -3425,7 +3425,7 @@ private void dumpBoxesToDB(string path, bool individualBoxFolders)
                 string boxfolder = "";
                 if (individualBoxFolders)
                 {
-                    boxfolder = SAV.getBoxName(i/30);
+                    boxfolder = SAV.getBoxName(i/SAV.BoxSlotCount);
                     Directory.CreateDirectory(Path.Combine(path, boxfolder));
                 }
                 if (!File.Exists(Path.Combine(Path.Combine(path, boxfolder), fileName)))
@@ -3445,7 +3445,7 @@ private void loadBoxesFromDB(string path)
 
             bool? noSetb = getPKMSetOverride();
 
-            int ctr = CB_BoxSelect.SelectedIndex*30;
+            int ctr = CB_BoxSelect.SelectedIndex*SAV.BoxSlotCount;
             int pastctr = 0;
             string[] filepaths = Directory.GetFiles(path, "*.*", SearchOption.TopDirectoryOnly);
 
@@ -3459,15 +3459,15 @@ private void loadBoxesFromDB(string path)
                 {
                     if (verifyPKMtoSAV(pk).Length > 0)
                         continue;
-                    SAV.setStoredSlot(pk, SAV.getBoxOffset(ctr/30) + ctr%30 * SAV.SIZE_STORED, noSetb);
+                    SAV.setStoredSlot(pk, SAV.getBoxOffset(ctr/SAV.BoxSlotCount) + ctr%SAV.BoxSlotCount * SAV.SIZE_STORED, noSetb);
                     if (pk.Format != temp.Format) // Transferred
                         pastctr++;
-                    if (++ctr == SAV.BoxCount*30) // Boxes full!
+                    if (++ctr == SAV.BoxCount*SAV.BoxSlotCount) // Boxes full!
                         break; 
                 }
                 Console.WriteLine(c);
             }
-            ctr -= 30*CB_BoxSelect.SelectedIndex; // actual imported count
+            ctr -= SAV.BoxSlotCount * CB_BoxSelect.SelectedIndex; // actual imported count
             if (ctr <= 0)
                 return;