aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route8Gate.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/Route8Gate.asm
parent`ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff)
downloadpokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz
pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz
pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip
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/Route8Gate.asm')
-rw-r--r--data/maps/objects/Route8Gate.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm
index f03530b5..89a79d87 100644
--- a/data/maps/objects/Route8Gate.asm
+++ b/data/maps/objects/Route8Gate.asm
@@ -1,15 +1,15 @@
Route8Gate_Object:
db $a ; border block
- def_warps
- warp 0, 3, 0, LAST_MAP
- warp 0, 4, 1, LAST_MAP
- warp 5, 3, 2, LAST_MAP
- warp 5, 4, 3, LAST_MAP
+ def_warp_events
+ warp_event 0, 3, LAST_MAP, 0
+ warp_event 0, 4, LAST_MAP, 1
+ warp_event 5, 3, LAST_MAP, 2
+ warp_event 5, 4, LAST_MAP, 3
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person
+ def_object_events
+ object_event 2, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person
def_warps_to ROUTE_8_GATE