5 files changed, 25 insertions, 59 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..25a0f2ec6
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_RedCave4_EventObjects:: @ 83909CC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_RedCave4_MapWarps:: @ 8390B34
+	warp_def 2, 12, 0, 126, MAP_NONE
+
+SecretBase_RedCave4_MapEvents:: @ 8390B3C
+	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 40e830726..77b6e06a7 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave4:: @ 83078D0
-	.4byte SecretBase_RedCave4_MapAttributes
+	.4byte SecretBase_RedCave4_Layout
 	.4byte SecretBase_RedCave4_MapEvents
 	.4byte SecretBase_RedCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 216
 	.byte 86
 	.byte 0
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..6d2402f03
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
@@ -0,0 +1 @@
+SecretBase_RedCave4_MapScripts:: @ 815F337