3 files changed, 42 insertions, 23 deletions
diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc
deleted file mode 100644
index 99c10d87e..000000000
--- a/data/maps/SeafloorCavern_Room6/events.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafloorCavern_Room6_MapWarps: @ 8535AB4
-	warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2
-	warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3
-	warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
-
-SeafloorCavern_Room6_MapEvents:: @ 8535ACC
-	map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
deleted file mode 100644
index d1346acd8..000000000
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room6: @ 848425C
-	.4byte SeafloorCavern_Room6_Layout
-	.4byte SeafloorCavern_Room6_MapEvents
-	.4byte SeafloorCavern_Room6_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte 153
-	.byte MAPSEC_SEAFLOOR_CAVERN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json
new file mode 100644
index 000000000..69c5330ea
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SEAFLOOR_CAVERN_ROOM6",
+  "name": "SeafloorCavern_Room6",
+  "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 21,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 4,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 14,
+      "y": 8,
+      "elevation": 1,
+      "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
+\ No newline at end of file