Merge pull request #636 from huderlem/assets

Map organization

5 files changed, 25 insertions, 51 deletions

diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/maps/SecretBase_Tree2/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Tree2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc
new file mode 100644
index 000000000..ef2280e01
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Tree2_EventObjects:: @ 838FDAC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_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_Tree2_MapWarps:: @ 838FF14
+	warp_def 3, 14, 0, 126, MAP_NONE
+
+SecretBase_Tree2_MapEvents:: @ 838FF1C
+	map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index fefd54e68..7138440cd 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree2:: @ 83077F0
-	.4byte SecretBase_Tree2_MapAttributes
+	.4byte SecretBase_Tree2_Layout
 	.4byte SecretBase_Tree2_MapEvents
 	.4byte SecretBase_Tree2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 208
 	.byte 86
 	.byte 0
diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/maps/SecretBase_Tree2/map.bin
deleted file mode 100644
index c2e5698b0..000000000
--- a/data/maps/SecretBase_Tree2/map.bin
+++ /dev/null
@@ -1,48 +0,0 @@
-
	
-2
-22
-2	
-2
-2
-2
-2	
-2
-2
-2
-2	
-2
-2
-2
-2
6	
-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
-26
-26	
-2	2
\ No newline at end of file
diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc
new file mode 100644
index 000000000..0f2976a8c
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/scripts.inc
@@ -0,0 +1 @@
+SecretBase_Tree2_MapScripts:: @ 815F337