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/Route12.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/Route12.asm (renamed from data/mapObjects/route12.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/Route12.asm index b72317d4..a9d84cf0 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/Route12.asm @@ -1,11 +1,11 @@ -Route12Object: +Route12_Object: db $43 ; border block db 4 ; warps warp 10, 15, 0, ROUTE_12_GATE_1F warp 11, 15, 1, ROUTE_12_GATE_1F warp 10, 21, 2, ROUTE_12_GATE_1F - warp 11, 77, 0, ROUTE_12_HOUSE + warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE db 2 ; signs sign 13, 13, 11 ; Route12Text11 @@ -27,4 +27,4 @@ Route12Object: warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_HOUSE + warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE |