From 396f2c9565082757361bb26e5c63a40fdb3c9fd8 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Sat, 6 Jan 2024 10:52:48 -0500 Subject: [PATCH] some pledge combo fixes (#3934) Co-authored-by: ghoulslash Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/battle_main.c | 2 ++ src/battle_util.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_main.c b/src/battle_main.c index 1216d8dd37..f647ae5569 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4932,6 +4932,8 @@ static void TurnValuesCleanUp(bool8 var0) gSideStatuses[B_SIDE_OPPONENT] &= ~(SIDE_STATUS_QUICK_GUARD | SIDE_STATUS_WIDE_GUARD | SIDE_STATUS_CRAFTY_SHIELD | SIDE_STATUS_MAT_BLOCK); gSideTimers[B_SIDE_PLAYER].followmeTimer = 0; gSideTimers[B_SIDE_OPPONENT].followmeTimer = 0; + + gBattleStruct->pledgeMove = FALSE; // combined pledge move may not have been used due to a canceller } void SpecialStatusesClear(void) diff --git a/src/battle_util.c b/src/battle_util.c index ff8a7f5dc8..81a5c82d8c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3165,7 +3165,7 @@ u8 DoBattlerEndTurnEffects(void) gBattleStruct->turnEffectsTracker++; break; case ENDTURN_SEA_OF_FIRE_DAMAGE: - if (gSideStatuses[GetBattlerSide(battler)] & SIDE_STATUS_SEA_OF_FIRE) + if (IsBattlerAlive(battler) && gSideStatuses[GetBattlerSide(battler)] & SIDE_STATUS_SEA_OF_FIRE) { gBattleMoveDamage = gBattleMons[battler].maxHP / 8; BtlController_EmitStatusAnimation(battler, BUFFER_A, FALSE, STATUS1_BURN);