summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_3F
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_3F
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/MtPyre_3F')
-rw-r--r--data/maps/MtPyre_3F/events.inc6
-rw-r--r--data/maps/MtPyre_3F/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
index f78373aca..4d6f3c9ea 100644
--- a/data/maps/MtPyre_3F/events.inc
+++ b/data/maps/MtPyre_3F/events.inc
@@ -1,10 +1,10 @@
-MtPyre_3F_EventObjects: @ 8534EEC
+MtPyre_3F_EventObjects:
object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL
object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
-MtPyre_3F_MapWarps: @ 8534F4C
+MtPyre_3F_MapWarps:
warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F
warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F
@@ -12,6 +12,6 @@ MtPyre_3F_MapWarps: @ 8534F4C
warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F
warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F
-MtPyre_3F_MapEvents:: @ 8534F7C
+MtPyre_3F_MapEvents::
map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index 3f54a3670..96026c7d9 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,10 +1,10 @@
-MtPyre_3F: @ 848409C
+MtPyre_3F:
.4byte MtPyre_3F_Layout
.4byte MtPyre_3F_MapEvents
.4byte MtPyre_3F_MapScripts
.4byte 0x0
.2byte MUS_M_DUNGON
- .2byte 139
+ .2byte LAYOUT_MT_PYRE_3F
.byte MAPSEC_MT_PYRE
.byte 0
.byte WEATHER_NONE