diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/Route6.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/Route6.asm (renamed from data/mapObjects/route6.asm) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/Route6.asm index a024d777..13825be1 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 |