diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index e79d7c3f3f..363dc1750b 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -4401,7 +4401,6 @@ Move_BUBBLE_BEAM:
 	delay 1
 	call Bulbblebeam1
 	createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET
-	createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_DEF_PARTNER
 	call Bulbblebeam1
 	call Bulbblebeam1
 	waitforvisualfinish
@@ -12285,22 +12284,22 @@ PoisonBubblesEffect:
 	return
 
 WaterBubbleEffect:
-	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0
 	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
-	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0
 	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
-	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0
 	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
-	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0
 	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
-	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0
 	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	delay 6
-	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0
 	playsewithpan SE_W145C, SOUND_PAN_TARGET
 	return
 
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 63fbdc2f57..18d5bd61df 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -862,7 +862,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .accuracy = 100,
         .pp = 20,
         .secondaryEffectChance = 10,
-        .target = MOVE_TARGET_BOTH,
+        .target = MOVE_TARGET_SELECTED,
         .priority = 0,
         .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
         .split = SPLIT_SPECIAL,