diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-28 17:55:14 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-28 17:55:14 -0500 |
| commit | 2e3b58e6207997315cd69bf50968494b3b2b982b (patch) | |
| tree | 104e499b82988166a41f778ac9f6e5132f307022 /engine/battle/moveEffects | |
| parent | Bank9 misc. functions (diff) | |
| download | pokeyellow-2e3b58e6207997315cd69bf50968494b3b2b982b.tar.gz pokeyellow-2e3b58e6207997315cd69bf50968494b3b2b982b.tar.xz pokeyellow-2e3b58e6207997315cd69bf50968494b3b2b982b.zip | |
BankA misc functions
predefsA.asm (replaces predefs12.asm), and LeechSeedEffect_
Diffstat (limited to 'engine/battle/moveEffects')
| -rw-r--r-- | engine/battle/moveEffects/leech_seed_effect.asm | 8 | ||||
| -rw-r--r-- | engine/battle/moveEffects/one_hit_ko_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/paralyze_effect.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm index 769e9ed9..ef649ff6 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm @@ -1,6 +1,6 @@ -LeechSeedEffect_: ; 2bea9 (a:7ea9) +LeechSeedEffect_: ; 2bdba (a:7dba) callab MoveHitTest - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .moveMissed ld hl, wEnemyBattleStatus2 @@ -31,10 +31,10 @@ LeechSeedEffect_: ; 2bea9 (a:7ea9) ld hl, EvadedAttackText jp PrintText -WasSeededText: ; 2bef2 (a:7ef2) +WasSeededText: ; 2be03 (a:7e03) TX_FAR _WasSeededText db "@" -EvadedAttackText: ; 2bef7 (a:7ef7) +EvadedAttackText: ; 2be08 (a:7e08) TX_FAR _EvadedAttackText db "@" diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm index 12f70b90..28973356 100644 --- a/engine/battle/moveEffects/one_hit_ko_effect.asm +++ b/engine/battle/moveEffects/one_hit_ko_effect.asm @@ -34,5 +34,5 @@ OneHitKOEffect_: ; f64db (3d:64db) .userIsSlower ; keep damage at 0 and set move missed flag if target's current speed is higher instead ld a, $1 - ld [W_MOVEMISSED], a + ld [wMoveMissed], a ret diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index 3e0cf062..9b364425 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -28,7 +28,7 @@ ParalyzeEffect_: ; f6562 (3d:6562) push hl callab MoveHitTest pop hl - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .didntAffect set PAR, [hl] |