diff options
| author | IIMarckus <iimarckus@gmail.com> | 2019-08-16 01:03:03 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2019-08-16 01:03:03 -0600 |
| commit | 2176239aa565126b528facc9041ed3b58eaade90 (patch) | |
| tree | 4589377cff104542abb2ee309496b5e4786eb59f /items | |
| parent | 901e6f25deda73fa7053942d7d094108a73e2bea (diff) | |
Incorporate the rest of the audio engine.
Diffstat (limited to 'items')
| -rwxr-xr-x | items/item_effects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 2e87ed74..51523d62 100755 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1417,7 +1417,7 @@ Functionf12c: ; f12c (3:712c) predef FlagPredef .asm_f15a xor a - ld [wDanger], a + ld [wLowHealthAlarm], a ld a, [wd002] cp REVIVE jr z, .asm_f16a @@ -1451,7 +1451,7 @@ FullRestore: ; f17e (3:717e) Functionf19a: ; f19a (3:719a) xor a - ld [wDanger], a + ld [wLowHealthAlarm], a call Functionf319 ld a, $20 call GetPartyParamLocation @@ -1528,7 +1528,7 @@ Functionf1ff: ; f1ff (3:71ff) ld a, $1 ret nc xor a - ld [wDanger], a + ld [wLowHealthAlarm], a call Functionf3eb call Functionf327 call RestoreBattlemonHP @@ -2060,7 +2060,7 @@ PokeFlute: ; f55c (3:755c) jp z, PrintText ld hl, Text_PlayedThePokeFlute ; $75c6 call PrintText - ld a, [wDanger] + ld a, [wLowHealthAlarm] and $80 jr nz, .asm_f59e .asm_f59e |