diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:29:01 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:29:01 -0400 |
| commit | 02fc3889b255aece1c02a673f7239a03e7a2396f (patch) | |
| tree | b817480cfebd32f7ddb5809c3feb95eab3d72ca0 | |
| parent | d4a0fe908ffae83fd0be6f820df0780f727f2e4b (diff) | |
Route 15
| -rwxr-xr-x | data/mapObjects/route15.asm | 4 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 12 |
4 files changed, 13 insertions, 7 deletions
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index e0d19e5c..bd6283b0 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -3,9 +3,9 @@ Route15Object: ; 0x5894e (size=126) db $4 ; warps db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F + db $9, $7, $0, ROUTE_15_GATE_1F db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + db $9, $e, $2, ROUTE_15_GATE_1F db $1 ; signs db $9, $27, $c ; Route15Text12 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index b47d5d8c..69852516 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -26,7 +26,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) 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 $16 ; db BANK(Route15_h) ; ROUTE_15 + db BANK(Route15_h) ; ROUTE_15 db BANK(Route16_h) ; ROUTE_16 db BANK(Route17_h) ; ROUTE_17 db BANK(Route18_h) ; ROUTE_18 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 413616d9..ff68b4fb 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -26,7 +26,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $466d ; dw Route12_h dw $4814 ; dw Route13_h dw $49a1 ; dw Route14_h - dw $492c ; dw Route15_h + dw Route15_h dw Route16_h dw Route17_h dw Route18_h @@ -854,7 +854,9 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54b28 + dr $54814,$54a1a +Route14Blocks: +INCBIN "maps/route14.blk" INCLUDE "data/mapHeaders/route17.asm" INCLUDE "data/mapObjects/route17.asm" @@ -900,7 +902,10 @@ INCBIN "maps/route8.blk" dr $582d4,$5855f Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$589cc + dr $5866d,$5892c + +INCLUDE "data/mapHeaders/route15.asm" +INCLUDE "data/mapObjects/route15.asm" Route15Blocks: INCBIN "maps/route15.blk" @@ -922,7 +927,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$597cf + dr $59052,$5964a +INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" INCLUDE "scripts/route18.asm" dr $59a00,$5a53a |