5 files changed, 15 insertions, 7 deletions

diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/maps/SeafloorCavern_Room7/border.bin
deleted file mode 100644
index a00c39057..000000000
--- a/data/maps/SeafloorCavern_Room7/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-~~~~
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc
new file mode 100644
index 000000000..2d8fca999
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/events.inc
@@ -0,0 +1,7 @@
+SeafloorCavern_Room7_MapWarps: @ 8535AE0
+	warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2
+	warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3
+
+SeafloorCavern_Room7_MapEvents:: @ 8535AF0
+	map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index fd0b49c93..3640bb597 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room7: @ 8484278
-	.4byte SeafloorCavern_Room7_MapAttributes
+	.4byte SeafloorCavern_Room7_Layout
 	.4byte SeafloorCavern_Room7_MapEvents
 	.4byte SeafloorCavern_Room7_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 154
-	.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_Room7/map.bin b/data/maps/SeafloorCavern_Room7/map.bin
deleted file mode 100644
index 7fa1d903d..000000000
--- a/data/maps/SeafloorCavern_Room7/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ˆ‰ŠŽz‘2’Ž~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2€‰‰‰€Žxzz€‰‰‰‰˜pppš‰‰‰‰‰‰‰‰xxzzppppppppppppppppp’xxzzpŒ‹‹‹‹‹‹‹‹‹‹‹‹‹‹p’xxzzpŒpppppppppppppƒp’xxzzpŒŒ„„„„„„„„„„„„ƒp’xxzzpŒŒppppŒppppppppp’xxzzppŒpppp„„„„„„„„Œp’xxzzppŒppppppppppppŒp’xxzzŒpŒpp‹‹‹‹‹‹‹‹‹pŒp’xxzzŒpŒppŒ‹ppppppƒpŒp’xxzzŒpŒppŒƒppppppƒpŒp’xxzzŒp„„„Œƒ‹‹‹‹‹‹p„Œp’xxzzŒppppŒpppppppƒpŒp’xxzzŒppppŒpppppppƒpŒp’xxzzŒ‹‹‹‹‹‹‹‹‹pppƒ‹‹‹’xxz“6œ6q2ypppppppƒpppƒppp’xxzy6z6y2pppppppƒpppƒppp’xxzy6z6y2q2q2q2q2q2yppƒpppƒppp’xxz6‚6y2y2y2y2y2y2ppƒpppƒppp’xxzzy2•2y2y2sy2tpp„pppƒppp’xx””˜™š“““““vvvvvvvvvv“““
\ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/scripts.inc b/data/maps/SeafloorCavern_Room7/scripts.inc
new file mode 100644
index 000000000..e91cf6193
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/scripts.inc
@@ -0,0 +1,3 @@
+SeafloorCavern_Room7_MapScripts:: @ 8234DC6
+	.byte 0
+