Legendary Mon Fusion Compatibility Added #2621

TeamAquasHideout · 2023-02-01T12:49:32Z

Kyurem, Calyrex, and Necrozma Fusions have been fully implemented according to what I have seen from the later Generation games. The Fusion can only be started with the main Legendary in the fusion who's stats stay, there can only be one fusion per item, and a few of the mons learn or forget a move after a fusion/unfusion. However, the animation for the process is incomplete, the party menu screen needs to be updated while the screen is whited out and it has proved beyond me right now. I am calling it for this feature from me. I left comments where the party menu updating should go in the Fusion Task.

I apologize to whoever has to read this and finish the final touches to the animation. I'm not a professional programmer, I studied math, soooo it's a little cursed I'm sure. I won't feel bad if it gets torn apart for optimization, I just wanted to contribute something.

Archie#5000

Kyurem, Calyrex, and Necrozma Fusions have been implemented, however, the animation for the the process is incomplete, the party menu screen needs to be updated while the screen is whited out and it has proved beyond me right now. Smh

Handles cases for learning the fusion moves from the other fused mon and deleting the move when you unfuse (plus learning confusion (well a set choice in the data struct) if there are no moves left after deleting one)

If the main fusion came after the fused mon in the party order it would try to teach the move to the next member in the party

ghoulslash · 2023-02-16T14:08:45Z

src/party_menu.c

+static void SpriteCB_FormChangeIconMosaic(struct Sprite *sprite);
+static void Task_TryItemUseUnfuseChange(u8 taskId);
+
+u8 IsFusionMon(u16 species) // Helps with control flow, probably not ideal


I recommend a SpeciesInfo flag

ghoulslash · 2023-02-16T14:09:08Z

src/party_menu.c

+u8 DoesMonHaveAnyMoves(struct Pokemon *mon)
+{   
+    struct BoxPokemon *boxMon = &mon->box;
+    u8 i;


ghoulslash · 2023-02-16T14:09:15Z

src/party_menu.c

+void DeleteMove(struct Pokemon *mon, u16 move)
+{
+    struct BoxPokemon *boxMon = &mon->box;
+    u8 i, j;


LOuroboros · 2023-03-02T07:35:04Z

src/party_menu.c

+    u16 i;
+    struct Task *task = &gTasks[taskId];
+    u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
+    const struct Fusion *itemFusion = gFusionTablePointers[species];
+
+    PlaySE(SE_SELECT);
+    switch(IsFusionMon(species)){
+        case FALSE: // Cancel if Not a Fuse Mon
+            break;
+        case UNFUSE_MON:
+            if(task->fusionType == FUSE_MON) // Cancel if An already Fused Mon Is Chosen For The Second Fusion Mon
+                break;
+            if(gPlayerPartyCount == 6)
+            {
+                gPartyMenuUseExitCallback = FALSE;                      
+                DisplayPartyMenuMessage(gText_YourPartysFull, TRUE);    
+                ScheduleBgCopyTilemapToVram(2);                         
+                task->func = taskFunc;
+                return;
+            }
+            for (i = 0; itemFusion[i].targetSpecies1 != FORM_CHANGE_END; i++) // Loops through fusion table and checks if the mon can be unfused
+            {
+                if(gPokemonStoragePtr->fusions[FusionStorageIndex(itemFusion[i].targetSpecies2)].level == 0)
+                    continue;
+                if((itemFusion[i].itemId == gSpecialVar_ItemId) && (itemFusion[i].targetSpecies1 == species)
+                    && (GetMonData(&gPokemonStoragePtr->fusions[FusionStorageIndex(itemFusion[i].targetSpecies2)], MON_DATA_SPECIES) == itemFusion[i].targetSpecies2))
+                {
+                    task->fusionType = UNFUSE_MON;
+                    task->firstFusion = species;
+                    task->firstFusionSlot = gPartyMenu.slotId;
+                    task->fusionResult = itemFusion[i].fusingIntoMon;
+                    task->unfuseSecondMon = itemFusion[i].targetSpecies2;
+                    task->moveToLearn = itemFusion[i].fusionMove;
+                    task->forgetMove = itemFusion[i].unfuseForgetMove;
+                    TryItemUseFusionChange(taskId, taskFunc);
+                    return;
+                }
+            }
+            break;
+        case FUSE_MON:
+            if(task->fusionType == FUSE_MON) // Cancel If Second Mon is Another First Fusion Mon
+                break;
+            for (i = 0; itemFusion[i].targetSpecies1 != FORM_CHANGE_END; i++) // Run through the Fusion table for each species and check if the item matches one of the entries
+            {
+                if(itemFusion[i].itemId == gSpecialVar_ItemId)
+                {
+                    task->fusionType = FUSE_MON;
+                    task->firstFusion = species;
+                    task->firstFusionSlot = gPartyMenu.slotId;
+                    task->func = Task_HandleChooseMonInput;       
+                    gPartyMenuUseExitCallback = FALSE;
+                    sPartyMenuInternal->exitCallback = NULL;
+                    PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
+                    DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_SECOND_FUSION);
+                    return;
+                }
+            }
+            break;   
+        case SECOND_FUSE_MON:
+            if(task->fusionType != FUSE_MON) // Cancel if Secondary Fusion Mon Chosen First
+                break;
+            if(gPokemonStoragePtr->fusions[FusionStorageIndex(species)].level != 0)
+                break;
+            for (i = 0; itemFusion[i].targetSpecies1 != FORM_CHANGE_END; i++) // run through fusion table and check if the fusion works
+            {
+                if((itemFusion[i].itemId == gSpecialVar_ItemId) && (itemFusion[i].targetSpecies2 == species) && (itemFusion[i].targetSpecies1 == task->firstFusion))
+                {
+                    task->fusionResult = itemFusion[i].fusingIntoMon;
+                    task->secondFusionSlot = gPartyMenu.slotId;
+                    task->moveToLearn = itemFusion[i].fusionMove;
+                    // Start Fusion
+                    TryItemUseFusionChange(taskId, taskFunc);
+                    return;
+                }
+            }
+            break;
+    }
+    // No Effect Exit
+    gPartyMenuUseExitCallback = FALSE;                      
+    DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);    
+    ScheduleBgCopyTilemapToVram(2);                         
+    task->func = taskFunc;
+    return;


Can you please fix all the syntax inconsistencies here?

Empty spaces between each if or switch and the opening parentheses, and in the case of the switch, the curly bracket needs to go in the next line, not at the end of the same line.

src/party_menu.c

LOuroboros · 2023-03-02T07:40:27Z

src/data/pokemon/form_change_table_pointers.h

+    [SPECIES_SPECTRIER] = sCalyrexFusionTable,
+    [SPECIES_GLASTRIER] = sCalyrexFusionTable,
+#endif
+};


Please add an empty line at the end of the file.

src/strings.c

include/pokemon_storage_system.h

AsparagusEduardo · 2023-03-27T02:38:34Z

src/data/pokemon/form_change_tables.h

+    {SPECIES_KYUREM, SPECIES_RESHIRAM, SPECIES_KYUREM_WHITE, ITEM_DNA_SPLICERS, 0, 0},
+    {SPECIES_KYUREM, SPECIES_ZEKROM, SPECIES_KYUREM_BLACK, ITEM_DNA_SPLICERS, 0, 0},
+    {SPECIES_KYUREM_BLACK, SPECIES_ZEKROM, SPECIES_KYUREM, ITEM_DNA_SPLICERS, 0, 0},
+    {SPECIES_KYUREM_WHITE, SPECIES_RESHIRAM, SPECIES_KYUREM, ITEM_DNA_SPLICERS, 0, 0},


Unused parameters can be left out, as they'll default to 0 anyway.

Co-authored-by: LOuroboros <[email protected]>

AsparagusEduardo · 2023-09-05T10:00:56Z

Replaced by #3274

TeamAquasHideout added 2 commits February 1, 2023 06:18

Legendary Mon Fusion Evolution Compatibility Added

eaa4a91

Kyurem, Calyrex, and Necrozma Fusions have been implemented, however, the animation for the the process is incomplete, the party menu screen needs to be updated while the screen is whited out and it has proved beyond me right now. Smh

Added Fusion Move Prompts

e523845

Handles cases for learning the fusion moves from the other fused mon and deleting the move when you unfuse (plus learning confusion (well a set choice in the data struct) if there are no moves left after deleting one)

AsparagusEduardo changed the title ~~Legendary Mon Fusion Evolution Compatibility Added~~ Legendary Mon Fusion Compatibility Added Feb 1, 2023

Fix Bug With Fusion Mon Move Learning

f3232b5

If the main fusion came after the fused mon in the party order it would try to teach the move to the next member in the party

ghoulslash requested changes Feb 16, 2023

View reviewed changes

LOuroboros reviewed Mar 2, 2023

View reviewed changes

LOuroboros requested changes Mar 2, 2023

View reviewed changes

AsparagusEduardo requested changes Mar 27, 2023

View reviewed changes

Apply suggestions from code review

a344137

Co-authored-by: LOuroboros <[email protected]>

kittenchilly mentioned this pull request Sep 3, 2023

Add support for legendary fusion #3274

Merged

AsparagusEduardo closed this Sep 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Legendary Mon Fusion Compatibility Added #2621

Legendary Mon Fusion Compatibility Added #2621

TeamAquasHideout commented Feb 1, 2023

ghoulslash Feb 16, 2023

ghoulslash Feb 16, 2023

ghoulslash Feb 16, 2023

LOuroboros Mar 2, 2023

LOuroboros Mar 2, 2023

AsparagusEduardo Mar 27, 2023

AsparagusEduardo commented Sep 5, 2023

Legendary Mon Fusion Compatibility Added #2621

Legendary Mon Fusion Compatibility Added #2621

Conversation

TeamAquasHideout commented Feb 1, 2023

ghoulslash Feb 16, 2023

Choose a reason for hiding this comment

ghoulslash Feb 16, 2023

Choose a reason for hiding this comment

ghoulslash Feb 16, 2023

Choose a reason for hiding this comment

LOuroboros Mar 2, 2023

Choose a reason for hiding this comment

LOuroboros Mar 2, 2023

Choose a reason for hiding this comment

AsparagusEduardo Mar 27, 2023

Choose a reason for hiding this comment

AsparagusEduardo commented Sep 5, 2023