ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed U-turn and Choice Items interaction

Browse Source
This commit is contained in:
LOuroboros 2021-08-31 23:49:23 -03:00
parent a58641cd70
commit d60545af7a
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))
{
if ((gBattleMoves[gChosenMove].effect == EFFECT_BATON_PASS
|| gBattleMoves[gChosenMove].effect == EFFECT_HEALING_WISH
|| gBattleMoves[gChosenMove].effect == EFFECT_HIT_ESCAPE)
&& !(gMoveResultFlags & MOVE_RESULT_FAILED))
|| gBattleMoves[gChosenMove].effect == EFFECT_HEALING_WISH)
&& !(gMoveResultFlags & MOVE_RESULT_FAILED))
{
++gBattleScripting.moveendState;
break;