diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-03-09 22:09:03 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-04-05 07:54:20 +0200 |
| commit | 80d437d56562e3ec75f2b2fbc05443f4d2cbc0b4 (patch) | |
| tree | a0839396304b84dd0c8fa9205eaa6e3db41cac15 | |
| parent | 28c6eb83418c0bb7ade8c564406dbb710428f0fd (diff) | |
Fix some uses of EFFECTIVE
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/conversion2.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 43e28c5db..1f4da606d 100644 --- 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 |