diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
| commit | f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch) | |
| tree | c5eb931244f739bd3a88d488586923b2a0762b74 /scripts/pewterpokecenter.asm | |
| parent | cd649184f556db777d592671a7274bfa4a8423d7 (diff) | |
Rename/organize part 2 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
Diffstat (limited to 'scripts/pewterpokecenter.asm')
| -rwxr-xr-x | scripts/pewterpokecenter.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 4cc4ffd2..8b2ac8f9 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -23,7 +23,7 @@ PewterPokecenterText3: ; 5c59b (17:459b) call PrintText ld a, $ff call PlaySound - ld c, $20 + ld c, 32 call DelayFrames ld hl, JigglypuffFacingDirections ld de, wTrainerFacingDirection @@ -34,7 +34,7 @@ PewterPokecenterText3: ; 5c59b (17:459b) .asm_5c5c3 cp [hl] inc hl - jr nz, .asm_5c5c3 ; 0x5c5c5 $fc + jr nz, .asm_5c5c3 dec hl push hl ld c, BANK(Music_JigglypuffSong) @@ -52,14 +52,14 @@ PewterPokecenterText3: ; 5c59b (17:459b) ld a, [wTrainerEngageDistance] ld [wcd42], a pop hl - ld c, $18 + ld c, 24 call DelayFrames ld a, [wc026] ld b, a ld a, [wc027] or b - jr nz, .asm_5c5d1 ; 0x5c5f6 $d9 - ld c, $30 + jr nz, .asm_5c5d1 + ld c, 48 call DelayFrames call PlayDefaultMusic jp TextScriptEnd |