diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
| commit | 38065a744de1065cc021a4cafe22476f8425448d (patch) | |
| tree | a37a103d7c22f3cc5f62689e5062877961493caa /engine/battle/moveEffects/drain_hp_effect.asm | |
| parent | Merge pull request #116 from YamaArashi/master (diff) | |
| download | pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.gz pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.xz pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.zip | |
No more W_
Diffstat (limited to 'engine/battle/moveEffects/drain_hp_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/drain_hp_effect.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index 1096794f..ffa75c13 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -1,5 +1,5 @@ DrainHPEffect_: ; 783f (1:783f) - ld hl, W_DAMAGE + ld hl, wDamage ld a, [hl] srl a ; divide damage by 2 ld [hli], a @@ -36,12 +36,12 @@ DrainHPEffect_: ; 783f (1:783f) dec bc ld [bc], a ; add damage to attacker's HP and copy new HP to wHPBarNewHP - ld a, [W_DAMAGE + 1] + ld a, [wDamage + 1] ld b, [hl] add b ld [hld], a ld [wHPBarNewHP], a - ld a, [W_DAMAGE] + ld a, [wDamage] ld b, [hl] adc b ld [hli], a @@ -85,9 +85,9 @@ DrainHPEffect_: ; 783f (1:783f) ld hl, SuckedHealthText ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] jr z, .next3 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .next3 cp DREAM_EATER_EFFECT jr nz, .printText |