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/Route125 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/Route125')
| -rw-r--r-- | data/maps/Route125/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route125/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route125/header.inc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 2b5f944c9..61ea9f029 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,9 +1,9 @@ -Route125_MapConnectionsList: @ 8486B90 +Route125_MapConnectionsList: connection down, 0, MAP_MOSSDEEP_CITY connection left, 0, MAP_ROUTE124 connection dive, 0, MAP_UNDERWATER7 -Route125_MapConnections: @ 8486BB4 - .4byte 0x3 +Route125_MapConnections: + .4byte 3 .4byte Route125_MapConnectionsList diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 256802406..e278d6e24 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,4 +1,4 @@ -Route125_EventObjects: @ 852C50C +Route125_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 @@ -10,15 +10,15 @@ Route125_EventObjects: @ 852C50C object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL -Route125_MapWarps: @ 852C5FC +Route125_MapWarps: warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -Route125_MapBGEvents: @ 852C604 +Route125_MapBGEvents: bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 -Route125_MapEvents:: @ 852C634 +Route125_MapEvents:: map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 12ea80531..b3a7308f3 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,10 +1,10 @@ -Route125: @ 8482918 +Route125: .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections .2byte MUS_DOORO_X3 - .2byte 41 + .2byte LAYOUT_ROUTE125 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY |