summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/game_init.c2
-rw-r--r--arm9/src/list_menu.c54
-rw-r--r--arm9/src/list_menu_items.c13
-rw-r--r--arm9/src/main.c2
-rw-r--r--arm9/src/text.c4
-rw-r--r--arm9/src/unk_02022504.c2
-rw-r--r--arm9/src/unk_02025484.c4
7 files changed, 40 insertions, 41 deletions
diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c
index f52a6659..12d18629 100644
--- a/arm9/src/game_init.c
+++ b/arm9/src/game_init.c
@@ -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)
diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c
index c54677a9..033d06f9 100644
--- a/arm9/src/list_menu.c
+++ b/arm9/src/list_menu.c
@@ -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);
}
}
}
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;
}
diff --git a/arm9/src/main.c b/arm9/src/main.c
index 4879cb4c..c05fa1f3 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -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);
diff --git a/arm9/src/text.c b/arm9/src/text.c
index 83d2612b..5078f229 100644
--- a/arm9/src/text.c
+++ b/arm9/src/text.c
@@ -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);
}
diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c
index 0267a87c..7f50815b 100644
--- a/arm9/src/unk_02022504.c
+++ b/arm9/src/unk_02022504.c
@@ -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);
}
diff --git a/arm9/src/unk_02025484.c b/arm9/src/unk_02025484.c
index 733ac23a..96da04c9 100644
--- a/arm9/src/unk_02025484.c
+++ b/arm9/src/unk_02025484.c
@@ -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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 17:07:27 +0000