aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route20.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route20.asm')
-rw-r--r--data/maps/objects/Route20.asm36
1 files changed, 24 insertions, 12 deletions
diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm
index bd9697c2..e48fead8 100644
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -1,3 +1,15 @@
+ object_const_def
+ const_export ROUTE20_SWIMMER1
+ const_export ROUTE20_SWIMMER2
+ const_export ROUTE20_SWIMMER3
+ const_export ROUTE20_SWIMMER4
+ const_export ROUTE20_SWIMMER5
+ const_export ROUTE20_SWIMMER6
+ const_export ROUTE20_COOLTRAINER_M
+ const_export ROUTE20_SWIMMER7
+ const_export ROUTE20_SWIMMER8
+ const_export ROUTE20_SWIMMER9
+
Route20_Object:
db $43 ; border block
@@ -6,19 +18,19 @@ Route20_Object:
warp_event 58, 9, SEAFOAM_ISLANDS_1F, 3
def_bg_events
- bg_event 51, 7, 11 ; Route20Text11
- bg_event 57, 11, 12 ; Route20Text12
+ bg_event 51, 7, TEXT_ROUTE20_SEAFOAM_ISLANDS_WEST_SIGN
+ bg_event 57, 11, TEXT_ROUTE20_SEAFOAM_ISLANDS_EAST_SIGN
def_object_events
- object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
- object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15
- object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6
- object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
- object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10
- object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11
- object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
- object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
- object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
- object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
+ object_event 87, 8, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER1, OPP_SWIMMER, 9
+ object_event 68, 11, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER2, OPP_BEAUTY, 15
+ object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER3, OPP_BEAUTY, 6
+ object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE20_SWIMMER4, OPP_JR_TRAINER_F, 24
+ object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER5, OPP_SWIMMER, 10
+ object_event 87, 13, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER6, OPP_SWIMMER, 11
+ object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE20_COOLTRAINER_M, OPP_BIRD_KEEPER, 11
+ object_event 25, 7, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER7, OPP_BEAUTY, 7
+ object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER8, OPP_JR_TRAINER_F, 16
+ object_event 15, 8, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER9, OPP_BEAUTY, 8
def_warps_to ROUTE_20