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

Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro

Browse Source
This commit is contained in:
LOuroboros 2021-01-20 18:16:02 -03:00
parent c90cbc0021
commit a6b03d45a8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@ -7116,9 +7116,8 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b
switch (GetBattlerHoldEffect(battlerAtk, TRUE))
{
case HOLD_EFFECT_THICK_CLUB:
if ((gBattleMons[battlerAtk].species == SPECIES_CUBONE
|| gBattleMons[battlerAtk].species == SPECIES_MAROWAK
|| gBattleMons[battlerAtk].species == SPECIES_MAROWAK_ALOLAN)
if ((GET_BASE_SPECIES_ID(battlerAtk) == SPECIES_CUBONE
|| GET_BASE_SPECIES_ID(battlerAtk) == SPECIES_MAROWAK)
&& IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(2.0));
break;