From a6b03d45a89a8d4eaedc2f7eadcb4896efefae55 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 20 Jan 2021 18:16:02 -0300 Subject: [PATCH] Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro --- src/battle_util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 52521e1753..94bee8ba52 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -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;