summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_4F
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_4F
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/MtPyre_4F')
-rw-r--r--data/maps/MtPyre_4F/events.inc6
-rw-r--r--data/maps/MtPyre_4F/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc
index ffe568880..030039d18 100644
--- a/data/maps/MtPyre_4F/events.inc
+++ b/data/maps/MtPyre_4F/events.inc
@@ -1,8 +1,8 @@
-MtPyre_4F_EventObjects: @ 8534F90
+MtPyre_4F_EventObjects:
object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE
-MtPyre_4F_MapWarps: @ 8534FC0
+MtPyre_4F_MapWarps:
warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F
warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F
@@ -10,6 +10,6 @@ MtPyre_4F_MapWarps: @ 8534FC0
warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F
warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F
-MtPyre_4F_MapEvents:: @ 8534FF0
+MtPyre_4F_MapEvents::
map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index 1c41c3a6d..86edc3843 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,10 +1,10 @@
-MtPyre_4F: @ 84840B8
+MtPyre_4F:
.4byte MtPyre_4F_Layout
.4byte MtPyre_4F_MapEvents
.4byte MtPyre_4F_MapScripts
.4byte 0x0
.2byte MUS_M_DUNGON
- .2byte 140
+ .2byte LAYOUT_MT_PYRE_4F
.byte MAPSEC_MT_PYRE
.byte 0
.byte WEATHER_NONE