summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route1P2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route1P2.asm')
-rw-r--r--data/maps/objects/Route1P2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route1P2.asm b/data/maps/objects/Route1P2.asm
index dd8381d..dfd4a23 100644
--- a/data/maps/objects/Route1P2.asm
+++ b/data/maps/objects/Route1P2.asm
@@ -9,18 +9,18 @@ SECTION "data/maps/objects/Route1P2.asm", ROMX
Route1P2_MapEvents::
dw $4000 ; unknown
- db 4 ; warp events
- warp_event 8, 5, 1, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53
- warp_event 9, 5, 2, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53
- warp_event 8, 25, 6, SHIZUKANA_OKA, wOverworldMapBlocks + 213
- warp_event 9, 25, 9, SHIZUKANA_OKA, wOverworldMapBlocks + 213
+ def_warp_events
+ warp_event 8, 5, ROUTE_1_GATE_1F, 1, 53
+ warp_event 9, 5, ROUTE_1_GATE_1F, 2, 53
+ warp_event 8, 25, SHIZUKANA_OKA, 6, 213
+ warp_event 9, 25, SHIZUKANA_OKA, 9, 213
- db 1 ; bg events
+ def_bg_events
bg_event 10, 20, 0, 1
- db 2 ; person events
- object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
+ def_object_events
+ object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
Route1P2_Blocks::
INCBIN "maps/Route1P2.blk"