diff options
Diffstat (limited to 'data/maps/Route105')
| -rw-r--r-- | data/maps/Route105/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route105/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route105/header.inc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index ac03944b7..89c412cc6 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,9 +1,9 @@ -Route105_MapConnectionsList: @ 8486898 +Route105_MapConnectionsList: connection up, 0, MAP_ROUTE104 connection down, 0, MAP_ROUTE106 connection dive, 0, MAP_UNDERWATER6 -Route105_MapConnections: @ 84868BC - .4byte 0x3 +Route105_MapConnections: + .4byte 3 .4byte Route105_MapConnectionsList diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index e22aa668c..851a26fdc 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,4 +1,4 @@ -Route105_EventObjects: @ 85286F0 +Route105_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 @@ -8,13 +8,13 @@ Route105_EventObjects: @ 85286F0 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 -Route105_MapWarps: @ 85287B0 +Route105_MapWarps: warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE -Route105_MapBGEvents: @ 85287B8 +Route105_MapBGEvents: bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL -Route105_MapEvents:: @ 85287D0 +Route105_MapEvents:: map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 5c6b2fc15..ac3e766dd 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,10 +1,10 @@ -Route105: @ 84826E8 +Route105: .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections .2byte MUS_NEXTROAD - .2byte 21 + .2byte LAYOUT_ROUTE105 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY |