diff options
Diffstat (limited to 'data/maps/Route124')
| -rw-r--r-- | data/maps/Route124/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route124/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route124/header.inc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index ed10daab9..959719385 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,11 +1,11 @@ -Route124_MapConnectionsList: @ 8486B4C +Route124_MapConnectionsList: connection down, 0, MAP_ROUTE126 connection left, 10, MAP_LILYCOVE_CITY connection right, 0, MAP_ROUTE125 connection right, 40, MAP_MOSSDEEP_CITY connection dive, 0, MAP_UNDERWATER1 -Route124_MapConnections: @ 8486B88 - .4byte 0x5 +Route124_MapConnections: + .4byte 5 .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 4b52615fc..4096396e8 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,4 +1,4 @@ -Route124_EventObjects: @ 852C3C4 +Route124_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 @@ -12,12 +12,12 @@ Route124_EventObjects: @ 852C3C4 object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 -Route124_MapWarps: @ 852C4E4 +Route124_MapWarps: warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE -Route124_MapBGEvents: @ 852C4EC +Route124_MapBGEvents: bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C -Route124_MapEvents:: @ 852C4F8 +Route124_MapEvents:: map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c9ae442b7..189d0dc51 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,10 +1,10 @@ -Route124: @ 84828FC +Route124: .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections .2byte MUS_DOORO_X3 - .2byte 40 + .2byte LAYOUT_ROUTE124 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY |