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/Route12.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/Route12.asm (renamed from data/mapObjects/route12.asm) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/Route12.asm index 394bae3d..8043b5db 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, 0, 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 |