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

Corrected base species check for Thick Club's effect

Browse Source 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
This commit is contained in:
LOuroboros 2021-01-20 19:30:48 -03:00 committed by GitHub
parent 412c28bb7a
commit 2a888a7b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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