diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/pewterpokecenter.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/pewterpokecenter.asm')
| -rwxr-xr-x | scripts/pewterpokecenter.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 70cf17f6..2d7f8713 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -1,11 +1,11 @@ -PewterPokecenterScript: ; 5c587 (17:4587) - ld hl, wPreventBlackout +PewterPokecenterScript: + ld hl, wd492 set 7, [hl] call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ret -PewterPokecenterTextPointers: ; 5c58d (17:458d) +PewterPokecenterTextPointers: dw PewterPokecenterText1 dw PewterPokecenterText2 dw PewterPokecenterText3 @@ -13,22 +13,22 @@ PewterPokecenterTextPointers: ; 5c58d (17:458d) dw PewterPokecenterText5 dw PewterPokecenterText6 -PewterPokecenterText1: ; 5c595 (17:4595) +PewterPokecenterText1: TX_POKECENTER_NURSE -PewterPokecenterText2: ; 5c596 (17:4596) +PewterPokecenterText2: TX_FAR _PewterPokecenterText1 db "@" -PewterPokecenterText3: ; 5c59b (17:459b) +PewterPokecenterText3: TX_ASM callba Func_f1da4 jp TextScriptEnd -PewterPokecenterText4: ; 5c60c (17:460c) +PewterPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST -PewterPokecenterText5: ; 5c603 (17:4603) +PewterPokecenterText5: TX_ASM callba Func_f1d98 jp TextScriptEnd |