5 files changed, 29 insertions, 62 deletions

diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/maps/SecretBase_RedCave4/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_RedCave4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc
new file mode 100644
index 000000000..9090f940e
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave4_EventObjects: @ 853942C
+	object_event 1, 255, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_RedCave4_MapWarps: @ 8539594
+	warp_def 2, 12, 0, 126, MAP_NONE
+
+SecretBase_RedCave4_MapEvents:: @ 853959C
+	map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index 163780567..94c8605a0 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_RedCave4: @ 8484C88
-	.4byte SecretBase_RedCave4_MapAttributes
+	.4byte SecretBase_RedCave4_Layout
 	.4byte SecretBase_RedCave4_MapEvents
 	.4byte SecretBase_RedCave4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 215
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/maps/SecretBase_RedCave4/map.bin
deleted file mode 100644
index 526763290..000000000
--- a/data/maps/SecretBase_RedCave4/map.bin
+++ /dev/null
@@ -1,56 +0,0 @@
-
	
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2"66	#6
2	
-2
-2
-2
-22
-2	
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2
6	
-22
-2
-2
-2
-2 6
-2
-2
-2
\ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc
new file mode 100644
index 000000000..98e79f89f
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
@@ -0,0 +1 @@
+SecretBase_RedCave4_MapScripts:: @ 823B483