ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 03:58:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update src/battle_util.c

Browse Source 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
This commit is contained in:
ExpoSeed 2021-06-04 21:26:15 -05:00 committed by GitHub
parent 8810809849
commit aefd5e26d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_util.c
View File

@ -7977,7 +7977,7 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
MulModifier(&finalModifier, UQ_4_12(2.0)); MulModifier(&finalModifier, UQ_4_12(2.0));
if (gBattleMoves[move].flags & FLAG_DMG_UNDERWATER && gStatuses3[battlerDef] & STATUS3_UNDERWATER) if (gBattleMoves[move].flags & FLAG_DMG_UNDERWATER && gStatuses3[battlerDef] & STATUS3_UNDERWATER)
MulModifier(&finalModifier, UQ_4_12(2.0)); MulModifier(&finalModifier, UQ_4_12(2.0));
if (gBattleMoves[move].flags & FLAG_DMG_2X_IN_AIR && gStatuses3[battlerDef] & STATUS3_ON_AIR) if (gBattleMoves[move].flags & FLAG_DMG_2X_IN_AIR && gStatuses3[battlerDef] & STATUS3_ON_AIR)
MulModifier(&finalModifier, UQ_4_12(2.0)); MulModifier(&finalModifier, UQ_4_12(2.0));
dmg = ApplyModifier(finalModifier, dmg); dmg = ApplyModifier(finalModifier, dmg);
@ -8661,4 +8661,3 @@ bool32 IsEntrainmentTargetOrSimpleBeamBannedAbility(u16 ability)
} }
return FALSE; return FALSE;
} }