diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-19 12:49:08 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-19 12:49:08 -0600 |
| commit | c74334c26a1565b3cae586efd2f8a07a8bb0f912 (patch) | |
| tree | c4ce2aad0f40f772bd1443bac3d419db188f9bcb /src | |
| parent | 4c6511c8f991e583c64ac0aa8912285600161b51 (diff) | |
Fix address of berry struct in item.c
Diffstat (limited to 'src')
| -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); } |