From 1b7493e47a11dfd93afd20ded9646eea0c8e342c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 23 May 2019 10:02:04 +0200
Subject: [PATCH] Fix Flame Burst crashing the game

---
 data/battle_scripts_1.s      | 12 ++++++++----
 src/battle_script_commands.c |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index a4d81c0b5..81376ed3c 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -737,12 +737,16 @@ BattleScript_EffectFlameBurst:
 	goto BattleScript_EffectHit
 	
 BattleScript_MoveEffectFlameBurst::
+	tryfaintmon BS_TARGET, FALSE, NULL
 	printstring STRINGID_BURSTINGFLAMESHIT
 	waitmessage 0x40
-	healthbarupdate BS_SCRIPTING
-	datahpupdate BS_SCRIPTING
-	tryfaintmon BS_SCRIPTING, FALSE, NULL
-	return
+	savetarget
+	copybyte gBattlerTarget, sBATTLER
+	healthbarupdate BS_TARGET
+	datahpupdate BS_TARGET
+	tryfaintmon BS_TARGET, FALSE, NULL
+	restoretarget
+	goto BattleScript_MoveEnd
 	
 BattleScript_EffectPowerTrick:
 	attackcanceler
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ab036f375..e8e7865b0 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -2794,7 +2794,6 @@ void SetMoveEffect(bool32 primary, u32 certain)
                     gBattleMoveDamage = gBattleMons[BATTLE_PARTNER(gBattlerTarget)].hp / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = BattleScript_MoveEffectFlameBurst;
                 }
                 break;