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/CinnabarIsland.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/CinnabarIsland.asm (renamed from data/mapObjects/cinnabarisland.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/CinnabarIsland.asm index a66d6444..1932e134 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/CinnabarIsland.asm @@ -1,10 +1,10 @@ -CinnabarIslandObject: +CinnabarIsland_Object: db $43 ; border block db 5 ; warps - warp 6, 3, 1, MANSION_1 + warp 6, 3, 1, POKEMON_MANSION_1F warp 18, 3, 0, CINNABAR_GYM - warp 6, 9, 0, CINNABAR_LAB_1 + warp 6, 9, 0, CINNABAR_LAB warp 11, 11, 0, CINNABAR_POKECENTER warp 15, 11, 0, CINNABAR_MART @@ -20,8 +20,8 @@ CinnabarIslandObject: object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person ; warp-to - warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1 + warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM - warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART |