diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:48:27 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:48:27 -0400 |
| commit | a202626b6e1daad2c0d6974cd9663f20e5526e40 (patch) | |
| tree | e500070c440a0eceae5774b2a6976fc46b58e669 | |
| parent | 117c154f56d932ef5fefdce7ed50ad081c5a4f6a (diff) | |
Route 10
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 9b66f8c9..338bd71c 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -21,7 +21,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route7_h) ; ROUTE_7 db $16 ; db BANK(Route8_h) ; ROUTE_8 db $15 ; db BANK(Route9_h) ; ROUTE_9 - db $16 ; db BANK(Route10_h) ; ROUTE_10 + db BANK(Route10_h) ; ROUTE_10 db BANK(Route11_h) ; ROUTE_11 db BANK(Route12_h) ; ROUTE_12 db BANK(Route13_h) ; ROUTE_13 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 03aa24f9..5359721f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -21,7 +21,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route7_h dw $412d ; dw Route8_h dw $468e ; dw Route9_h - dw $42d4 ; dw Route10_h + dw Route10_h dw Route11_h dw Route12_h dw Route13_h @@ -916,7 +916,8 @@ INCBIN "maps/route6.blk" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$58356 +INCLUDE "data/mapHeaders/route10.asm" +INCLUDE "data/mapObjects/route10.asm" Route10Blocks: INCBIN "maps/route10.blk" @@ -953,7 +954,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$592e8 + dr $59052,$591d2 +INCLUDE "scripts/route10.asm" INCLUDE "scripts/route11.asm" INCLUDE "scripts/route12.asm" INCLUDE "scripts/route15.asm" |