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/Route104 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/Route104')
| -rw-r--r-- | data/maps/Route104/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route104/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route104/header.inc | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index ce605c828..193f89833 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,9 +1,9 @@ -Route104_MapConnectionsList: @ 848686C +Route104_MapConnectionsList: connection up, 0, MAP_RUSTBORO_CITY connection down, 0, MAP_ROUTE105 connection right, 50, MAP_PETALBURG_CITY -Route104_MapConnections: @ 8486890 - .4byte 0x3 +Route104_MapConnections: + .4byte 3 .4byte Route104_MapConnectionsList diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 53e868559..8b67a0854 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,4 +1,4 @@ -Route104_EventObjects: @ 85282E4 +Route104_EventObjects: object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 @@ -34,7 +34,7 @@ Route104_EventObjects: @ 85282E4 object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL -Route104_MapWarps: @ 8528614 +Route104_MapWarps: warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS @@ -44,10 +44,10 @@ Route104_MapWarps: @ 8528614 warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS -Route104_MapCoordEvents: @ 8528654 +Route104_MapCoordEvents: coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 -Route104_MapBGEvents: @ 8528664 +Route104_MapBGEvents: bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A @@ -59,6 +59,6 @@ Route104_MapBGEvents: @ 8528664 bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE -Route104_MapEvents:: @ 85286DC +Route104_MapEvents:: map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 101e690d5..6f8e0776b 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,10 +1,10 @@ -Route104: @ 84826CC +Route104: .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections .2byte MUS_NEXTROAD - .2byte 20 + .2byte LAYOUT_ROUTE104 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY |