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/Route20.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/Route20.asm (renamed from data/mapObjects/route20.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/Route20.asm index 5f4d5647..7bceef97 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/Route20.asm @@ -1,9 +1,9 @@ -Route20Object: +Route20_Object: db $43 ; border block db 2 ; warps - warp 48, 5, 0, SEAFOAM_ISLANDS_1 - warp 58, 9, 2, SEAFOAM_ISLANDS_1 + warp 48, 5, 0, SEAFOAM_ISLANDS_1F + warp 58, 9, 2, SEAFOAM_ISLANDS_1F db 2 ; signs sign 51, 7, 11 ; Route20Text11 @@ -22,5 +22,5 @@ Route20Object: object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 ; warp-to - warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F |