summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route2.asm')
-rw-r--r--data/maps/objects/Route2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm
index 5480743..ab400d0 100644
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -9,19 +9,19 @@ SECTION "data/maps/objects/Route2.asm", ROMX
Route2_MapEvents::
dw $4000 ; unknown
- db 2 ; warp events
- warp_event 6, 5, 3, ROUTE_2_GATE_1F, wOverworldMapBlocks + 67
- warp_event 15, 4, 1, ROUTE_2_HOUSE, wOverworldMapBlocks + 71
+ def_warp_events
+ warp_event 6, 5, ROUTE_2_GATE_1F, 3, 67
+ warp_event 15, 4, ROUTE_2_HOUSE, 1, 71
- db 3 ; bg events
- bg_event 15, 4, 0, 3
- bg_event 14, 5, 0, 1
+ def_bg_events
+ bg_event 15, 4, 0, 3
+ bg_event 14, 5, 0, 1
bg_event 24, 10, 0, 2
- db 3 ; person events
+ def_object_events
object_event 19, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0
- object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
+ object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
Route2_Blocks::
INCBIN "maps/Route2.blk"