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/FieryPath/border.bin |  1 -
 data/maps/FieryPath/header.inc |  2 +-
 data/maps/FieryPath/map.bin    | 10 ----------
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 data/maps/FieryPath/border.bin
 delete mode 100644 data/maps/FieryPath/map.bin

(limited to 'data/maps/FieryPath')

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/header.inc b/data/maps/FieryPath/header.inc
index 0cb60553b..c02896935 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,5 +1,5 @@
 FieryPath: @ 8484048
-	.4byte FieryPath_MapAttributes
+	.4byte FieryPath_Layout
 	.4byte FieryPath_MapEvents
 	.4byte FieryPath_MapScripts
 	.4byte 0x0
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
-- 
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/FieryPath/events.inc  | 17 +++++++++++++++++
 data/maps/FieryPath/scripts.inc | 15 +++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 data/maps/FieryPath/events.inc
 create mode 100644 data/maps/FieryPath/scripts.inc

(limited to 'data/maps/FieryPath')

diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
new file mode 100644
index 000000000..37fecaf5e
--- /dev/null
+++ b/data/maps/FieryPath/events.inc
@@ -0,0 +1,17 @@
+FieryPath_EventObjects: @ 8534C80
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111
+
+FieryPath_MapWarps: @ 8534D40
+	warp_def 26, 36, 3, 4, MAP_ROUTE112
+	warp_def 26, 4, 3, 5, MAP_ROUTE112
+
+FieryPath_MapEvents:: @ 8534D50
+	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
new file mode 100644
index 000000000..a040a5327
--- /dev/null
+++ b/data/maps/FieryPath/scripts.inc
@@ -0,0 +1,15 @@
+FieryPath_MapScripts:: @ 8230F24
+	map_script 3, FieryPath_MapScript1_230F2A
+	.byte 0
+
+FieryPath_MapScript1_230F2A: @ 8230F2A
+	checkflag FLAG_LANDMARK_FIERY_PATH
+	call_if 0, FieryPath_EventScript_230F37
+	setflag FLAG_LANDMARK_FIERY_PATH
+	end
+
+FieryPath_EventScript_230F37:: @ 8230F37
+	setflag FLAG_0x2FE
+	clearflag FLAG_0x2FF
+	return
+
-- 
cgit v1.2.3