summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route12Gate1F.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/Route12Gate1F.asm
parent45c039801916713e4066644086de4d4940d5fa1d (diff)
parent30acb46b988d4bb54af761696123778acd8517e3 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route12Gate1F.asm')
-rw-r--r--data/maps/objects/Route12Gate1F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm
index 356bf67a..3f1692e8 100644
--- a/data/maps/objects/Route12Gate1F.asm
+++ b/data/maps/objects/Route12Gate1F.asm
@@ -1,16 +1,16 @@
Route12Gate1F_Object:
db $a ; border block
- def_warps
- warp 4, 0, 0, LAST_MAP
- warp 5, 0, 1, LAST_MAP
- warp 4, 7, 2, LAST_MAP
- warp 5, 7, 2, LAST_MAP
- warp 8, 6, 0, ROUTE_12_GATE_2F
+ def_warp_events
+ warp_event 4, 0, LAST_MAP, 0
+ warp_event 5, 0, LAST_MAP, 1
+ warp_event 4, 7, LAST_MAP, 2
+ warp_event 5, 7, LAST_MAP, 2
+ warp_event 8, 6, ROUTE_12_GATE_2F, 0
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person
+ def_object_events
+ object_event 1, 3, SPRITE_GUARD, STAY, NONE, 1 ; person
def_warps_to ROUTE_12_GATE_1F