From f78e1e05dbd00a23da8bb97683fc686eb28a83b9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 10 Jul 2017 17:30:12 -0700 Subject: Label audio engine update methods --- engine/pinball_game/object_collision/blue_stage_resolve_collision.asm | 4 ++-- engine/pinball_game/object_collision/red_stage_resolve_collision.asm | 4 ++-- engine/pinball_game/save_game.asm | 4 ++-- engine/pinball_game/slot.asm | 4 ++-- engine/pinball_game/vertical_screen_transition.asm | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/pinball_game') diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm index 8cc2636..c9ac09d 100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -810,13 +810,13 @@ UpdatePikachuSaverAnimation_BlueField: ; 0x1d133 cp $1 jr nz, .asm_1d18c xor a - ld [wd85d], a + ld [wAudioEngineEnabled], a call Func_310a rst AdvanceFrame ld a, $1 callba PlayPikachuSoundClip ld a, $1 - ld [wd85d], a + ld [wAudioEngineEnabled], a ld a, $ff ld [wRumblePattern], a ld a, $60 diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm index 3e534b4..dcd080b 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -2392,13 +2392,13 @@ UpdatePikachuSaverAnimation_RedField: ; 0x1669e cp $1 jr nz, .asm_166f7 xor a - ld [wd85d], a + ld [wAudioEngineEnabled], a call Func_310a rst AdvanceFrame ld a, $1 callba PlayPikachuSoundClip ld a, $1 - ld [wd85d], a + ld [wAudioEngineEnabled], a ld a, $ff ld [wRumblePattern], a ld a, $60 diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm index 624a1a9..c1d65a8 100644 --- a/engine/pinball_game/save_game.asm +++ b/engine/pinball_game/save_game.asm @@ -4,9 +4,9 @@ SaveGame: ; 0xda05 ld bc, $0004 call AdvanceFrames call FadeOut - ld a, [wd849] + ld a, [wUpdateAudioEngineUsingTimerInterrupt] and a - call nz, Func_e5d + call nz, ToggleAudioEngineUpdateMethod call DisableLCD ld hl, hSTAT res 6, [hl] diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm index 3331fae..01e3bef 100644 --- a/engine/pinball_game/slot.asm +++ b/engine/pinball_game/slot.asm @@ -254,13 +254,13 @@ SlotRewardPikachuSaver: ; 0xef83 ld a, MAX_PIKACHU_SAVER_CHARGE ld [wPikachuSaverCharge], a xor a - ld [wd85d], a + ld [wAudioEngineEnabled], a call Func_310a rst AdvanceFrame ld a, $0 callba PlayPikachuSoundClip ld a, $1 - ld [wd85d], a + ld [wAudioEngineEnabled], a ret SlotRewardBonusMultiplier: ; 0xefa7 diff --git a/engine/pinball_game/vertical_screen_transition.asm b/engine/pinball_game/vertical_screen_transition.asm index 57ae6bb..59deb90 100644 --- a/engine/pinball_game/vertical_screen_transition.asm +++ b/engine/pinball_game/vertical_screen_transition.asm @@ -16,13 +16,13 @@ FieldVerticalTransition: ; 0xe674 ld [hOBP0], a ld [hOBP1], a rst AdvanceFrame - call Func_e5d + call ToggleAudioEngineUpdateMethod call DisableLCD call ClearOAMBuffer call Func_1129 call LoadStageCollisionAttributes call LoadStageData - call Func_e5d + call ToggleAudioEngineUpdateMethod call EnableLCD ld a, $e4 ld [hBGP], a -- cgit v1.2.3