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/GameCorner.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/GameCorner.asm (renamed from data/mapObjects/celadongamecorner.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm index a09691d6..2704f6ab 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/GameCorner.asm @@ -1,10 +1,10 @@ -CeladonGameCornerObject: +GameCorner_Object: db $f ; border block db 3 ; warps warp 15, 17, 7, -1 warp 16, 17, 7, -1 - warp 17, 4, 1, ROCKET_HIDEOUT_1 + warp 17, 4, 1, ROCKET_HIDEOUT_B1F db 1 ; signs sign 9, 4, 12 ; CeladonGameCornerText12 @@ -25,4 +25,4 @@ CeladonGameCornerObject: ; warp-to warp_to 15, 17, GAME_CORNER_WIDTH warp_to 16, 17, GAME_CORNER_WIDTH - warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F |