summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route16Gate2F.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/Route16Gate2F.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/Route16Gate2F.asm')
-rw-r--r--data/maps/objects/Route16Gate2F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
index 53511ae5..047e2d70 100644
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -1,15 +1,15 @@
Route16Gate2F_Object:
db $a ; border block
- def_warps
- warp 7, 7, 8, ROUTE_16_GATE_1F
+ def_warp_events
+ warp_event 7, 7, ROUTE_16_GATE_1F, 8
- def_signs
- sign 1, 2, 3 ; Route16GateUpstairsText3
- sign 6, 2, 4 ; Route16GateUpstairsText4
+ def_bg_events
+ bg_event 1, 2, 3 ; Route16GateUpstairsText3
+ bg_event 6, 2, 4 ; Route16GateUpstairsText4
- def_objects
- object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person
- object SPRITE_LITTLE_GIRL, 2, 5, WALK, LEFT_RIGHT, 2 ; person
+ def_object_events
+ object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person
+ object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person
def_warps_to ROUTE_16_GATE_2F