diff options
| -rwxr-xr-x | data/mapObjects/lavenderpokecenter.asm | 5 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 13 | ||||
| -rwxr-xr-x | scripts/lavenderpokecenter.asm | 10 |
5 files changed, 25 insertions, 11 deletions
diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index b421c3a4..702e67b7 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -7,11 +7,12 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $5, $3, STAY, NONE, $2 ; person - object SPRITE_LITTLE_GIRL, $2, $6, WALK, $1, $3 ; person + object SPRITE_LITTLE_GIRL, $a, $5, WALK, $2, $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 LAVENDER_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e36b827c..e93540d5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -141,7 +141,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonDiner_h) db BANK(CeladonHouse_h) db BANK(CeladonHotel_h) - db $17 ; db BANK(LavenderPokecenter_h) + db BANK(LavenderPokecenter_h) db $18 ; db BANK(PokemonTower1_h) db $18 ; db BANK(PokemonTower2_h) db $18 ; db BANK(PokemonTower3_h) @@ -150,7 +150,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $18 ; db BANK(PokemonTower6_h) db $18 ; db BANK(PokemonTower7_h) db $07 ; db BANK(LavenderHouse1_h) - db $17 ; db BANK(LavenderMart_h) + db BANK(LavenderMart_h) db $07 ; db BANK(LavenderHouse2_h) db $07 ; db BANK(FuchsiaMart_h) db $1d ; db BANK(FuchsiaHouse1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7f00f77b..5418152f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -141,7 +141,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonDiner_h dw CeladonHouse_h dw CeladonHotel_h ;id=140 - dw $479c ; dw LavenderPokecenter_h + dw LavenderPokecenter_h dw $4420 ; dw PokemonTower1_h dw $44e7 ; dw PokemonTower2_h dw $46af ; dw PokemonTower3_h @@ -150,7 +150,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4ad2 ; dw PokemonTower6_h dw $4ce8 ; dw PokemonTower7_h dw $51a4 ; dw LavenderHouse1_h - dw $4802 ; dw LavenderMart_h ;id=150 + dw LavenderMart_h ;id=150 dw $52aa ; dw LavenderHouse2_h dw $5685 ; dw FuchsiaMart_h dw $4851 ; dw FuchsiaHouse1_h @@ -324,7 +324,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -LavenderMartBlocks: CeladonMartBlocks: SaffronMartBlocks: FuchsiaMartBlocks: @@ -822,7 +821,6 @@ LavenderTownBlocks: INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: SaffronPokecenterBlocks: -LavenderPokecenterBlocks: FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" @@ -1355,6 +1353,7 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] CeruleanMartBlocks: VermilionMartBlocks: +LavenderMartBlocks: INCBIN "maps/ceruleanmart.blk" RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" @@ -1364,6 +1363,7 @@ Museum2FBlocks: INCBIN "maps/museum2f.blk" PewterPokecenterBlocks: VermilionPokecenterBlocks: +LavenderPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" UndergroundPathEntranceRoute5Blocks: UndergroundPathEntranceRoute6Blocks: @@ -1420,7 +1420,14 @@ INCBIN "maps/ceruleangym.blk" INCLUDE "data/mapHeaders/ceruleanmart.asm" INCLUDE "scripts/ceruleanmart.asm" INCLUDE "data/mapObjects/ceruleanmart.asm" - dr $5c79c,$5c865 + +INCLUDE "data/mapHeaders/lavenderpokecenter.asm" +INCLUDE "scripts/lavenderpokecenter.asm" +INCLUDE "data/mapObjects/lavenderpokecenter.asm" + +INCLUDE "data/mapHeaders/lavendermart.asm" +INCLUDE "scripts/lavendermart.asm" +INCLUDE "data/mapObjects/lavendermart.asm" INCLUDE "data/mapHeaders/vermilionpokecenter.asm" INCLUDE "scripts/vermilionpokecenter.asm" diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index 452cc8a4..8f9c5454 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -7,12 +7,13 @@ LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0) dw LavenderPokecenterText2 dw LavenderPokecenterText3 dw LavenderPokecenterText4 + dw LavenderPokecenterText5 LavenderPokecenterText4: ; 5c8e8 (17:48e8) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST LavenderPokecenterText1: ; 5c8e9 (17:48e9) - db $ff + TX_POKECENTER_NURSE LavenderPokecenterText2: ; 5c8ea (17:48ea) TX_FAR _LavenderPokecenterText1 @@ -21,3 +22,8 @@ LavenderPokecenterText2: ; 5c8ea (17:48ea) LavenderPokecenterText3: ; 5c8ef (17:48ef) TX_FAR _LavenderPokecenterText3 db "@" + +LavenderPokecenterText5: + TX_ASM + callab PokecenterChanseyText + jp TextScriptEnd |