Fix some uses of EFFECTIVE

2018-03-09 22:09:03 +01:00 · 2018-03-09 22:09:03 +01:00 · 80d437d565
parent 28c6eb8341
commit 80d437d565
3 changed files with 3 additions and 3 deletions
--- 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
--- 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

--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@ -1338,7 +1338,7 @@ PlayHitSound: ; cc881
 	and $7f
 	ret z

-	cp 10
+	cp EFFECTIVE
 	ld de, SFX_DAMAGE
 	jr z, .play