merge with battle tent update

5 files changed, 18 insertions, 3 deletions

diff --git a/data/maps/ScorchedSlab/border.bin b/data/maps/ScorchedSlab/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ScorchedSlab/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
new file mode 100644
index 000000000..588b7a9ae
--- /dev/null
+++ b/data/maps/ScorchedSlab/events.inc
@@ -0,0 +1,9 @@
+ScorchedSlab_EventObjects: @ 8536F88
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079
+
+ScorchedSlab_MapWarps: @ 8536FA0
+	warp_def 7, 16, 1, 1, MAP_ROUTE120
+
+ScorchedSlab_MapEvents:: @ 8536FA8
+	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index e9b0a7b7e..543f83ebb 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,5 +1,5 @@
 ScorchedSlab: @ 84846BC
-	.4byte ScorchedSlab_MapAttributes
+	.4byte ScorchedSlab_Layout
 	.4byte ScorchedSlab_MapEvents
 	.4byte ScorchedSlab_MapScripts
 	.4byte 0x0
diff --git a/data/maps/ScorchedSlab/map.bin b/data/maps/ScorchedSlab/map.bin
deleted file mode 100644
index edbd982ee..000000000
--- a/data/maps/ScorchedSlab/map.bin
+++ /dev/null
@@ -1 +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
2
2
2
2
2
2
2
2
2‰‘‘‘‘‘Šppppp‰’ppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppƒpppˆGG^^‹Œ„^^GGG										$G
\ No newline at end of file
diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc
new file mode 100644
index 000000000..f83724ec5
--- /dev/null
+++ b/data/maps/ScorchedSlab/scripts.inc
@@ -0,0 +1,8 @@
+ScorchedSlab_MapScripts:: @ 8239291
+	map_script 3, ScorchedSlab_MapScript1_239297
+	.byte 0
+
+ScorchedSlab_MapScript1_239297: @ 8239297
+	setflag FLAG_LANDMARK_SCORCHED_SLAB
+	end
+