aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/ViridianCity.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/ViridianCity.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/ViridianCity.asm')
-rwxr-xr-xdata/maps/objects/ViridianCity.asm7
1 files changed, 1 insertions, 6 deletions
diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm
index 9f7938e9..64940a65 100755
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -25,9 +25,4 @@ ViridianCity_Object:
object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person
object SPRITE_GAMBLER, 17, 5, WALK, LEFT_RIGHT, 7 ; person
- ; warp-to
- warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER
- warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART
- warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE
- warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE
- warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM
+ def_warps_to VIRIDIAN_CITY