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/Route6.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/Route6.asm (renamed from data/mapObjects/route6.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/Route6.asm index e0eea85b..fc2d7e24 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/Route6.asm @@ -1,11 +1,11 @@ -Route6Object: +Route6_Object: db $f ; border block db 4 ; warps warp 9, 1, 2, ROUTE_6_GATE warp 10, 1, 2, ROUTE_6_GATE warp 10, 7, 0, ROUTE_6_GATE - warp 17, 13, 0, PATH_ENTRANCE_ROUTE_6 + warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 db 1 ; signs sign 19, 15, 7 ; Route6Text7 @@ -22,4 +22,4 @@ Route6Object: warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 17, 13, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 + warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6 |