From 3a839f4f2969a3a2bfd8e7acdd5d87cb3def95ce Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Sun, 15 Jun 2025 12:39:45 +0200
Subject: [PATCH] sync item_menu.h

---
 include/item_menu.h | 24 +++++++++++-------------
 include/item_use.h  |  1 -
 src/item_menu.c     |  3 ++-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/include/item_menu.h b/include/item_menu.h
index c85b4cb66..94cb804f1 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -83,24 +83,22 @@ struct BagMenu
 extern struct BagMenu *gBagMenu;
 extern u16 gSpecialVar_ItemId;
 
-// Exported ROM declarations
-void ResetBagScrollPositions(void);
-void InitPokedudeBag(u8);
-void CB2_BagMenuFromStartMenu(void);
-void Task_FadeAndCloseBagMenu(u8 taskId);
-void ItemMenu_SetExitCallback(void (*)(void));
-void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void (*callback)(u8 taskId));
-void CloseItemMessage(u8 taskId);
 void CB2_BagMenuFromBattle(void);
-void InitOldManBag(void);
-void UpdatePocketItemList(u8 pocketId);
 void UpdatePocketListPosition(u8 pocketId);
-void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
+void CB2_BagMenuFromStartMenu(void);
 bool8 UseRegisteredKeyItemOnField(void);
+void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
+void ResetBagScrollPositions(void);
 void CB2_ChooseBerry(void);
 void CB2_ChooseMulch(void);
-
+void Task_FadeAndCloseBagMenu(u8 taskId);
 void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable *funcTable);
-void BagDrawTextBoxOnWindow(u8 windowId);
+void UpdatePocketItemList(u8 pocketId);
+void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void (*callback)(u8 taskId));
+void CloseItemMessage(u8 taskId);
+
+void InitPokedudeBag(u8);
+void ItemMenu_SetExitCallback(void (*)(void));
+void InitOldManBag(void);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/item_use.h b/include/item_use.h
index f4803f245..3ded70c53 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -50,7 +50,6 @@ u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
 void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8);
 void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16);
 void FieldCB_UseItemOnField(void);
-void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField);
 
 enum {
     BALL_THROW_UNABLE_TWO_MONS,
diff --git a/src/item_menu.c b/src/item_menu.c
index 6d9ba2b0f..44de67261 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -198,6 +198,7 @@ static void Task_Bag_TeachyTvCatching(u8 taskId);
 static void Task_Bag_TeachyTvStatus(u8 taskId);
 static void Task_Bag_TeachyTvTMs(u8 taskId);
 static void BagDrawDepositItemTextBox(void);
+static void BagDrawTextBoxOnWindow(u8 windowId);
 
 static const u8 sText_DepositHowManyVar1[] = _("Deposit how many\n{STR_VAR_1}(s)?");
 static const u8 sText_DepositedVar2Var1s[] = _("Deposited {STR_VAR_2}\n{STR_VAR_1}(s).");
@@ -2669,7 +2670,7 @@ static void DisplayCurrentMoneyWindow(void)
     PrintMoneyAmountInMoneyBoxWithBorder(windowId, 0x081, 0x0C, GetMoney(&gSaveBlock1Ptr->money));
 }
 
-void BagDrawTextBoxOnWindow(u8 windowId)
+static void BagDrawTextBoxOnWindow(u8 windowId)
 {
     DrawTextBorderOuter(windowId, 0x064, 14);
 }