From 712d41c75226c700224a9b98108e93934a7a0d3e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 5 Nov 2022 23:51:59 -0300 Subject: [PATCH] Cleaned up move effect checks for Dragon Tail/Circle Throw --- src/battle_script_commands.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7dfdd9c83..78797c39e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5718,8 +5718,7 @@ static void Cmd_moveend(void) break; } case MOVEEND_EJECT_BUTTON: - if (gCurrentMove != MOVE_DRAGON_TAIL - && gCurrentMove != MOVE_CIRCLE_THROW + if (gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET && IsBattlerAlive(gBattlerAttacker) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove) && (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER || (gBattleTypeFlags & BATTLE_TYPE_TRAINER))) @@ -5752,8 +5751,7 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_RED_CARD: - if (gCurrentMove != MOVE_DRAGON_TAIL - && gCurrentMove != MOVE_CIRCLE_THROW + if (gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET && IsBattlerAlive(gBattlerAttacker) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove)) {