summaryrefslogtreecommitdiff
path: root/data/maps/objects/SSAnne3F.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/SSAnne3F.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
parentd5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff)
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/SSAnne3F.asm')
-rwxr-xr-xdata/maps/objects/SSAnne3F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm
index cd493a96..af2760ad 100755
--- a/data/maps/objects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
@@ -1,15 +1,13 @@
SSAnne3F_Object:
db $c ; border block
- db 2 ; warps
+ def_warps
warp 0, 3, 0, SS_ANNE_BOW
warp 19, 3, 7, SS_ANNE_2F
- db 0 ; signs
+ def_signs
- db 1 ; objects
+ def_objects
object SPRITE_SAILOR, 9, 3, WALK, LEFT_RIGHT, 1 ; person
- ; warp-to
- warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW
- warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F
+ def_warps_to SS_ANNE_3F