Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-20 20:08:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync item_menu.h

Browse Source
This commit is contained in:
cawtds 2025-06-15 12:39:45 +02:00
parent f5aa6cfda2
commit 3a839f4f29
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/item_menu.h
View File

@ -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

1
include/item_use.h
View File

@ -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,

3
src/item_menu.c
View File

@ -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);
}