diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-04-08 19:04:36 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-04-08 19:04:36 -0600 |
| commit | adc6a3aac7d883f9833c7da3f5896935715291e7 (patch) | |
| tree | c084374aad2aa31165f9831440f1b7f82f0d04b0 /scripts/pewterpokecenter.asm | |
| parent | 72790bcbacc7405fe8d94d57c98adc45e0812705 (diff) | |
Clean up script labels in marts and Pokémon Centers.
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 |