diff options
Diffstat (limited to 'data/maps/Route101')
| -rw-r--r-- | data/maps/Route101/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route101/events.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route101/header.inc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index f5f35e974..32ee511a8 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,8 +1,8 @@ -Route101_MapConnectionsList: @ 848680C +Route101_MapConnectionsList: connection up, 0, MAP_OLDALE_TOWN connection down, 0, MAP_LITTLEROOT_TOWN -Route101_MapConnections: @ 8486824 - .4byte 0x2 +Route101_MapConnections: + .4byte 2 .4byte Route101_MapConnectionsList diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 77ee2848f..b14649cc0 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,4 +1,4 @@ -Route101_EventObjects: @ 8527E98 +Route101_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG @@ -6,7 +6,7 @@ Route101_EventObjects: @ 8527E98 object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY -Route101_MapCoordEvents: @ 8527F28 +Route101_MapCoordEvents: coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E @@ -17,9 +17,9 @@ Route101_MapCoordEvents: @ 8527F28 coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A -Route101_MapBGEvents: @ 8527FB8 +Route101_MapBGEvents: bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D -Route101_MapEvents:: @ 8527FC4 +Route101_MapEvents:: map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 5a98f7e22..b40de8df9 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,10 +1,10 @@ -Route101: @ 8482678 +Route101: .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections .2byte MUS_DOORO1 - .2byte 17 + .2byte LAYOUT_ROUTE101 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY |