From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 20 Jun 2018 17:41:17 -0500
Subject: Move 'map attributes' into 'layouts'

---
 data/maps/SecretBase_Shrub4/border.bin |  1 -
 data/maps/SecretBase_Shrub4/header.inc |  2 +-
 data/maps/SecretBase_Shrub4/map.bin    | 69 ----------------------------------
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 data/maps/SecretBase_Shrub4/border.bin
 delete mode 100644 data/maps/SecretBase_Shrub4/map.bin

(limited to 'data/maps/SecretBase_Shrub4')

diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/maps/SecretBase_Shrub4/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 10a4d4ca4..12fa26c3c 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Shrub4: @ 8484D14
-	.4byte SecretBase_Shrub4_MapAttributes
+	.4byte SecretBase_Shrub4_Layout
 	.4byte SecretBase_Shrub4_MapEvents
 	.4byte SecretBase_Shrub4_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/maps/SecretBase_Shrub4/map.bin
deleted file mode 100644
index 8a4cf836d..000000000
--- a/data/maps/SecretBase_Shrub4/map.bin
+++ /dev/null
@@ -1,69 +0,0 @@
-
	
-2
-2"6
-2
-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
-22
-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
-22
-2	
-2
-2
-2
-2
-2
\ No newline at end of file
-- 
cgit v1.2.3


From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 20 Jun 2018 17:41:41 -0500
Subject: Move events and scripts into map dirs

---
 data/maps/SecretBase_Shrub4/events.inc  | 23 +++++++++++++++++++++++
 data/maps/SecretBase_Shrub4/scripts.inc |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 data/maps/SecretBase_Shrub4/events.inc
 create mode 100644 data/maps/SecretBase_Shrub4/scripts.inc

(limited to 'data/maps/SecretBase_Shrub4')

diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc
new file mode 100644
index 000000000..a027b266b
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub4_EventObjects: @ 8539BC0
+	object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_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_Shrub4_MapWarps: @ 8539D28
+	warp_def 11, 8, 0, 126, MAP_NONE
+
+SecretBase_Shrub4_MapEvents:: @ 8539D30
+	map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc
new file mode 100644
index 000000000..1a9952232
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
@@ -0,0 +1 @@
+SecretBase_Shrub4_MapScripts:: @ 823B483
-- 
cgit v1.2.3