diff options
| -rw-r--r-- | data/map_header_banks.asm | 6 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 6 | ||||
| -rwxr-xr-x | main.asm | 27 | ||||
| -rwxr-xr-x | scripts/pewterhouse1.asm | 3 |
4 files changed, 31 insertions, 11 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index d935a5ec..0dd10719 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -55,9 +55,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Museum1F_h) db BANK(Museum2F_h) db BANK(PewterGym_h) - db $07 ; db BANK(PewterHouse1_h) - db $1d ; db BANK(PewterMart_h) - db $07 ; db BANK(PewterHouse2_h) + db BANK(PewterHouse1_h) + db BANK(PewterMart_h) + db BANK(PewterHouse2_h) db $17 ; db BANK(PewterPokecenter_h) db $12 ; db BANK(MtMoon1_h) db $14 ; db BANK(MtMoon2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 06df0f27..a7a0763d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -55,9 +55,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Museum1F_h dw Museum2F_h dw PewterGym_h - dw $4e30 ; dw PewterHouse1_h - dw $44de ; dw PewterMart_h - dw $4e86 ; dw PewterHouse2_h + dw PewterHouse1_h + dw PewterMart_h + dw PewterHouse2_h dw $446e ; dw PewterPokecenter_h dw $5953 ; dw MtMoon1_h dw $5a78 ; dw MtMoon2_h ;id=60 @@ -295,6 +295,8 @@ OaksLabBlocks: INCBIN "maps/oakslab.blk" ViridianHouseBlocks: Route2HouseBlocks: +PewterHouse1Blocks: +PewterHouse2Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" @@ -317,7 +319,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -PewterMartBlocks: CeruleanMartBlocks: VermilionMartBlocks: LavenderMartBlocks: @@ -334,7 +335,16 @@ INCLUDE "data/mapObjects/school.asm" INCLUDE "data/mapHeaders/viridianhouse.asm" INCLUDE "scripts/viridianhouse.asm" INCLUDE "data/mapObjects/viridianhouse.asm" - dr $1ce30,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/pewterhouse1.asm" +INCLUDE "scripts/pewterhouse1.asm" +INCLUDE "data/mapObjects/pewterhouse1.asm" + +INCLUDE "data/mapHeaders/pewterhouse2.asm" +INCLUDE "scripts/pewterhouse2.asm" +INCLUDE "data/mapObjects/pewterhouse2.asm" + + dr $1cec3,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" @@ -1150,7 +1160,11 @@ INCLUDE "engine/save.asm" SECTION "bank1D",ROMX,BANK[$1D] - dr $74000,$7405c + dr $74000,$74010 + +PewterMartBlocks: +INCBIN "maps/pewtermart.blk" + dr $74020,$7405c INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/ceruleancity2.asm" @@ -1160,7 +1174,12 @@ INCLUDE "scripts/viridiangym.asm" INCLUDE "data/mapObjects/viridiangym.asm" ViridianGymBlocks: INCBIN "maps/viridiangym.blk" - dr $744de,$74726 + +INCLUDE "data/mapHeaders/pewtermart.asm" +INCLUDE "scripts/pewtermart.asm" +INCLUDE "data/mapObjects/pewtermart.asm" + + dr $7453d,$74726 VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) diff --git a/scripts/pewterhouse1.asm b/scripts/pewterhouse1.asm index a670f23c..a825b303 100755 --- a/scripts/pewterhouse1.asm +++ b/scripts/pewterhouse1.asm @@ -1,5 +1,6 @@ PewterHouse1Script: ; 1d5f3 (7:55f3) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret PewterHouse1TextPointers: ; 1d5f6 (7:55f6) dw PewterHouse1Text1 |