Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 9 insertions, 5 deletions

diff --git a/include/item_menu.h b/include/item_menu.h
index b1275549d..089bff6cf 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -71,10 +71,10 @@ extern u16 gSpecialVar_ItemId;
 void sub_81AAC14(void);
 void FavorLadyOpenBagMenu(void);
 void QuizLadyOpenBagMenu(void);
-void sub_81AAC28(void);
+void ApprenticeOpenBagMenu(void);
 void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
-void bag_menu_mail_related(void);
+void CB2_ReturnToBagMenuPocket(void);
 void CB2_BagMenuFromStartMenu(void);
 u8 GetItemListPosition(u8 pocketId);
 bool8 UseRegisteredKeyItemOnField(void);
@@ -82,11 +82,15 @@ void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
-void sub_81AABF0(void (*callback)(void));
+void ChooseBerrySetCallback(void (*callback)(void));
 void CB2_ChooseBerry(void);
-void unknown_ItemMenu_Confirm(u8 taskId);
+void Task_FadeAndCloseBagMenu(u8 taskId);
 void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
-void sub_81AB9A8(u8 pocketId);
+void BagMenu_InitListsMenu(u8 taskId);
+void UpdatePocketItemList(u8 pocketId);
+void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId));
+void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
+
 
 
 #endif //GUARD_item_menu_H