summaryrefslogtreecommitdiff
path: root/data/maps/DesertUnderpass
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/DesertUnderpass
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/DesertUnderpass')
-rw-r--r--data/maps/DesertUnderpass/events.inc6
-rw-r--r--data/maps/DesertUnderpass/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc
index aec461c34..25497be27 100644
--- a/data/maps/DesertUnderpass/events.inc
+++ b/data/maps/DesertUnderpass/events.inc
@@ -1,9 +1,9 @@
-DesertUnderpass_EventObjects: @ 85376D4
+DesertUnderpass_EventObjects:
object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
-DesertUnderpass_MapWarps: @ 85376EC
+DesertUnderpass_MapWarps:
warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
-DesertUnderpass_MapEvents:: @ 85376F4
+DesertUnderpass_MapEvents::
map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
index 757d81e73..ca7ab5254 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -1,10 +1,10 @@
-DesertUnderpass: @ 8484978
+DesertUnderpass:
.4byte DesertUnderpass_Layout
.4byte DesertUnderpass_MapEvents
.4byte DesertUnderpass_MapScripts
.4byte 0x0
.2byte MUS_TOZAN
- .2byte 389
+ .2byte LAYOUT_DESERT_UNDERPASS
.byte MAPSEC_DESERT_UNDERPASS
.byte 0
.byte WEATHER_NONE