summaryrefslogtreecommitdiff
path: root/data/maps/FieryPath
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FieryPath')
-rw-r--r--data/maps/FieryPath/border.bin1
-rw-r--r--data/maps/FieryPath/events.inc17
-rw-r--r--data/maps/FieryPath/header.inc10
-rw-r--r--data/maps/FieryPath/map.bin10
-rw-r--r--data/maps/FieryPath/scripts.inc15
5 files changed, 37 insertions, 16 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..3b3985325
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091
+ object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17
+ object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18
+ object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19
+ object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20
+ object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21
+ object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22
+ object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 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/header.inc b/data/maps/FieryPath/header.inc
index 0cb60553b..3c9f51bc1 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,15 +1,15 @@
FieryPath: @ 8484048
- .4byte FieryPath_MapAttributes
+ .4byte FieryPath_Layout
.4byte FieryPath_MapEvents
.4byte FieryPath_MapScripts
.4byte 0x0
.2byte MUS_DAN01
.2byte 293
- .byte 74
+ .byte MAPSEC_FIERY_PATH
.byte 0
- .byte 0
- .byte 4
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL
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|qqqqqqr 33333333|pqqqqqrr33 73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr   333qpqqqqqqr     3333pqqqqq  jr333qpqqqqqqiiiij3333pqqqqqqqqrr33
-~qpqqqqqqqqqqqr3333pqqqqqqqqrr3
-~qqpqqqqqqqqqqqr 333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z 333pxt|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..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
+