summaryrefslogtreecommitdiff
path: root/data/maps/Route119_WeatherInstitute_2F
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/Route119_WeatherInstitute_2F
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F')
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/events.inc6
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
index d2cc64d40..746384820 100644
--- a/data/maps/Route119_WeatherInstitute_2F/events.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
@@ -1,4 +1,4 @@
-Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
+Route119_WeatherInstitute_2F_EventObjects:
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA
@@ -8,9 +8,9 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA
-Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
+Route119_WeatherInstitute_2F_MapWarps:
warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
-Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
+Route119_WeatherInstitute_2F_MapEvents::
map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index c81f9731c..8543b0ed8 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,10 +1,10 @@
-Route119_WeatherInstitute_2F: @ 8485D0C
+Route119_WeatherInstitute_2F:
.4byte Route119_WeatherInstitute_2F_Layout
.4byte Route119_WeatherInstitute_2F_MapEvents
.4byte Route119_WeatherInstitute_2F_MapScripts
.4byte 0x0
.2byte MUS_GOTOWN
- .2byte 272
+ .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F
.byte MAPSEC_ROUTE_119
.byte 0
.byte WEATHER_NONE