Skip to content

Critical hit fix #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ddaretrogamer merged 2 commits into from
Sep 27, 2025
Merged

Critical hit fix #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2220ed0
fix critical hit (maybe)
fakuzatsu Sep 27, 2025
51bec1c
disable crits for sure
fakuzatsu Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/battle_script_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,6 +1970,9 @@ s32 CalcCritChanceStage(u32 battlerAtk, u32 battlerDef, u32 move, bool32 recordA
critChance = CRITICAL_HIT_BLOCKED;
}

if (critChance != CRITICAL_HIT_ALWAYS)
critChance = CRITICAL_HIT_BLOCKED;

return critChance;
}

Expand Down Expand Up @@ -2075,6 +2078,8 @@ static void Cmd_critcalc(void)
gSpecialStatuses[battlerDef].criticalHit = FALSE;
else if (gBattleStruct->critChance[battlerDef] == -2)
gSpecialStatuses[battlerDef].criticalHit = TRUE;
else if (PlayerIsDitto()) // Disable non-guarenteed crits
gSpecialStatuses[battlerDef].criticalHit = FALSE;
else
{
if (GetGenConfig(GEN_CONFIG_CRIT_CHANCE) == GEN_1)
Expand Down
Loading