diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /include/item.h | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/item.h')
| -rw-r--r-- | include/item.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/item.h b/include/item.h index eaefa0298..a136f03ec 100644 --- a/include/item.h +++ b/include/item.h @@ -31,6 +31,7 @@ extern struct BagPocket gBagPockets[]; void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity); void CopyItemName(u16 itemId, u8 *string); +void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity); bool8 IsBagPocketNonEmpty(u8 pocket); bool8 CheckBagHasItem(u16 itemId, u16 count); bool8 CheckBagHasSpace(u16 itemId, u16 count); @@ -58,5 +59,6 @@ ItemUseFunc ItemId_GetFieldFunc(u16 itemId); u8 ItemId_GetBattleUsage(u16 itemId); ItemUseFunc ItemId_GetBattleFunc(u16 itemId); u8 ItemId_GetSecondaryId(u16 itemId); +u16 itemid_get_market_price(u16 itemId); #endif // ITEM_H |