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/Route102 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/Route102')
| -rw-r--r-- | data/maps/Route102/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route102/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route102/header.inc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 419cfeec9..1b76d47f5 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,8 +1,8 @@ -Route102_MapConnectionsList: @ 848682C +Route102_MapConnectionsList: connection left, -10, MAP_PETALBURG_CITY connection right, 0, MAP_OLDALE_TOWN -Route102_MapConnections: @ 8486844 - .4byte 0x2 +Route102_MapConnections: + .4byte 2 .4byte Route102_MapConnectionsList diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index b2299feea..65acbee41 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,4 +1,4 @@ -Route102_EventObjects: @ 8527FD8 +Route102_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 @@ -9,10 +9,10 @@ Route102_EventObjects: @ 8527FD8 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 -Route102_MapBGEvents: @ 85280B0 +Route102_MapBGEvents: bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA -Route102_MapEvents:: @ 85280C8 +Route102_MapEvents:: map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 7a0fcacda..6b5c24b0c 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,10 +1,10 @@ -Route102: @ 8482694 +Route102: .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections .2byte MUS_DOORO1 - .2byte 18 + .2byte LAYOUT_ROUTE102 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY |