diff --git a/PKHeX.Core/Saves/SAV4HGSS.cs b/PKHeX.Core/Saves/SAV4HGSS.cs
index 7b1b4246a..6447408a8 100644
--- a/PKHeX.Core/Saves/SAV4HGSS.cs
+++ b/PKHeX.Core/Saves/SAV4HGSS.cs
@@ -79,11 +79,11 @@ private void GetSAVOffsets()
         private static int GetBoxNameOffset(int box) => BOX_NAME + (box * BOX_NAME_LEN);
         protected override int GetBoxWallpaperOffset(int box) => BOX_WP + box;
 
-        // 8 bytes current & (stored count?)
+        // 8 bytes current box (align 32) & (stored count?)
         public override int CurrentBox
         {
-            get => BitConverter.ToInt32(Storage, BOX_END);
-            set => SetData(Storage, BitConverter.GetBytes(value), BOX_END);
+            get => Storage[BOX_END];
+            set => Storage[BOX_END] = (byte)value;
         }
 
         public int Counter
diff --git a/PKHeX.Core/Saves/SAV4Sinnoh.cs b/PKHeX.Core/Saves/SAV4Sinnoh.cs
index f9b8094d1..4f0d51dbc 100644
--- a/PKHeX.Core/Saves/SAV4Sinnoh.cs
+++ b/PKHeX.Core/Saves/SAV4Sinnoh.cs
@@ -31,10 +31,10 @@ public abstract class SAV4Sinnoh : SAV4
         private static int GetBoxNameOffset(int box) => BOX_NAME + (box * BOX_NAME_LEN);
         protected override int GetBoxWallpaperOffset(int box) => BOX_WP + box;
 
-        public override int CurrentBox
+        public override int CurrentBox // (align 32)
         {
-            get => BitConverter.ToInt32(Storage, 0);
-            set => SetData(Storage, BitConverter.GetBytes(value), 0);
+            get => Storage[0];
+            set => Storage[0] = (byte)value;
         }
 
         public int Unknown