From b138e415a2c6b4e42a08e776cd482d91d50bbc2a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 22:26:26 -0400 Subject: Finish msgdata.c --- arm9/src/nutdata.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arm9/src/nutdata.c') diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c index 09542052..bce5c291 100644 --- a/arm9/src/nutdata.c +++ b/arm9/src/nutdata.c @@ -61,18 +61,18 @@ u32 GetNutAttr(struct NutData * nut, u32 attr) } } -u16 * GetNutName(u32 berry_idx, u32 heap_id) +struct String * GetNutName(u32 berry_idx, u32 heap_id) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 373, heap_id); - u16 * ret = FUN_0200A914(msgData, berry_idx); + struct String * ret = FUN_0200A914(msgData, berry_idx); DestroyMsgData(msgData); return ret; } -u16 * GetNutDesc(u32 berry_idx, u32 heap_id) +struct String * GetNutDesc(u32 berry_idx, u32 heap_id) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 372, heap_id); - u16 * ret = FUN_0200A914(msgData, berry_idx); + struct String * ret = FUN_0200A914(msgData, berry_idx); DestroyMsgData(msgData); return ret; } -- cgit v1.2.3 From 1386f29730b42a640fde1d568255dc10be4ac759 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 20 Jun 2020 09:18:15 -0400 Subject: Name methods in msgdata.c and unk_02021934.s aka string16.s --- arm9/src/nutdata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arm9/src/nutdata.c') diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c index bce5c291..4baaa1ae 100644 --- a/arm9/src/nutdata.c +++ b/arm9/src/nutdata.c @@ -1,7 +1,7 @@ #include "global.h" #include "filesystem.h" #include "itemtool.h" -#include "msg_data.h" +#include "msgdata.h" #pragma thumb on @@ -64,7 +64,7 @@ u32 GetNutAttr(struct NutData * nut, u32 attr) struct String * GetNutName(u32 berry_idx, u32 heap_id) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 373, heap_id); - struct String * ret = FUN_0200A914(msgData, berry_idx); + struct String * ret = NewString_ReadMsgData(msgData, berry_idx); DestroyMsgData(msgData); return ret; } @@ -72,7 +72,7 @@ struct String * GetNutName(u32 berry_idx, u32 heap_id) struct String * GetNutDesc(u32 berry_idx, u32 heap_id) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 372, heap_id); - struct String * ret = FUN_0200A914(msgData, berry_idx); + struct String * ret = NewString_ReadMsgData(msgData, berry_idx); DestroyMsgData(msgData); return ret; } -- cgit v1.2.3 From 448adae329f322486961b897984db882e36a0623 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 20 Jun 2020 09:23:37 -0400 Subject: Fix warnings in nutdata --- arm9/src/nutdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/src/nutdata.c') 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); } -- cgit v1.2.3