diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/CeruleanCity.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/CeruleanCity.asm (renamed from data/mapObjects/ceruleancity.asm) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/CeruleanCity.asm index 66d18a29..d5adcfd7 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/CeruleanCity.asm @@ -1,17 +1,17 @@ -CeruleanCityObject: +CeruleanCity_Object: db $f ; border block db 10 ; warps - warp 27, 11, 0, TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_HOUSE_1 + warp 27, 11, 0, CERULEAN_TRASHED_HOUSE + warp 13, 15, 0, CERULEAN_TRADE_HOUSE warp 19, 17, 0, CERULEAN_POKECENTER warp 30, 19, 0, CERULEAN_GYM warp 13, 25, 0, BIKE_SHOP warp 25, 25, 0, CERULEAN_MART - warp 4, 11, 0, UNKNOWN_DUNGEON_1 - warp 27, 9, 2, TRASHED_HOUSE - warp 9, 11, 1, CERULEAN_HOUSE_2 - warp 9, 9, 0, CERULEAN_HOUSE_2 + warp 4, 11, 0, CERULEAN_CAVE_1F + warp 27, 9, 2, CERULEAN_TRASHED_HOUSE + warp 9, 11, 1, CERULEAN_BADGE_HOUSE + warp 9, 9, 0, CERULEAN_BADGE_HOUSE db 6 ; signs sign 23, 19, 12 ; CeruleanCityText12 @@ -35,13 +35,13 @@ CeruleanCityObject: object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person ; warp-to - warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 + 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 ; UNKNOWN_DUNGEON_1 - warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 - warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 + 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 |