merge with battle tent update

5 files changed, 48 insertions, 82 deletions

diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/maps/SecretBase_YellowCave4/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_YellowCave4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
new file mode 100644
index 000000000..07ac363ac
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave4_EventObjects: @ 85398B8
+	object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+
+SecretBase_YellowCave4_MapWarps: @ 8539A20
+	warp_def 6, 12, 0, 126, MAP_NONE
+
+SecretBase_YellowCave4_MapEvents:: @ 8539A28
+	map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 1a5c43da5..baf6b7d89 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_YellowCave4: @ 8484CDC
-	.4byte SecretBase_YellowCave4_MapAttributes
+	.4byte SecretBase_YellowCave4_Layout
 	.4byte SecretBase_YellowCave4_MapEvents
 	.4byte SecretBase_YellowCave4_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/maps/SecretBase_YellowCave4/map.bin
deleted file mode 100644
index d3c3e0204..000000000
--- a/data/maps/SecretBase_YellowCave4/map.bin
+++ /dev/null
@@ -1,80 +0,0 @@
-
	
-2
-2
-2
-2
-2
-2
-2
-2"6
-2
-2	
-2
-2
-2
-2
-2
-2
-2
-2#6
-2
-2	
-2
-2
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2	
-2
-2	
-2
-2	
-2
-2

-2
-2	
-2
-2 6
-2
-2
-22
-2
-2	
-2
-2
-2
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2
-2
-2	
-2
-2
-2
-2
-2
-2
-2	
-2
-2
-22
-2
-2
-2
\ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
new file mode 100644
index 000000000..32da39388
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
@@ -0,0 +1,24 @@
+SecretBase_YellowCave4_MapScripts:: @ 823B483
+	map_script 4, SecretBase_RedCave1_MapScript2_23B498
+	map_script 3, SecretBase_RedCave1_MapScript1_23B4A2
+	map_script 2, SecretBase_RedCave1_MapScript2_23B4AE
+	map_script 5, SecretBase_RedCave1_MapScript1_23B4B8
+	.byte 0
+
+SecretBase_RedCave1_MapScript2_23B498: @ 823B498
+	map_script_2 VAR_0x4089, 0, EventScript_275D0C
+	.2byte 0
+
+SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
+	call SecretBase_RedCave1_EventScript_275CE1
+	special sub_80E95D4
+	special sub_80EB1AC
+	end
+
+SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE
+	map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81
+	.2byte 0
+
+SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8
+	setstepcallback 6
+	end