From e9f33ce19c3f573cc7fb312d6869e711d5d9de4f Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 8 May 2017 02:54:20 -0500 Subject: =?UTF-8?q?Typo:=20SFX=5FPOKEFLUE=20=E2=86=92=20SFX=5FPOKEFLUTE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/music_constants.asm | 2 +- engine/items/items.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 57ad230d..5eb05b61 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -194,7 +194,7 @@ ENDM music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_Pokeflute + music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 diff --git a/engine/items/items.asm b/engine/items/items.asm index f8873a6e..057595df 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1846,12 +1846,12 @@ PlayedFluteHadEffectText: ; play out-of-battle pokeflute music ld a,$ff call PlaySound ; turn off music - ld a, SFX_POKEFLUE + ld a, SFX_POKEFLUTE ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wChannelSoundIDs + Ch2] - cp a, SFX_POKEFLUE + cp a, SFX_POKEFLUTE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done -- cgit v1.2.3