From c1b2c31a4a935f6c452596d5f2fad2e2cb588d4d Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 5 Jan 2017 20:39:55 -0800 Subject: item constants --- src/calculate_base_damage.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/calculate_base_damage.c') diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index e6fd49444..86446e588 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -11,6 +11,7 @@ #include "hold_effects.h" #include "event_data.h" #include "battle.h" +#include "items.h" extern u8 gPlayerPartyCount; extern struct Pokemon gPlayerParty[6]; @@ -89,7 +90,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de spAttack = attacker->spAttack; spDefense = defender->spDefense; - if (attacker->item == 175) + if (attacker->item == ITEM_ENIGMA_BERRY) { attackerHoldEffect = gEnigmaBerries[a7].holdEffect; attackerHoldEffectParam = gEnigmaBerries[a7].holdEffectParam; @@ -100,7 +101,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de attackerHoldEffectParam = ItemId_GetHoldEffectParam(attacker->item); } - if (defender->item == 175) + if (defender->item == ITEM_ENIGMA_BERRY) { defenderHoldEffect = gEnigmaBerries[a8].holdEffect; defenderHoldEffectParam = gEnigmaBerries[a8].holdEffectParam; -- cgit v1.2.3