diff options
Diffstat (limited to 'data/maps/objects/Route6.asm')
| -rw-r--r-- | data/maps/objects/Route6.asm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 6501f8f6..9476d469 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,3 +1,11 @@ + object_const_def + const_export ROUTE6_COOLTRAINER_M1 + const_export ROUTE6_COOLTRAINER_F1 + const_export ROUTE6_YOUNGSTER1 + const_export ROUTE6_COOLTRAINER_M2 + const_export ROUTE6_COOLTRAINER_F2 + const_export ROUTE6_YOUNGSTER2 + Route6_Object: db $f ; border block @@ -8,14 +16,14 @@ Route6_Object: warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events - bg_event 19, 15, 7 ; Route6Text7 + bg_event 19, 15, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN def_object_events - object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 10 - object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 25 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 10 + object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 25 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER1, OPP_BUG_CATCHER, 10 + object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 + object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 |