aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SaffronCity.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/SaffronCity.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/SaffronCity.asm')
-rwxr-xr-xdata/maps/objects/SaffronCity.asm10
1 files changed, 1 insertions, 9 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index 48329891..04e75c31 100755
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -40,12 +40,4 @@ SaffronCity_Object:
object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person
object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person
- ; warp-to
- warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F
- warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO
- warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM
- warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE
- warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART
- warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F
- warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER
- warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE
+ def_warps_to SAFFRON_CITY