diff options
| -rwxr-xr-x | data/mapObjects/saffronpokecenter.asm | 3 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 6 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 6 | ||||
| -rwxr-xr-x | main.asm | 26 | ||||
| -rwxr-xr-x | scripts/saffronpokecenter.asm | 10 |
5 files changed, 35 insertions, 16 deletions
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 8487bb01..bda46343 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -7,11 +7,12 @@ SaffronPokecenterObject: ; 0x5d54f (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 5b968c1e..322d2eb8 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -180,9 +180,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(FightingDojo_h) db BANK(SaffronGym_h) db BANK(SaffronHouse1_h) - db $17 ; db BANK(SaffronMart_h) - db $17 ; db BANK(SilphCo1_h) - db $17 ; db BANK(SaffronPokecenter_h) + db BANK(SaffronMart_h) + db BANK(SilphCo1_h) + db BANK(SaffronPokecenter_h) db BANK(SaffronHouse2_h) db $12 ; db BANK(Route15Gate_h) db $12 ; db BANK(Route15GateUpstairs_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8b4e634c..5fd190b6 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -180,9 +180,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw FightingDojo_h dw SaffronGym_h dw SaffronHouse1_h - dw $52f3 ; dw SaffronMart_h ;id=180 - dw $5338 ; dw SilphCo1_h - dw $541f ; dw SaffronPokecenter_h + dw SaffronMart_h ;id=180 + dw SilphCo1_h + dw SaffronPokecenter_h dw SaffronHouse2_h dw $558d ; dw Route15Gate_h dw $55d5 ; dw Route15GateUpstairs_h @@ -325,8 +325,7 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -CeladonMartBlocks: -SaffronMartBlocks: INCBIN "maps/viridianmart.blk" +CeladonMartBlocks:INCBIN "maps/viridianmart.blk" INCLUDE "data/mapHeaders/school.asm" INCLUDE "scripts/school.asm" @@ -827,8 +826,7 @@ SECTION "bank11",ROMX,BANK[$11] INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" -ViridianPokecenterBlocks: -SaffronPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" +ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" dr $440fb,$4410b INCLUDE "scripts/lavendertown.asm" @@ -1327,14 +1325,16 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] CeruleanMartBlocks: VermilionMartBlocks: -LavenderMartBlocks: INCBIN "maps/ceruleanmart.blk" +LavenderMartBlocks: +SaffronMartBlocks: INCBIN "maps/ceruleanmart.blk" RedsHouse2FBlocks: CopycatsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" Museum1FBlocks: INCBIN "maps/museum1f.blk" Museum2FBlocks: INCBIN "maps/museum2f.blk" PewterPokecenterBlocks: VermilionPokecenterBlocks: -LavenderPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" +LavenderPokecenterBlocks: +SaffronPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" UndergroundPathEntranceRoute5Blocks: UndergroundPathEntranceRoute6Blocks: UndergroundPathEntranceRoute7Blocks: @@ -1420,7 +1420,19 @@ INCLUDE "data/mapHeaders/saffrongym.asm" INCLUDE "scripts/saffrongym.asm" INCLUDE "data/mapObjects/saffrongym.asm" SaffronGymBlocks: INCBIN "maps/saffrongym.blk" - dr $5d2f3,$5d485 + +INCLUDE "data/mapHeaders/saffronmart.asm" +INCLUDE "scripts/saffronmart.asm" +INCLUDE "data/mapObjects/saffronmart.asm" + +INCLUDE "data/mapHeaders/silphco1.asm" +INCLUDE "scripts/silphco1.asm" +INCLUDE "data/mapObjects/silphco1.asm" +SilphCo1Blocks: INCBIN "maps/silphco1.blk" + +INCLUDE "data/mapHeaders/saffronpokecenter.asm" +INCLUDE "scripts/saffronpokecenter.asm" +INCLUDE "data/mapObjects/saffronpokecenter.asm" INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index 8f569a8e..05420812 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -7,9 +7,10 @@ SaffronPokecenterTextPointers: ; 5d53b (17:553b) dw SaffronPokecenterText2 dw SaffronPokecenterText3 dw SaffronPokecenterText4 + dw SaffronPokecenterText5 SaffronPokecenterText1: ; 5d543 (17:5543) - db $ff + TX_POKECENTER_NURSE SaffronPokecenterText2: ; 5d544 (17:5544) TX_FAR _SaffronPokecenterText1 @@ -20,4 +21,9 @@ SaffronPokecenterText3: ; 5d549 (17:5549) db "@" SaffronPokecenterText4: ; 5d54e (17:554e) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST + +SaffronPokecenterText5: + TX_ASM + callab PokecenterChanseyText + jp TextScriptEnd |