summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route5.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-20 19:07:42 -0400
committerGitHub <noreply@github.com>2020-08-20 19:07:42 -0400
commit7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch)
treeddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/Route5.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route5.asm')
-rwxr-xr-xdata/maps/objects/Route5.asm13
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm
index df2c8c03..e7eadee8 100755
--- a/data/maps/objects/Route5.asm
+++ b/data/maps/objects/Route5.asm
@@ -1,21 +1,16 @@
Route5_Object:
db $a ; border block
- db 5 ; warps
+ def_warps
warp 10, 29, 3, 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
- db 1 ; signs
+ def_signs
sign 17, 29, 1 ; Route5Text1
- db 0 ; objects
+ def_objects
- ; warp-to
- warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5
- warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE
+ def_warps_to ROUTE_5