diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 19:36:12 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 19:36:12 -0400 |
| commit | 11e4037756a6eb9978a4fe8917552f08c4ee1b7a (patch) | |
| tree | 81bb39a93c58e18ccc04f49dbfe2b75f017479d1 | |
| parent | a4aae63a38867c65473756a265b7808e497812cb (diff) | |
Remaining map in bank 17
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 9 | ||||
| -rwxr-xr-x | maps/unusedblocks58d7d.blk | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index d0379b37..728b8675 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -233,7 +233,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $1d ; db BANK(CeruleanHouse2_h) db $01 ; unused db $11 ; db BANK(RockTunnel2_h) - db $17 ; db BANK(SilphCo9_h) + db BANK(SilphCo9_h) db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) db $11 ; db BANK(SilphCoElevator_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 54e7dc96..5b224ec3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -233,7 +233,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4643 ; dw CeruleanHouse2_h dw $5649 ; dw Route16Gate_h ; unused dw $624e ; dw RockTunnel2_h - dw $56ba ; dw SilphCo9_h + dw SilphCo9_h dw SilphCo10_h dw $6105 ; dw SilphCo11_h dw $5a08 ; dw SilphCoElevator_h @@ -1401,7 +1401,8 @@ Route16Blocks: INCBIN "maps/route16.blk" ; 58b84 INCLUDE "data/mapHeaders/route18.asm" INCLUDE "data/mapObjects/route18.asm" Route18Blocks: INCBIN "maps/route18.blk" - dr $58d7d,$58d99 + +INCBIN "maps/unusedblocks58d7d.blk" INCLUDE "engine/experience.asm" @@ -1590,7 +1591,11 @@ INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" INCLUDE "scripts/undergroundpathentranceroute7copy.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" - dr $5d6ba,$5d909 + +INCLUDE "data/mapHeaders/silphco9.asm" +INCLUDE "scripts/silphco9.asm" +INCLUDE "data/mapObjects/silphco9.asm" +SilphCo9Blocks: INCBIN "maps/silphco9.blk" INCLUDE "data/mapHeaders/victoryroad1.asm" INCLUDE "scripts/victoryroad1.asm" diff --git a/maps/unusedblocks58d7d.blk b/maps/unusedblocks58d7d.blk index 9641efe4..dd54efd9 100755 --- a/maps/unusedblocks58d7d.blk +++ b/maps/unusedblocks58d7d.blk @@ -1,2 +1,2 @@ -
!"# +
'"#
\ No newline at end of file |