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/Route7.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/Route7.asm (renamed from data/mapObjects/route7.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route7.asm b/data/mapObjects/Route7.asm index d32e6019..182904ef 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/Route7.asm @@ -1,4 +1,4 @@ -Route7Object: +Route7_Object: db $f ; border block db 5 ; warps @@ -6,7 +6,7 @@ Route7Object: warp 18, 10, 3, ROUTE_7_GATE warp 11, 9, 0, ROUTE_7_GATE warp 11, 10, 1, ROUTE_7_GATE - warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7 + warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 db 1 ; signs sign 3, 13, 1 ; Route7Text1 @@ -18,4 +18,4 @@ Route7Object: warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 5, 13, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 + warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7 |