diff --git a/src/party_menu.c b/src/party_menu.c index ce18d0a0db..40815c9044 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -6300,6 +6300,7 @@ static void DeleteInvalidFusionMoves(struct Pokemon *mon, u32 species) } } +#if P_FUSION_FORMS static void SwapFusionMonMoves(struct Pokemon *mon, const u16 moveTable[][2], u32 mode) { u32 oldMoveIndex, newMoveIndex; @@ -6328,6 +6329,8 @@ static void SwapFusionMonMoves(struct Pokemon *mon, const u16 moveTable[][2], u3 } } +#endif //P_FUSION_FORMS + static void Task_TryItemUseFusionChange(u8 taskId) { struct Pokemon *mon = &gPlayerParty[gTasks[taskId].firstFusionSlot]; @@ -6421,6 +6424,7 @@ static void Task_TryItemUseFusionChange(u8 taskId) { if (gTasks[taskId].fusionType == FUSE_MON) { +#if P_FUSION_FORMS #if P_FAMILY_KYUREM #if P_FAMILY_RESHIRAM if (gTasks[taskId].tExtraMoveHandling == SWAP_EXTRA_MOVES_KYUREM_WHITE) @@ -6431,11 +6435,13 @@ static void Task_TryItemUseFusionChange(u8 taskId) SwapFusionMonMoves(mon, gKyuremBlackSwapMoveTable, FUSE_MON); #endif //P_FAMILY_ZEKROM #endif //P_FAMILY_KYUREM +#endif //P_FUSION_FORMS if (gTasks[taskId].moveToLearn != 0) FormChangeTeachMove(taskId, gTasks[taskId].moveToLearn, gTasks[taskId].firstFusionSlot); } else //(gTasks[taskId].fusionType == UNFUSE_MON) { +#if P_FUSION_FORMS #if P_FAMILY_KYUREM #if P_FAMILY_RESHIRAM if (gTasks[taskId].tExtraMoveHandling == SWAP_EXTRA_MOVES_KYUREM_WHITE) @@ -6446,6 +6452,7 @@ static void Task_TryItemUseFusionChange(u8 taskId) SwapFusionMonMoves(mon, gKyuremBlackSwapMoveTable, UNFUSE_MON); #endif //P_FAMILY_ZEKROM #endif //P_FAMILY_KYUREM +#endif //P_FUSION_FORMS if ( gTasks[taskId].tExtraMoveHandling == FORGET_EXTRA_MOVES) { DeleteInvalidFusionMoves(mon, gTasks[taskId].fusionResult);