From 02b3a1da8679c5d71e3ba2669e5e8bf62f49079b Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sat, 13 Nov 2021 17:13:03 +1300 Subject: [PATCH] Fix infinite Bide loop Bide no longer gets stuck in a loop, but also doesn't strike twice. --- src/battle_script_commands.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d3cafecca..243661622 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -13598,7 +13598,9 @@ static bool32 CriticalCapture(u32 odds) bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId) { - if (gBattleMoves[move].split != SPLIT_STATUS && !(sForbiddenMoves[move] & FORBIDDEN_PARENTAL_BOND)) + if (gBattleMoves[move].split != SPLIT_STATUS + && !(sForbiddenMoves[move] & FORBIDDEN_PARENTAL_BOND) + && gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) {