diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:32:45 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:32:45 -0400 |
| commit | 0c6ecb4054043b8c807065363f3d5d288d03db5d (patch) | |
| tree | 3d2b3ff15fb1daecdd17a1f8532a390ac89f8283 | |
| parent | 02fc3889b255aece1c02a673f7239a03e7a2396f (diff) | |
Route 14
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 69852516..fa275804 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -25,7 +25,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route11_h) ; ROUTE_11 db $16 ; db BANK(Route12_h) ; ROUTE_12 db $15 ; db BANK(Route13_h) ; ROUTE_13 - db $15 ; db BANK(Route14_h) ; ROUTE_14 + db BANK(Route14_h) ; ROUTE_14 db BANK(Route15_h) ; ROUTE_15 db BANK(Route16_h) ; ROUTE_16 db BANK(Route17_h) ; ROUTE_17 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ff68b4fb..0d36b121 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -25,7 +25,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $44be ; dw Route11_h dw $466d ; dw Route12_h dw $4814 ; dw Route13_h - dw $49a1 ; dw Route14_h + dw Route14_h dw Route15_h dw Route16_h dw Route17_h @@ -854,7 +854,12 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54a1a + dr $54814,$54893 +Route13Blocks: +INCBIN "maps/route13.blk" + +INCLUDE "data/mapHeaders/route14.asm" +INCLUDE "data/mapObjects/route14.asm" Route14Blocks: INCBIN "maps/route14.blk" @@ -879,7 +884,8 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$55b8e + dr $556d0,$559e7 +INCLUDE "scripts/route14.asm" INCLUDE "scripts/route17.asm" INCLUDE "scripts/route19.asm" INCLUDE "scripts/route21.asm" |