summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route18.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route18.asm')
-rw-r--r--data/maps/objects/Route18.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm
index eafdf1d0..c95e3cf9 100644
--- a/data/maps/objects/Route18.asm
+++ b/data/maps/objects/Route18.asm
@@ -1,19 +1,19 @@
Route18_Object:
db $43 ; border block
- def_warps
- warp 33, 8, 0, ROUTE_18_GATE_1F
- warp 33, 9, 1, ROUTE_18_GATE_1F
- warp 40, 8, 2, ROUTE_18_GATE_1F
- warp 40, 9, 3, ROUTE_18_GATE_1F
+ def_warp_events
+ warp_event 33, 8, ROUTE_18_GATE_1F, 0
+ warp_event 33, 9, ROUTE_18_GATE_1F, 1
+ warp_event 40, 8, ROUTE_18_GATE_1F, 2
+ warp_event 40, 9, ROUTE_18_GATE_1F, 3
- def_signs
- sign 43, 7, 4 ; Route18Text4
- sign 33, 5, 5 ; Route18Text5
+ def_bg_events
+ bg_event 43, 7, 4 ; Route18Text4
+ bg_event 33, 5, 5 ; Route18Text5
- def_objects
- object SPRITE_COOLTRAINER_M, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
- object SPRITE_COOLTRAINER_M, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
- object SPRITE_COOLTRAINER_M, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
+ def_object_events
+ object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
+ object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
+ object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
def_warps_to ROUTE_18