ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 12:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix two turn moves not activating moxie

Browse Source
This commit is contained in:
DizzyEggg 2020-02-22 18:43:16 +01:00
parent bd75f16a9b
commit b1b1bf7f12
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -6595,7 +6595,7 @@ static bool32 HasAttackerFaintedTarget(void)
&& gBattleStruct->moveTarget[gBattlerAttacker] == gBattlerTarget && gBattleStruct->moveTarget[gBattlerAttacker] == gBattlerTarget
&& gBattlerTarget != gBattlerAttacker && gBattlerTarget != gBattlerAttacker
&& gCurrentTurnActionNumber == GetBattlerTurnOrderNum(gBattlerAttacker) && gCurrentTurnActionNumber == GetBattlerTurnOrderNum(gBattlerAttacker)
&& gChosenMove == gChosenMoveByBattler[gBattlerAttacker]) && (gChosenMove == gChosenMoveByBattler[gBattlerAttacker] || gChosenMove == gBattleMons[gBattlerAttacker].moves[gChosenMovePos]))
return TRUE; return TRUE;
else else
return FALSE; return FALSE;