diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 18:19:38 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 18:19:38 -0400 |
| commit | 1d93d0da4b1c576a1ed155bc76991daca772966c (patch) | |
| tree | c22ee4978da33b1bad58908149237878f1537359 | |
| parent | 8cdf73265f95e9a55112f373804867244512878d (diff) | |
Remaining maps in Bank 16
| -rw-r--r-- | data/map_header_banks.asm | 6 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 18 | ||||
| -rwxr-xr-x | main.asm | 16 |
3 files changed, 27 insertions, 13 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 04bee42f..d605c3ea 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -207,8 +207,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $01 ; unused db $01 ; unused db $01 ; unused - db $16 ; db BANK(SilphCo2_h) - db $16 ; db BANK(SilphCo3_h) + db BANK(SilphCo2_h) + db BANK(SilphCo3_h) db $06 ; db BANK(SilphCo4_h) db $06 ; db BANK(SilphCo5_h) db $06 ; db BANK(SilphCo6_h) @@ -234,7 +234,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $01 ; unused db $11 ; db BANK(RockTunnel2_h) db $17 ; db BANK(SilphCo9_h) - db $16 ; db BANK(SilphCo10_h) + db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) db $11 ; db BANK(SilphCoElevator_h) db $11 ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 501724af..6bb5806f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -207,8 +207,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RocketHideoutElevator_h ; unused dw RocketHideoutElevator_h ; unused dw RocketHideoutElevator_h ; unused - dw $5c80 ; dw SilphCo2_h - dw $5eea ; dw SilphCo3_h + dw SilphCo2_h + dw SilphCo3_h dw $5e09 ; dw SilphCo4_h dw $6035 ; dw SilphCo5_h ;210 dw $62a7 ; dw SilphCo6_h @@ -234,17 +234,17 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $5649 ; dw Route16Gate_h ; unused dw $624e ; dw RockTunnel2_h dw $56ba ; dw SilphCo9_h - dw $60c8 ; dw SilphCo10_h + dw SilphCo10_h dw $6105 ; dw SilphCo11_h dw $5a08 ; dw SilphCoElevator_h - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused dw TradeCenter_h dw Colosseum_h - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused dw $59ef ; dw Lorelei_h dw $5b4a ; dw Bruno_h dw $5ca1 ; dw Agatha_h ;247 @@ -1387,7 +1387,21 @@ INCLUDE "data/mapHeaders/fanclub.asm" INCLUDE "scripts/fanclub.asm" INCLUDE "data/mapObjects/fanclub.asm" FanClubBlocks: INCBIN "maps/fanclub.blk" - dr $59c80,$5a23d + +INCLUDE "data/mapHeaders/silphco2.asm" +INCLUDE "scripts/silphco2.asm" +INCLUDE "data/mapObjects/silphco2.asm" +SilphCo2Blocks: INCBIN "maps/silphco2.blk" + +INCLUDE "data/mapHeaders/silphco3.asm" +INCLUDE "scripts/silphco3.asm" +INCLUDE "data/mapObjects/silphco3.asm" +SilphCo3Blocks: INCBIN "maps/silphco3.blk" + +INCLUDE "data/mapHeaders/silphco10.asm" +INCLUDE "scripts/silphco10.asm" +INCLUDE "data/mapObjects/silphco10.asm" +SilphCo10Blocks: INCBIN "maps/silphco10.blk" INCLUDE "data/mapHeaders/lance.asm" INCLUDE "scripts/lance.asm" |