From 92341e6d6a9d3e378f3a21502d339f843749b5ab Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 26 Jan 2023 13:04:01 -0500 Subject: [PATCH] fix flame burst hitting semi-invulnerable partner --- 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 4b12f52ec..ab516d01a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3485,7 +3485,9 @@ void SetMoveEffect(bool32 primary, u32 certain) } break; case MOVE_EFFECT_FLAME_BURST: - if (IsBattlerAlive(BATTLE_PARTNER(gBattlerTarget)) && GetBattlerAbility(BATTLE_PARTNER(gBattlerTarget)) != ABILITY_MAGIC_GUARD) + if (IsBattlerAlive(BATTLE_PARTNER(gBattlerTarget)) + && !(gStatuses3[BATTLE_PARTNER(gBattlerTarget)] & STATUS3_SEMI_INVULNERABLE) + && GetBattlerAbility(BATTLE_PARTNER(gBattlerTarget)) != ABILITY_MAGIC_GUARD) { gBattleScripting.savedBattler = BATTLE_PARTNER(gBattlerTarget); gBattleMoveDamage = gBattleMons[BATTLE_PARTNER(gBattlerTarget)].hp / 16;