diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 14:38:26 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 14:38:26 -0500 |
commit | 83137b40053bbea4c5288e269ed913746dd9713f (patch) | |
tree | c30e0e3d4e88caf9e9f9fb6345c85bdd8aa071d2 /src/item_menu.c | |
parent | 7f81fdc8df5247c926228b784f6878dc3edac051 (diff) | |
parent | 3d5d298c63a88c1a581b58d44dcc3706a7799c04 (diff) |
Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking
Diffstat (limited to 'src/item_menu.c')
-rw-r--r-- | src/item_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/item_menu.c b/src/item_menu.c index 2253c287e..4131e7fd5 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -496,9 +496,9 @@ static bool8 LoadBagMenuGraphics(void) break; case 19: if (gBagMenuState.location == ITEMMENULOCATION_ITEMPC) - HelpSystem_SetSomeVariable2(29); + SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS); else - HelpSystem_SetSomeVariable2(9); + SetHelpContext(HELPCONTEXT_BAG); gPaletteFade.bufferTransferDisabled = FALSE; gMain.state++; break; @@ -1434,7 +1434,7 @@ static void OpenContextMenu(u8 taskId) Menu_InitCursor(r6, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0); r4 = ShowBagWindow(6, 0); CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1); + StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); BagPrintTextOnWindow(r4, 2, gStringVar4, 0, 2, 1, 0, 0, 1); } |