summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route16FlyHouse.asm
diff options
context:
space:
mode:
authorYoann Fievez <yoann.fievez@gmail.com>2021-09-27 04:56:09 +0200
committerGitHub <noreply@github.com>2021-09-26 21:56:09 -0500
commit2c4f35848b786864822a3f211df91de30a2857c9 (patch)
treefcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/Route16FlyHouse.asm
parentf1285f8584ce7ff50ceb5e3134c0efc867209096 (diff)
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/Route16FlyHouse.asm')
-rw-r--r--data/maps/objects/Route16FlyHouse.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm
index be6cdc61..1e4d2643 100644
--- a/data/maps/objects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
@@ -1,14 +1,14 @@
Route16FlyHouse_Object:
db $a ; border block
- def_warps
- warp 2, 7, 8, LAST_MAP
- warp 3, 7, 8, LAST_MAP
+ def_warp_events
+ warp_event 2, 7, LAST_MAP, 8
+ warp_event 3, 7, LAST_MAP, 8
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
- object SPRITE_BIRD, 6, 4, WALK, ANY_DIR, 2 ; person
+ def_object_events
+ object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person
+ object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, 2 ; person
def_warps_to ROUTE_16_FLY_HOUSE