From 3623694789225a4a4dbece35d81c11f1dc72f5ef Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 20 Mar 2024 19:19:18 -0300 Subject: [PATCH] Actually remove unused STATUS3_CANT_SCORE_A_CRIT (#4293) --- include/constants/battle.h | 2 +- src/battle_script_commands.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/constants/battle.h b/include/constants/battle.h index 9a3654195e..17606586af 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -167,7 +167,7 @@ #define STATUS3_YAWN_TURN(num) (((num) << 11) & STATUS3_YAWN) #define STATUS3_IMPRISONED_OTHERS (1 << 13) #define STATUS3_GRUDGE (1 << 14) -#define STATUS3_CANT_SCORE_A_CRIT (1 << 15) +#define STATUS3___UNUSED (1 << 15) #define STATUS3_GASTRO_ACID (1 << 16) #define STATUS3_EMBARGO (1 << 17) #define STATUS3_UNDERWATER (1 << 18) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 43071ff5f6..e3c6b2f7a5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1893,7 +1893,7 @@ s32 CalcCritChanceStageArgs(u32 battlerAtk, u32 battlerDef, u32 move, bool32 rec { s32 critChance = 0; - if (gSideStatuses[battlerDef] & SIDE_STATUS_LUCKY_CHANT || gStatuses3[battlerAtk] & STATUS3_CANT_SCORE_A_CRIT + if (gSideStatuses[battlerDef] & SIDE_STATUS_LUCKY_CHANT || abilityDef == ABILITY_BATTLE_ARMOR || abilityDef == ABILITY_SHELL_ARMOR) { critChance = -1;