diff options
| -rwxr-xr-x | data/mapObjects/fuchsiapokecenter.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 | 15 | ||||
| -rwxr-xr-x | scripts/fuchsiapokecenter.asm | 6 |
5 files changed, 25 insertions, 9 deletions
diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 19b2c950..8a1c392b 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -7,11 +7,12 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person + object SPRITE_ROCKER, $4, $3, STAY, UP, $2 ; person object SPRITE_LASS, $6, $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 FUCHSIA_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 31c629f5..83716936 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -153,8 +153,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(LavenderMart_h) db BANK(LavenderHouse2_h) db BANK(FuchsiaMart_h) - db $1d ; db BANK(FuchsiaHouse1_h) - db $1d ; db BANK(FuchsiaPokecenter_h) + db BANK(FuchsiaHouse1_h) + db BANK(FuchsiaPokecenter_h) db $1d ; db BANK(FuchsiaHouse2_h) db $1d ; db BANK(SafariZoneEntrance_h) db $1d ; db BANK(FuchsiaGym_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index eb0bb978..866ccb8a 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -153,8 +153,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw LavenderMart_h ;id=150 dw LavenderHouse2_h dw FuchsiaMart_h - dw $4851 ; dw FuchsiaHouse1_h - dw $489c ; dw FuchsiaPokecenter_h + dw FuchsiaHouse1_h + dw FuchsiaPokecenter_h dw $4902 ; dw FuchsiaHouse2_h dw $4a1a ; dw SafariZoneEntrance_h dw $4bd9 ; dw FuchsiaGym_h @@ -820,7 +820,6 @@ INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: SaffronPokecenterBlocks: -FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" dr $440fb,$4410b @@ -1593,7 +1592,9 @@ SECTION "bank1D",ROMX,BANK[$1D] dr $74000,$74010 PewterMartBlocks: INCBIN "maps/pewtermart.blk" - dr $74020,$7405c +FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" +FuchsiaPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk" + dr $7404c,$7405c INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/ceruleancity2.asm" @@ -1610,7 +1611,15 @@ INCLUDE "data/mapObjects/pewtermart.asm" dr $7453d,$74726 INCLUDE "engine/menu/vending_machine.asm" - dr $74851,$757a0 + +INCLUDE "data/mapHeaders/fuchsiahouse1.asm" +INCLUDE "scripts/fuchsiahouse1.asm" +INCLUDE "data/mapObjects/fuchsiahouse1.asm" + +INCLUDE "data/mapHeaders/fuchsiapokecenter.asm" +INCLUDE "scripts/fuchsiapokecenter.asm" +INCLUDE "data/mapObjects/fuchsiapokecenter.asm" + dr $74902,$757a0 INCLUDE "data/mapHeaders/gary.asm" INCLUDE "scripts/gary.asm" diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm index 26f88844..2ad3ac01 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/fuchsiapokecenter.asm @@ -7,6 +7,7 @@ FuchsiaPokecenterTextPointers: ; 75069 (1d:5069) dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText3 dw FuchsiaPokecenterText4 + dw FuchsiaPokecenterText5 FuchsiaPokecenterText1: ; 75071 (1d:5071) db $ff @@ -21,3 +22,8 @@ FuchsiaPokecenterText3: ; 75077 (1d:5077) FuchsiaPokecenterText4: ; 7507c (1d:507c) db $f6 + +FuchsiaPokecenterText5: + TX_ASM + callab PokecenterChanseyText + jp TextScriptEnd |