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/Route16.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/Route16.asm (renamed from data/mapObjects/route16.asm) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/Route16.asm index 0b84caa7..93531d13 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/Route16.asm @@ -1,4 +1,4 @@ -Route16Object: +Route16_Object: db $f ; border block db 9 ; warps @@ -10,7 +10,7 @@ Route16Object: warp 17, 5, 4, ROUTE_16_GATE_1F warp 24, 4, 6, ROUTE_16_GATE_1F warp 24, 5, 6, ROUTE_16_GATE_1F - warp 7, 5, 0, ROUTE_16_HOUSE + warp 7, 5, 0, ROUTE_16_FLY_HOUSE db 2 ; signs sign 27, 11, 8 ; Route16Text8 |