atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed redundant check in Punk Rock's effect

Browse source
This commit is contained in:
LOuroboros 2020-12-19 19:15:12 -03:00
parent a417a1b2b9
commit 819001c102
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/battle_util.c
View file

@ -6778,7 +6778,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe
MulModifier(&modifier, UQ_4_12(1.2)); MulModifier(&modifier, UQ_4_12(1.2));
break; break;
case ABILITY_PUNK_ROCK: case ABILITY_PUNK_ROCK:
if ((gBattleMoves[move].flags & FLAG_SOUND) && !IS_MOVE_STATUS(move)) if (gBattleMoves[move].flags & FLAG_SOUND)
MulModifier(&modifier, UQ_4_12(1.3)); MulModifier(&modifier, UQ_4_12(1.3));
break; break;
} }
@ -7234,7 +7234,7 @@ static u32 CalcDefenseStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType,
MulModifier(&modifier, UQ_4_12(1.5)); MulModifier(&modifier, UQ_4_12(1.5));
break; break;
case ABILITY_PUNK_ROCK: case ABILITY_PUNK_ROCK:
if ((gBattleMoves[move].flags & FLAG_SOUND) && !IS_MOVE_STATUS(move)) if (gBattleMoves[move].flags & FLAG_SOUND)
MulModifier(&modifier, UQ_4_12(1.3)); MulModifier(&modifier, UQ_4_12(1.3));
break; break;
} }