summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route2House.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/Route2House.asm
parent5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff)
Port updated map event macros
Diffstat (limited to 'data/maps/objects/Route2House.asm')
-rw-r--r--data/maps/objects/Route2House.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/Route2House.asm b/data/maps/objects/Route2House.asm
index 2088ef6..e8010d1 100644
--- a/data/maps/objects/Route2House.asm
+++ b/data/maps/objects/Route2House.asm
@@ -7,20 +7,20 @@ SECTION "data/maps/objects/Route2House.asm", ROMX
Route2House_MapEvents::
dw $4000 ; unknown
- db 2 ; warp events
- warp_event 4, 7, 2, ROUTE_2, wOverworldMapBlocks + 43
- warp_event 5, 7, 2, ROUTE_2, wOverworldMapBlocks + 43
+ def_warp_events
+ warp_event 4, 7, ROUTE_2, 2, 43
+ warp_event 5, 7, ROUTE_2, 2, 43
- db 6 ; bg events
- bg_event 0, 0, 0, 1
- bg_event 2, 0, 0, 1
- bg_event 4, 0, 0, 1
- bg_event 6, 0, 0, 1
- bg_event 0, 3, 0, 2
- bg_event 4, 3, 0, 3
+ def_bg_events
+ bg_event 0, 0, 0, 1
+ bg_event 2, 0, 0, 1
+ bg_event 4, 0, 0, 1
+ bg_event 6, 0, 0, 1
+ bg_event 0, 3, 0, 2
+ bg_event 4, 3, 0, 3
- db 1 ; person events
- object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ def_object_events
+ object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
Route2House_Blocks::
INCBIN "maps/Route2House.blk"