ref: 80d437d56562e3ec75f2b2fbc05443f4d2cbc0b4
parent: 28c6eb83418c0bb7ade8c564406dbb710428f0fd
author: mid-kid <[email protected]>
date: Fri Mar 9 17:09:03 EST 2018
Fix some uses of EFFECTIVE
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1533,7 +1533,7 @@
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 @@
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 @@
and $7f
ret z
- cp 10
+ cp EFFECTIVE
ld de, SFX_DAMAGE
jr z, .play