diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 17:47:28 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 18:08:54 -0400 |
| commit | 4373aafac152f64621bf3d8c6b8d037cd9c76f7b (patch) | |
| tree | cd1c88a283f52e0d98211b84f181f169c4f3e526 /data/maps/objects/CeladonCity.asm | |
| parent | Use map constants for SilphCoElevator warps (diff) | |
| download | pokeyellow-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/CeladonCity.asm')
| -rwxr-xr-x | data/maps/objects/CeladonCity.asm | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 92ee0bce..cce4464d 100755 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -38,17 +38,4 @@ CeladonCity_Object: object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person - ; warp-to - warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER - warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM - warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F - warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM - warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE - warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL + def_warps_to CELADON_CITY |