summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_6F
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_6F
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/MtPyre_6F')
-rw-r--r--data/maps/MtPyre_6F/events.inc6
-rw-r--r--data/maps/MtPyre_6F/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
index 3ab5dcf70..df862d84e 100644
--- a/data/maps/MtPyre_6F/events.inc
+++ b/data/maps/MtPyre_6F/events.inc
@@ -1,12 +1,12 @@
-MtPyre_6F_EventObjects: @ 8535070
+MtPyre_6F_EventObjects:
object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30
object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0
-MtPyre_6F_MapWarps: @ 85350B8
+MtPyre_6F_MapWarps:
warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
-MtPyre_6F_MapEvents:: @ 85350C8
+MtPyre_6F_MapEvents::
map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index 4e8082820..ca0e545aa 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,10 +1,10 @@
-MtPyre_6F: @ 84840F0
+MtPyre_6F:
.4byte MtPyre_6F_Layout
.4byte MtPyre_6F_MapEvents
.4byte MtPyre_6F_MapScripts
.4byte 0x0
.2byte MUS_M_DUNGON
- .2byte 142
+ .2byte LAYOUT_MT_PYRE_6F
.byte MAPSEC_MT_PYRE
.byte 0
.byte WEATHER_NONE