diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 7d2814306..4dd61cb71 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -367,14 +367,14 @@ BattleScript_EffectPartingShotTrySpAtk:
 	statbuffchange 0x1, BattleScript_MoveEnd
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
-	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_MoveEnd
-	openpartyscreen BS_ATTACKER, BattleScript_ButItFailed
-	printstring STRINGID_PKMNWENTBACK
+	setbyte sMOVEEND_STATE, 0x0
+	moveend 0x0, 0x0
+	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_PartingShotEnd
+	openpartyscreen 0x1, BattleScript_PartingShotEnd
 	switchoutabilities BS_ATTACKER
 	waitstate
 	switchhandleorder BS_ATTACKER, 0x2
-	returnatktoball
-	waitstate
+	returntoball BS_ATTACKER
 	getswitchedmondata BS_ATTACKER
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
@@ -382,7 +382,8 @@ BattleScript_EffectPartingShotTrySpAtk:
 	switchinanim BS_ATTACKER, TRUE
 	waitstate
 	switchineffects BS_ATTACKER
-	goto BattleScript_MoveEnd
+BattleScript_PartingShotEnd:
+	end
 	
 BattleScript_EffectSpAtkUpHit:
 	setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER