diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 16:55:25 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 16:55:25 -0600 |
| commit | 5c1667b41a7d31df6d405d272833895bf8472cf6 (patch) | |
| tree | dcee557154cc86398b9815838fc61fbe01837ddc /data/maps/Route134 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/Route134')
| -rw-r--r-- | data/maps/Route134/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route134/events.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route134/header.inc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 861c82b4d..30989b374 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,8 +1,8 @@ -Route134_MapConnectionsList: @ 8486D04 +Route134_MapConnectionsList: connection left, 0, MAP_SLATEPORT_CITY connection right, 0, MAP_ROUTE133 -Route134_MapConnections: @ 8486D1C - .4byte 0x2 +Route134_MapConnections: + .4byte 2 .4byte Route134_MapConnectionsList diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 8caf4da1e..83e693c26 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,4 +1,4 @@ -Route134_EventObjects: @ 852CD98 +Route134_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 @@ -11,6 +11,6 @@ Route134_EventObjects: @ 852CD98 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE -Route134_MapEvents:: @ 852CEA0 +Route134_MapEvents:: map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 8204e2815..87bddf5c7 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,10 +1,10 @@ -Route134: @ 8482A14 +Route134: .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections .2byte MUS_GRANROAD - .2byte 50 + .2byte LAYOUT_ROUTE134 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY |