aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnneB1FRooms.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/SSAnneB1FRooms.asm
parentUse map constants for SilphCoElevator warps (diff)
downloadpokeyellow-4373aafac152f64621bf3d8c6b8d037cd9c76f7b.tar.gz
pokeyellow-4373aafac152f64621bf3d8c6b8d037cd9c76f7b.tar.xz
pokeyellow-4373aafac152f64621bf3d8c6b8d037cd9c76f7b.zip
Use def_warps_to macro for automatic warp_to entries
Diffstat (limited to 'data/maps/objects/SSAnneB1FRooms.asm')
-rwxr-xr-xdata/maps/objects/SSAnneB1FRooms.asm12
1 files changed, 1 insertions, 11 deletions
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
index ffd15990..20b3ef0a 100755
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -28,14 +28,4 @@ SSAnneB1FRooms_Object:
object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST
object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
- ; warp-to
- warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ def_warps_to SS_ANNE_B1F_ROOMS