summaryrefslogtreecommitdiff
path: root/data/maps/objects/CinnabarLab.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/CinnabarLab.asm
parentf4514ff53ce74d13013c994cfd321aa711fc95c2 (diff)
Use def_warps_to macro for automatic warp_to entries
Diffstat (limited to 'data/maps/objects/CinnabarLab.asm')
-rwxr-xr-xdata/maps/objects/CinnabarLab.asm7
1 files changed, 1 insertions, 6 deletions
diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm
index 1a4f182d..ac326748 100755
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -17,9 +17,4 @@ CinnabarLab_Object:
def_objects
object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_WIDTH
- warp_to 3, 7, CINNABAR_LAB_WIDTH
- warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
- warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
- warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM
+ def_warps_to CINNABAR_LAB