diff options
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rw-r--r-- | engine/overworld/healing_machine.asm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 62abc7ee..a081811b 100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -12,14 +12,13 @@ AnimateHealingMachine: push af ld a, $e0 ldh [rOBP1], a + call UpdateGBCPal_OBP1 ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData call CopyHealingMachineOAM ld a, 4 ld [wAudioFadeOutControl], a - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic .waitLoop ld a, [wAudioFadeOutControl] and a ; is fade-out finished? @@ -38,9 +37,7 @@ AnimateHealingMachine: cp BANK("Audio Engine 3") ld [wAudioSavedROMBank], a jr nz, .next - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld a, BANK(Music_PkmnHealed) ld [wAudioROMBank], a .next @@ -57,6 +54,7 @@ AnimateHealingMachine: call DelayFrames pop af ldh [rOBP1], a + call UpdateGBCPal_OBP1 pop hl pop af ld [hl], a @@ -67,14 +65,14 @@ PokeCenterFlashingMonitorAndHealBall: PokeCenterOAMData: ; heal machine monitor - dbsprite 6, 4, 4, 4, $7c, OAM_OBP1 + dbsprite 6, 4, 4, 4, $7c, OAM_OBP1 | OAM_HIGH_PALS ; poke balls 1-6 - dbsprite 6, 5, 0, 3, $7d, OAM_OBP1 - dbsprite 7, 5, 0, 3, $7d, OAM_OBP1 | OAM_HFLIP - dbsprite 6, 6, 0, 0, $7d, OAM_OBP1 - dbsprite 7, 6, 0, 0, $7d, OAM_OBP1 | OAM_HFLIP - dbsprite 6, 6, 0, 5, $7d, OAM_OBP1 - dbsprite 7, 6, 0, 5, $7d, OAM_OBP1 | OAM_HFLIP + dbsprite 6, 5, 0, 3, $7d, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 7, 5, 0, 3, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP + dbsprite 6, 6, 0, 0, $7d, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 7, 6, 0, 0, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP + dbsprite 6, 6, 0, 5, $7d, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 7, 6, 0, 5, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP ; d = value to xor with palette FlashSprite8Times: @@ -83,6 +81,7 @@ FlashSprite8Times: ldh a, [rOBP1] xor d ldh [rOBP1], a + call UpdateGBCPal_OBP1 ld c, 10 call DelayFrames dec b |