diff --git a/pk3DS/Subforms/Gen6/MartEditor6.cs b/pk3DS/Subforms/Gen6/MartEditor6.cs
index 6314661..cadd661 100644
--- a/pk3DS/Subforms/Gen6/MartEditor6.cs
+++ b/pk3DS/Subforms/Gen6/MartEditor6.cs
@@ -58,8 +58,8 @@ private static int GetDataOffset(byte[] data)
                 3, // Unused
                 7, 6, 4, 3, 8,
                 8, 3, 3, 4,
-                3, 6, 6,
-                7, 4
+                3, 6, 8,
+                5, 4
             }
             : new byte[] // XY
             {
diff --git a/pk3DS/Subforms/Gen7/MartEditor7.cs b/pk3DS/Subforms/Gen7/MartEditor7.cs
index 07605c9..5573dab 100644
--- a/pk3DS/Subforms/Gen7/MartEditor7.cs
+++ b/pk3DS/Subforms/Gen7/MartEditor7.cs
@@ -97,12 +97,12 @@ public MartEditor7()
         };
         private readonly string[] locationsBP =
         {
-            "Royal 1",
-            "Royal 2",
-            "Royal 3",
-            "Battle Tree 1",
-            "Battle Tree 2",
-            "Battle Tree 3",
+            "Battle Royal Dome [Medicine]",
+            "Battle Royal Dome [EV Training]",
+            "Battle Royal Dome [Held Items]",
+            "Battle Tree [Trade Evolution Items]",
+            "Battle Tree [Held Items]",
+            "Battle Tree [Mega Stones]",
         };
         #endregion