summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route6Gate.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/Route6Gate.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route6Gate.asm')
-rwxr-xr-xdata/maps/objects/Route6Gate.asm12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm
index 2f8a6f20..fb6dbc14 100755
--- a/data/maps/objects/Route6Gate.asm
+++ b/data/maps/objects/Route6Gate.asm
@@ -1,19 +1,15 @@
Route6Gate_Object:
db $a ; border block
- db 4 ; warps
+ def_warps
warp 3, 5, 2, LAST_MAP
warp 4, 5, 2, LAST_MAP
warp 3, 0, 1, LAST_MAP
warp 4, 0, 1, LAST_MAP
- db 0 ; signs
+ def_signs
- db 1 ; objects
+ def_objects
object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
- ; warp-to
- warp_to 3, 5, ROUTE_6_GATE_WIDTH
- warp_to 4, 5, ROUTE_6_GATE_WIDTH
- warp_to 3, 0, ROUTE_6_GATE_WIDTH
- warp_to 4, 0, ROUTE_6_GATE_WIDTH
+ def_warps_to ROUTE_6_GATE