Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace boolean multiplications with ternaries (#7653)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-08-30 11:22:02 +02:00 committed by GitHub
parent a4c473e73c
commit 7302de4209
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_script_commands.c
View File

@ -1630,12 +1630,12 @@ s32 CalcCritChanceStage(u32 battlerAtk, u32 battlerDef, u32 move, bool32 recordA
}
else
{
critChance = 2 * (gBattleMons[battlerAtk].volatiles.focusEnergy != 0)
+ 1 * (gBattleMons[battlerAtk].volatiles.dragonCheer != 0)
critChance = (gBattleMons[battlerAtk].volatiles.focusEnergy != 0 ? 2 : 0)
+ (gBattleMons[battlerAtk].volatiles.dragonCheer != 0 ? 1 : 0)
+ GetMoveCriticalHitStage(move)
+ GetHoldEffectCritChanceIncrease(battlerAtk, holdEffectAtk)
+ 2 * (B_AFFECTION_MECHANICS == TRUE && GetBattlerAffectionHearts(battlerAtk) == AFFECTION_FIVE_HEARTS)
+ (abilityAtk == ABILITY_SUPER_LUCK)
+ ((B_AFFECTION_MECHANICS == TRUE && GetBattlerAffectionHearts(battlerAtk) == AFFECTION_FIVE_HEARTS) ? 2 : 0)
+ (abilityAtk == ABILITY_SUPER_LUCK ? 1 : 0)
+ gBattleStruct->bonusCritStages[gBattlerAttacker];
if (critChance >= ARRAY_COUNT(sCriticalHitOdds))