summaryrefslogtreecommitdiff
path: root/data/maps/objects/SSAnne1F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 17:47:28 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 18:08:54 -0400
commit4373aafac152f64621bf3d8c6b8d037cd9c76f7b (patch)
treecd1c88a283f52e0d98211b84f181f169c4f3e526 /data/maps/objects/SSAnne1F.asm
parentf4514ff53ce74d13013c994cfd321aa711fc95c2 (diff)
Use def_warps_to macro for automatic warp_to entries
Diffstat (limited to 'data/maps/objects/SSAnne1F.asm')
-rwxr-xr-xdata/maps/objects/SSAnne1F.asm13
1 files changed, 1 insertions, 12 deletions
diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm
index 511ec20b..56c95a68 100755
--- a/data/maps/objects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
@@ -20,15 +20,4 @@ SSAnne1F_Object:
object SPRITE_WAITER, 12, 6, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
- ; warp-to
- warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
- warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
- warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F
- warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F
- warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN
+ def_warps_to SS_ANNE_1F