aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarIsland.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/CinnabarIsland.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/CinnabarIsland.asm')
-rwxr-xr-xdata/maps/objects/CinnabarIsland.asm7
1 files changed, 1 insertions, 6 deletions
diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
index f908da0b..7e93bcb6 100755
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -19,9 +19,4 @@ CinnabarIsland_Object:
object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
- ; warp-to
- warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
- warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
- warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
- warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
- warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART
+ def_warps_to CINNABAR_ISLAND