aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanCity.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/CeruleanCity.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/CeruleanCity.asm')
-rwxr-xr-xdata/maps/objects/CeruleanCity.asm12
1 files changed, 1 insertions, 11 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index fa28858e..aed54837 100755
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -34,14 +34,4 @@ CeruleanCity_Object:
object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person
object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
- ; warp-to
- warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
- warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE
- warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
- warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
- warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
- warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
- warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F
- warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
- warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
- warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
+ def_warps_to CERULEAN_CITY