diff --git a/data/graphics.js b/data/graphics.js
index 79dddda7f..69cdddc49 100644
--- a/data/graphics.js
+++ b/data/graphics.js
@@ -2059,6 +2059,7 @@ var BattleOtherAnims = {
 		anim: function (battle, args) {
 			var attacker = args[0];
 
+			battle.backgroundEffect('#0000DD', 600, 0.2);
 			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
@@ -2155,6 +2156,7 @@ var BattleOtherAnims = {
 		anim: function (battle, args) {
 			var attacker = args[0];
 
+			battle.backgroundEffect('#0000DD', 600, 0.2);
 			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
@@ -5902,8 +5904,8 @@ var BattleMoveAnims = {
 		anim: function (battle, args) {
 			var attacker = args[0];
 
-			battle.backgroundEffect('#000000', 700, 0.3);
-			battle.showEffect('wisp', {
+			battle.backgroundEffect("url('fx/bg-space.jpg')", 800, 0.6);
+			battle.showEffect('shine', {
 				x: attacker.x + 40,
 				y: attacker.y - 40,
 				z: attacker.z,
@@ -5915,7 +5917,7 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 600
 			}, 'accel', 'fade');
-			battle.showEffect('electroball', {
+			battle.showEffect('wisp', {
 				x: attacker.x - 40,
 				y: attacker.y - 40,
 				z: attacker.z,
@@ -5927,7 +5929,7 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 700
 			}, 'accel', 'fade');
-			battle.showEffect('electroball', {
+			battle.showEffect('wisp', {
 				x: attacker.x + 20,
 				y: attacker.y - 40,
 				z: attacker.z,
@@ -5939,7 +5941,7 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'accel', 'fade');
-			battle.showEffect('wisp', {
+			battle.showEffect('shine', {
 				x: attacker.x - 20,
 				y: attacker.y - 40,
 				z: attacker.z,
@@ -16857,7 +16859,7 @@ var BattleMoveAnims = {
 				defender = args[i];
 				defender.delay(200);
 				defender.anim({
-					y: defender.y - 10,
+					y: defender.y - 7,
 					yscale: 0.9,
 					time: 100
 				}, 'decel');
@@ -16866,7 +16868,7 @@ var BattleMoveAnims = {
 				});
 				defender.delay(200);
 				defender.anim({
-					y: defender.y - 10,
+					y: defender.y - 7,
 					yscale: 0.9,
 					time: 100
 				}, 'decel');
@@ -16976,7 +16978,7 @@ var BattleMoveAnims = {
 
 			defender.delay(200);
 			defender.anim({
-				y: defender.y - 10,
+				y: defender.y - 7,
 				yscale: 0.9,
 				time: 100
 			}, 'decel');
@@ -16985,7 +16987,7 @@ var BattleMoveAnims = {
 			});
 			defender.delay(200);
 			defender.anim({
-				y: defender.y - 10,
+				y: defender.y - 7,
 				yscale: 0.9,
 				time: 100
 			}, 'decel');
@@ -17123,290 +17125,290 @@ var BattleMoveAnims = {
 				defender.anim({
 					time: 100
 				}, 'accel');
-
-				battle.backgroundEffect('#000000', 1100, 0.3);
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 1,
-					opacity: 0.5
-				}, {
-					scale: 6,
-					opacity: 0
-				}, 'linear');
-				battle.showEffect('wisp', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 1,
-					opacity: 0.5
-				}, {
-					scale: 3,
-					opacity: 0.3,
-					time: 600
-				}, 'decel', 'fade');
-
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y - 35,
-					z: attacker.z,
-					scale: 0.1,
-					opacity: 0.4,
-					time: 0
-				}, {
-					x: attacker.x + 30,
-					y: attacker.y + 200,
-					z: attacker.z,
-					scale: 0.2,
-					opacity: 0,
-					time: 300
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y - 35,
-					z: attacker.z,
-					scale: 0.1,
-					opacity: 0.4,
-					time: 50
-				}, {
-					x: attacker.x - 30,
-					y: attacker.y + 200,
-					z: attacker.z,
-					scale: 0.2,
-					opacity: 0,
-					time: 350
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y - 35,
-					z: attacker.z,
-					scale: 0.1,
-					opacity: 0.4,
-					time: 100
-				}, {
-					x: attacker.x - 10,
-					y: attacker.y + 200,
-					z: attacker.z,
-					scale: 0.2,
-					opacity: 0,
-					time: 400
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y - 35,
-					z: attacker.z,
-					scale: 0.1,
-					opacity: 0.4,
-					time: 150
-				}, {
-					x: attacker.x + 10,
-					y: attacker.y + 200,
-					z: attacker.z,
-					scale: 0.2,
-					opacity: 0,
-					time: 450
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y - 35,
-					z: attacker.z,
-					scale: 0.1,
-					opacity: 0.4,
-					time: 175
-				}, {
-					x: attacker.x + 35,
-					y: attacker.y + 200,
-					z: attacker.z,
-					scale: 0.2,
-					opacity: 0,
-					time: 500
-				}, 'decel', 'fade');
-				battle.showEffect('energyball', {
-					x: attacker.x,
-					y: attacker.y - 35,
-					z: attacker.z,
-					scale: 0.1,
-					opacity: 0.4,
-					time: 200
-				}, {
-					x: attacker.x,
-					y: attacker.y + 200,
-					z: attacker.behind(-10),
-					scale: 0.2,
-					opacity: 0,
-					time: 550
-				}, 'decel', 'fade');
-
-				battle.showEffect('energyball', {
-					x: defender.x - 20,
-					y: defender.y + 200,
-					z: defender.behind(5),
-					opacity: 0.4,
-					xscale: 0.1,
-					yscale: 5,
-					time: 375
-				}, {
-					y: defender.y + 150,
-					opacity: 0,
-					time: 675
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: defender.x - 20,
-					y: defender.y - 50,
-					z: defender.behind(5),
-					opacity: 0.4,
-					xscale: 0.3,
-					yscale: 0.1,
-					time: 390
-				}, {
-					xscale: 0.6,
-					yscale: 0.1,
-					opacity: 0,
-					time: 675
-				}, 'linear');
-
-				battle.showEffect('energyball', {
-					x: defender.x + 40,
-					y: defender.y + 200,
-					z: defender.behind(-5),
-					opacity: 0.4,
-					xscale: 0.1,
-					yscale: 5,
-					time: 525
-				}, {
-					y: defender.y + 150,
-					opacity: 0,
-					time: 800
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: defender.x + 40,
-					y: defender.y - 50,
-					z: defender.behind(-5),
-					opacity: 0.4,
-					xscale: 0.3,
-					yscale: 0.1,
-					time: 540
-				}, {
-					xscale: 0.6,
-					yscale: 0.1,
-					opacity: 0,
-					time: 800
-				}, 'linear');
-
-				battle.showEffect('energyball', {
-					x: defender.x - 70,
-					y: defender.y + 200,
-					z: defender.behind(-10),
-					opacity: 0.4,
-					xscale: 0.1,
-					yscale: 5,
-					time: 575
-				}, {
-					y: defender.y + 150,
-					z: defender.behind(-10),
-					opacity: 0,
-					time: 825
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: defender.x - 70,
-					y: defender.y - 50,
-					z: defender.z,
-					opacity: 0.4,
-					xscale: 0.3,
-					yscale: 0.1,
-					time: 590
-				}, {
-					xscale: 0.6,
-					yscale: 0.1,
-					opacity: 0,
-					time: 825
-				}, 'linear');
-
-				battle.showEffect('energyball', {
-					x: defender.x + 70,
-					y: defender.y + 200,
-					z: defender.behind(10),
-					opacity: 0.4,
-					xscale: 0.1,
-					yscale: 5,
-					time: 650
-				}, {
-					y: defender.y + 150,
-					opacity: 0,
-					time: 950
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: defender.x + 70,
-					y: defender.y - 50,
-					z: defender.behind(10),
-					opacity: 0.4,
-					xscale: 0.3,
-					yscale: 0.1,
-					time: 665
-				}, {
-					xscale: 0.6,
-					yscale: 0.1,
-					opacity: 0,
-					time: 950
-				}, 'linear');
-
-				battle.showEffect('energyball', {
-					x: defender.x,
-					y: defender.y + 200,
-					z: defender.z,
-					opacity: 0.4,
-					xscale: 0.1,
-					yscale: 5,
-					time: 700
-				}, {
-					y: defender.y + 150,
-					opacity: 0,
-					time: 1000
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: defender.x,
-					y: defender.y - 50,
-					z: defender.z,
-					opacity: 0.4,
-					xscale: 0.3,
-					yscale: 0.1,
-					time: 720
-				}, {
-					xscale: 0.6,
-					yscale: 0.1,
-					opacity: 0,
-					time: 1000
-				}, 'linear');
-
-				battle.showEffect('energyball', {
-					x: defender.x,
-					y: defender.y + 200,
-					z: defender.behind(-20),
-					opacity: 0.4,
-					xscale: 0.1,
-					yscale: 5,
-					time: 725
-				}, {
-					y: defender.y + 150,
-					opacity: 0,
-					time: 1025
-				}, 'decel');
-				battle.showEffect('energyball', {
-					x: defender.x,
-					y: defender.y - 35,
-					z: defender.behind(-20),
-					opacity: 0.4,
-					xscale: 0.3,
-					yscale: 0.1,
-					time: 740
-				}, {
-					xscale: 0.6,
-					yscale: 0.1,
-					opacity: 0,
-					time: 1025
-				}, 'linear');
 			}
+
+			battle.backgroundEffect('#000000', 1100, 0.3);
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 1,
+				opacity: 0.5
+			}, {
+				scale: 6,
+				opacity: 0
+			}, 'linear');
+			battle.showEffect('wisp', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 1,
+				opacity: 0.5
+			}, {
+				scale: 3,
+				opacity: 0.3,
+				time: 600
+			}, 'decel', 'fade');
+
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y - 35,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0.4,
+				time: 0
+			}, {
+				x: attacker.x + 30,
+				y: attacker.y + 200,
+				z: attacker.z,
+				scale: 0.2,
+				opacity: 0,
+				time: 300
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y - 35,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0.4,
+				time: 50
+			}, {
+				x: attacker.x - 30,
+				y: attacker.y + 200,
+				z: attacker.z,
+				scale: 0.2,
+				opacity: 0,
+				time: 350
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y - 35,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0.4,
+				time: 100
+			}, {
+				x: attacker.x - 10,
+				y: attacker.y + 200,
+				z: attacker.z,
+				scale: 0.2,
+				opacity: 0,
+				time: 400
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y - 35,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0.4,
+				time: 150
+			}, {
+				x: attacker.x + 10,
+				y: attacker.y + 200,
+				z: attacker.z,
+				scale: 0.2,
+				opacity: 0,
+				time: 450
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y - 35,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0.4,
+				time: 175
+			}, {
+				x: attacker.x + 35,
+				y: attacker.y + 200,
+				z: attacker.z,
+				scale: 0.2,
+				opacity: 0,
+				time: 500
+			}, 'decel', 'fade');
+			battle.showEffect('energyball', {
+				x: attacker.x,
+				y: attacker.y - 35,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0.4,
+				time: 200
+			}, {
+				x: attacker.x,
+				y: attacker.y + 200,
+				z: attacker.behind(-10),
+				scale: 0.2,
+				opacity: 0,
+				time: 550
+			}, 'decel', 'fade');
+
+			battle.showEffect('energyball', {
+				x: defender.x - 20,
+				y: defender.y + 200,
+				z: defender.behind(5),
+				opacity: 0.4,
+				xscale: 0.1,
+				yscale: 5,
+				time: 375
+			}, {
+				y: defender.y + 150,
+				opacity: 0,
+				time: 675
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: defender.x - 20,
+				y: defender.y - 50,
+				z: defender.behind(5),
+				opacity: 0.4,
+				xscale: 0.3,
+				yscale: 0.1,
+				time: 390
+			}, {
+				xscale: 0.6,
+				yscale: 0.1,
+				opacity: 0,
+				time: 675
+			}, 'linear');
+
+			battle.showEffect('energyball', {
+				x: defender.x + 40,
+				y: defender.y + 200,
+				z: defender.behind(-5),
+				opacity: 0.4,
+				xscale: 0.1,
+				yscale: 5,
+				time: 525
+			}, {
+				y: defender.y + 150,
+				opacity: 0,
+				time: 800
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: defender.x + 40,
+				y: defender.y - 50,
+				z: defender.behind(-5),
+				opacity: 0.4,
+				xscale: 0.3,
+				yscale: 0.1,
+				time: 540
+			}, {
+				xscale: 0.6,
+				yscale: 0.1,
+				opacity: 0,
+				time: 800
+			}, 'linear');
+
+			battle.showEffect('energyball', {
+				x: defender.x - 70,
+				y: defender.y + 200,
+				z: defender.behind(-10),
+				opacity: 0.4,
+				xscale: 0.1,
+				yscale: 5,
+				time: 575
+			}, {
+				y: defender.y + 150,
+				z: defender.behind(-10),
+				opacity: 0,
+				time: 825
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: defender.x - 70,
+				y: defender.y - 50,
+				z: defender.z,
+				opacity: 0.4,
+				xscale: 0.3,
+				yscale: 0.1,
+				time: 590
+			}, {
+				xscale: 0.6,
+				yscale: 0.1,
+				opacity: 0,
+				time: 825
+			}, 'linear');
+
+			battle.showEffect('energyball', {
+				x: defender.x + 70,
+				y: defender.y + 200,
+				z: defender.behind(10),
+				opacity: 0.4,
+				xscale: 0.1,
+				yscale: 5,
+				time: 650
+			}, {
+				y: defender.y + 150,
+				opacity: 0,
+				time: 950
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: defender.x + 70,
+				y: defender.y - 50,
+				z: defender.behind(10),
+				opacity: 0.4,
+				xscale: 0.3,
+				yscale: 0.1,
+				time: 665
+			}, {
+				xscale: 0.6,
+				yscale: 0.1,
+				opacity: 0,
+				time: 950
+			}, 'linear');
+
+			battle.showEffect('energyball', {
+				x: defender.x,
+				y: defender.y + 200,
+				z: defender.z,
+				opacity: 0.4,
+				xscale: 0.1,
+				yscale: 5,
+				time: 700
+			}, {
+				y: defender.y + 150,
+				opacity: 0,
+				time: 1000
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: defender.x,
+				y: defender.y - 50,
+				z: defender.z,
+				opacity: 0.4,
+				xscale: 0.3,
+				yscale: 0.1,
+				time: 720
+			}, {
+				xscale: 0.6,
+				yscale: 0.1,
+				opacity: 0,
+				time: 1000
+			}, 'linear');
+
+			battle.showEffect('energyball', {
+				x: defender.x,
+				y: defender.y + 200,
+				z: defender.behind(-20),
+				opacity: 0.4,
+				xscale: 0.1,
+				yscale: 5,
+				time: 725
+			}, {
+				y: defender.y + 150,
+				opacity: 0,
+				time: 1025
+			}, 'decel');
+			battle.showEffect('energyball', {
+				x: defender.x,
+				y: defender.y - 35,
+				z: defender.behind(-20),
+				opacity: 0.4,
+				xscale: 0.3,
+				yscale: 0.1,
+				time: 740
+			}, {
+				xscale: 0.6,
+				yscale: 0.1,
+				opacity: 0,
+				time: 1025
+			}, 'linear');
 		}
 	},
 	thousandwaves: {
@@ -18080,7 +18082,7 @@ var BattleMoveAnims = {
 			}, 'swing');
 		}
 	},
-	psystrike: { // todo: give psystrike a new background
+	psystrike: {
 		anim: function (battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
@@ -18687,7 +18689,7 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.backgroundEffect('#000000', 800, 0.3);
+			battle.backgroundEffect("url('fx/bg-space.jpg')", 800, 0.6);
 			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
@@ -18717,6 +18719,25 @@ var BattleMoveAnims = {
 				time: 500
 			}, 'linear', 'explode');
 
+			battle.showEffect('wisp', {
+				x: 0,
+				y: +175,
+				z: +50,
+				scale: 1.5,
+				opacity: 1
+			}, {
+				time: 800
+			}, 'accel', 'fade');
+			battle.showEffect('iceball', {
+				x: 0,
+				y: +175,
+				z: +50,
+				scale: 0.5,
+				opacity: 0.8
+			}, {
+				time: 800
+			}, 'accel', 'fade');
+
 			defender.delay(500);
 			defender.anim({
 				z: defender.behind(5),
@@ -20535,63 +20556,66 @@ var BattleMoveAnims = {
 	lavaplume: {
 		anim: function (battle, args) {
 			var attacker = args[0];
-			var defender = args[1];
+			var defender;
 
-			battle.showEffect('fireball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.1,
-				opacity: 1
-			}, {
-				x: defender.x + 30,
-				y: defender.y + 20,
-				z: defender.z,
-				scale: 1,
-				opacity: 0.7
-			}, 'ballistic', 'explode');
-			battle.showEffect('fireball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.1,
-				opacity: 1,
-				time: 75
-			}, {
-				x: defender.x + 20,
-				y: defender.y - 20,
-				z: defender.z,
-				scale: 1,
-				opacity: 0.7
-			}, 'ballistic', 'explode');
-			battle.showEffect('fireball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.1,
-				opacity: 1,
-				time: 150
-			}, {
-				x: defender.x - 30,
-				y: defender.y,
-				z: defender.z,
-				scale: 1,
-				opacity: 0.7
-			}, 'ballistic', 'explode');
-			battle.showEffect('fireball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.1,
-				opacity: 1,
-				time: 225
-			}, {
-				x: defender.x - 10,
-				y: defender.y + 5,
-				z: defender.z,
-				scale: 1,
-				opacity: 0.7
-			}, 'ballistic', 'explode');
+			for (var i = 1; i < args.length; i++) {
+				defender = args[i];
+				battle.showEffect('fireball', {
+					x: attacker.x,
+					y: attacker.y,
+					z: attacker.z,
+					scale: 0.1,
+					opacity: 1
+				}, {
+					x: defender.x + 30,
+					y: defender.y + 20,
+					z: defender.z,
+					scale: 1,
+					opacity: 0.7
+				}, 'ballistic', 'explode');
+				battle.showEffect('fireball', {
+					x: attacker.x,
+					y: attacker.y,
+					z: attacker.z,
+					scale: 0.1,
+					opacity: 1,
+					time: 75
+				}, {
+					x: defender.x + 20,
+					y: defender.y - 20,
+					z: defender.z,
+					scale: 1,
+					opacity: 0.7
+				}, 'ballistic', 'explode');
+				battle.showEffect('fireball', {
+					x: attacker.x,
+					y: attacker.y,
+					z: attacker.z,
+					scale: 0.1,
+					opacity: 1,
+					time: 150
+				}, {
+					x: defender.x - 30,
+					y: defender.y,
+					z: defender.z,
+					scale: 1,
+					opacity: 0.7
+				}, 'ballistic', 'explode');
+				battle.showEffect('fireball', {
+					x: attacker.x,
+					y: attacker.y,
+					z: attacker.z,
+					scale: 0.1,
+					opacity: 1,
+					time: 225
+				}, {
+					x: defender.x - 10,
+					y: defender.y + 5,
+					z: defender.z,
+					scale: 1,
+					opacity: 0.7
+				}, 'ballistic', 'explode');
+			}
 		}
 	},
 	eruption: {
@@ -24677,6 +24701,7 @@ var BattleMoveAnims = {
 			var defender;
 
 			battle.backgroundEffect('#FF99FF', 700, 0.3);
+
 			for (var i = 1; i < args.length; i++) {
 				defender = args[i];
 				defender.delay(350);
@@ -24701,91 +24726,91 @@ var BattleMoveAnims = {
 				defender.anim({
 					time: 75
 				}, 'swing');
-
-				battle.showEffect('petal', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 0.6,
-					opacity: 0.6
-				}, {
-					x: defender.x + 80,
-					y: defender.y + 60,
-					z: defender.z,
-					scale: 2,
-					opacity: 0.3
-				}, 'accel', 'explode');
-				battle.showEffect('petal', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 0.6,
-					opacity: 0.6,
-					time: 75
-				}, {
-					x: defender.x + 60,
-					y: defender.y - 60,
-					z: defender.z,
-					scale: 2,
-					opacity: 0.3
-				}, 'accel', 'explode');
-				battle.showEffect('petal', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 0.6,
-					opacity: 0.6,
-					time: 150
-				}, {
-					x: defender.x - 80,
-					y: defender.y - 20,
-					z: defender.z,
-					scale: 2,
-					opacity: 0.3
-				}, 'accel', 'explode');
-				battle.showEffect('petal', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 0.6,
-					opacity: 0.6,
-					time: 225
-				}, {
-					x: defender.x - 60,
-					y: defender.y + 20,
-					z: defender.z,
-					scale: 2,
-					opacity: 0.3
-				}, 'accel', 'explode');
-				battle.showEffect('petal', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 0.6,
-					opacity: 0.6,
-					time: 275
-				}, {
-					x: defender.x + 40,
-					y: defender.y - 40,
-					z: defender.z,
-					scale: 2,
-					opacity: 0.3
-				}, 'accel', 'explode');
-				battle.showEffect('petal', {
-					x: attacker.x,
-					y: attacker.y,
-					z: attacker.z,
-					scale: 0.6,
-					opacity: 0.6,
-					time: 300
-				}, {
-					x: defender.x - 60,
-					y: defender.y - 30,
-					z: defender.z,
-					scale: 2,
-					opacity: 0.3
-				}, 'accel', 'explode');
 			}
+			if (args.length > 2) defender = args[2];
+			battle.showEffect('petal', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.6,
+				opacity: 0.6
+			}, {
+				x: defender.x + 80,
+				y: defender.y + 60,
+				z: defender.z,
+				scale: 2,
+				opacity: 0.3
+			}, 'accel', 'explode');
+			battle.showEffect('petal', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.6,
+				opacity: 0.6,
+				time: 75
+			}, {
+				x: defender.x + 60,
+				y: defender.y - 60,
+				z: defender.z,
+				scale: 2,
+				opacity: 0.3
+			}, 'accel', 'explode');
+			battle.showEffect('petal', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.6,
+				opacity: 0.6,
+				time: 150
+			}, {
+				x: defender.x - 80,
+				y: defender.y - 20,
+				z: defender.z,
+				scale: 2,
+				opacity: 0.3
+			}, 'accel', 'explode');
+			battle.showEffect('petal', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.6,
+				opacity: 0.6,
+				time: 225
+			}, {
+				x: defender.x - 60,
+				y: defender.y + 20,
+				z: defender.z,
+				scale: 2,
+				opacity: 0.3
+			}, 'accel', 'explode');
+			battle.showEffect('petal', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.6,
+				opacity: 0.6,
+				time: 275
+			}, {
+				x: defender.x + 40,
+				y: defender.y - 40,
+				z: defender.z,
+				scale: 2,
+				opacity: 0.3
+			}, 'accel', 'explode');
+			battle.showEffect('petal', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.6,
+				opacity: 0.6,
+				time: 300
+			}, {
+				x: defender.x - 60,
+				y: defender.y - 30,
+				z: defender.z,
+				scale: 2,
+				opacity: 0.3
+			}, 'accel', 'explode');
 		}
 	},
 	magicalleaf: {
@@ -30275,7 +30300,7 @@ BattleMoveAnims['stompingtantrum'] = {anim:BattleMoveAnims['earthquake'].anim};
 BattleMoveAnims['camouflage'] = {anim:BattleMoveAnims['tailglow'].anim};
 BattleMoveAnims['telekinesis'] = {anim:BattleMoveAnims['kinesis'].anim};
 BattleMoveAnims['foulplay'] = {anim:BattleMoveAnims['psyshock'].anim};
-BattleMoveAnims['psywave'] = {anim:BattleMoveAnims['psyshock'].anim};
+BattleMoveAnims['psywave'] = {anim:BattleMoveAnims['psybeam'].anim};
 BattleMoveAnims['extrasensory'] = {anim:BattleMoveAnims['psychic'].anim};
 BattleMoveAnims['confusion'] = {anim:BattleMoveAnims['psychic'].anim};
 BattleMoveAnims['miracleeye'] = {anim:BattleMoveAnims['mindreader'].anim};