Merge pull request #1 from pret/master

synching with source repo

5 files changed, 25 insertions, 55 deletions

diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/maps/SecretBase_Shrub1/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc
new file mode 100644
index 000000000..acdac9692
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/events.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub1_EventObjects: @ 8538078
+	object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_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_Shrub1_MapWarps: @ 85381E0
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_Shrub1_MapEvents:: @ 85381E8
+	map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 8f5fd7198..6ab9f9d94 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,5 +1,5 @@
 SecretBase_Shrub1: @ 8484B1C
-	.4byte SecretBase_Shrub1_MapAttributes
+	.4byte SecretBase_Shrub1_Layout
 	.4byte SecretBase_Shrub1_MapEvents
 	.4byte SecretBase_Shrub1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/maps/SecretBase_Shrub1/map.bin
deleted file mode 100644
index 4b566cc1b..000000000
--- a/data/maps/SecretBase_Shrub1/map.bin
+++ /dev/null
@@ -1,53 +0,0 @@
-

	
-2
-2

-2
-2
-2
-2	
-2
-2 6
-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
-2
-26
-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_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc
new file mode 100644
index 000000000..24b8685a0
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/scripts.inc
@@ -0,0 +1 @@
+SecretBase_Shrub1_MapScripts:: @ 823B483