Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking

2020-03-05 14:38:26 -05:00
parent 7f81fdc8df 3d5d298c63
commit 83137b4005
219 changed files with 6271 additions and 9187 deletions
@@ -1027,7 +1027,7 @@ static void CreateNormalContextMenu(u8 taskId)
    Menu_InitCursor(windowId, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0);
    windowId2 = GetOrCreateVariableWindow(6);
    CopySelectedListMenuItemName(data[1], gStringVar1);
-    StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
+    StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
    BerryPouchPrint(windowId2, 2, gStringVar4, 0, 2, 1, 2, 0, 1);
 }