diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 19:10:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 19:10:56 -0400 |
| commit | 0d0f5b70b03e271d05cd30ccacddd55d75c4e530 (patch) | |
| tree | 7ab7010abde683379b2cb6e63ded0dbbf4ab4388 /arm9/src/list_menu_items.c | |
| parent | 6d1fe6e7fdb5eae0dec5ec463ddf1fac0c1316e2 (diff) | |
Silence compiler warnings
Diffstat (limited to 'arm9/src/list_menu_items.c')
| -rw-r--r-- | arm9/src/list_menu_items.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arm9/src/list_menu_items.c b/arm9/src/list_menu_items.c index 7e7b36d2..3aa5b0a0 100644 --- a/arm9/src/list_menu_items.c +++ b/arm9/src/list_menu_items.c @@ -4,7 +4,6 @@ #include "heap.h" void ListMenuItems_DestroyMenuStrings(struct ListMenuItem * items); -struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, s32 * idx_p); THUMB_FUNC struct ListMenuItem * ListMenuItems_ctor(u32 count, u32 heap_id) { @@ -18,7 +17,7 @@ THUMB_FUNC struct ListMenuItem * ListMenuItems_ctor(u32 count, u32 heap_id) ret[i].value = 0; } ret[i].text = (struct String *)-1u; - ret[i].value = heap_id; + ret[i].value = (s32)heap_id; } return ret; } @@ -31,7 +30,7 @@ THUMB_FUNC void ListMenuItems_dtor(struct ListMenuItem * items) THUMB_FUNC void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, struct MsgData * msgData, u32 msgNo, s32 value) { - s32 heap_id; + u32 heap_id; struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id); if (newItem != NULL) { @@ -42,7 +41,7 @@ THUMB_FUNC void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, str THUMB_FUNC void ListMenuItems_AddItem(struct ListMenuItem * items, struct String * str, s32 value) { - s32 heap_id; + u32 heap_id; struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id); if (newItem != NULL) { @@ -53,7 +52,7 @@ THUMB_FUNC void ListMenuItems_AddItem(struct ListMenuItem * items, struct String THUMB_FUNC void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListMenuItem * src) { - s32 heap_id; + u32 heap_id; struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id); if (newItem != NULL) { @@ -62,7 +61,7 @@ THUMB_FUNC void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListM } } -THUMB_FUNC struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, s32 * heap_id_p) +THUMB_FUNC struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, u32 * heap_id_p) { struct ListMenuItem * ret; for (; items->text != NULL; items++) @@ -76,7 +75,7 @@ THUMB_FUNC struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * ite ret = items; for (; items->text != (struct String *)-1u; items++) ; - *heap_id_p = items->value; + *heap_id_p = (u32)items->value; return ret; } |