diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-01-16 15:16:13 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-01-16 15:16:13 -0500 |
| commit | 02598831824a605fe66fe09dcdef7ad399dc0d7d (patch) | |
| tree | f969d2a7916010308633f25c970610d1a484d981 /engine/battle/moveEffects | |
| parent | More BankF documentation (diff) | |
| download | pokeyellow-02598831824a605fe66fe09dcdef7ad399dc0d7d.tar.gz pokeyellow-02598831824a605fe66fe09dcdef7ad399dc0d7d.tar.xz pokeyellow-02598831824a605fe66fe09dcdef7ad399dc0d7d.zip | |
More bankF documentation.
PrintCriticalOHKOText to AdjustDamageForMoveType
Diffstat (limited to 'engine/battle/moveEffects')
| -rw-r--r-- | engine/battle/moveEffects/heal_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/paralyze_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/recoil_effect.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index 7a1983d7..418f7df7 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -3,7 +3,7 @@ HealEffect_: ; f62ba (3d:62ba) and a ld de, wBattleMonHP ld hl, wBattleMonMaxHP - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] jr z, .healEffect ld de, wEnemyMonHP ld hl, wEnemyMonMaxHP diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index a8d39629..5cec6b02 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -1,6 +1,6 @@ ParalyzeEffect_: ; f6562 (3d:6562) ld hl, wEnemyMonStatus - ld de, W_PLAYERMOVETYPE + ld de, wPlayerMoveType ld a, [H_WHOSETURN] and a jp z, .next diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 984feba7..d65696e2 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -1,7 +1,7 @@ RecoilEffect_: ; 138f6 (4:78f6) ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] ld hl, wBattleMonMaxHP jr z, .recoilEffect ld a, [wEnemyMoveNum] |