diff options
Diffstat (limited to 'maps/Route16.asm')
| -rw-r--r-- | maps/Route16.asm | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/Route16.asm b/maps/Route16.asm index 0e0fb2dc4..327b90a85 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,16 +1,14 @@ Route16_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: checkcode VAR_YCOORD - if_less_than 5, .CanWalk + ifless 5, .CanWalk checkcode VAR_XCOORD - if_greater_than 13, .CanWalk + ifgreater 13, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return @@ -29,23 +27,18 @@ CyclingRoadSignText: done Route16_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE - warp_def 14, 6, 3, ROUTE_16_GATE - warp_def 14, 7, 4, ROUTE_16_GATE - warp_def 9, 6, 1, ROUTE_16_GATE - warp_def 9, 7, 2, ROUTE_16_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 5, 5, BGEVENT_READ, CyclingRoadSign - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1 + warp_event 14, 6, ROUTE_16_GATE, 3 + warp_event 14, 7, ROUTE_16_GATE, 4 + warp_event 9, 6, ROUTE_16_GATE, 1 + warp_event 9, 7, ROUTE_16_GATE, 2 + + db 0 ; coord events + + db 1 ; bg events + bg_event 5, 5, BGEVENT_READ, CyclingRoadSign + + db 0 ; object events |