diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-15 12:01:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-15 12:01:57 -0400 |
| commit | ee5eee6ccc3c792203838baec7a1273010414027 (patch) | |
| tree | c2097775edd87f2b2af7582de5b851e72e0458ae /src/berry_tag_screen.c | |
| parent | c7fc6ac893b1018d48379d807740352e0926defd (diff) | |
| parent | 034b7f051338a45823a239ee2628ae58f9c96eb2 (diff) | |
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
Document item menu
Diffstat (limited to 'src/berry_tag_screen.c')
| -rw-r--r-- | src/berry_tag_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 4632f6dc0..babbbb3eb 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -548,9 +548,9 @@ static void Task_HandleInput(u8 taskId) static void TryChangeDisplayedBerry(u8 taskId, s8 toMove) { s16 *data = gTasks[taskId].data; - s16 currPocketPosition = gBagPositionStruct.scrollPosition[3] + gBagPositionStruct.cursorPosition[3]; + s16 currPocketPosition = gBagPosition.scrollPosition[BERRIES_POCKET] + gBagPosition.cursorPosition[BERRIES_POCKET]; u32 newPocketPosition = currPocketPosition + toMove; - if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(POCKET_BERRIES, newPocketPosition) != 0) + if (newPocketPosition < ITEM_TO_BERRY(MAX_BERRY_INDEX) && BagGetItemIdByPocketPosition(POCKET_BERRIES, newPocketPosition) != ITEM_NONE) { if (toMove < 0) data[1] = 2; @@ -566,8 +566,8 @@ static void TryChangeDisplayedBerry(u8 taskId, s8 toMove) static void HandleBagCursorPositionChange(s8 toMove) { - u16 *scrollPos = &gBagPositionStruct.scrollPosition[3]; - u16 *cursorPos = &gBagPositionStruct.cursorPosition[3]; + u16 *scrollPos = &gBagPosition.scrollPosition[BERRIES_POCKET]; + u16 *cursorPos = &gBagPosition.cursorPosition[BERRIES_POCKET]; if (toMove > 0) { if (*cursorPos < 4 || BagGetItemIdByPocketPosition(POCKET_BERRIES, *scrollPos + 8) == 0) |