atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow Lv100 'mons to access level based evos

Browse source
This commit is contained in:
LOuroboros 2022-11-25 17:29:00 -03:00
parent b48f057fe7
commit 53110a0ff6
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/party_menu.c
View file

@ -5161,8 +5161,9 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc task)
u16 *itemPtr = &gSpecialVar_ItemId; u16 *itemPtr = &gSpecialVar_ItemId;
bool8 cannotUseEffect; bool8 cannotUseEffect;
u8 holdEffectParam = ItemId_GetHoldEffectParam(*itemPtr); u8 holdEffectParam = ItemId_GetHoldEffectParam(*itemPtr);
sInitialLevel = GetMonData(mon, MON_DATA_LEVEL); u16 targetSpecies = GetEvolutionTargetSpecies(mon, EVO_MODE_NORMAL, ITEM_NONE, NULL);
sInitialLevel = GetMonData(mon, MON_DATA_LEVEL);
if (sInitialLevel != MAX_LEVEL) if (sInitialLevel != MAX_LEVEL)
{ {
BufferMonStatsToTaskData(mon, arrayPtr); BufferMonStatsToTaskData(mon, arrayPtr);
@ -5176,10 +5177,17 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc task)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
if (cannotUseEffect) if (cannotUseEffect)
{ {
gPartyMenuUseExitCallback = FALSE; if (targetSpecies != SPECIES_NONE)
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE); {
ScheduleBgCopyTilemapToVram(2); PartyMenuTryEvolution(taskId);
gTasks[taskId].func = task; }
else
{
gPartyMenuUseExitCallback = FALSE;
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = task;
}
} }
else else
{ {