dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-itemmenu2

Browse Source
This commit is contained in:
GriffinR
2021-08-11 19:01:47 -04:00
committed by GitHub
parent 28a8fe191a cc51627465
commit 80348e7188
34 changed files with 1124 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/item_menu.c
View File

@@ -590,7 +590,7 @@ void CB2_GoToSellMenu(void)
void CB2_GoToItemDepositMenu(void)
{
GoToBagMenu(ITEMMENULOCATION_ITEMPC, POCKETS_COUNT, sub_816B31C);
GoToBagMenu(ITEMMENULOCATION_ITEMPC, POCKETS_COUNT, CB2_PlayerPCExitBagMenu);
}
void ApprenticeOpenBagMenu(void)
@@ -1138,7 +1138,7 @@ static void UpdatePocketItemLists(void)
void UpdatePocketListPosition(u8 pocketId)
{
sub_812225C(&gBagPosition.scrollPosition[pocketId], &gBagPosition.cursorPosition[pocketId], gBagMenu->numShownItems[pocketId], gBagMenu->numItemStacks[pocketId]);
SetCursorWithinListBounds(&gBagPosition.scrollPosition[pocketId], &gBagPosition.cursorPosition[pocketId], gBagMenu->numShownItems[pocketId], gBagMenu->numItemStacks[pocketId]);
}
static void InitPocketListPositions(void)