diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /engine/overworld/healing_machine.asm | |
| parent | 604eb493c42b457f9e006e2cf67f29c15e0d1d0b (diff) | |
| parent | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokeredmerge-pokered
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 4648f68b..ed733d7d 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -21,13 +21,13 @@ AnimateHealingMachine: call StopAllMusic .waitLoop ld a, [wAudioFadeOutControl] - and a - jr nz, .waitLoop - ld a, [wPartyCount] ; wPartyCount + and a ; is fade-out finished? + jr nz, .waitLoop ; if not, check again + ld a, [wPartyCount] ld b, a .partyLoop call CopyHealingMachineOAM - ld a, $9e ; (SFX_02_4a - SFX_Headers_02) / 3 + ld a, SFX_HEALING_MACHINE call PlaySound ld c, 30 call DelayFrames @@ -38,18 +38,18 @@ AnimateHealingMachine: ld [wAudioSavedROMBank], a jr nz, .next call StopAllMusic - ld a, $2 ; BANK(Music_PkmnHealed) + ld a, BANK(Music_PkmnHealed) ld [wAudioROMBank], a .next - ld a, $e8 ; MUSIC_PKMN_HEALED + ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a call PlaySound ld d, $28 call FlashSprite8Times .waitLoop2 ld a, [wChannelSoundIDs] - cp $e8 ; MUSIC_PKMN_HEALED - jr z, .waitLoop2 + cp MUSIC_PKMN_HEALED ; is the healed music still playing? + jr z, .waitLoop2 ; if so, check gain ld c, 32 call DelayFrames pop af |