aboutsummaryrefslogtreecommitdiffstats
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.asm27
1 files changed, 18 insertions, 9 deletions
diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm
index 6680d1c4..58289c93 100644
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -1,3 +1,12 @@
+ object_const_def
+ const_export ROUTE16_BIKER1
+ const_export ROUTE16_BIKER2
+ const_export ROUTE16_BIKER3
+ const_export ROUTE16_BIKER4
+ const_export ROUTE16_BIKER5
+ const_export ROUTE16_BIKER6
+ const_export ROUTE16_SNORLAX
+
Route16_Object:
db $f ; border block
@@ -13,16 +22,16 @@ Route16_Object:
warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1
def_bg_events
- bg_event 27, 11, 8 ; Route16Text8
- bg_event 5, 17, 9 ; Route16Text9
+ bg_event 27, 11, TEXT_ROUTE16_CYCLING_ROAD_SIGN
+ bg_event 5, 17, TEXT_ROUTE16_SIGN
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
+ object_event 17, 12, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER1, OPP_BIKER, 5
+ object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER2, OPP_CUE_BALL, 1
+ object_event 11, 12, SPRITE_BIKER, STAY, UP, TEXT_ROUTE16_BIKER3, OPP_CUE_BALL, 2
+ object_event 9, 11, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER4, OPP_BIKER, 6
+ object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER5, OPP_CUE_BALL, 3
+ object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER6, OPP_BIKER, 7
+ object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, TEXT_ROUTE16_SNORLAX
def_warps_to ROUTE_16