summaryrefslogtreecommitdiff
path: root/src/menu_helpers.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/menu_helpers.c')
-rw-r--r--src/menu_helpers.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 3fb5ca40d..801e2546b 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -37,10 +37,10 @@ static const struct OamData sOamData_859F4E8 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
- .shape = 0,
+ .shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
- .size = 1,
+ .size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
@@ -344,17 +344,17 @@ void sub_812220C(struct ItemSlot *slots, u8 count, u8 *arg2, u8 *usedSlotsCount,
*arg2 = (*usedSlotsCount);
}
-void sub_812225C(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3)
+void sub_812225C(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 numItems)
{
- if ((*arg0) != 0 && (*arg0) + arg2 > arg3)
- (*arg0) = arg3 - arg2;
+ if (*scrollOffset != 0 && *scrollOffset + maxShownItems > numItems)
+ *scrollOffset = numItems - maxShownItems;
- if ((*arg0) + (*arg1) >= arg3)
+ if (*scrollOffset + *cursorPos >= numItems)
{
- if (arg3 == 0)
- (*arg1) = 0;
+ if (numItems == 0)
+ *cursorPos = 0;
else
- (*arg1) = arg3 - 1;
+ *cursorPos = numItems - 1;
}
}