summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_5F
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
committerMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
commit5c1667b41a7d31df6d405d272833895bf8472cf6 (patch)
treedcee557154cc86398b9815838fc61fbe01837ddc /data/maps/MtPyre_5F
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/MtPyre_5F')
-rw-r--r--data/maps/MtPyre_5F/events.inc6
-rw-r--r--data/maps/MtPyre_5F/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
index afd3801e3..fd6261356 100644
--- a/data/maps/MtPyre_5F/events.inc
+++ b/data/maps/MtPyre_5F/events.inc
@@ -1,14 +1,14 @@
-MtPyre_5F_EventObjects: @ 8535004
+MtPyre_5F_EventObjects:
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE
-MtPyre_5F_MapWarps: @ 8535034
+MtPyre_5F_MapWarps:
warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F
warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F
warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F
warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
-MtPyre_5F_MapEvents:: @ 853505C
+MtPyre_5F_MapEvents::
map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index 17c8eddcd..8296f03dc 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,10 +1,10 @@
-MtPyre_5F: @ 84840D4
+MtPyre_5F:
.4byte MtPyre_5F_Layout
.4byte MtPyre_5F_MapEvents
.4byte MtPyre_5F_MapScripts
.4byte 0x0
.2byte MUS_M_DUNGON
- .2byte 141
+ .2byte LAYOUT_MT_PYRE_5F
.byte MAPSEC_MT_PYRE
.byte 0
.byte WEATHER_NONE