diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 19:30:01 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 19:30:01 +0100 |
| commit | f53a39e7a25dd8c7240d4d6c2fd81932927f812e (patch) | |
| tree | 5d9929a043f362b53328355114b53aed563a286e /src/item.c | |
| parent | 0bc7fb92db8658c461f81ef57bc9bc4f3ee80c7b (diff) | |
| parent | 0db23bc215000bbad41968ba5a650e55f86ceb71 (diff) | |
mystery event labels
Diffstat (limited to 'src/item.c')
| -rw-r--r-- | src/item.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/item.c b/src/item.c index 931027e25..a17599db9 100644 --- a/src/item.c +++ b/src/item.c @@ -1,5 +1,6 @@ #include "global.h" #include "item.h" +#include "berry.h" #include "constants/items.h" #include "string_util.h" #include "text.h" @@ -11,7 +12,6 @@ extern bool8 InBattlePyramid(void); extern const u8 gText_PokeBalls[]; extern const u8 gText_Berries[]; extern const u8 gText_Berry[]; -extern const u8 gUnknown_085897E4[][28]; // not sure what this one is bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); @@ -96,8 +96,8 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity) } else { - if (itemId >= 0x85 && itemId <= 0xAF) - GetBerryCountString(string, gUnknown_085897E4[itemId], quantity); + if (itemId >= ITEM_CHERI_BERRY && itemId <= ITEM_ENIGMA_BERRY) + GetBerryCountString(string, gBerries[itemId - ITEM_CHERI_BERRY].name, quantity); else StringCopy(string, ItemId_GetItem(itemId)->name); } |