aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnneBow.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SSAnneBow.asm')
-rwxr-xr-xdata/maps/objects/SSAnneBow.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm
index ee434a79..b9f9eb3a 100755
--- a/data/maps/objects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
@@ -1,19 +1,17 @@
SSAnneBow_Object:
db $23 ; border block
- db 2 ; warps
+ def_warps
warp 13, 6, 0, SS_ANNE_3F
warp 13, 7, 0, SS_ANNE_3F
- db 0 ; signs
+ def_signs
- db 5 ; objects
+ def_objects
object SPRITE_SUPER_NERD, 5, 2, STAY, UP, 1 ; person
object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person
object SPRITE_COOLTRAINER_M, 7, 11, STAY, NONE, 3 ; person
object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1
object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
- ; warp-to
- warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
- warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
+ def_warps_to SS_ANNE_BOW