summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/core.asm2
-rw-r--r--engine/battle/move_effects/conversion2.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index fe20333b5..c94b2b8dd 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1533,7 +1533,7 @@ HandleFutureSight: ; 3ca26
xor a
ld [wAttackMissed], a
ld [wAlreadyDisobeyed], a
- ld a, 10
+ ld a, EFFECTIVE
ld [wTypeModifier], a
callfar DoMove
xor a
diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm
index 074ca93ba..c0e390926 100644
--- a/engine/battle/move_effects/conversion2.asm
+++ b/engine/battle/move_effects/conversion2.asm
@@ -50,7 +50,7 @@ BattleCommand_Conversion2: ; 359e6
ld [hl], a
pop hl
ld a, [wTypeMatchup]
- cp 10
+ cp EFFECTIVE
jr nc, .loop
call BattleCommand_SwitchTurn