aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/VermilionCity.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/VermilionCity.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/VermilionCity.asm')
-rwxr-xr-xdata/maps/objects/VermilionCity.asm11
1 files changed, 1 insertions, 10 deletions
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
index 7d39e369..e6a28cfd 100755
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -29,13 +29,4 @@ VermilionCity_Object:
object SPRITE_MONSTER, 29, 9, WALK, UP_DOWN, 5 ; person
object SPRITE_SAILOR, 25, 27, WALK, LEFT_RIGHT, 6 ; person
- ; warp-to
- warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER
- warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB
- warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART
- warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM
- warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE
- warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
- warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
- warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE
- warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE
+ def_warps_to VERMILION_CITY