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/Route2.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/Route2.asm (renamed from data/mapObjects/route2.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/Route2.asm index b62f9fdb..b27ad199 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/Route2.asm @@ -1,13 +1,13 @@ -Route2Object: +Route2_Object: db $f ; border block db 6 ; warps - warp 12, 9, 0, DIGLETTS_CAVE_EXIT - warp 3, 11, 1, VIRIDIAN_FOREST_EXIT - warp 15, 19, 0, ROUTE_2_HOUSE + warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 + warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 19, 0, ROUTE_2_TRADE_HOUSE warp 16, 35, 1, ROUTE_2_GATE warp 15, 39, 2, ROUTE_2_GATE - warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE + warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE db 2 ; signs sign 5, 65, 3 ; Route2Text3 @@ -18,12 +18,12 @@ Route2Object: object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP ; warp-to - warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE + warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 + warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE ; unused warp_to 2, 7, 4 |