summaryrefslogtreecommitdiff
path: root/data/maps/objects/SSAnneB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SSAnneB1F.asm')
-rwxr-xr-xdata/maps/objects/SSAnneB1F.asm14
1 files changed, 4 insertions, 10 deletions
diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm
index fe54ea24..f3c6e0b9 100755
--- a/data/maps/objects/SSAnneB1F.asm
+++ b/data/maps/objects/SSAnneB1F.asm
@@ -1,7 +1,7 @@
SSAnneB1F_Object:
db $c ; border block
- db 6 ; warps
+ def_warps
warp 23, 3, 8, SS_ANNE_B1F_ROOMS
warp 19, 3, 6, SS_ANNE_B1F_ROOMS
warp 15, 3, 4, SS_ANNE_B1F_ROOMS
@@ -9,14 +9,8 @@ SSAnneB1F_Object:
warp 7, 3, 0, SS_ANNE_B1F_ROOMS
warp 27, 5, 9, SS_ANNE_1F
- db 0 ; signs
+ def_signs
- db 0 ; objects
+ def_objects
- ; warp-to
- warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F
+ def_warps_to SS_ANNE_B1F