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

Merge pull request #1615 from LOuroboros/choiceUTurn

Browse source 
Fixed U-turn and Choice Items interaction
This commit is contained in:
ghoulslash 2021-09-01 06:00:02 -06:00 committed by GitHub
commit dd83e37261
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/battle_script_commands.c
View file

@ -4872,9 +4872,8 @@ static void Cmd_moveend(void)
&& (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF)) && (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF))
{ {
if ((gBattleMoves[gChosenMove].effect == EFFECT_BATON_PASS if ((gBattleMoves[gChosenMove].effect == EFFECT_BATON_PASS
|| gBattleMoves[gChosenMove].effect == EFFECT_HEALING_WISH || gBattleMoves[gChosenMove].effect == EFFECT_HEALING_WISH)
|| gBattleMoves[gChosenMove].effect == EFFECT_HIT_ESCAPE) && !(gMoveResultFlags & MOVE_RESULT_FAILED))
&& !(gMoveResultFlags & MOVE_RESULT_FAILED))
{ {
++gBattleScripting.moveendState; ++gBattleScripting.moveendState;
break; break;