diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 21:20:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 21:20:02 -0400 |
| commit | d8dae96f35222ababb9688ce2aed3292515f8ca2 (patch) | |
| tree | dbb61bf4f2afab02d51f629a89f9505c0b262a60 /scripts/pewterpokecenter.asm | |
| parent | 8b3f9b244d72169e04a617eba0b36cae002b31a5 (diff) | |
Implement handy text macros from yellow
Diffstat (limited to 'scripts/pewterpokecenter.asm')
| -rwxr-xr-x | scripts/pewterpokecenter.asm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 9398d027..bea7a47d 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -9,7 +9,7 @@ PewterPokecenterTextPointers: dw PewterTradeNurseText PewterHealNurseText: - db $ff + TX_POKECENTER_NURSE PewterPokecenterText2: TX_FAR _PewterPokecenterText2 @@ -21,8 +21,7 @@ PewterJigglypuffText: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, .Text call PrintText - ld a, $ff - call PlaySound + StopAllMusic ld c, 32 call DelayFrames ld hl, JigglypuffFacingDirections @@ -30,7 +29,7 @@ PewterJigglypuffText: ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections call CopyData - ld a, [wSpriteStateData1 + 3 * $10 + $2] + ld a, [Sprite03SpriteImageIdx] ld hl, wJigglypuffFacingDirections .findMatchingFacingDirectionLoop cp [hl] @@ -44,7 +43,7 @@ PewterJigglypuffText: pop hl .loop ld a, [hl] - ld [wSpriteStateData1 + 3 * $10 + $2], a + ld [Sprite03SpriteImageIdx], a ; rotate the array push hl @@ -82,4 +81,4 @@ JigglypuffFacingDirections: JigglypuffFacingDirectionsEnd: PewterTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST |