diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
| commit | cb5fe2f84f6f79748f8b67c236956371784619db (patch) | |
| tree | 24df75a4c8b2051aa2fb6c51fcd1c79bf1d3cbb0 /include/item.h | |
| parent | 1b7dc422d96ef13888139f190a5f7c2d591fb0ca (diff) | |
| parent | bc0fe11d163da1131daf63bdeb2abcba788f6036 (diff) | |
resolve conflict
Diffstat (limited to 'include/item.h')
| -rw-r--r-- | include/item.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/item.h b/include/item.h index 01d2a55e5..7a4279976 100644 --- a/include/item.h +++ b/include/item.h @@ -68,6 +68,7 @@ bool8 AddBagItem(u16 itemId, u16 amount); void SortPocketAndPlaceHMsFirst(struct BagPocket * pocket); u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 itemId); u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 itemId); +u16 BagGetQuantityByItemId(u16 item); bool8 itemid_is_unique(u16 itemId); void BagPocketCompaction(struct ItemSlot * slots, u8 capacity); u16 GetPcItemQuantity(u16 *); |