summaryrefslogtreecommitdiff
path: root/data/maps/objects/VermilionDock.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/VermilionDock.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/VermilionDock.asm')
-rwxr-xr-xdata/maps/objects/VermilionDock.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm
index 70a30b31..0b1c4e57 100755
--- a/data/maps/objects/VermilionDock.asm
+++ b/data/maps/objects/VermilionDock.asm
@@ -1,14 +1,12 @@
VermilionDock_Object:
db $f ; border block
- db 2 ; warps
+ def_warps
warp 14, 0, 5, LAST_MAP
warp 14, 2, 1, SS_ANNE_1F
- db 0 ; signs
+ def_signs
- db 0 ; objects
+ def_objects
- ; warp-to
- warp_to 14, 0, VERMILION_DOCK_WIDTH
- warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F
+ def_warps_to VERMILION_DOCK