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/Route10.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/Route10.asm (renamed from data/mapObjects/route10.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/Route10.asm index 90abb47d..12850577 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/Route10.asm @@ -1,10 +1,10 @@ -Route10Object: +Route10_Object: db $2c ; border block db 4 ; warps warp 11, 19, 0, ROCK_TUNNEL_POKECENTER - warp 8, 17, 0, ROCK_TUNNEL_1 - warp 8, 53, 2, ROCK_TUNNEL_1 + warp 8, 17, 0, ROCK_TUNNEL_1F + warp 8, 53, 2, ROCK_TUNNEL_1F warp 6, 39, 0, POWER_PLANT db 4 ; signs @@ -23,6 +23,6 @@ Route10Object: ; warp-to warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER - warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 - warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F + warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT |