diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2017-08-10 00:43:16 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2017-08-10 00:43:16 +1200 |
| commit | a5e8fc7dfcb2ec286ba28f89a2116f2f4a36d80a (patch) | |
| tree | 680bdaed164fc3eba910e7aba571d26eae3bfec3 /engine/items | |
| parent | 82267acc6938eda87c89e720c7dbce364b252223 (diff) | |
| parent | a1ca8aa239837496f98e54c7c246fd9fb9c8a5e3 (diff) | |
Update to latest pokered
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 07c20534..65115fed 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: jp nc,.useVitamin ; if it's a vitamin or Rare Candy cp a,FULL_RESTORE jr nc,.healHP ; if it's a Full Restore or one of the potions -; fall through if it's one of the status-specifc healing items +; fall through if it's one of the status-specific healing items .cureStatusAilment ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status @@ -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 |