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/Route127 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/Route127')
| -rw-r--r-- | data/maps/Route127/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route127/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route127/header.inc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 3ad7057a3..8dcdf7978 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,10 +1,10 @@ -Route127_MapConnectionsList: @ 8486BE8 +Route127_MapConnectionsList: connection up, 0, MAP_MOSSDEEP_CITY connection down, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE126 connection dive, 0, MAP_UNDERWATER3 -Route127_MapConnections: @ 8486C18 - .4byte 0x4 +Route127_MapConnections: + .4byte 4 .4byte Route127_MapConnectionsList diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 78dc26899..7b9e040d3 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,4 +1,4 @@ -Route127_EventObjects: @ 852C734 +Route127_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC @@ -11,13 +11,13 @@ Route127_EventObjects: @ 852C734 object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY -Route127_MapBGEvents: @ 852C83C +Route127_MapBGEvents: bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 -Route127_MapEvents:: @ 852C878 +Route127_MapEvents:: map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index b237a42ab..0a7055f1c 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,10 +1,10 @@ -Route127: @ 8482950 +Route127: .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections .2byte MUS_DOORO_X3 - .2byte 43 + .2byte LAYOUT_ROUTE127 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY |