5 files changed, 16 insertions, 7 deletions

diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/maps/SeafloorCavern_Room6/border.bin
deleted file mode 100644
index a00c39057..000000000
--- a/data/maps/SeafloorCavern_Room6/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-~~~~
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc
new file mode 100644
index 000000000..99c10d87e
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/events.inc
@@ -0,0 +1,8 @@
+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
index e1aab7b08..2f76c9b8f 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room6: @ 848425C
-	.4byte SeafloorCavern_Room6_MapAttributes
+	.4byte SeafloorCavern_Room6_Layout
 	.4byte SeafloorCavern_Room6_MapEvents
 	.4byte SeafloorCavern_Room6_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 153
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/maps/SeafloorCavern_Room6/map.bin
deleted file mode 100644
index 452263326..000000000
--- a/data/maps/SeafloorCavern_Room6/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-‰ŠŽz‘2’Žxzzy2y2y2y2€‰‰‰‰‰‰‰‰‰‰‰‰‰‰xxzzy2y2y2y2pŒ‹‹‹‹‹‹‹‹‹‹‹‹’xxzzy2y2y2y2pŒpppppppppppƒ’xxzzy2y2y2y2pŒpppΓvvvΕpppƒ’xxzz€‰‰‰˜pŒppu~~~—wppƒ’xxzzpppppŒpp}€ˆ‰Š‚ppƒ’xxzzpp„„„Œpp…††‘††‡ppƒ’xxzzpƒpppŒpppppƒpppp„ƒ’xxzzpƒpppŒp„„„„ƒppppƒƒ’xxzzpƒpppŒpƒpppppŒ‹‹pƒ’xxzzpƒpŒ‹p„ƒŒ‹‹‹‹‹ppƒp’xxzzpƒpŒpŒppŒpppppppƒp’xxzzpƒpŒpŒpp„„„Œppppƒp’xxzzpƒpŒpŒpppppŒppppƒp’xxzzpƒpŒpŒpppp„p„„„„ƒp’xxzzpƒpŒpŒppppƒ„„„„ƒpp’xxzzpƒpŒp„„„„„ƒppppppp’xxzzpƒ‹‹ppƒpppƒpppppΓvvvvzzpppppΓœo2o2o2›vΕpΓvv~~~~vvvvvvvvvz~2–2~2x~vvv~~~~~~~~~~~~~~~”˜™š“~~~~~~~~~~
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/scripts.inc b/data/maps/SeafloorCavern_Room6/scripts.inc
new file mode 100644
index 000000000..ae8cf02fa
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/scripts.inc
@@ -0,0 +1,3 @@
+SeafloorCavern_Room6_MapScripts:: @ 8234DC5
+	.byte 0
+