diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-03-19 16:15:13 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-03-19 16:15:13 +0530 |
| commit | f9f64fff422a245536a3baadc02c120474af1957 (patch) | |
| tree | 26483531fb97102fe728ca8793bde039473b90aa /src/berry_tag_screen.c | |
| parent | a24ffb13213b7cd8761cd501bc4c052da66f57c4 (diff) | |
| parent | 2ecbe252a29b9d58bfd2df82c01f94be7b69a7b0 (diff) | |
Resolve conflicts
Diffstat (limited to 'src/berry_tag_screen.c')
| -rw-r--r-- | src/berry_tag_screen.c | 6 |
1 files changed, 3 insertions, 3 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) |