summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route25.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route25.asm')
-rw-r--r--data/maps/objects/Route25.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm
index 4f0be4d4..96af21ab 100644
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -1,22 +1,22 @@
Route25_Object:
db $2c ; border block
- def_warps
- warp 45, 3, 0, BILLS_HOUSE
+ def_warp_events
+ warp_event 45, 3, BILLS_HOUSE, 0
- def_signs
- sign 43, 3, 11 ; Route25Text11
+ def_bg_events
+ bg_event 43, 3, 11 ; Route25Text11
- def_objects
- object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
- object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
- object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
- object SPRITE_COOLTRAINER_F, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9
- object SPRITE_YOUNGSTER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7
- object SPRITE_COOLTRAINER_F, 37, 4, STAY, DOWN, 6, OPP_LASS, 10
- object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2
- object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3
- object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4
- object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS
+ def_object_events
+ object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
+ object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6
+ object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
+ object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9
+ object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7
+ object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
+ object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
+ object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
+ object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4
+ object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS
def_warps_to ROUTE_25