diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-05 20:39:55 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-05 20:39:55 -0800 |
| commit | c1b2c31a4a935f6c452596d5f2fad2e2cb588d4d (patch) | |
| tree | c9a1a7102a97ccfff96388b2205003d13a3ec8ce /src/pokemon_3.c | |
| parent | 746b12fb99bb435ea5fcd06b12032d40e088c6c9 (diff) | |
item constants
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index fe64a6cf4..cf172b122 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -10,6 +10,7 @@ #include "event_data.h" #include "rtc.h" #include "item.h" +#include "items.h" #define EVO_FRIENDSHIP 0x0001 // Pokémon levels up with friendship ≥ 220 #define EVO_FRIENDSHIP_DAY 0x0002 // Pokémon levels up during the day with friendship ≥ 220 @@ -100,10 +101,10 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) temp = gItemEffectTable[itemId - 13]; - if (!temp && itemId != 175) + if (!temp && itemId != ITEM_ENIGMA_BERRY) return 0; - if (itemId == 175) + if (itemId == ITEM_ENIGMA_BERRY) { temp = gEnigmaBerries[gUnknown_02024A60].itemEffect; } @@ -213,7 +214,7 @@ u8 *sub_803F378(u16 itemId) int i; u8 *itemEffect; - if (itemId == 175) + if (itemId == ITEM_ENIGMA_BERRY) { if (gMain.inBattle) { @@ -281,7 +282,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) u16 upperPersonality = personality >> 16; u8 holdEffect; - if (heldItem == 175) + if (heldItem == ITEM_ENIGMA_BERRY) holdEffect = gSaveBlock1.enigmaBerry.holdEffect; else holdEffect = ItemId_GetHoldEffect(heldItem); |