summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route5.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/Route5.asm
parent45c039801916713e4066644086de4d4940d5fa1d (diff)
parent30acb46b988d4bb54af761696123778acd8517e3 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route5.asm')
-rw-r--r--data/maps/objects/Route5.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm
index 98f76683..910d7358 100644
--- a/data/maps/objects/Route5.asm
+++ b/data/maps/objects/Route5.asm
@@ -1,16 +1,16 @@
Route5_Object:
db $a ; border block
- def_warps
- warp 10, 29, 2, ROUTE_5_GATE
- warp 9, 29, 2, ROUTE_5_GATE
- warp 10, 33, 0, ROUTE_5_GATE
- warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5
- warp 10, 21, 0, DAYCARE
+ def_warp_events
+ warp_event 10, 29, ROUTE_5_GATE, 2
+ warp_event 9, 29, ROUTE_5_GATE, 2
+ warp_event 10, 33, ROUTE_5_GATE, 0
+ warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 0
+ warp_event 10, 21, DAYCARE, 0
- def_signs
- sign 17, 29, 1 ; Route5Text1
+ def_bg_events
+ bg_event 17, 29, 1 ; Route5Text1
- def_objects
+ def_object_events
def_warps_to ROUTE_5