From 05699884d5114694103486021fd709dc58c2c899 Mon Sep 17 00:00:00 2001
From: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Date: Fri, 12 Nov 2021 21:19:06 +0100
Subject: [PATCH] Crits and Confusion bypass screens

---
 src/battle_util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 18847b8cc..ee0345355 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -8609,7 +8609,8 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
     if (((gSideStatuses[defSide] & SIDE_STATUS_REFLECT && IS_MOVE_PHYSICAL(move))
             || (gSideStatuses[defSide] & SIDE_STATUS_LIGHTSCREEN && IS_MOVE_SPECIAL(move))
             || (gSideStatuses[defSide] & SIDE_STATUS_AURORA_VEIL))
-        && abilityAtk != ABILITY_INFILTRATOR)
+        && abilityAtk != ABILITY_INFILTRATOR && !(isCrit)
+        && !gProtectStructs[gBattlerAttacker].confusionSelfDmg)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
             MulModifier(&finalModifier, UQ_4_12(0.66));