Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-25 11:40:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected usage of B_AFFECTION_MECHANICS in CalcCritChanceStage

Browse Source
This commit is contained in:
LOuroboros
2022-06-22 08:42:31 -03:00
parent aa5c6a3f01
commit deef09112f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_script_commands.c
View File

@@ -1892,9 +1892,11 @@ s32 CalcCritChanceStage(u8 battlerAtk, u8 battlerDef, u32 move, bool32 recordAbi
+ (holdEffectAtk == HOLD_EFFECT_SCOPE_LENS)
+ 2 * (holdEffectAtk == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattlerAttacker].species == SPECIES_CHANSEY)
+ 2 * BENEFITS_FROM_LEEK(battlerAtk, holdEffectAtk)
+ (abilityAtk == ABILITY_SUPER_LUCK)
#if B_AFFECTION_MECHANICS == TRUE
+ (abilityAtk == ABILITY_SUPER_LUCK)
*= 2 (GetMonFriendshipScore(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]) >= 5);
#else
+ (abilityAtk == ABILITY_SUPER_LUCK);
#endif
if (critChance >= ARRAY_COUNT(sCriticalHitChance))