From 4c5de0998a756ecd2e4347f49fb2be16b4d96d74 Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Mon, 18 May 2020 08:51:30 -0400 Subject: [PATCH] Fixed chances of confusion self-damage. (#371) --- src/battle_util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 86de71de34..d31edb72cc 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2311,12 +2311,7 @@ u8 AtkCanceller_UnableToUseMove(void) gBattleMons[gBattlerAttacker].status2--; if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION) { - if (Random() % ((B_CONFUSION_SELF_DMG_CHANCE >= GEN_7) ? 3 : 2 == 0)) - { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - BattleScriptPushCursor(); - } - else // confusion dmg + if (Random() % ((B_CONFUSION_SELF_DMG_CHANCE >= GEN_7) ? 3 : 2 == 0)) // confusion dmg { gBattleCommunication[MULTISTRING_CHOOSER] = 1; gBattlerTarget = gBattlerAttacker; @@ -2324,6 +2319,11 @@ u8 AtkCanceller_UnableToUseMove(void) gProtectStructs[gBattlerAttacker].confusionSelfDmg = 1; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; } + else + { + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + BattleScriptPushCursor(); + } gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused; } else // snapped out of confusion