summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route2Gate1F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-22 14:32:37 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-22 14:44:22 -0400
commite6a99b8f9e20f7058a140fe7f0668b17ce49c6eb (patch)
tree2081afd14167056953c8140699d35532d236938d /data/maps/objects/Route2Gate1F.asm
parent5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff)
Port updated map event macros
Diffstat (limited to 'data/maps/objects/Route2Gate1F.asm')
-rw-r--r--data/maps/objects/Route2Gate1F.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/Route2Gate1F.asm b/data/maps/objects/Route2Gate1F.asm
index a9639b0..8719634 100644
--- a/data/maps/objects/Route2Gate1F.asm
+++ b/data/maps/objects/Route2Gate1F.asm
@@ -7,18 +7,18 @@ SECTION "data/maps/objects/Route2Gate1F.asm", ROMX
Route2Gate1F_MapEvents::
dw $4000 ; unknown
- db 5 ; warp events
- warp_event 0, 7, 13, WEST, wOverworldMapBlocks + 45
- warp_event 1, 7, 13, WEST, wOverworldMapBlocks + 45
- warp_event 8, 7, 1, ROUTE_2, wOverworldMapBlocks + 49
- warp_event 9, 7, 1, ROUTE_2, wOverworldMapBlocks + 49
- warp_event 1, 0, 1, ROUTE_2_GATE_2F, wOverworldMapBlocks + 12
+ def_warp_events
+ warp_event 0, 7, WEST, 13, 45
+ warp_event 1, 7, WEST, 13, 45
+ warp_event 8, 7, ROUTE_2, 1, 49
+ warp_event 9, 7, ROUTE_2, 1, 49
+ warp_event 1, 0, ROUTE_2_GATE_2F, 1, 12
- db 0 ; bg events
+ def_bg_events
- db 2 ; person events
- object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ def_object_events
+ object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
Route2Gate1F_Blocks::
INCBIN "maps/Route2Gate1F.blk"