diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /engine/overworld/healing_machine.asm | |
| parent | Make pokeyellow build to baserom. (diff) | |
| parent | Merge pull request #114 from YamaArashi/master (diff) | |
| download | pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.gz pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.xz pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 23e24b23..e9310925 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,59 +1,58 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7 ld hl, vChars0 + $7c0 - ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03 + lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles call CopyVideoData ld hl, wUpdateSpritesEnabled ld a, [hl] push af ld [hl], $ff push hl - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] push af ld a, $e0 +<<<<<<< HEAD ld [rOBP1], a ; $ff49 call Func_3061 ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData ; $44d7 - call Func_7055a - ld a, $4 - ld [wMusicHeaderPointer], a + call CopyHealingMachineOAM + ld a, 4 + ld [wAudioFadeOutControl], a call StopAllMusic - ;ld a, $ff - ;ld [wc0ee], a - ;call PlaySound -.asm_704ba - ld a, [wMusicHeaderPointer] +.waitLoop + ld a, [wAudioFadeOutControl] and a - jr nz, .asm_704ba + jr nz, .waitLoop ld a, [wPartyCount] ; wPartyCount ld b, a -.asm_704c4 - call Func_7055a +.partyLoop + call CopyHealingMachineOAM ld a, $9e ; (SFX_02_4a - SFX_Headers_02) / 3 call PlaySound - ld c, $1e + ld c, 30 call DelayFrames dec b - jr nz, .asm_704c4 - ld a, [wc0ef] +<<<<<<< HEAD + jr nz, .partyLoop + ld a, [wAudioROMBank] cp $1f - ld [wc0f0], a - jr nz, .asm_704e6 + ld [wAudioSavedROMBank], a + jr nz, .next call StopAllMusic ld a, $2 ; BANK(Music_PkmnHealed) - ld [wc0ef], a -.asm_704e6 + ld [wAudioROMBank], a +.next ld a, $e8 ; MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld d, $28 call FlashSprite8Times -.asm_704f3 +.waitLoop2 ld a, [wc026] cp $e8 ; MUSIC_PKMN_HEALED - jr z, .asm_704f3 - ld c, $20 + jr z, .waitLoop2 + ld c, 32 call DelayFrames pop af ld [rOBP1], a ; $ff49 @@ -89,7 +88,8 @@ FlashSprite8Times: ; 70547 (1c:4547) jr nz, .loop ret -Func_7055a: ; 7055a (1c:455a) +CopyHealingMachineOAM: ; 7055a (1c:455a) +; copy one OAM entry and advance the pointers ld a, [de] inc de ld [hli], a |