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

Cleaned up move effect checks for Dragon Tail/Circle Throw

Browse source
This commit is contained in:
Eduardo Quezada 2022-11-05 23:51:59 -03:00
parent 1da4eb3b14
commit 712d41c752
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle_script_commands.c
View file

@ -5718,8 +5718,7 @@ static void Cmd_moveend(void)
break; break;
} }
case MOVEEND_EJECT_BUTTON: case MOVEEND_EJECT_BUTTON:
if (gCurrentMove != MOVE_DRAGON_TAIL if (gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET
&& gCurrentMove != MOVE_CIRCLE_THROW
&& IsBattlerAlive(gBattlerAttacker) && IsBattlerAlive(gBattlerAttacker)
&& !TestSheerForceFlag(gBattlerAttacker, gCurrentMove) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove)
&& (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER || (gBattleTypeFlags & BATTLE_TYPE_TRAINER))) && (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER || (gBattleTypeFlags & BATTLE_TYPE_TRAINER)))
@ -5752,8 +5751,7 @@ static void Cmd_moveend(void)
gBattleScripting.moveendState++; gBattleScripting.moveendState++;
break; break;
case MOVEEND_RED_CARD: case MOVEEND_RED_CARD:
if (gCurrentMove != MOVE_DRAGON_TAIL if (gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET
&& gCurrentMove != MOVE_CIRCLE_THROW
&& IsBattlerAlive(gBattlerAttacker) && IsBattlerAlive(gBattlerAttacker)
&& !TestSheerForceFlag(gBattlerAttacker, gCurrentMove)) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove))
{ {