From 90c7b976dca2467f47c4916b3835414bb07cc4d1 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sat, 28 Nov 2015 17:09:19 -0500 Subject: engine/battle/moveEffects/substitute_effect.asm and ActivatePC Also no more W_PLAYER/ENEMYBATTSTATUS --- engine/battle/moveEffects/conversion_effect.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/battle/moveEffects/conversion_effect.asm') 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 -- cgit v1.3.1-sl0p