Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-28 13:41:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1281 from NamNguyenUTSA/patch-2

Browse Source 
Allow player partner NPC's to mega evolve
This commit is contained in:
ultima-soul
2020-12-18 23:39:15 -08:00
committed by GitHub
parent aefa35a04f ee59fab143
commit 1b1b2ff0a3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_controller_player_partner.c
View File

@@ -1526,7 +1526,10 @@ static void PlayerPartnerHandleChooseMove(void)
gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
}
BtlController_EmitTwoReturnValues(1, 10, chosenMoveId | (gBattlerTarget << 8));
if (CanMegaEvolve(gActiveBattler)) // If partner can mega evolve, do it.
BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (RET_MEGA_EVOLUTION) | (gBattlerTarget << 8));
else
BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBattlerTarget << 8));
PlayerPartnerBufferExecCompleted();
}