summaryrefslogtreecommitdiff
path: root/data/maps/objects/SSAnne2F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
commite2c99f19103856426966e30cf1910d07995bb936 (patch)
tree513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/SSAnne2F.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/SSAnne2F.asm')
-rwxr-xr-xdata/maps/objects/SSAnne2F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index 97dbbcc1..d18935c6 100755
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -1,7 +1,7 @@
SSAnne2F_Object:
db $c ; border block
- db 9 ; warps
+ def_warps
warp 9, 11, 0, SS_ANNE_2F_ROOMS
warp 13, 11, 2, SS_ANNE_2F_ROOMS
warp 17, 11, 4, SS_ANNE_2F_ROOMS
@@ -12,9 +12,9 @@ SSAnne2F_Object:
warp 2, 12, 1, SS_ANNE_3F
warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM
- db 0 ; signs
+ def_signs
- db 2 ; objects
+ def_objects
object SPRITE_WAITER, 3, 7, WALK, UP_DOWN, 1 ; person
object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1