Merge pull request #636 from huderlem/assets

Map organization

5 files changed, 25 insertions, 13 deletions

diff --git a/data/maps/FieryPath/border.bin b/data/maps/FieryPath/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/FieryPath/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq
\ No newline at end of file
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
new file mode 100644
index 000000000..faf6d5011
--- /dev/null
+++ b/data/maps/FieryPath/events.inc
@@ -0,0 +1,16 @@
+FieryPath_EventObjects:: @ 838C718
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2
+
+FieryPath_MapWarps:: @ 838C7D8
+	warp_def 26, 36, 3, 4, MAP_ROUTE112
+	warp_def 26, 4, 3, 5, MAP_ROUTE112
+
+FieryPath_MapEvents:: @ 838C7E8
+	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index ccca2e656..dcc4d55ea 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,9 +1,9 @@
 FieryPath:: @ 8306EF8
-	.4byte FieryPath_MapAttributes
+	.4byte FieryPath_Layout
 	.4byte FieryPath_MapEvents
 	.4byte FieryPath_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 294
 	.byte 74
 	.byte 0
diff --git a/data/maps/FieryPath/map.bin b/data/maps/FieryPath/map.bin
deleted file mode 100644
index 5928fb173..000000000
--- a/data/maps/FieryPath/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-qqqq{ttttttt|qqqq{ttttttttttt|qqqqqqqqqr{ttt|qpqqqqr{tttttttt|qpqqqqqqqq{z{333|pqqq{z33333333|pqqqqqqqqrq33333pqqqrq333333333pqqqqqqq{zq33333pqqqr{3333333	33pqqqqqq{zq3
-~pqqqr3333
-
~~qqqqqqr{tt3h~qqqr333
-pqqqqqqqqqqqqqrr3333pqqqqqqr333pqqqqqqqqqqqqqrr3
-3pqqqqqqqr333pqqqqqqqqqqqqqrr33xttttt|qr333pqqqqqqqqqqqqqrr33ttttt|pqr333pqqqqqqqqqqqqqrr3333333333pqr333pqqqqqqqqqqqqqrr3
-
3
-~xtz333pqqqqqqqqqqqqqrr3qqq
3qqqq333pqqqqqqqqqqqqqrr3hjr33tttt333x|qqqqqqqqqqqqrr3pqrr33333333333pqqqqqqqqqqqqrr3pqqrr333
-333qpqqqqqqqqqqqqrr3pqqr~hj333|x|qqqqqqqqqqrr3pqq~qr3333qxtttt|qqqqq{zr3xt|qqqqqqqqr3333tttt|pqqqqqr{3t|xt|qqqqqqr33333333|pqqqqqrr33
73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr333qpqqqqqqr3333pqqqqqjr333qpqqqqqqiiiij3333pqqqqqqqqrr33
-~qpqqqqqqqqqqqr3333pqqqqqqqqrr3
-~qqpqqqqqqqqqqqr333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z333pxt|qqqqqqqqqqr333pqqqqqqqr{tz333xt|pqqqqqqqqqqr333pqqqqqqqrr
33333
ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqr~pqqqqqqqqqqr333pqqqqqqqiiiiiiiii~qqqqqqqqqqr3	33pqqqqqqqqqqqqqqqqqqqqqqqqqqqq
~~qqqqq
\ No newline at end of file
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
new file mode 100644
index 000000000..f0bd22071
--- /dev/null
+++ b/data/maps/FieryPath/scripts.inc
@@ -0,0 +1,7 @@
+FieryPath_MapScripts:: @ 815D318
+	map_script 3, FieryPath_MapScript1_15D31E
+	.byte 0
+
+FieryPath_MapScript1_15D31E:: @ 815D31E
+	setflag FLAG_LANDMARK_FIERY_PATH
+	end