diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-28 17:09:19 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-28 17:09:19 -0500 |
| commit | 90c7b976dca2467f47c4916b3835414bb07cc4d1 (patch) | |
| tree | f2acf7019573d3b708339c704c51b8ecca77b6ea /engine/battle/moveEffects/conversion_effect.asm | |
| parent | bg_map_attributes.asm (diff) | |
| download | pokeyellow-90c7b976dca2467f47c4916b3835414bb07cc4d1.tar.gz pokeyellow-90c7b976dca2467f47c4916b3835414bb07cc4d1.tar.xz pokeyellow-90c7b976dca2467f47c4916b3835414bb07cc4d1.zip | |
engine/battle/moveEffects/substitute_effect.asm and ActivatePC
Also no more W_PLAYER/ENEMYBATTSTATUS
Diffstat (limited to 'engine/battle/moveEffects/conversion_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/conversion_effect.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index 968f27e9..5965f2a8 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -3,13 +3,13 @@ ConversionEffect_: ; 1396d (4:796d) ld de, wBattleMonType1 ld a, [H_WHOSETURN] and a - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] jr z, .conversionEffect push hl ld h, d ld l, e pop de - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] .conversionEffect bit Invulnerable, a ; is mon immune to typical attacks (dig/fly) jr nz, PrintButItFailedText |