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

Fix fusions (#3602)

Browse source
This commit is contained in:
Bassoonian 2023-11-25 13:56:41 +01:00 committed by GitHub
parent c8b0545d20
commit 0fe203c7f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/party_menu.c
View file

@ -5876,6 +5876,8 @@ u8 IsFusionMon(u16 species)
{
u16 i;
const struct Fusion *itemFusion = gFusionTablePointers[species];
if (itemFusion == NULL)
return FALSE;
for (i = 0; itemFusion[i].fusionStorageIndex != FUSION_TERMINATOR; i++)
{
if (itemFusion[i].fusingIntoMon == species)
@ -6157,7 +6159,7 @@ void ItemUseCB_Fusion(u8 taskId, TaskFunc taskFunc)
{
if (gPokemonStoragePtr->fusions[itemFusion[i].fusionStorageIndex].level != 0)
continue;
if (itemFusion[i].itemId == gSpecialVar_ItemId && itemFusion[i].targetSpecies1 == task->firstFusion)
if (itemFusion[i].itemId == gSpecialVar_ItemId && itemFusion[i].targetSpecies1 == task->firstFusion && itemFusion[i].targetSpecies2 == species)
{
task->storageIndex = itemFusion[i].fusionStorageIndex;
task->fusionResult = itemFusion[i].fusingIntoMon;