diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/Route2.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/Route2.asm (renamed from data/mapObjects/route2.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/Route2.asm index b9f7ae19..9595fec0 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/Route2.asm @@ -1,13 +1,13 @@ -Route2Object: +Route2_Object: db $f ; border block db 7 ; 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 warp 17, 35, 1, ROUTE_2_GATE db 2 ; signs @@ -30,7 +30,7 @@ Route2Object: ; unused warp_to 2, 7, 4 dw $c712 - db $9, $7 + db $9, $7 warp_to 2, 7, 4 warp_to 2, 7, 4 warp_to 2, 7, 4 |