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

Made Alolan Marowak be affected by Thick Club

Browse Source
This commit is contained in:
LOuroboros 2021-01-03 09:58:19 -03:00
parent 0af8cab87e
commit da1f525d45
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/battle_config.h
View File

@ -35,6 +35,7 @@
#define SPECIES_ZYGARDE 0 // 50%
#define SPECIES_ZYGARDE_10 10011 // 10 %
#define SPECIES_ZYGARDE_COMPLETE 10012 // 100 %
#define SPECIES_MAROWAK_ALOLAN 0
#endif
// Items with peculiar battle effects.

5
src/battle_util.c
View File

@ -7006,7 +7006,10 @@ 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) && IS_MOVE_PHYSICAL(move))
if ((gBattleMons[battlerAtk].species == SPECIES_CUBONE
|| gBattleMons[battlerAtk].species == SPECIES_MAROWAK
|| gBattleMons[battlerAtk].species == SPECIES_MAROWAK_ALOLAN)
&& IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(2.0));
break;
case HOLD_EFFECT_DEEP_SEA_TOOTH: