tbld/tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

repeat meds

Browse Source
This commit is contained in:
Skye Chappelle 2022-05-20 13:16:55 +00:00
parent 538733d798
commit 1885ee79dc
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitpod.yml
View File

@ -1,8 +0,0 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
# and commit this file to your remote git repository to share the goodness with others.
tasks:
- init: sh makerom

16
src/party_menu.c
View File

@ -4345,7 +4345,11 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE); DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = task; if (gPartyMenu.menuType == PARTY_MENU_TYPE_FIELD)
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
else
gTasks[taskId].func = task;
return;
} }
else else
{ {
@ -4377,7 +4381,10 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
GetMedicineItemEffectMessage(item); GetMedicineItemEffectMessage(item);
DisplayPartyMenuMessage(gStringVar4, TRUE); DisplayPartyMenuMessage(gStringVar4, TRUE);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = task; if (gPartyMenu.menuType == PARTY_MENU_TYPE_FIELD && CheckBagHasItem(item, 1))
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
else
gTasks[taskId].func = task;
} }
} }
} }
@ -4389,7 +4396,10 @@ static void Task_DisplayHPRestoredMessage(u8 taskId)
DisplayPartyMenuMessage(gStringVar4, FALSE); DisplayPartyMenuMessage(gStringVar4, FALSE);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
HandleBattleLowHpMusicChange(); HandleBattleLowHpMusicChange();
gTasks[taskId].func = Task_ClosePartyMenuAfterText; if (gPartyMenu.menuType == PARTY_MENU_TYPE_FIELD && CheckBagHasItem(gSpecialVar_ItemId, 1))
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
else
gTasks[taskId].func = Task_ClosePartyMenuAfterText;
} }
static void Task_ClosePartyMenuAfterText(u8 taskId) static void Task_ClosePartyMenuAfterText(u8 taskId)