From fed5c6fa7a47ab340f3ccb0a705f69de83813e66 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sat, 10 Feb 2024 18:43:46 +0100 Subject: [PATCH] Analogously fix Supersweet Syrup interaction (#4170) --- src/battle_script_commands.c | 2 +- src/battle_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index de0e478d10..b97659cf50 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7117,7 +7117,7 @@ static void Cmd_switchineffects(void) // Don't activate switch-in abilities if the opposing field is empty. // This could happen when a mon uses explosion and causes everyone to faint. - if ((battlerAbility == ABILITY_INTIMIDATE || battlerAbility == ABILITY_DOWNLOAD) + if ((battlerAbility == ABILITY_INTIMIDATE || battlerAbility == ABILITY_SUPERSWEET_SYRUP || battlerAbility == ABILITY_DOWNLOAD) && !IsBattlerAlive(BATTLE_OPPOSITE(battler)) && !IsBattlerAlive(BATTLE_PARTNER(BATTLE_OPPOSITE(battler)))) { diff --git a/src/battle_util.c b/src/battle_util.c index 1411b0b452..f6fee3a372 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4465,8 +4465,8 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && !(gBattleStruct->abilityActivated[GetBattlerSide(battler)] & gBitTable[gBattlerPartyIndexes[battler]])) { gBattleStruct->abilityActivated[GetBattlerSide(battler)] |= gBitTable[gBattlerPartyIndexes[battler]]; - gBattlerAttacker = battler; gSpecialStatuses[battler].switchInAbilityDone = TRUE; + gBattlerAttacker = battler; BattleScriptPushCursorAndCallback(BattleScript_SupersweetSyrupActivates); effect++; }