diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
| commit | 31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch) | |
| tree | 6941b2b38a2615223b30e8cceb7aab636768dabd /scripts/pewterpokecenter.asm | |
| parent | 93fe3064750c2b4ae6c243dafd9702c7248520c6 (diff) | |
| parent | 38ea9cd829c51fbfd1e5e89e94c073ea1987948d (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/pewterpokecenter.asm')
| -rwxr-xr-x | scripts/pewterpokecenter.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 46d4d509..9398d027 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -1,25 +1,25 @@ -PewterPokecenterScript: ; 5c587 (17:4587) +PewterPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -PewterPokecenterTextPointers: ; 5c58d (17:458d) - dw PewterPokecenterText1 +PewterPokecenterTextPointers: + dw PewterHealNurseText dw PewterPokecenterText2 - dw PewterPokecenterText3 - dw PewterPokecenterText4 + dw PewterJigglypuffText + dw PewterTradeNurseText -PewterPokecenterText1: ; 5c595 (17:4595) +PewterHealNurseText: db $ff -PewterPokecenterText2: ; 5c596 (17:4596) - TX_FAR _PewterPokecenterText1 +PewterPokecenterText2: + TX_FAR _PewterPokecenterText2 db "@" -PewterPokecenterText3: ; 5c59b (17:459b) +PewterJigglypuffText: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, PewterPokecenterText5 + ld hl, .Text call PrintText ld a, $ff call PlaySound @@ -70,16 +70,16 @@ PewterPokecenterText3: ; 5c59b (17:459b) call PlayDefaultMusic jp TextScriptEnd -PewterPokecenterText5: ; 5c603 (17:4603) - TX_FAR _PewterPokecenterText5 +.Text + TX_FAR _PewterJigglypuffText db "@" -JigglypuffFacingDirections: ; 5c608 (17:4608) +JigglypuffFacingDirections: db $30 | SPRITE_FACING_DOWN db $30 | SPRITE_FACING_LEFT db $30 | SPRITE_FACING_UP db $30 | SPRITE_FACING_RIGHT JigglypuffFacingDirectionsEnd: -PewterPokecenterText4: ; 5c60c (17:460c) +PewterTradeNurseText: db $f6 |