diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-20 09:23:37 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-20 09:23:37 -0400 |
| commit | 448adae329f322486961b897984db882e36a0623 (patch) | |
| tree | 9f862a03d1e6ed7e64343bbfc3db4c8d5f805eeb | |
| parent | a16371f513daf21948e372a3955f4cfa0d89a141 (diff) | |
Fix warnings in nutdata
| -rw-r--r-- | arm9/src/nutdata.c | 4 | ||||
| -rw-r--r-- | include/itemtool.h | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c index 4baaa1ae..a8f916e2 100644 --- a/arm9/src/nutdata.c +++ b/arm9/src/nutdata.c @@ -20,12 +20,12 @@ void CloseNutsDataNarc(NARC * narc) NARC_dtor(narc); } -struct NutData * LoadNutDataSingle(u32 berry_idx, u32 heap_id) +struct NutData * LoadNutDataSingle(s32 berry_idx, u32 heap_id) { return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, berry_idx, heap_id); } -struct NutData * LoadNutDataSingleByItemId(u32 item_id, u32 heap_id) +struct NutData * LoadNutDataSingleByItemId(s32 item_id, u32 heap_id) { return LoadNutDataSingle(item_id - FIRST_BERRY_IDX, heap_id); } diff --git a/include/itemtool.h b/include/itemtool.h index 525e68f9..d8419c2b 100644 --- a/include/itemtool.h +++ b/include/itemtool.h @@ -21,4 +21,13 @@ struct NutData u8 unkB; }; +NARC * OpenNutsDataNarc(u32 heap_id); +struct NutData * ReadNutDataFromNarc(NARC * narc, u32 berry_idx, u32 heap_id); +void CloseNutsDataNarc(NARC * narc); +struct NutData * LoadNutDataSingle(s32 berry_idx, u32 heap_id); +struct NutData * LoadNutDataSingleByItemId(s32 item_id, u32 heap_id); +u32 GetNutAttr(struct NutData * nut, u32 attr); +struct String * GetNutName(u32 berry_idx, u32 heap_id); +struct String * GetNutDesc(u32 berry_idx, u32 heap_id); + #endif //POKEDIAMOND_ITEMTOOL_H |