summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCoElevator.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/SilphCoElevator.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/SilphCoElevator.asm')
-rwxr-xr-xdata/maps/objects/SilphCoElevator.asm14
1 files changed, 6 insertions, 8 deletions
diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm
index 9c4b5a79..54aeaf8e 100755
--- a/data/maps/objects/SilphCoElevator.asm
+++ b/data/maps/objects/SilphCoElevator.asm
@@ -1,15 +1,13 @@
SilphCoElevator_Object:
db $f ; border block
- db 2 ; warps
- warp 1, 3, 0, 237
- warp 2, 3, 0, 237
+ def_warps
+ warp 1, 3, 0, UNUSED_MAP_ED
+ warp 2, 3, 0, UNUSED_MAP_ED
- db 1 ; signs
+ def_signs
sign 3, 0, 1 ; SilphCoElevatorText1
- db 0 ; objects
+ def_objects
- ; warp-to
- warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH
- warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH
+ def_warps_to SILPH_CO_ELEVATOR