diff options
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 18 |
3 files changed, 18 insertions, 8 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index a552d9fa..52f4b49f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -188,8 +188,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route15GateUpstairs_h) db BANK(Route16Gate_h) db BANK(Route16GateUpstairs_h) - db $07 ; db BANK(Route16House_h) - db $15 ; db BANK(Route12House_h) + db BANK(Route16House_h) + db BANK(Route12House_h) db BANK(Route18Gate_h) db BANK(Route18GateUpstairs_h) db $11 ; db BANK(SeafoamIslands1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 49293c55..0177e164 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -188,8 +188,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route15GateUpstairs_h dw Route16Gate_h dw Route16GateUpstairs_h - dw $5ef6 ; dw Route16House_h - dw $64a5 ; dw Route12House_h + dw Route16House_h + dw Route12House_h dw Route18Gate_h ;id=190 dw Route18GateUpstairs_h dw $487e ; dw SeafoamIslands1_h @@ -304,7 +304,8 @@ VermilionHouse1Blocks: LavenderHouse1Blocks: LavenderHouse2Blocks: SaffronHouse1Blocks: -SaffronHouse2Blocks: INCBIN "maps/viridianhouse.blk" +SaffronHouse2Blocks: +Route16HouseBlocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -431,7 +432,11 @@ PowerPlantBlocks: INCBIN "maps/powerplant.blk" INCLUDE "data/mapHeaders/diglettscaveroute11.asm" INCLUDE "scripts/diglettscaveroute11.asm" INCLUDE "data/mapObjects/diglettscaveroute11.asm" - dr $1def6,$1e06e ; map scripts + +INCLUDE "data/mapHeaders/route16house.asm" +INCLUDE "scripts/route16house.asm" +INCLUDE "data/mapObjects/route16house.asm" + dr $1df81,$1e06e ; map scripts INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" @@ -1243,7 +1248,8 @@ INCLUDE "data/mapObjects/route21.asm" Route21Blocks: INCBIN "maps/route21.blk" ; 5507d DayCareMBlocks: -VermilionHouse2Blocks: INCBIN "maps/daycarem.blk" +VermilionHouse2Blocks: +Route12HouseBlocks: INCBIN "maps/daycarem.blk" FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk" INCLUDE "engine/battle/experience.asm" @@ -1275,7 +1281,11 @@ INCLUDE "data/mapObjects/fuchsiahouse3.asm" INCLUDE "data/mapHeaders/daycarem.asm" INCLUDE "scripts/daycarem.asm" INCLUDE "data/mapObjects/daycarem.asm" - dr $564a5,$56714 + +INCLUDE "data/mapHeaders/route12house.asm" +INCLUDE "scripts/route12house.asm" +INCLUDE "data/mapObjects/route12house.asm" + dr $5652a,$56714 INCLUDE "engine/menu/diploma_1.asm" |