diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/move_effects/conversion2.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fe20333b5..de4830766 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -289,7 +289,7 @@ HandleBetweenTurnEffects: ; 3c1d6 .NoMoreFaintingConditions: call HandleLeftovers call HandleMysteryberry - call HanleDefrost + call HandleDefrost call HandleSafeguard call HandleScreens call HandleStatBoostingHeldItems @@ -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 @@ -1549,7 +1549,7 @@ HandleFutureSight: ; 3ca26 jp UpdateEnemyMonInParty ; 3ca8f -HanleDefrost: ; 3ca8f +HandleDefrost: ; 3ca8f ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK jr z, .enemy_first 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 |