From e1bc6849b844d819e13cc6b4fe246bc73cf7b5c2 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 19:09:30 -0400 Subject: Remaining maps in Bank 06 --- data/map_header_banks.asm | 6 +++--- data/map_header_pointers.asm | 6 +++--- main.asm | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index d605c3ea..14c096dd 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -209,9 +209,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $01 ; unused 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) + db BANK(SilphCo4_h) + db BANK(SilphCo5_h) + db BANK(SilphCo6_h) db $14 ; db BANK(SilphCo7_h) db $15 ; db BANK(SilphCo8_h) db $14 ; db BANK(Mansion2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 6bb5806f..672f8c75 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -209,9 +209,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RocketHideoutElevator_h ; unused dw SilphCo2_h dw SilphCo3_h - dw $5e09 ; dw SilphCo4_h - dw $6035 ; dw SilphCo5_h ;210 - dw $62a7 ; dw SilphCo6_h + dw SilphCo4_h + dw SilphCo5_h ;210 + dw SilphCo6_h dw $5b97 ; dw SilphCo7_h dw $652a ; dw SilphCo8_h dw $5ff5 ; dw Mansion2_h diff --git a/main.asm b/main.asm index f3807631..bf650f4b 100755 --- a/main.asm +++ b/main.asm @@ -282,7 +282,21 @@ INCLUDE "data/mapHeaders/indigoplateaulobby.asm" INCLUDE "scripts/indigoplateaulobby.asm" INCLUDE "data/mapObjects/indigoplateaulobby.asm" IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk" - dr $19e09,$1a4ea + +INCLUDE "data/mapHeaders/silphco4.asm" +INCLUDE "scripts/silphco4.asm" +INCLUDE "data/mapObjects/silphco4.asm" +SilphCo4Blocks: INCBIN "maps/silphco4.blk" + +INCLUDE "data/mapHeaders/silphco5.asm" +INCLUDE "scripts/silphco5.asm" +INCLUDE "data/mapObjects/silphco5.asm" +SilphCo5Blocks: INCBIN "maps/silphco5.blk" + +INCLUDE "data/mapHeaders/silphco6.asm" +INCLUDE "scripts/silphco6.asm" +INCLUDE "data/mapObjects/silphco6.asm" +SilphCo6Blocks: INCBIN "maps/silphco6.blk" INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" -- cgit v1.3.1-sl0p