summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-03-04 20:12:45 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-03-04 20:12:45 +0100
commit1771e8b458c76a52f6d475bcc3f10124382c3ca9 (patch)
treef44f5eba1939feb229956be54f93a80bd3382e0a
parent62e849a5df791e92f0648827081f2c6247f09c5f (diff)
make it compile
-rw-r--r--src/berry_tag_screen.c6
-rwxr-xr-xsrc/item_menu.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index f86f350bf..1a0d1bce0 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -515,7 +515,7 @@ static void Task_HandleInput(u8 taskId)
static void TryChangeDisplayedBerry(u8 taskId, s8 toMove)
{
s16 *data = gTasks[taskId].data;
- s16 currPocketPosition = gUnknown_0203CE58.unk12[3] + gUnknown_0203CE58.unk8[3];
+ s16 currPocketPosition = gUnknown_0203CE58.scrollPosition[3] + gUnknown_0203CE58.cursorPosition[3];
u32 newPocketPosition = currPocketPosition + toMove;
if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(BAG_BERRIES, newPocketPosition) != 0)
{
@@ -533,8 +533,8 @@ static void TryChangeDisplayedBerry(u8 taskId, s8 toMove)
static void HandleBagCursorPositionChange(s8 toMove)
{
- u16 *scrollPos = &gUnknown_0203CE58.unk12[3];
- u16 *cursorPos = &gUnknown_0203CE58.unk8[3];
+ u16 *scrollPos = &gUnknown_0203CE58.scrollPosition[3];
+ u16 *cursorPos = &gUnknown_0203CE58.cursorPosition[3];
if (toMove > 0)
{
if (*cursorPos < 4 || BagGetItemIdByPocketPosition(BAG_BERRIES, *scrollPos + 8) == 0)
diff --git a/src/item_menu.c b/src/item_menu.c
index 270e79a47..d9acf0430 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -991,7 +991,6 @@ u8 GetSwitchBagPocketDirection(void)
return 0;
}
-
void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId)
{
if (deltaBagPocketId == 1 && *bagPocketId == 4)