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/GameCornerPrizeRoom.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/GameCornerPrizeRoom.asm (renamed from data/mapObjects/celadonprizeroom.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/GameCornerPrizeRoom.asm index bdaafe02..35cd3ac8 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/GameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoomObject: +GameCornerPrizeRoom_Object: db $f ; border block db 2 ; warps @@ -15,5 +15,5 @@ CeladonPrizeRoomObject: object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person ; warp-to - warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH - warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH + warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH + warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH |