diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-13 16:15:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 16:15:11 -0400 |
| commit | c2a07276ae095a2345f68e34fcd76cdaffd889ea (patch) | |
| tree | 9daf711e52915bee634e3a051f5a4f88db1d4a8f /src/item_use.c | |
| parent | a9a427c6f268e04468c8e30242f3ed4f96036848 (diff) | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Merge branch 'master' into doc-link
Diffstat (limited to 'src/item_use.c')
| -rwxr-xr-x | src/item_use.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/item_use.c b/src/item_use.c index d359dbcef..ff689a19a 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -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 |