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

Updated Ability Patch for Gen 9 functionality (#2989)

Browse source
This commit is contained in:
Frank DeBlasio 2023-05-14 19:30:30 -04:00 committed by GitHub
parent f6f0e5fa33
commit 2420134e45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/party_menu.c
View file

@ -4663,7 +4663,6 @@ void Task_AbilityPatch(u8 taskId)
// Can't use. // Can't use.
if (gSpeciesInfo[tSpecies].abilities[tAbilityNum] == 0 if (gSpeciesInfo[tSpecies].abilities[tAbilityNum] == 0
|| !tSpecies || !tSpecies
|| GetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, NULL) > 1
) )
{ {
gPartyMenuUseExitCallback = FALSE; gPartyMenuUseExitCallback = FALSE;
@ -4734,7 +4733,10 @@ void ItemUseCB_AbilityPatch(u8 taskId, TaskFunc task)
tState = 0; tState = 0;
tMonId = gPartyMenu.slotId; tMonId = gPartyMenu.slotId;
tSpecies = GetMonData(&gPlayerParty[tMonId], MON_DATA_SPECIES, NULL); tSpecies = GetMonData(&gPlayerParty[tMonId], MON_DATA_SPECIES, NULL);
tAbilityNum = 2; if (GetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, NULL) == 2)
tAbilityNum = 0;
else
tAbilityNum = 2;
SetWordTaskArg(taskId, tOldFunc, (uintptr_t)(gTasks[taskId].func)); SetWordTaskArg(taskId, tOldFunc, (uintptr_t)(gTasks[taskId].func));
gTasks[taskId].func = Task_AbilityPatch; gTasks[taskId].func = Task_AbilityPatch;
} }