diff options
Diffstat (limited to 'data/maps/objects/Route18.asm')
| -rw-r--r-- | data/maps/objects/Route18.asm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 7555aa4f..29bafe90 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -1,3 +1,8 @@ + object_const_def + const_export ROUTE18_COOLTRAINER_M1 + const_export ROUTE18_COOLTRAINER_M2 + const_export ROUTE18_COOLTRAINER_M3 + Route18_Object: db $43 ; border block @@ -8,12 +13,12 @@ Route18_Object: warp_event 40, 9, ROUTE_18_GATE_1F, 3 def_bg_events - bg_event 43, 7, 4 ; Route18Text4 - bg_event 33, 5, 5 ; Route18Text5 + bg_event 43, 7, SCRIPT_ROUTE18_SIGN + bg_event 33, 5, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN 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 + object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, SCRIPT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8 + object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9 + object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10 def_warps_to ROUTE_18 |