diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 14:16:16 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-02 14:16:16 -0400 |
| commit | 564b0c65f3d4b2da54c598457fbb9152b18d97e5 (patch) | |
| tree | 4d19ba5c5c64912f984862a03938fd3859392506 | |
| parent | eb83973a646203425a52cbb80d03efcfdb04bc6a (diff) | |
Copycat's House 2F and Fighting Dojo
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 14 |
3 files changed, 16 insertions, 6 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 4793e452..026ae661 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -176,8 +176,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CinnabarMart_h) db BANK(IndigoPlateauLobby_h) db BANK(CopycatsHouse1F_h) - db $17 ; db BANK(CopycatsHouse2F_h) - db $17 ; db BANK(FightingDojo_h) + db BANK(CopycatsHouse2F_h) + db BANK(FightingDojo_h) db $17 ; db BANK(SaffronGym_h) db $07 ; db BANK(SaffronHouse1_h) db $17 ; db BANK(SaffronMart_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7c16b7e2..66f99bdf 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -176,8 +176,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CinnabarMart_h ; unused dw IndigoPlateauLobby_h dw CopycatsHouse1F_h - dw $4b5b ; dw CopycatsHouse2F_h - dw $4c47 ; dw FightingDojo_h + dw CopycatsHouse2F_h + dw FightingDojo_h dw $4ef7 ; dw SaffronGym_h dw $56db ; dw SaffronHouse1_h dw $52f3 ; dw SaffronMart_h ;id=180 @@ -1319,7 +1319,8 @@ SECTION "bank17",ROMX,BANK[$17] CeruleanMartBlocks: VermilionMartBlocks: LavenderMartBlocks: INCBIN "maps/ceruleanmart.blk" -RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" +RedsHouse2FBlocks: +CopycatsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" Museum1FBlocks: INCBIN "maps/museum1f.blk" Museum2FBlocks: INCBIN "maps/museum2f.blk" PewterPokecenterBlocks: @@ -1396,7 +1397,16 @@ INCLUDE "data/mapHeaders/vermiliongym.asm" INCLUDE "scripts/vermiliongym.asm" INCLUDE "data/mapObjects/vermiliongym.asm" VermilionGymBlocks: INCBIN "maps/vermiliongym.blk" - dr $5cb5b,$5d485 + +INCLUDE "data/mapHeaders/copycatshouse2f.asm" +INCLUDE "scripts/copycatshouse2f.asm" +INCLUDE "data/mapObjects/copycatshouse2f.asm" + +INCLUDE "data/mapHeaders/fightingdojo.asm" +INCLUDE "scripts/fightingdojo.asm" +INCLUDE "data/mapObjects/fightingdojo.asm" +FightingDojoBlocks: INCBIN "maps/fightingdojo.blk" + dr $5cef7,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" |