diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /engine/overworld/healing_machine.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 90d306c3..d00bbc05 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,5 +1,5 @@ AnimateHealingMachine: ; 70433 (1c:4433) - ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7 + ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03 call CopyVideoData @@ -8,12 +8,12 @@ AnimateHealingMachine: ; 70433 (1c:4433) push af ld [hl], $ff push hl - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] push af ld a, $e0 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a ld hl, wOAMBuffer + $84 - ld de, PokeCenterOAMData ; $44d7 + ld de, PokeCenterOAMData call Func_70503 ld a, $4 ld [wMusicHeaderPointer], a @@ -24,18 +24,18 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld a, [wMusicHeaderPointer] and a jr nz, .asm_70464 - ld a, [wPartyCount] ; wPartyCount + ld a, [wPartyCount] ld b, a .asm_7046e call Func_70503 ld a, (SFX_02_4a - SFX_Headers_02) / 3 call PlaySound - ld c, $1e + ld c, 30 call DelayFrames dec b jr nz, .asm_7046e ld a, [wc0ef] - cp $1f + cp BANK(Music1f_UpdateMusic) ld [wc0f0], a jr nz, .asm_70495 ld a, $ff @@ -53,10 +53,10 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld a, [wc026] cp MUSIC_PKMN_HEALED jr z, .asm_704a2 - ld c, $20 + ld c, 32 call DelayFrames pop af - ld [rOBP1], a ; $ff49 + ld [rOBP1], a pop hl pop af ld [hl], a |