summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route2Gate.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/Route2Gate.asm
parent45c039801916713e4066644086de4d4940d5fa1d (diff)
parent30acb46b988d4bb54af761696123778acd8517e3 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route2Gate.asm')
-rw-r--r--data/maps/objects/Route2Gate.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm
index 3151ce79..8d8b5db2 100644
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -1,16 +1,16 @@
Route2Gate_Object:
db $a ; border block
- def_warps
- warp 4, 0, 3, LAST_MAP
- warp 5, 0, 3, LAST_MAP
- warp 4, 7, 4, LAST_MAP
- warp 5, 7, 4, LAST_MAP
+ def_warp_events
+ warp_event 4, 0, LAST_MAP, 3
+ warp_event 5, 0, LAST_MAP, 3
+ warp_event 4, 7, LAST_MAP, 4
+ warp_event 5, 7, LAST_MAP, 4
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_SCIENTIST, 1, 4, STAY, LEFT, 1 ; person
- object SPRITE_YOUNGSTER, 5, 4, WALK, LEFT_RIGHT, 2 ; person
+ def_object_events
+ object_event 1, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
+ object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
def_warps_to ROUTE_2_GATE