aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/LavenderTown.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/LavenderTown.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/LavenderTown.asm')
-rwxr-xr-xdata/maps/objects/LavenderTown.asm8
1 files changed, 1 insertions, 7 deletions
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
index 16f881d8..9dbd9802 100755
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -22,10 +22,4 @@ LavenderTown_Object:
object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person
object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person
- ; warp-to
- warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
- warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F
- warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE
- warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
- warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE
- warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE
+ def_warps_to LAVENDER_TOWN