Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-08-23 01:05:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silence compiler warnings

Browse Source
This commit is contained in:
PikalaxALT
2021-05-22 19:10:56 -04:00
parent 6d1fe6e7fd
commit 0d0f5b70b0
13 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/lib/src/RTC_internal.c
View File

@@ -27,5 +27,5 @@ ARM_FUNC BOOL RTCi_WriteRawStatus2Async(void)
ARM_FUNC static BOOL RtcSendPxiCommand(u8 command)
{
s32 data = command << 8 & 0x7f00;
return PXI_SendWordByFifo(PXI_FIFO_TAG_RTC, data, FALSE) >= 0;
return PXI_SendWordByFifo(PXI_FIFO_TAG_RTC, (u32)data, FALSE) >= 0;
}

2
arm9/src/game_init.c
View File

@@ -141,7 +141,7 @@ void FUN_02015FC8(void)
{
csum++;
}
FUN_020166C8((u32 *)UNK_020EDB10, 4, 92, (int)csum);
FUN_020166C8((u32 *)UNK_020EDB10, 4, 92, csum);
}
void InitSystemForTheGame(void)

54
arm9/src/list_menu.c
View File

@@ -86,23 +86,23 @@ THUMB_FUNC s32 ListMenu_ProcessInput(struct ListMenu * list)
rightButton = FALSE;
break;
case LIST_MULTIPLE_SCROLL_DPAD:
leftButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_LEFT_MASK;
rightButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_RIGHT_MASK;
leftButton = (u16)(gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_LEFT_MASK);
rightButton = (u16)(gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_RIGHT_MASK);
break;
case LIST_MULTIPLE_SCROLL_L_R:
leftButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_L_MASK;
rightButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_R_MASK;
leftButton = (u16)(gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_L_MASK);
rightButton = (u16)(gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_R_MASK);
break;
}
if (leftButton)
{
if (!ListMenuChangeSelection(list, TRUE, list->template.maxShowed, FALSE))
if (!ListMenuChangeSelection(list, TRUE, (u8)list->template.maxShowed, FALSE))
list->unk_33 = 3;
return LIST_NOTHING_CHOSEN;
}
else if (rightButton)
{
if (!ListMenuChangeSelection(list, TRUE, list->template.maxShowed, TRUE))
if (!ListMenuChangeSelection(list, TRUE, (u8)list->template.maxShowed, TRUE))
list->unk_33 = 4;
return LIST_NOTHING_CHOSEN;
}
@@ -142,11 +142,11 @@ THUMB_FUNC s32 ListMenuTestInputInternal(struct ListMenu * list, const struct Li
if (input == REG_PAD_KEYINPUT_UP_MASK)
{
ListMenuChangeSelection(list, updateFlag, 1, FALSE);
ListMenuChangeSelection(list, (u8)updateFlag, 1, FALSE);
}
else if (input == REG_PAD_KEYINPUT_DOWN_MASK)
{
ListMenuChangeSelection(list, updateFlag, 1, TRUE);
ListMenuChangeSelection(list, (u8)updateFlag, 1, TRUE);
}
if (newCursorPos != NULL)
{
@@ -174,7 +174,7 @@ THUMB_FUNC void ListMenuOverrideSetColors(struct ListMenu * list, u8 cursorPal,
THUMB_FUNC void ListMenuGetCurrentItemArrayId(struct ListMenu * list, u16 * index_p)
{
*index_p = list->cursorPos + list->itemsAbove;
*index_p = (u16)(list->cursorPos + list->itemsAbove);
}
THUMB_FUNC void ListMenuGetScrollAndRow(struct ListMenu * list, u16 * cursorPos_p, u16 * itemsAbove_p)
@@ -218,7 +218,7 @@ THUMB_FUNC s32 ListMenuGetTemplateField(struct ListMenu * list, u32 attr)
case 8:
return (s32)list->template.upText_Y;
case 9:
return GetFontAttribute(list->template.fontId, 1) + list->template.itemVerticalPadding;
return GetFontAttribute((u8)list->template.fontId, 1) + list->template.itemVerticalPadding;
case 10:
return (s32)list->template.cursorPal;
case 11:
@@ -333,7 +333,7 @@ THUMB_FUNC void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16
{
s32 i;
u8 x, y;
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.itemVerticalPadding;
u8 yMultiplier = (u8)(GetFontAttribute((u8)list->template.fontId, 1) + list->template.itemVerticalPadding);
for (i = 0; i < count; i++)
{
@@ -341,7 +341,7 @@ THUMB_FUNC void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16
x = list->template.item_X;
else
x = list->template.header_X;
y = (yOffset + i) * yMultiplier + list->template.upText_Y;
y = (u8)((yOffset + i) * yMultiplier + list->template.upText_Y);
if (list->template.itemPrintFunc != NULL)
list->template.itemPrintFunc(list, list->template.items[startIndex].value, y);
ListMenuPrint(list, list->template.items[startIndex].text, x, y);
@@ -351,9 +351,9 @@ THUMB_FUNC void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16
THUMB_FUNC void ListMenuDrawCursor(struct ListMenu * list)
{
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.itemVerticalPadding;
u8 yMultiplier = (u8)(GetFontAttribute((u8)list->template.fontId, 1) + list->template.itemVerticalPadding);
u8 x = list->template.cursor_X;
u8 y = list->itemsAbove * yMultiplier + list->template.upText_Y;
u8 y = (u8)(list->itemsAbove * yMultiplier + list->template.upText_Y);
switch (list->template.cursorKind)
{
case 0:
@@ -371,13 +371,13 @@ THUMB_FUNC void ListMenuErasePrintedCursor(struct ListMenu * list, u16 itemsAbov
switch (list->template.cursorKind)
{
case 0:
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.itemVerticalPadding;
u8 yMultiplier = (u8)(GetFontAttribute(list->template.fontId, 1) + list->template.itemVerticalPadding);
u8 width = 8;
u8 height = 16;
FillWindowPixelRect(list->template.window,
list->template.fillValue,
list->template.cursor_X,
itemsAbove * yMultiplier + list->template.upText_Y,
(u16)(itemsAbove * yMultiplier + list->template.upText_Y),
width,
height);
break;
@@ -402,7 +402,7 @@ THUMB_FUNC u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *lis
if (list->template.maxShowed == 1)
newRow = 0;
else
newRow = list->template.maxShowed - ((list->template.maxShowed / 2) + (list->template.maxShowed % 2)) - 1;
newRow = (u16)(list->template.maxShowed - ((list->template.maxShowed / 2) + (list->template.maxShowed % 2)) - 1);
if (cursorPos == 0)
{
@@ -429,7 +429,7 @@ THUMB_FUNC u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *lis
}
}
list->itemsAbove = newRow;
list->cursorPos = cursorPos - 1;
list->cursorPos = (u16)(cursorPos - 1);
}
}
else
@@ -437,7 +437,7 @@ THUMB_FUNC u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *lis
if (list->template.maxShowed == 1)
newRow = 0;
else
newRow = ((list->template.maxShowed / 2) + (list->template.maxShowed % 2));
newRow = (u16)((list->template.maxShowed / 2) + (list->template.maxShowed % 2));
if (cursorPos == list->template.totalItems - list->template.maxShowed)
{
@@ -464,7 +464,7 @@ THUMB_FUNC u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *lis
}
}
list->itemsAbove = newRow;
list->cursorPos = cursorPos + 1;
list->cursorPos = (u16)(cursorPos + 1);
}
}
return 2;
@@ -479,33 +479,33 @@ THUMB_FUNC void ListMenuScroll(struct ListMenu * list, u8 count, u8 movingDown)
}
else
{
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.itemVerticalPadding;
u8 yMultiplier = (u8)(GetFontAttribute((u8)list->template.fontId, 1) + list->template.itemVerticalPadding);
if (!movingDown)
{
u16 y, width, height;
ScrollWindow(list->template.window, 1, count * yMultiplier, (list->template.fillValue << 4) | list->template.fillValue);
ScrollWindow(list->template.window, 1, (u8)(count * yMultiplier), (u8)((list->template.fillValue << 4) | list->template.fillValue));
ListMenuPrintEntries(list, list->cursorPos, 0, count);
y = (list->template.maxShowed * yMultiplier) + list->template.upText_Y;
y = (u16)((list->template.maxShowed * yMultiplier) + list->template.upText_Y);
width = GetWindowWidth(list->template.window);
height = GetWindowHeight(list->template.window);
FillWindowPixelRect(list->template.window,
list->template.fillValue,
0, y, width * 8, height * 8 - y);
0, y, (u16)(width * 8), (u16)(height * 8 - y));
}
else
{
u32 width;
ScrollWindow(list->template.window, 0, count * yMultiplier, (list->template.fillValue << 4) | list->template.fillValue);
ListMenuPrintEntries(list, list->cursorPos + (list->template.maxShowed - count), list->template.maxShowed - count, count);
ScrollWindow(list->template.window, 0, (u8)(count * yMultiplier), (u8)((list->template.fillValue << 4) | list->template.fillValue));
ListMenuPrintEntries(list, (u16)(list->cursorPos + (list->template.maxShowed - count)), (u16)(list->template.maxShowed - count), count);
width = GetWindowWidth(list->template.window);
FillWindowPixelRect(list->template.window,
list->template.fillValue,
0, 0, width * 8, list->template.upText_Y);
0, 0, (u16)(width * 8), list->template.upText_Y);
}
}
}

13
arm9/src/list_menu_items.c
View File

@@ -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;
}

2
arm9/src/main.c
View File

@@ -24,7 +24,7 @@ FS_EXTERN_OVERLAY(MODULE_63);
s32 UNK_02016FA4;
PMBackLightSwitch gBacklightTop;
struct UnkStruct_02016FA8 UNK_02016FA8;;
struct UnkStruct_02016FA8 UNK_02016FA8;
extern void InitSystemForTheGame(void);
extern void InitGraphicMemory(void);

4
arm9/src/text.c
View File

@@ -9,7 +9,7 @@
const struct FontInfo *gFonts = NULL;
u16 UNK_021C5734[0x100];
u32 UNK_021C5714[8];
BOOL UNK_021C5714[8];
u16 UNK_021C570E;
u16 UNK_021C5710;
u16 UNK_021C5712;
@@ -345,7 +345,7 @@ THUMB_FUNC void FUN_0201C1EC(struct TextPrinter *printer, u32 param1, u32 param2
printer->Unk2C = FUN_0201C1B0();
}
u16 * r6 = printer->Unk2C + param3 * 24 * 8;
u16 r2 = (GetWindowWidth(window) - 3) * 8;
u16 r2 = (u16)((GetWindowWidth(window) - 3) * 8);
BlitBitmapRectToWindow(window, r6, 0, 0, 24, 32, r2, 0, 24, 32);
}

2
arm9/src/unk_02022504.c
View File

@@ -26,7 +26,7 @@ THUMB_FUNC u8 *LoadHallOfFame(struct SaveBlock2 *sav2, u32 heap_id, int *ret_p)
return ReadSaveFileFromFlash(sav2, heap_id, 0, ret_p);
}
THUMB_FUNC s32 *SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data)
THUMB_FUNC s32 SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data)
{
return WriteSaveFileToFlash(sav2, 0, data);
}

4
arm9/src/unk_02025484.c
View File

@@ -3,14 +3,14 @@
#include "error_handling.h"
#include "unk_02025484.h"
THUMB_FUNC void FUN_02025484(struct unk_2025484 *r0, u32 r1)
THUMB_FUNC void FUN_02025484(struct unk_2025484 *r0)
{
MI_CpuFill8(r0, 0, sizeof(struct unk_2025484));
}
THUMB_FUNC u32 *FUN_02025490(struct unk_2025484 *r0, u32 r1)
{
FUN_02025484(r0, r1);
FUN_02025484(r0);
r0->unk0 = r1;
return &r0->unk4;
}

15
include/list_menu.h
View File

@@ -69,5 +69,20 @@ struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cur
s32 ListMenu_ProcessInput(struct ListMenu * list);
void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * itemsAbove);
void RedrawListMenu(struct ListMenu * list);
s32 ListMenuTestInputInternal(struct ListMenu * list, const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u16 updateFlag, u16 input, u16 *newCursorPos, u16 *newItemsAbove);
s32 ListMenuTestInput(struct ListMenu * list, const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u16 input, u16 *newCursorPos, u16 *newItemsAbove);
void ListMenuOverrideSetColors(struct ListMenu * list, u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void ListMenuGetCurrentItemArrayId(struct ListMenu * list, u16 * index_p);
void ListMenuGetScrollAndRow(struct ListMenu * list, u16 * cursorPos_p, u16 * itemsAbove_p);
u8 ListMenuGetUnk33(struct ListMenu * list);
s32 ListMenuGetValueByArrayId(struct ListMenu * list, s32 index);
s32 ListMenuGetTemplateField(struct ListMenu * list, u32 attr);
void ListMenuSetTemplateField(struct ListMenu * list, u32 attr, s32 value);
void ListMenuGetItemStr(struct ListMenu * list, struct ListMenuItem * items);
void ListMenuPrint(struct ListMenu * list, struct String * str, u8 x, u8 y);
void ListMenuErasePrintedCursor(struct ListMenu * list, u16 itemsAbove);
u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, u8 movingDown);
void ListMenuScroll(struct ListMenu * list, u8 count, u8 movingDown);
void ListMenuCopyToVram(struct ListMenu * list);
#endif // POKEDIAMOND_LIST_MENU_H

9
include/list_menu_items.h
View File

@@ -2,6 +2,7 @@
#define POKEDIAMOND_LIST_MENU_ITEMS_H
#include "string16.h"
#include "msgdata.h"
struct ListMenuItem
{
@@ -9,4 +10,12 @@ struct ListMenuItem
s32 value;
};
struct ListMenuItem * ListMenuItems_ctor(u32 count, u32 heap_id);
void ListMenuItems_dtor(struct ListMenuItem * items);
void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, struct MsgData * msgData, u32 msgNo, s32 value);
void ListMenuItems_AddItem(struct ListMenuItem * items, struct String * str, s32 value);
void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListMenuItem * src);
struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, u32 * heap_id_p);
void ListMenuItems_DestroyMenuStrings(struct ListMenuItem * items);
#endif // POKEDIAMOND_LIST_MENU_ITEMS_H

1
include/scrcmd.h
View File

@@ -161,6 +161,7 @@ BOOL ScrCmd_Unk0054(struct ScriptContext *ctx);
BOOL FUN_02041464(struct ScriptContext *ctx);
BOOL ScrCmd_Unk0055(struct ScriptContext* ctx);
BOOL ScrCmd_Unk0056(struct ScriptContext* ctx);
BOOL ScrCmd_Unk0057(struct ScriptContext* ctx);
BOOL ScrCmd_Unk0058(struct ScriptContext* ctx);
BOOL ScrCmd_Unk0049(struct ScriptContext* ctx);
BOOL ScrCmd_Unk004A(struct ScriptContext* ctx);

2
include/unk_02022504.h
View File

@@ -9,6 +9,6 @@ struct PCStorage *GetStoragePCPointer(struct SaveBlock2 *sav2);
void *FUN_0202251C(struct SaveBlock2 *sav2);
void *FUN_02022528(struct SaveBlock2 *sav2);
u8 *LoadHallOfFame(struct SaveBlock2 *sav2, u32 heap_id, int *ret_p);
s32 *SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data);
s32 SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data);
#endif //POKEDIAMOND_UNK_02022504_H

2
include/unk_02025484.h
View File

@@ -9,7 +9,7 @@ struct unk_2025484
u8 padding[0x1C];
};
void FUN_02025484(struct unk_2025484 *r0, u32 r1);
void FUN_02025484(struct unk_2025484 *r0);
u32 *FUN_02025490(struct unk_2025484 *r0, u32 r1);
u32 *FUN_020254A0(struct unk_2025484 *r0, u32 r1);
u32 FUN_020254B4(struct unk_2025484 *r0);