diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:15:16 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:15:16 -0400 |
| commit | 78c0b78c55efb97739b060801aea89bf1ac3adc0 (patch) | |
| tree | be0b5c9969344ace993058b51f5a7768282dbc8c | |
| parent | f0125912eaf67644a7c32c18a0ba6940469ee1bb (diff) | |
Route 17... that was easy
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 214f2466..1e99ee16 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -28,7 +28,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route14_h) ; ROUTE_14 db $16 ; db BANK(Route15_h) ; ROUTE_15 db $16 ; db BANK(Route16_h) ; ROUTE_16 - db $15 ; db BANK(Route17_h) ; ROUTE_17 + db BANK(Route17_h) ; ROUTE_17 db BANK(Route18_h) ; ROUTE_18 db BANK(Route19_h) ; ROUTE_19 db BANK(Route20_h) ; ROUTE_20 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8418f195..18a0e9c7 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -28,7 +28,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $49a1 ; dw Route14_h dw $492c ; dw Route15_h dw $4ada ; dw Route16_h - dw $4b28 ; dw Route17_h + dw Route17_h dw Route18_h dw Route19_h dw Route20_h @@ -854,7 +854,10 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54bb0 + dr $54814,$54b28 + +INCLUDE "data/mapHeaders/route17.asm" +INCLUDE "data/mapObjects/route17.asm" Route17Blocks: INCBIN "maps/route17.blk" @@ -874,7 +877,8 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$55d58 + dr $556d0,$55b8e +INCLUDE "scripts/route17.asm" INCLUDE "scripts/route19.asm" INCLUDE "scripts/route21.asm" dr $56054,$56714 |