diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/4_2.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 16 | ||||
| -rwxr-xr-x | engine/evolution.asm | 2 | ||||
| -rwxr-xr-x | engine/items/items.asm | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm index bac0a2d1..ea29cca7 100755 --- a/engine/battle/4_2.asm +++ b/engine/battle/4_2.asm @@ -45,7 +45,7 @@ EndOfBattle: ; 137aa (4:77aa) predef EvolutionAfterBattle .resetVariables xor a - ld [wd083], a + ld [wLowHealthAlarm], a ;disable low health alarm ld [wc02a], a ld [W_ISINBATTLE], a ld [W_BATTLETYPE], a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 63be5676..e76a2720 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -947,7 +947,7 @@ EnemyMonFaintedText: ; 0x3c63e Func_3c643: ; 3c643 (f:4643) xor a - ld [wd083], a + ld [wLowHealthAlarm], a ;disable low health alarm ld [wc02a], a inc a ld [wccf6], a @@ -1089,15 +1089,15 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) predef FlagActionPredef ; clear gain exp flag for fainted mon ld hl, W_ENEMYBATTSTATUS1 res 2, [hl] ; reset "attacking multiple times" flag - ld a, [wd083] + ld a, [wLowHealthAlarm] bit 7, a ; skip sound flag (red bar (?)) jr z, .skipWaitForSound ld a, $ff - ld [wd083], a + ld [wLowHealthAlarm], a ;disable low health alarm call WaitForSoundToFinish .skipWaitForSound ; bug? if the player mon faints while the enemy mon is using bide, -; the accumulated damage is overwritten. xxx what values can [wd083] have here? +; the accumulated damage is overwritten. xxx what values can [wLowHealthAlarm] have here? ld hl, wEnemyBideAccumulatedDamage ld [hli], a ld [hl], a @@ -1934,16 +1934,16 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) cp $2 jr z, .asm_3cde6 .asm_3cdd9 - ld hl, wd083 - bit 7, [hl] + ld hl, wLowHealthAlarm + bit 7, [hl] ;low health alarm enabled? ld [hl], $0 ret z xor a ld [wc02a], a ret .asm_3cde6 - ld hl, wd083 - set 7, [hl] + ld hl, wLowHealthAlarm + set 7, [hl] ;enable low health alarm ret DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) diff --git a/engine/evolution.asm b/engine/evolution.asm index 5842f1a2..7ae88fdf 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -7,7 +7,7 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld a, [wd0b5] push af xor a - ld [wd083], a + ld [wLowHealthAlarm], a ld [wc02a], a dec a ld [wc0ee], a diff --git a/engine/items/items.asm b/engine/items/items.asm index c1268cd5..605e5dde 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -858,7 +858,7 @@ ItemUseMedicine: ; dabb (3:5abb) jp .cureStatusAilment .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a - ld [wd083],a + ld [wLowHealthAlarm],a ;disable low health alarm ld [wc02a],a push hl push de @@ -1645,7 +1645,7 @@ ItemUsePokeflute: ; e140 (3:6140) ; if some pokemon were asleep ld hl,PlayedFluteHadEffectText call PrintText - ld a,[wd083] + ld a,[wLowHealthAlarm] and a,$80 jr nz,.skipMusic call WaitForSoundToFinish ; wait for sound to end |