diff options
Diffstat (limited to 'scripts')
| -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 |
7 files changed, 22 insertions, 16 deletions
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 |