diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 20:01:27 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 20:01:27 -0400 |
| commit | 38d57913867d66d30bca12070d2cbc2bc5fc25ba (patch) | |
| tree | 9aebe477d9d4e2d32aa263e8b28bbf649ca9e8ac | |
| parent | dc8677aa1c1ef9ef8cc3fb217641ae6619a3dae6 (diff) | |
Route 8; all outdoor maps completed
| -rwxr-xr-x | data/mapObjects/route8.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 | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 5863129b..38bcca5e 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -3,9 +3,9 @@ Route8Object: ; 0x5814f (size=119) db $5 ; warps db $9, $1, $0, ROUTE_8_GATE - db $a, $1, $1, ROUTE_8_GATE + db $a, $1, $0, ROUTE_8_GATE db $9, $8, $2, ROUTE_8_GATE - db $a, $8, $3, ROUTE_8_GATE + db $a, $8, $2, ROUTE_8_GATE db $3, $d, $0, PATH_ENTRANCE_ROUTE_8 db $1 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 3268cdf8..060ebdc8 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -19,7 +19,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route5_h) ; ROUTE_5 db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 - db $16 ; db BANK(Route8_h) ; ROUTE_8 + db BANK(Route8_h) ; ROUTE_8 db BANK(Route9_h) ; ROUTE_9 db BANK(Route10_h) ; ROUTE_10 db BANK(Route11_h) ; ROUTE_11 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 70fa7aa0..704e7c2d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -19,7 +19,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route5_h dw Route6_h dw Route7_h - dw $412d ; dw Route8_h + dw Route8_h dw Route9_h dw Route10_h dw Route11_h @@ -913,7 +913,8 @@ INCLUDE "data/mapObjects/route6.asm" Route6Blocks: ; 58079 INCBIN "maps/route6.blk" - dr $5812d,$581c6 +INCLUDE "data/mapHeaders/route8.asm" +INCLUDE "data/mapObjects/route8.asm" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" @@ -955,7 +956,7 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$591d2 +INCLUDE "scripts/route8.asm" INCLUDE "scripts/route10.asm" INCLUDE "scripts/route11.asm" INCLUDE "scripts/route12.asm" |