dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Begin item_menu.c cleanup

Browse Source
This commit is contained in:
Sierraffinity
2020-05-14 01:37:09 -07:00
parent 70c5f923ad
commit 74edaed426
63 changed files with 885 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/item_use.c
View File

@@ -107,7 +107,7 @@ static void SetUpItemUseCallback(u8 taskId)
type = ItemId_GetType(gSpecialVar_ItemId) - 1;
if (!InBattlePyramid())
{
gBagMenu->mainCallback2 = sItemUseCallbacks[type];
gBagMenu->exitCallback = sItemUseCallbacks[type];
Task_FadeAndCloseBagMenu(taskId);
}
else
@@ -192,7 +192,7 @@ static void CB2_CheckMail(void)
void ItemUseOutOfBattle_Mail(u8 taskId)
{
gBagMenu->mainCallback2 = CB2_CheckMail;
gBagMenu->exitCallback = CB2_CheckMail;
Task_FadeAndCloseBagMenu(taskId);
}
@@ -611,13 +611,13 @@ static void Task_StandingOnHiddenItem(u8 taskId)
void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
{
if (sub_81221AC() == TRUE) // link func
if (MenuHelpers_LinkSomething() == TRUE) // link func
{
DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem);
}
else if (gTasks[taskId].tUsingRegisteredKeyItem != TRUE)
{
gBagMenu->mainCallback2 = CB2_OpenPokeblockCaseOnField;
gBagMenu->exitCallback = CB2_OpenPokeblockCaseOnField;
Task_FadeAndCloseBagMenu(taskId);
}
else
@@ -679,7 +679,7 @@ void ItemUseOutOfBattle_Berry(u8 taskId)
{
sItemUseOnFieldCB = ItemUseOnFieldCB_Berry;
gFieldCallback = FieldCB_UseItemOnField;
gBagMenu->mainCallback2 = CB2_ReturnToField;
gBagMenu->exitCallback = CB2_ReturnToField;
Task_FadeAndCloseBagMenu(taskId);
}
else
@@ -1003,7 +1003,7 @@ static void ItemUseInBattle_ShowPartyMenu(u8 taskId)
{
if (!InBattlePyramid())
{
gBagMenu->mainCallback2 = ChooseMonForInBattleItem;
gBagMenu->exitCallback = ChooseMonForInBattleItem;
Task_FadeAndCloseBagMenu(taskId);
}
else