summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route16.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route16.asm')
-rw-r--r--data/maps/objects/Route16.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm
index 44e2de01..88da2f5f 100644
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -1,28 +1,28 @@
Route16_Object:
db $f ; border block
- def_warps
- warp 17, 10, 0, ROUTE_16_GATE_1F
- warp 17, 11, 1, ROUTE_16_GATE_1F
- warp 24, 10, 2, ROUTE_16_GATE_1F
- warp 24, 11, 3, ROUTE_16_GATE_1F
- warp 17, 4, 4, ROUTE_16_GATE_1F
- warp 17, 5, 5, ROUTE_16_GATE_1F
- warp 24, 4, 6, ROUTE_16_GATE_1F
- warp 24, 5, 7, ROUTE_16_GATE_1F
- warp 7, 5, 0, ROUTE_16_FLY_HOUSE
+ def_warp_events
+ warp_event 17, 10, ROUTE_16_GATE_1F, 0
+ warp_event 17, 11, ROUTE_16_GATE_1F, 1
+ warp_event 24, 10, ROUTE_16_GATE_1F, 2
+ warp_event 24, 11, ROUTE_16_GATE_1F, 3
+ warp_event 17, 4, ROUTE_16_GATE_1F, 4
+ warp_event 17, 5, ROUTE_16_GATE_1F, 5
+ warp_event 24, 4, ROUTE_16_GATE_1F, 6
+ warp_event 24, 5, ROUTE_16_GATE_1F, 7
+ warp_event 7, 5, ROUTE_16_FLY_HOUSE, 0
- def_signs
- sign 27, 11, 8 ; Route16Text8
- sign 5, 17, 9 ; Route16Text9
+ def_bg_events
+ bg_event 27, 11, 8 ; Route16Text8
+ bg_event 5, 17, 9 ; Route16Text9
- def_objects
- object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5
- object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1
- object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2
- object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6
- object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3
- object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7
- object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person
+ def_object_events
+ object_event 17, 12, SPRITE_BIKER, STAY, LEFT, 1, OPP_BIKER, 5
+ object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 1
+ object_event 11, 12, SPRITE_BIKER, STAY, UP, 3, OPP_CUE_BALL, 2
+ object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6
+ object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3
+ object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7
+ object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person
def_warps_to ROUTE_16