summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route7.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/Route7.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route7.asm')
-rwxr-xr-xdata/maps/objects/Route7.asm13
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm
index 182904ef..1ea17c6b 100755
--- a/data/maps/objects/Route7.asm
+++ b/data/maps/objects/Route7.asm
@@ -1,21 +1,16 @@
Route7_Object:
db $f ; border block
- db 5 ; warps
+ def_warps
warp 18, 9, 2, ROUTE_7_GATE
warp 18, 10, 3, ROUTE_7_GATE
warp 11, 9, 0, ROUTE_7_GATE
warp 11, 10, 1, ROUTE_7_GATE
warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
- db 1 ; signs
+ def_signs
sign 3, 13, 1 ; Route7Text1
- db 0 ; objects
+ def_objects
- ; warp-to
- warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7
+ def_warps_to ROUTE_7