aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route22Gate.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:38:47 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:43:09 -0500
commit501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch)
treec2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/Route22Gate.asm
parentSwitch from Travis CI to GitHub Actions (diff)
parentFix typos (#334) (diff)
downloadpokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz
pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz
pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route22Gate.asm')
-rw-r--r--data/maps/objects/Route22Gate.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm
index 53944c52..2f00d24c 100644
--- a/data/maps/objects/Route22Gate.asm
+++ b/data/maps/objects/Route22Gate.asm
@@ -1,15 +1,15 @@
Route22Gate_Object:
db $a ; border block
- def_warps
- warp 4, 7, 0, LAST_MAP
- warp 5, 7, 0, LAST_MAP
- warp 4, 0, 0, LAST_MAP
- warp 5, 0, 0, LAST_MAP
+ def_warp_events
+ warp_event 4, 7, LAST_MAP, 0
+ warp_event 5, 7, LAST_MAP, 0
+ warp_event 4, 0, LAST_MAP, 0
+ warp_event 5, 0, LAST_MAP, 0
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
+ def_object_events
+ object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person
def_warps_to ROUTE_22_GATE