diff options
| -rwxr-xr-x | data/mapObjects/celadonpokecenter.asm | 5 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rw-r--r-- | engine/bank3c.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | scripts/celadonpokecenter.asm | 10 | ||||
| -rwxr-xr-x | scripts/ceruleanpokecenter.asm | 6 | ||||
| -rwxr-xr-x | scripts/mtmoonpokecenter.asm | 2 | ||||
| -rwxr-xr-x | scripts/pewterpokecenter.asm | 6 | ||||
| -rwxr-xr-x | scripts/rocktunnelpokecenter.asm | 2 | ||||
| -rwxr-xr-x | scripts/vermilionpokecenter.asm | 6 | ||||
| -rwxr-xr-x | scripts/viridianpokecenter.asm | 6 |
12 files changed, 34 insertions, 23 deletions
diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index ccc30ce7..7429c190 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -7,11 +7,12 @@ CeladonPokecenterObject: ; 0x488d2 (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person + object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $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 CELADON_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 4262635f..06432efe 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -133,7 +133,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonMansion3_h) db BANK(CeladonMansion4_h) db BANK(CeladonMansion5_h) - db $12 ; db BANK(CeladonPokecenter_h) + db BANK(CeladonPokecenter_h) db $12 ; db BANK(CeladonGym_h) db $12 ; db BANK(CeladonGameCorner_h) db $12 ; db BANK(CeladonMart5_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9d3c5135..0556b7a2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -133,7 +133,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonMansion3_h ;id=130 dw CeladonMansion4_h dw CeladonMansion5_h - dw $48af ; dw CeladonPokecenter_h + dw CeladonPokecenter_h dw $4915 ; dw CeladonGym_h dw $4bc8 ; dw CeladonGameCorner_h dw $507f ; dw CeladonMart5_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 1e099f36..852af176 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -330,7 +330,7 @@ Pic_f0cf4: ; f0cf4 (3c:4cf4) GFX_f0d82: ; f0d82 (3c:4d82) dr $f0d82, $f0f12 -Func_f0f12: +PokecenterChanseyText: ld hl, NurseChanseyText call PrintText ld a, CHANSEY @@ -823,7 +823,6 @@ INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: SaffronPokecenterBlocks: LavenderPokecenterBlocks: -CeladonPokecenterBlocks: FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" @@ -872,6 +871,7 @@ Route7Blocks: ; 48051 INCBIN "maps/route7.blk" MtMoonPokecenterBlocks: RockTunnelPokecenterBlocks: +CeladonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" Route11GateBlocks: INCBIN "maps/route11gate.blk" @@ -933,7 +933,11 @@ INCLUDE "scripts/celadonmansion4.asm" INCLUDE "data/mapObjects/celadonmansion4.asm" CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk" - dr $488af,$492a9 + +INCLUDE "data/mapHeaders/celadonpokecenter.asm" +INCLUDE "scripts/celadonpokecenter.asm" +INCLUDE "data/mapObjects/celadonpokecenter.asm" + dr $48915,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm index 1b8d3a1b..4ff71c43 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/celadonpokecenter.asm @@ -7,12 +7,13 @@ CeladonPokecenterTextPointers: ; 488be (12:48be) dw CeladonPokecenterText2 dw CeladonPokecenterText3 dw CeladonPokecenterText4 + dw CeladonPokecenterText5 CeladonPokecenterText4: ; 488c6 (12:48c6) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST CeladonPokecenterText1: ; 488c7 (12:48c7) - db $ff + TX_POKECENTER_NURSE CeladonPokecenterText2: ; 488c8 (12:48c8) TX_FAR _CeladonPokecenterText2 @@ -21,3 +22,8 @@ CeladonPokecenterText2: ; 488c8 (12:48c8) CeladonPokecenterText3: ; 488cd (12:48cd) TX_FAR _CeladonPokecenterText3 db "@" + +CeladonPokecenterText5: + TX_ASM + callab PokecenterChanseyText + jp TextScriptEnd diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index f4eb68ae..5ee5d4a2 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -10,10 +10,10 @@ CeruleanPokecenterTextPointers: ; 5c64b (17:464b) dw CeruleanPokecenterText5 CeruleanPokecenterText4: ; 5c653 (17:4653) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST CeruleanPokecenterText1: ; 5c654 (17:4654) - db $ff + TX_POKECENTER_NURSE CeruleanPokecenterText2: ; 5c655 (17:4655) TX_FAR _CeruleanPokecenterText1 @@ -25,5 +25,5 @@ CeruleanPokecenterText3: ; 5c65a (17:465a) CeruleanPokecenterText5: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 320ed070..9c35686f 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -36,5 +36,5 @@ MtMoonPokecenterText6: ; 49375 (12:5375) MtMoonPokecenterText7: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 90f5e2b9..70cf17f6 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -14,7 +14,7 @@ PewterPokecenterTextPointers: ; 5c58d (17:458d) dw PewterPokecenterText6 PewterPokecenterText1: ; 5c595 (17:4595) - db $ff + TX_POKECENTER_NURSE PewterPokecenterText2: ; 5c596 (17:4596) TX_FAR _PewterPokecenterText1 @@ -26,7 +26,7 @@ PewterPokecenterText3: ; 5c59b (17:459b) jp TextScriptEnd PewterPokecenterText4: ; 5c60c (17:460c) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST PewterPokecenterText5: ; 5c603 (17:4603) TX_ASM @@ -35,5 +35,5 @@ PewterPokecenterText5: ; 5c603 (17:4603) PewterPokecenterText6: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm index 7d8f4bf6..3518bd8f 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/rocktunnelpokecenter.asm @@ -25,5 +25,5 @@ RockTunnelPokecenterText4: ; 493d3 (12:53d3) RockTunnelPokecenterText5: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm index 6796851f..72c232b7 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/vermilionpokecenter.asm @@ -10,7 +10,7 @@ VermilionPokecenterTextPointers: ; 5c995 (17:4995) dw VermilionPokecenterText5 VermilionPokecenterText1: ; 5c99d (17:499d) - db $ff + TX_POKECENTER_NURSE VermilionPokecenterText2: ; 5c99e (17:499e) TX_FAR _VermilionPokecenterText1 @@ -21,9 +21,9 @@ VermilionPokecenterText3: ; 5c9a3 (17:49a3) db "@" VermilionPokecenterText4: ; 5c9a8 (17:49a8) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST VermilionPokecenterText5: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index f8aed602..c2e2d283 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -10,7 +10,7 @@ ViridianPokecenterTextPointers: ; 44263 (11:4263) dw ViridianPokeCenterText5 ViridianPokeCenterText1: ; 4426b (11:426b) - db $ff + TX_POKECENTER_NURSE ViridianPokeCenterText2: ; 4426c (11:426c) TX_FAR _ViridianPokeCenterText1 @@ -21,9 +21,9 @@ ViridianPokeCenterText3: ; 44271 (11:4271) db "@" ViridianPokeCenterText4: ; 44276 (11:4276) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST ViridianPokeCenterText5: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd |