From ab378e9f4bfec455bc4a3fa9199d23a5d6e09637 Mon Sep 17 00:00:00 2001
From: ascriptmaster <ascriptmaster@gmail.com>
Date: Thu, 30 Oct 2014 14:21:31 -0700
Subject: [PATCH] Fix spacing on all moves

Added spaces after commas.
---
 data/graphics.js | 1316 +++++++++++++++++++++++-----------------------
 1 file changed, 658 insertions(+), 658 deletions(-)

diff --git a/data/graphics.js b/data/graphics.js
index d3e70226f..c9fea8a25 100644
--- a/data/graphics.js
+++ b/data/graphics.js
@@ -153,13 +153,13 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 1
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(40),
@@ -285,14 +285,14 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -300,14 +300,14 @@ var BattleOtherAnims = {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -315,14 +315,14 @@ var BattleOtherAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -362,14 +362,14 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('topbite',{
+			battle.showEffect('topbite', {
 				x: defender.x,
 				y: defender.y+50,
 				z: defender.z,
 				scale: .5,
 				opacity: 0,
 				time: 370
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y+20,
 				z: defender.z,
@@ -377,14 +377,14 @@ var BattleOtherAnims = {
 				opacity: 1,
 				time: 500
 			}, 'linear', 'fade');
-			battle.showEffect('bottombite',{
+			battle.showEffect('bottombite', {
 				x: defender.x,
 				y: defender.y-50,
 				z: defender.z,
 				scale: .5,
 				opacity: 0,
 				time: 370
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-20,
 				z: defender.z,
@@ -399,14 +399,14 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('foot',{
+			battle.showEffect('foot', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -421,49 +421,49 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 260
-			},{
+			}, {
 				scale: 2,
 				opacity: 0,
 				time: 560
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 310
-			},{
+			}, {
 				scale: 2,
 				opacity: 0,
 				time: 610
 			}, 'linear');
-			battle.showEffect(attacker.sp,{
+			battle.showEffect(attacker.sp, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				opacity: .3,
 				time: 50
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(70),
 				time: 350
 			}, 'accel', 'fade');
-			battle.showEffect(attacker.sp,{
+			battle.showEffect(attacker.sp, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				opacity: .3,
 				time: 100
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(70),
@@ -590,26 +590,26 @@ var BattleOtherAnims = {
 	selfstatus: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.2,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: 1,
 				time: 300
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				scale: 0,
 				opacity: 1,
 				time: 500
@@ -619,14 +619,14 @@ var BattleOtherAnims = {
 	lightstatus: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 600
@@ -658,14 +658,14 @@ var BattleOtherAnims = {
 				opacity: 1,
 				time: 350
 			}, 'accel');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 700
-			},{
+			}, {
 				scale: 2,
 				opacity: 0,
 				time: 900
@@ -722,42 +722,42 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x-30,
 				y: defender.y-40,
 				z: defender.z,
 				scale: .2,
 				opacity: .7,
 				time: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 500,
 				opacity: 0.1
 			}, 'ballistic2', 'fade');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x+40,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .2,
 				opacity: .7,
 				time: 50
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 550,
 				opacity: 0.1
 			}, 'linear', 'fade');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x+20,
 				y: defender.y-25,
 				z: defender.z,
 				scale: .2,
 				opacity: .7,
 				time: 100
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -769,13 +769,13 @@ var BattleOtherAnims = {
 	fullparalysis: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2
-			},{
+			}, {
 				scale: 3,
 				opacity: .1,
 				time: 300
@@ -787,42 +787,42 @@ var BattleOtherAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 500,
 				opacity: 0
 			}, 'ballistic2');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 50
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 550,
 				opacity: 0
 			}, 'linear');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 100
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -916,41 +916,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: .5
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(40),
 				scale: 1,
 				opacity: .2
 			}, 'decel');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: .5,
 				time: 50
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(40),
 				scale: 1,
 				opacity: .2
 			}, 'decel');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: .5,
 				time: 100
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(40),
@@ -965,13 +965,13 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#B84038',700,.6);
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.behind(-30),
 				scale: 3,
 				opacity: .3
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.behind(-30),
@@ -979,14 +979,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 300
 			}, 'decel', 'fade');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.behind(-30),
 				scale: 3,
 				opacity: .3,
 				time: 100
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.behind(-30),
@@ -994,14 +994,14 @@ var BattleMoveAnims = {
 				opacity: .6,
 				time: 400
 			}, 'decel', 'fade');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.behind(-30),
 				scale: .6,
 				opacity: .8,
 				time: 400
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(40),
@@ -1015,50 +1015,50 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 1,
 				time: 0
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 300
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 1,
 				time: 200
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 500
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 0
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 300
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 200
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 500
@@ -1081,38 +1081,38 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 0
-			},{
+			}, {
 				scale: 8,
 				opacity: .1,
 				time: 600
 			}, 'linear', 'fade');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				scale: 8,
 				opacity: .1,
 				time: 800
 			}, 'linear', 'fade');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 500
-			},{
+			}, {
 				scale: 4,
 				opacity: .1,
 				time: 800
@@ -1123,38 +1123,38 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 0
-			},{
+			}, {
 				scale: 8,
 				opacity: .1,
 				time: 600
 			}, 'linear', 'fade');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				scale: 8,
 				opacity: .1,
 				time: 800
 			}, 'linear', 'fade');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 500
-			},{
+			}, {
 				scale: 4,
 				opacity: .1,
 				time: 800
@@ -1165,50 +1165,50 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3,
 				time: 0
-			},{
+			}, {
 				scale: 8,
 				opacity: .07,
 				time: 400
 			}, 'linear', 'fade');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3,
 				time: 100
-			},{
+			}, {
 				scale: 8,
 				opacity: .07,
 				time: 500
 			}, 'linear', 'fade');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3,
 				time: 200
-			},{
+			}, {
 				scale: 8,
 				opacity: .07,
 				time: 600
 			}, 'linear', 'fade');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 0.3,
 				time: 500
-			},{
+			}, {
 				scale: 2,
 				opacity: .1,
 				time: 800
@@ -1219,35 +1219,35 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x+40,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: .6
-			},{
+			}, {
 				scale: 6,
 				opacity: 0
 			}, 'linear');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x-40,
 				y: attacker.y-20,
 				z: attacker.z,
 				scale: 0,
 				opacity: .6,
 				time: 150
-			},{
+			}, {
 				scale: 6,
 				opacity: 0
 			}, 'linear');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x+10,
 				y: attacker.y+20,
 				z: attacker.z,
 				scale: 0,
 				opacity: .6,
 				time: 300
-			},{
+			}, {
 				scale: 6,
 				opacity: 0
 			}, 'linear');
@@ -1384,26 +1384,26 @@ var BattleMoveAnims = {
 	acidarmor: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.2,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: 1,
 				time: 300
 			}, 'linear');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				scale: 0,
 				opacity: 1,
 				time: 500
@@ -1446,26 +1446,26 @@ var BattleMoveAnims = {
 	calmmind: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 400
 			}, 'linear');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 200
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 600
@@ -1475,26 +1475,26 @@ var BattleMoveAnims = {
 	nastyplot: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 400
 			}, 'linear');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 200
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 600
@@ -1504,26 +1504,26 @@ var BattleMoveAnims = {
 	growth: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 400
 			}, 'linear');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 200
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 600
@@ -1533,14 +1533,14 @@ var BattleMoveAnims = {
 	tailglow: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.2,
 				time: 0
-			},{
+			}, {
 				scale: 1,
 				opacity: .5,
 				time: 400
@@ -1551,67 +1551,67 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 0
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-30,
 				z: defender.z,
 				time: 300
 			}, 'ballistic2', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				time: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y-30,
 				z: attacker.z,
 				time: 300
 			}, 'ballistic2Under', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: defender.x,
 				y: defender.y-30,
 				z: defender.z,
 				time: 300
-			},{
+			}, {
 				x: attacker.x-50,
 				y: attacker.y,
 				z: attacker.z,
 				time: 600
 			}, 'ballistic2', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: attacker.x,
 				y: attacker.y-30,
 				z: attacker.z,
 				time: 300
-			},{
+			}, {
 				x: defender.x-50,
 				y: defender.y,
 				z: defender.z,
 				time: 600
 			}, 'ballistic2Under', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: attacker.x-50,
 				y: attacker.y,
 				z: attacker.z,
 				time: 600
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				time: 900
 			}, 'ballistic2', 'explode');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: defender.x-50,
 				y: defender.y,
 				z: defender.z,
 				time: 600
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -1623,67 +1623,67 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 			var defender = args[1];
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 0
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-30,
 				z: defender.z,
 				time: 300
 			}, 'ballistic2', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				time: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y-30,
 				z: attacker.z,
 				time: 300
 			}, 'ballistic2Under', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: defender.x,
 				y: defender.y-30,
 				z: defender.z,
 				time: 300
-			},{
+			}, {
 				x: attacker.x-50,
 				y: attacker.y,
 				z: attacker.z,
 				time: 600
 			}, 'ballistic2', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: attacker.x,
 				y: attacker.y-30,
 				z: attacker.z,
 				time: 300
-			},{
+			}, {
 				x: defender.x-50,
 				y: defender.y,
 				z: defender.z,
 				time: 600
 			}, 'ballistic2Under', 'fade');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: attacker.x-50,
 				y: attacker.y,
 				z: attacker.z,
 				time: 600
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				time: 900
 			}, 'ballistic2', 'explode');
-			battle.showEffect('pokeball',{
+			battle.showEffect('pokeball', {
 				x: defender.x-50,
 				y: defender.y,
 				z: defender.z,
 				time: 600
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -1694,14 +1694,14 @@ var BattleMoveAnims = {
 	recover: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 2,
 				opacity: 0.1,
 				time: 0
-			},{
+			}, {
 				scale: 0,
 				opacity: .5,
 				time: 600
@@ -1713,26 +1713,26 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 400
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 600
 			}, 'linear');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 500
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 700
@@ -1796,26 +1796,26 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 350
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 500
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 450
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 600
@@ -1884,26 +1884,26 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 350
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 500
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 450
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 600
@@ -1972,26 +1972,26 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 350
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 500
 			}, 'linear');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 450
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 600
@@ -2129,13 +2129,13 @@ var BattleMoveAnims = {
 
 			for (var i=0; i<4; i++)
 			{
-				battle.showEffect('electroball',{
+				battle.showEffect('electroball', {
 					x: attacker.x,
 					y: attacker.y,
 					z: attacker.z,
 					scale: 0.5,
 					opacity: 1
-				},{
+				}, {
 					x: attacker.x+240*xf[i],
 					y: attacker.y,
 					z: attacker.z+137*yf[i],
@@ -2143,13 +2143,13 @@ var BattleMoveAnims = {
 					opacity: 0.5,
 					time: 800
 				}, 'accel');
-				battle.showEffect('electroball',{
+				battle.showEffect('electroball', {
 					x: attacker.x,
 					y: attacker.y,
 					z: attacker.z,
 					scale: 0.5,
 					opacity: 1
-				},{
+				}, {
 					x: attacker.x+339*xf2[i],
 					y: attacker.y,
 					z: attacker.z+194*yf2[i],
@@ -2172,13 +2172,13 @@ var BattleMoveAnims = {
 
 			for (var i=0; i<4; i++)
 			{
-				battle.showEffect('poisonwisp',{
+				battle.showEffect('poisonwisp', {
 					x: attacker.x,
 					y: attacker.y,
 					z: attacker.z,
 					scale: 0.5,
 					opacity: 1
-				},{
+				}, {
 					x: attacker.x+240*xf[i],
 					y: attacker.y,
 					z: attacker.z+137*yf[i],
@@ -2186,13 +2186,13 @@ var BattleMoveAnims = {
 					opacity: 0.5,
 					time: 800
 				}, 'accel');
-				battle.showEffect('poisonwisp',{
+				battle.showEffect('poisonwisp', {
 					x: attacker.x,
 					y: attacker.y,
 					z: attacker.z,
 					scale: 0.5,
 					opacity: 1
-				},{
+				}, {
 					x: attacker.x+339*xf2[i],
 					y: attacker.y,
 					z: attacker.z+194*yf2[i],
@@ -2213,27 +2213,27 @@ var BattleMoveAnims = {
 			var xf2=[1,0,-1,0];
 			var yf2=[0,1,0,-1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: .4,
 				time: 0
-			},{
+			}, {
 				scale: 8,
 				opacity: .1,
 				time: 600
 			}, 'linear', 'fade');
 			for (var i=0; i<4; i++)
 			{
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: attacker.x,
 					y: attacker.y,
 					z: attacker.z,
 					scale: .2,
 					opacity: 1
-				},{
+				}, {
 					x: attacker.x+240*xf[i],
 					y: attacker.y,
 					z: attacker.z+137*yf[i],
@@ -2241,13 +2241,13 @@ var BattleMoveAnims = {
 					opacity: 0.5,
 					time: 800
 				}, 'accel');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: attacker.x,
 					y: attacker.y,
 					z: attacker.z,
 					scale: .2,
 					opacity: 1
-				},{
+				}, {
 					x: attacker.x+339*xf2[i],
 					y: attacker.y,
 					z: attacker.z+194*yf2[i],
@@ -2265,14 +2265,14 @@ var BattleMoveAnims = {
 
 			BattleOtherAnims.clawattack.anim(battle,args);
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 420
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2280,14 +2280,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 520
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2304,14 +2304,14 @@ var BattleMoveAnims = {
 
 			BattleOtherAnims.clawattack.anim(battle,args);
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 420
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2319,14 +2319,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 520
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2456,14 +2456,14 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			BattleOtherAnims.xattack.anim(battle,args);
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.leftof(20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2471,14 +2471,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 750
 			}, 'linear');
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 750
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2494,14 +2494,14 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			BattleOtherAnims.xattack.anim(battle,args);
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 0,
 				time: 450
-			},{
+			}, {
 				x: defender.leftof(20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2509,14 +2509,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 750
 			}, 'linear', 'fade');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 0,
 				time: 750
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2586,14 +2586,14 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			BattleOtherAnims.fastattack.anim(battle, args);
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 260
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(20),
@@ -2609,14 +2609,14 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			BattleOtherAnims.fastattack.anim(battle, args);
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 260
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(20),
@@ -2644,26 +2644,26 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#987058',400,.3);
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 300
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 600
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 500
-			},{
+			}, {
 				scale: 3,
 				opacity: 0,
 				time: 800
@@ -2692,14 +2692,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2707,14 +2707,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2722,14 +2722,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2769,14 +2769,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2784,14 +2784,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2799,14 +2799,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2847,14 +2847,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2862,14 +2862,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2877,14 +2877,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('fist',{
+			battle.showEffect('fist', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y,
 				z: defender.behind(20),
@@ -2924,14 +2924,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -2939,14 +2939,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 550
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -2964,14 +2964,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -2979,14 +2979,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 550
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -3004,14 +3004,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -3019,14 +3019,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 550
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -3044,14 +3044,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -3059,14 +3059,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 550
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-40,
 				z: defender.behind(15),
@@ -3084,13 +3084,13 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#000000', 700, 0.2);
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x+30,
 				y: defender.y+30,
 				z: defender.z,
@@ -3098,14 +3098,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 200
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x+20,
 				y: defender.y-30,
 				z: defender.z,
@@ -3113,14 +3113,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 275
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y,
 				z: defender.z,
@@ -3128,14 +3128,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 350
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 225
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+10,
 				z: defender.z,
@@ -3143,14 +3143,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 425
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 300
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-10,
 				z: defender.z,
@@ -3158,14 +3158,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 375
-			},{
+			}, {
 				x: defender.x-20,
 				y: defender.y,
 				z: defender.z,
@@ -3174,26 +3174,26 @@ var BattleMoveAnims = {
 				time: 575
 			}, 'linear', 'explode');
 
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 550
-			},{
+			}, {
 				scale: 4,
 				opacity: 0,
 				time: 750
 			}, 'linear');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 600
-			},{
+			}, {
 				scale: 4,
 				opacity: 0,
 				time: 800
@@ -3207,49 +3207,49 @@ var BattleMoveAnims = {
 
 			battle.backgroundEffect('#000000', 700, 0.2);
 
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 300
-			},{
+			}, {
 				scale: 4,
 				opacity: 0,
 				time: 600
 			}, 'linear');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 500
-			},{
+			}, {
 				scale: 4,
 				opacity: 0,
 				time: 800
 			}, 'linear');
-			battle.showEffect(attacker.sp,{
+			battle.showEffect(attacker.sp, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				opacity: .3,
 				time: 50
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(-5),
 				time: 350
 			}, 'accel', 'fade');
-			battle.showEffect(attacker.sp,{
+			battle.showEffect(attacker.sp, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				opacity: .3,
 				time: 100
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(-5),
@@ -3279,26 +3279,26 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 300
-			},{
+			}, {
 				scale: 8,
 				opacity: 0,
 				time: 600
 			}, 'linear');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				scale: 8,
 				opacity: 0,
 				time: 800
@@ -3327,14 +3327,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 1,
 				time: 0
-			},{
+			}, {
 				x: attacker.x-50,
 				y: attacker.y-50,
 				z: attacker.z,
@@ -3342,14 +3342,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 300
 			}, 'ballistic');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 1,
 				time: 150
-			},{
+			}, {
 				x: attacker.x+60,
 				y: attacker.y-50,
 				z: attacker.z,
@@ -3357,14 +3357,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 450
 			}, 'ballistic');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 1,
 				time: 300
-			},{
+			}, {
 				x: attacker.x+10,
 				y: attacker.y-60,
 				z: attacker.z,
@@ -3397,14 +3397,14 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: 0.5,
 				time: 450
-			},{
+			}, {
 				scale: 2,
 				opacity: 0,
 				time: 700
@@ -3524,14 +3524,14 @@ var BattleMoveAnims = {
 				time: 100
 			});
 
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: defender.x+10,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .4,
 				opacity: 1,
 				time: 0
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y,
 				z: defender.z,
@@ -3539,14 +3539,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 300
 			}, 'linear');
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: defender.x-30,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .4,
 				opacity: 1,
 				time: 100
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y,
 				z: defender.z,
@@ -3554,14 +3554,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 400
 			}, 'linear');
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: defender.x+40,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .4,
 				opacity: 1,
 				time: 200
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y,
 				z: defender.z,
@@ -3576,14 +3576,14 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			for (var i=0; i<3; i++) {
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x+30,
 					y: defender.y-35,
 					z: defender.behind(i*40-60),
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x-30,
 					y: defender.y,
 					z: defender.behind(i*40-60),
@@ -3591,14 +3591,14 @@ var BattleMoveAnims = {
 					opacity: .4,
 					time: 200*i+200
 				}, 'linear', 'fade');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x-30,
 					y: defender.y+35,
 					z: defender.behind(i*40-60),
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x+30,
 					y: defender.y,
 					z: defender.behind(i*40-60),
@@ -3606,14 +3606,14 @@ var BattleMoveAnims = {
 					opacity: .4,
 					time: 200*i+200
 				}, 'linear', 'fade');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x+30,
 					y: defender.y,
 					z: defender.behind(i*40-60),
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x-30,
 					y: defender.y-35,
 					z: defender.behind(i*40-60),
@@ -3621,14 +3621,14 @@ var BattleMoveAnims = {
 					opacity: .4,
 					time: 200*i+200
 				}, 'linear', 'fade');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x-30,
 					y: defender.y,
 					z: defender.behind(i*40-60),
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x+30,
 					y: defender.y-35,
 					z: defender.behind(i*40-60),
@@ -3645,14 +3645,14 @@ var BattleMoveAnims = {
 			battle.backgroundEffect('#000000', 900, 0.6);
 
 			for (var i=0; i<4; i++) {
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x+50,
 					y: defender.y-35,
 					z: defender.z,
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x-50,
 					y: defender.y,
 					z: defender.z,
@@ -3660,14 +3660,14 @@ var BattleMoveAnims = {
 					opacity: .4,
 					time: 200*i+200
 				}, 'linear', 'fade');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x-50,
 					y: defender.y+35,
 					z: defender.z,
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x+50,
 					y: defender.y,
 					z: defender.z,
@@ -3675,14 +3675,14 @@ var BattleMoveAnims = {
 					opacity: .4,
 					time: 200*i+200
 				}, 'linear', 'fade');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x+50,
 					y: defender.y,
 					z: defender.z,
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x-50,
 					y: defender.y-35,
 					z: defender.z,
@@ -3690,14 +3690,14 @@ var BattleMoveAnims = {
 					opacity: .4,
 					time: 200*i+200
 				}, 'linear', 'fade');
-				battle.showEffect('wisp',{
+				battle.showEffect('wisp', {
 					x: defender.x-50,
 					y: defender.y,
 					z: defender.z,
 					scale: .2,
 					opacity: 1,
 					time: 200*i
-				},{
+				}, {
 					x: defender.x+50,
 					y: defender.y-35,
 					z: defender.z,
@@ -3711,40 +3711,40 @@ var BattleMoveAnims = {
 	roar: {
 		anim: function(battle, args) {
 			var attacker = args[0];
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 0.7,
 				time: 0
-			},{
+			}, {
 				z: attacker.behind(-50),
 				scale: 5,
 				opacity: 0,
 				time: 400
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 0.7,
 				time: 150
-			},{
+			}, {
 				z: attacker.behind(-50),
 				scale: 5,
 				opacity: 0,
 				time: 600
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0,
 				opacity: 0.7,
 				time: 300
-			},{
+			}, {
 				z: attacker.behind(-50),
 				scale: 5,
 				opacity: 0,
@@ -3756,13 +3756,13 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var defender = args[1];
 			battle.backgroundEffect('#000000', 1100, 0.7);
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y + 100,
 				z: defender.z,
 				yscale: 0,
 				xscale: 1
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y + 25,
 				z: defender.z,
@@ -3771,25 +3771,25 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 200
 			}, 'linear');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y + 25,
 				z: defender.z,
 				yscale: .7,
 				xscale: 1,
 				time: 200
-			},{
+			}, {
 				opacity: 0,
 				time: 700
 			}, 'linear');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y + 25,
 				z: defender.z,
 				yscale: .7,
 				xscale: 1,
 				time: 600
-			},{
+			}, {
 				opacity: 0,
 				time: 1100
 			}, 'linear');
@@ -3799,13 +3799,13 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var defender = args[1];
 			battle.backgroundEffect('#000000', 600, 0.2);
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x,
 				y: defender.y + 100,
 				z: defender.z,
 				yscale: 0,
 				xscale: 1
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y + 25,
 				z: defender.z,
@@ -3814,14 +3814,14 @@ var BattleMoveAnims = {
 				opacity: .8,
 				time: 200
 			}, 'linear', 'fade');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x-25,
 				y: defender.y + 100,
 				z: defender.z,
 				yscale: 0,
 				xscale: 1,
 				time: 200
-			},{
+			}, {
 				x: defender.x-25,
 				y: defender.y + 25,
 				z: defender.z,
@@ -3830,14 +3830,14 @@ var BattleMoveAnims = {
 				opacity: .8,
 				time: 400
 			}, 'linear', 'fade');
-			battle.showEffect('lightning',{
+			battle.showEffect('lightning', {
 				x: defender.x+25,
 				y: defender.y + 100,
 				z: defender.z,
 				yscale: 0,
 				xscale: 1,
 				time: 400
-			},{
+			}, {
 				x: defender.x+25,
 				y: defender.y + 25,
 				z: defender.z,
@@ -3893,13 +3893,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .6,
 				opacity: 0.4
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -3918,41 +3918,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				opacity: 0.6,
 				time: 300
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .5,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				opacity: 0.6,
 				time: 375
 			}, 'linear', 'fade');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .5,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -3979,27 +3979,27 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				opacity: 0.6,
 				time: 300
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .2,
 				opacity: 0.6,
 				time: 30
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4014,60 +4014,60 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x+20,
 				y: attacker.y+30,
 				z: defender.z,
 				scale: 0,
 				opacity: 1
-			},{
+			}, {
 				y: attacker.y-20,
 				scale: 4,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: parseInt((attacker.x+defender.x)/2)-20,
 				y: parseInt((attacker.y+defender.y)/2)+30,
 				z: parseInt((attacker.z+defender.z)/2),
 				scale: 0,
 				opacity: 1,
 				time: 150
-			},{
+			}, {
 				y: parseInt((attacker.y+defender.y)/2)-20,
 				scale: 4,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: defender.x+10,
 				y: defender.y+30,
 				z: defender.z,
 				scale: 0,
 				opacity: 1,
 				time: 300
-			},{
+			}, {
 				y: defender.y-20,
 				scale: 4,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect(attacker.sp,{
+			battle.showEffect(attacker.sp, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				opacity: .3,
 				time: 50
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(70),
 				time: 350
 			}, 'accel', 'fade');
-			battle.showEffect(attacker.sp,{
+			battle.showEffect(attacker.sp, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				opacity: .3,
 				time: 100
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(70),
@@ -4113,41 +4113,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1.5,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				opacity: 0.6,
 				time: 300
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1.5,
 				opacity: 0.1,
 				time: 100
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				opacity: 0.3,
 				time: 400
 			}, 'linear', 'fade');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1.5,
 				opacity: 0.1,
 				time: 200
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4161,55 +4161,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 100
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 600
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.5,
 				opacity: 0.2,
 				time: 300
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-5,
 				z: defender.behind(20),
@@ -4223,13 +4223,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .2,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x+50,
 				y: defender.y+20,
 				z: defender.behind(20),
@@ -4237,13 +4237,13 @@ var BattleMoveAnims = {
 				scale: .7,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .2,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-30,
 				z: defender.behind(20),
@@ -4251,13 +4251,13 @@ var BattleMoveAnims = {
 				scale: .7,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .2,
 				opacity: 0.7
-			},{
+			}, {
 				x: defender.x-50,
 				y: defender.y+5,
 				z: defender.behind(20),
@@ -4272,55 +4272,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .7,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .7,
 				opacity: 0.2,
 				time: 100
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .7,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 600
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .7,
 				opacity: 0.2,
 				time: 300
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-5,
 				z: defender.behind(20),
@@ -4334,55 +4334,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.7
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(0),
 				opacity: 0.6,
 				time: 400
 			}, 'decel', 'explode');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.7,
 				time: 100
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-5,
 				z: defender.behind(0),
 				opacity: 0.6,
 				time: 500
 			}, 'decel', 'explode');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.7,
 				time: 200
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+5,
 				z: defender.behind(0),
 				opacity: 0.6,
 				time: 600
 			}, 'decel', 'explode');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.7,
 				time: 300
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-5,
 				z: defender.behind(0),
@@ -4396,13 +4396,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4417,13 +4417,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4431,14 +4431,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 400
 			}, 'ballistic', 'explode');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 100
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-20,
 				z: defender.z,
@@ -4446,14 +4446,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 500
 			}, 'ballistic', 'explode');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 200
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y-10,
 				z: defender.z,
@@ -4468,13 +4468,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4482,14 +4482,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 400
 			}, 'ballistic', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 100
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-20,
 				z: defender.z,
@@ -4497,14 +4497,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 500
 			}, 'ballistic', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 200
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y-10,
 				z: defender.z,
@@ -4519,13 +4519,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0
-			},{
+			}, {
 				x: defender.leftof(40),
 				y: defender.y+15,
 				z: defender.z,
@@ -4533,14 +4533,14 @@ var BattleMoveAnims = {
 				opacity: .7,
 				time: 500
 			}, 'decel', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.leftof(40),
 				y: defender.y+15,
 				z: defender.z,
 				scale: 0.8,
 				opacity: .7,
 				time: 500
-			},{
+			}, {
 				x: defender.leftof(-40),
 				y: defender.y,
 				z: defender.z,
@@ -4548,14 +4548,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 700
 			}, 'swing', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.leftof(-40),
 				y: defender.y,
 				z: defender.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 700
-			},{
+			}, {
 				x: defender.leftof(10),
 				y: defender.y-15,
 				z: defender.z,
@@ -4570,56 +4570,56 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: defender.x+15,
 				y: defender.y-50,
 				z: defender.z,
 				scale: .5
-			},{
+			}, {
 				y: defender.y+60,
 				opacity: 0,
 				time: 350
 			}, 'accel');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: defender.x+30,
 				y: defender.y-50,
 				z: defender.z,
 				scale: .5,
 				time: 150
-			},{
+			}, {
 				y: defender.y+60,
 				opacity: 0,
 				time: 500
 			}, 'accel');
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: defender.x-30,
 				y: defender.y-50,
 				z: defender.z,
 				scale: .5,
 				time: 300
-			},{
+			}, {
 				y: defender.y+60,
 				opacity: 0,
 				time: 650
 			}, 'accel');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: defender.x,
 				y: defender.y-50,
 				z: defender.z,
 				scale: .5,
 				time: 400
-			},{
+			}, {
 				y: defender.y+60,
 				opacity: 0,
 				time: 750
 			}, 'accel');
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: defender.x-15,
 				y: defender.y-50,
 				z: defender.z,
 				scale: .5,
 				time: 500
-			},{
+			}, {
 				y: defender.y+60,
 				opacity: 0,
 				time: 850
@@ -4631,61 +4631,61 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: defender.x+15,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: .5
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 300
 			}, 'linear', 'explode');
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: defender.x+30,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: .5,
 				time: 100
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: defender.x-30,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: .5,
 				time: 200
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: defender.x,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: .5,
 				time: 300
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 600
 			}, 'linear', 'explode');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: defender.x-15,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: .5,
 				time: 400
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 700
@@ -4697,61 +4697,61 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x+15,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: 1
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 300
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x+30,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: 1,
 				time: 100
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x-30,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: 1,
 				time: 200
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: 1,
 				time: 300
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 600
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: defender.x-15,
 				y: defender.y+70,
 				z: defender.z,
 				opacity: 0,
 				scale: 1,
 				time: 400
-			},{
+			}, {
 				y: defender.y-20,
 				opacity: 1,
 				time: 700
@@ -4763,37 +4763,37 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: defender.x+10,
 				y: defender.y+90,
 				z: defender.z,
 				opacity: 0,
 				scale: .4
-			},{
+			}, {
 				y: defender.y-5,
 				opacity: 1,
 				time: 500
 			}, 'decel', 'fade');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: defender.x+30,
 				y: defender.y+90,
 				z: defender.z,
 				opacity: 0,
 				scale: .4,
 				time: 150
-			},{
+			}, {
 				y: defender.y-5,
 				opacity: 1,
 				time: 650
 			}, 'decel', 'fade');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: defender.x-30,
 				y: defender.y+90,
 				z: defender.z,
 				opacity: 0,
 				scale: .4,
 				time: 300
-			},{
+			}, {
 				y: defender.y-5,
 				opacity: 1,
 				time: 800
@@ -4805,13 +4805,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4819,14 +4819,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 500
 			}, 'linear', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 50
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -4834,70 +4834,70 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 550
 			}, 'linear', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-100,
 				scale: 3,
 				opacity: 0,
 				time: 1100
 			}, 'linear', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y+80,
 				scale: 3,
 				opacity: 0,
 				time: 1100
 			}, 'linear', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.x+60,
 				y: defender.y+80,
 				scale: 3,
 				opacity: 0,
 				time: 1100
 			}, 'linear', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.x-90,
 				y: defender.y-40,
 				scale: 3,
 				opacity: 0,
 				time: 1100
 			}, 'linear', 'fade');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 1,
 				time: 500
-			},{
+			}, {
 				x: defender.x+90,
 				y: defender.y-40,
 				scale: 3,
@@ -4911,41 +4911,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x-100,
 				y: defender.y,
 				z: defender.z,
 				scale: .5,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				scale: 1,
 				opacity: 1,
 				time: 250
 			}, 'decel', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+70,
 				y: defender.y-70,
 				z: defender.z,
 				scale: .5,
 				opacity: 0.2,
 				time: 100
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				scale: 1,
 				opacity: 1,
 				time: 350
 			}, 'decel', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y+100,
 				z: defender.z,
 				scale: .5,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				scale: 1,
@@ -4953,70 +4953,70 @@ var BattleMoveAnims = {
 				time: 450
 			}, 'decel', 'fade');
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-100,
 				scale: 0.9,
 				opacity: 0,
 				time: 950
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y+80,
 				scale: 0.9,
 				opacity: 0,
 				time: 950
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x+60,
 				y: defender.y+80,
 				scale: 0.9,
 				opacity: 0,
 				time: 950
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x-90,
 				y: defender.y-40,
 				scale: 0.9,
 				opacity: 0,
 				time: 950
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 1,
 				time: 450
-			},{
+			}, {
 				x: defender.x+90,
 				y: defender.y-40,
 				scale: 0.9,
@@ -5031,13 +5031,13 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#000000', 600, 0.1);
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -5052,13 +5052,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -5073,13 +5073,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -5094,13 +5094,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -5115,24 +5115,24 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 1
-			},{
+			}, {
 				y: attacker.y+90,
 				opacity: 0
 			}, 'linear');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x,
 				y: defender.y+90,
 				z: defender.z,
 				scale: 1,
 				opacity: 0,
 				time: 500
-			},{
+			}, {
 				y: defender.y,
 				opacity: 1,
 				time: 1000
@@ -5143,13 +5143,13 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 1
-			},{
+			}, {
 				y: attacker.y+130,
 				opacity: 0
 			}, 'accel');
@@ -5157,13 +5157,13 @@ var BattleMoveAnims = {
 		residualAnim: function(battle, args) {
 			var attacker = args[0];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y+130,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -5175,13 +5175,13 @@ var BattleMoveAnims = {
 		anim: function(battle, args) {
 			var attacker = args[0];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 1
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y+130,
 				z: attacker.z,
@@ -5191,13 +5191,13 @@ var BattleMoveAnims = {
 		residualAnim: function(battle, args) {
 			var attacker = args[0];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y+130,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -5210,55 +5210,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5
-			},{
+			}, {
 				x: defender.leftof(-40),
 				y: defender.y-10,
 				z: defender.z,
 				scale: .3,
 				opacity: 1
 			}, 'ballistic');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 75
-			},{
+			}, {
 				x: defender.leftof(-20),
 				y: defender.y-40,
 				z: defender.z,
 				scale: .3,
 				opacity: 1
 			}, 'ballistic');
-			battle.showEffect('rock1',{
+			battle.showEffect('rock1', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 150
-			},{
+			}, {
 				x: defender.leftof(30),
 				y: defender.y-20,
 				z: defender.z,
 				scale: .3,
 				opacity: 1
 			}, 'ballistic');
-			battle.showEffect('rock2',{
+			battle.showEffect('rock2', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 225
-			},{
+			}, {
 				x: defender.leftof(10),
 				y: defender.y-30,
 				z: defender.z,
@@ -5272,41 +5272,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5
-			},{
+			}, {
 				x: defender.x-25,
 				y: defender.y-40,
 				z: defender.z,
 				scale: .3,
 				opacity: 1
 			}, 'ballistic');
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 125
-			},{
+			}, {
 				x: defender.x+50,
 				y: defender.y-40,
 				z: defender.z,
 				scale: .3,
 				opacity: 1
 			}, 'ballistic');
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 250
-			},{
+			}, {
 				x: defender.x+30,
 				y: defender.y-45,
 				z: defender.z,
@@ -5320,27 +5320,27 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisoncaltrop',{
+			battle.showEffect('poisoncaltrop', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5
-			},{
+			}, {
 				x: defender.x+5,
 				y: defender.y-40,
 				z: defender.z,
 				scale: .3,
 				opacity: 1
 			}, 'ballistic');
-			battle.showEffect('poisoncaltrop',{
+			battle.showEffect('poisoncaltrop', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 200
-			},{
+			}, {
 				x: defender.x-15,
 				y: defender.y-35,
 				z: defender.z,
@@ -5354,13 +5354,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('web',{
+			battle.showEffect('web', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -5374,41 +5374,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y-40,
 				z: defender.z,
 				scale: .2,
 				opacity: .6
 			}, 'ballistic');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 125
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .2,
 				opacity: .6
 			}, 'ballistic');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.5,
 				time: 250
-			},{
+			}, {
 				x: defender.x+20,
 				y: defender.y-25,
 				z: defender.z,
@@ -5422,35 +5422,35 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: defender.x+40,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: .6
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('poisonwisp',{
+			battle.showEffect('poisonwisp', {
 				x: defender.x-40,
 				y: defender.y-20,
 				z: defender.z,
 				scale: 0,
 				opacity: .6,
 				time: 150
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: defender.x+10,
 				y: defender.y+20,
 				z: defender.z,
 				scale: 0,
 				opacity: .6,
 				time: 300
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
@@ -5461,13 +5461,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 1
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(40),
@@ -5476,36 +5476,36 @@ var BattleMoveAnims = {
 				time: 100
 			}, 'linear');
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: defender.x+40,
 				y: defender.y,
 				z: defender.z,
 				scale: 0,
 				opacity: .6,
 				time: 100
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x-40,
 				y: defender.y-20,
 				z: defender.z,
 				scale: 0,
 				opacity: .6,
 				time: 150
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+10,
 				y: defender.y+20,
 				z: defender.z,
 				scale: 0,
 				opacity: .6,
 				time: 200
-			},{
+			}, {
 				scale: 1,
 				opacity: 0
 			}, 'decel');
@@ -5516,24 +5516,24 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x+30,
 				y: defender.y+10,
 				z: defender.z,
 				scale: 0,
 				opacity: .6
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: defender.x-30,
 				y: defender.y-10,
 				z: defender.z,
 				scale: 0,
 				opacity: .6,
 				time: 150
-			},{
+			}, {
 				scale: 3,
 				opacity: 0
 			}, 'decel');
@@ -5544,13 +5544,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+60,
 				y: defender.y+30,
 				z: defender.z,
 				scale: .2,
 				opacity: 1
-			},{
+			}, {
 				x: defender.x-70,
 				y: defender.y-40,
 				z: defender.z,
@@ -5558,14 +5558,14 @@ var BattleMoveAnims = {
 				opacity: .4,
 				time: 200
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+60,
 				y: defender.y+30,
 				z: defender.z,
 				scale: .2,
 				opacity: 1,
 				time: 100
-			},{
+			}, {
 				x: defender.x-70,
 				y: defender.y-40,
 				z: defender.z,
@@ -5573,14 +5573,14 @@ var BattleMoveAnims = {
 				opacity: .4,
 				time: 300
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+80,
 				y: defender.y+10,
 				z: defender.z,
 				scale: .2,
 				opacity: 1,
 				time: 100
-			},{
+			}, {
 				x: defender.x-50,
 				y: defender.y-60,
 				z: defender.z,
@@ -5588,14 +5588,14 @@ var BattleMoveAnims = {
 				opacity: .4,
 				time: 300
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+80,
 				y: defender.y+10,
 				z: defender.z,
 				scale: .2,
 				opacity: 1,
 				time: 200
-			},{
+			}, {
 				x: defender.x-50,
 				y: defender.y-60,
 				z: defender.z,
@@ -5610,13 +5610,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+60,
 				y: defender.y-10,
 				z: defender.z,
 				scale: .2,
 				opacity: 1
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y-10,
 				z: defender.z,
@@ -5624,14 +5624,14 @@ var BattleMoveAnims = {
 				opacity: .4,
 				time: 200
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+60,
 				y: defender.y+20,
 				z: defender.z,
 				scale: .2,
 				opacity: 1,
 				time: 100
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y+20,
 				z: defender.z,
@@ -5639,14 +5639,14 @@ var BattleMoveAnims = {
 				opacity: .4,
 				time: 300
 			}, 'linear', 'fade');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: defender.x+60,
 				y: defender.y+50,
 				z: defender.z,
 				scale: .2,
 				opacity: 1,
 				time: 200
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y+50,
 				z: defender.z,
@@ -5661,39 +5661,39 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x+40-40,
 				y: defender.y+80,
 				z: defender.z,
 				scale: 1,
 				opacity: 0
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y,
 				scale: 1,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x-40-40,
 				y: defender.y+20+80,
 				z: defender.z,
 				scale: 1,
 				opacity: 0,
 				time: 150
-			},{
+			}, {
 				x: defender.x-40,
 				y: defender.y+20,
 				scale: 1,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x+10-40,
 				y: defender.y-20+80,
 				z: defender.z,
 				scale: 1,
 				opacity: 0,
 				time: 300
-			},{
+			}, {
 				x: defender.x-40,
 				y: defender.y+20,
 				scale: 1,
@@ -5706,41 +5706,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y+5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 75
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y-5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 150
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y+5,
 				z: defender.behind(30),
@@ -5754,41 +5754,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y+5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 75
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y-5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 150
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y+5,
 				z: defender.behind(30),
@@ -5802,41 +5802,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y+5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 75
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y-5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 150
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y+5,
 				z: defender.behind(30),
@@ -5850,55 +5850,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x+30,
 				y: defender.y+20,
 				z: defender.z,
 				scale: 1,
 				opacity: 0.3
 			}, 'ballistic', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x+20,
 				y: defender.y-20,
 				z: defender.z,
 				scale: 1,
 				opacity: 0.3
 			}, 'ballistic', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y,
 				z: defender.z,
 				scale: 1,
 				opacity: 0.3
 			}, 'ballistic', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0.6,
 				time: 225
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+5,
 				z: defender.z,
@@ -5912,55 +5912,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			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',{
+			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',{
+			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',{
+			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,
@@ -5976,13 +5976,13 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#9AB440', 700, 0.4);
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x+30,
 				y: defender.y+30,
 				z: defender.z,
@@ -5990,14 +5990,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 200
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x+20,
 				y: defender.y-30,
 				z: defender.z,
@@ -6005,14 +6005,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 275
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y,
 				z: defender.z,
@@ -6020,14 +6020,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 350
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 225
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+10,
 				z: defender.z,
@@ -6035,14 +6035,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 425
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 300
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-10,
 				z: defender.z,
@@ -6050,14 +6050,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 375
-			},{
+			}, {
 				x: defender.x-20,
 				y: defender.y,
 				z: defender.z,
@@ -6077,55 +6077,55 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#009AA4', 700, 0.5);
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x+60,
 				y: defender.y+40,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.3
 			}, 'accel', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-40,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.3
 			}, 'accel', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.3
 			}, 'accel', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6,
 				time: 225
-			},{
+			}, {
 				x: defender.x-20,
 				y: defender.y+10,
 				z: defender.z,
@@ -6157,55 +6157,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.8
-			},{
+			}, {
 				x: defender.x+60,
 				y: defender.y+40,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.8,
 				time: 75
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-40,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.8,
 				time: 150
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.8,
 				time: 225
-			},{
+			}, {
 				x: defender.x-20,
 				y: defender.y+10,
 				z: defender.z,
@@ -6219,13 +6219,13 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('web',{
+			battle.showEffect('web', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
@@ -6233,14 +6233,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 400
 			}, 'ballistic', 'explode');
-			battle.showEffect('web',{
+			battle.showEffect('web', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 100
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-20,
 				z: defender.z,
@@ -6248,14 +6248,14 @@ var BattleMoveAnims = {
 				opacity: 1,
 				time: 500
 			}, 'ballistic', 'explode');
-			battle.showEffect('web',{
+			battle.showEffect('web', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.1,
 				opacity: 0,
 				time: 200
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y-10,
 				z: defender.z,
@@ -6270,42 +6270,42 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 500,
 				opacity: 0
 			}, 'ballistic2');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 50
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 550,
 				opacity: 0
 			}, 'linear');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 100
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -6319,42 +6319,42 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 0
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 500,
 				opacity: 0
 			}, 'ballistic2');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 50
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				time: 550,
 				opacity: 0
 			}, 'linear');
-			battle.showEffect('shadowball',{
+			battle.showEffect('shadowball', {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
 				scale: 0.6,
 				opacity: .6,
 				time: 100
-			},{
+			}, {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
@@ -6368,55 +6368,55 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.5,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.5,
 				opacity: 0.2,
 				time: 100
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.5,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 600
 			}, 'linear', 'explode');
-			battle.showEffect('energyball',{
+			battle.showEffect('energyball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.5,
 				opacity: 0.2,
 				time: 300
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y-5,
 				z: defender.behind(20),
@@ -6430,41 +6430,41 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('fireball',{
+			battle.showEffect('fireball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('icicle',{
+			battle.showEffect('icicle', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 1,
 				opacity: 0.2,
 				time: 100
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-5,
 				z: defender.behind(20),
 				opacity: 0.6,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('electroball',{
+			battle.showEffect('electroball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.5,
 				opacity: 0.2,
 				time: 200
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+5,
 				z: defender.behind(20),
@@ -6500,14 +6500,14 @@ var BattleMoveAnims = {
 				time: 100
 			});
 
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: defender.x+10,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .5,
 				opacity: 1,
 				time: 0
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y+10,
 				z: defender.z,
@@ -6515,14 +6515,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 300
 			}, 'linear', 'explode');
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: defender.x-30,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .5,
 				opacity: 1,
 				time: 100
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y+10,
 				z: defender.z,
@@ -6530,14 +6530,14 @@ var BattleMoveAnims = {
 				opacity: 0,
 				time: 400
 			}, 'linear', 'explode');
-			battle.showEffect('caltrop',{
+			battle.showEffect('caltrop', {
 				x: defender.x+40,
 				y: defender.y-35,
 				z: defender.z,
 				scale: .5,
 				opacity: 1,
 				time: 200
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y+10,
 				z: defender.z,
@@ -6553,41 +6553,41 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#00CCCC', 700, 0.5);
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y+5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 75
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y-5,
 				z: defender.behind(30),
 				scale: 1,
 				opacity: 0.6
 			}, 'decel', 'explode');
-			battle.showEffect('waterwisp',{
+			battle.showEffect('waterwisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.4,
 				opacity: 0.3,
 				time: 150
-			},{
+			}, {
 				x: defender.x,
 				y: defender.y+5,
 				z: defender.behind(30),
@@ -6611,13 +6611,13 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#FF99FF', 700, 0.3);
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x+30,
 				y: defender.y+30,
 				z: defender.z,
@@ -6625,14 +6625,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 200
 			}, 'linear', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x+20,
 				y: defender.y-30,
 				z: defender.z,
@@ -6640,14 +6640,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 275
 			}, 'linear', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x-30,
 				y: defender.y,
 				z: defender.z,
@@ -6655,14 +6655,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 350
 			}, 'linear', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 225
-			},{
+			}, {
 				x: defender.x-10,
 				y: defender.y+10,
 				z: defender.z,
@@ -6670,14 +6670,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 425
 			}, 'linear', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 300
-			},{
+			}, {
 				x: defender.x+10,
 				y: defender.y-10,
 				z: defender.z,
@@ -6685,14 +6685,14 @@ var BattleMoveAnims = {
 				opacity: 0.3,
 				time: 500
 			}, 'linear', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: .4,
 				opacity: 0.6,
 				time: 375
-			},{
+			}, {
 				x: defender.x-20,
 				y: defender.y,
 				z: defender.z,
@@ -6708,55 +6708,55 @@ var BattleMoveAnims = {
 			var defender = args[1];
 
 			battle.backgroundEffect('#FF99FF', 700, 0.5);
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6
-			},{
+			}, {
 				x: defender.x+60,
 				y: defender.y+40,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.3
 			}, 'accel', 'explode');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6,
 				time: 75
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y-40,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.3
 			}, 'accel', 'explode');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6,
 				time: 150
-			},{
+			}, {
 				x: defender.x-60,
 				y: defender.y,
 				z: defender.z,
 				scale: 2,
 				opacity: 0.3
 			}, 'accel', 'explode');
-			battle.showEffect('wisp',{
+			battle.showEffect('wisp', {
 				x: attacker.x,
 				y: attacker.y,
 				z: attacker.z,
 				scale: 0.6,
 				opacity: 0.6,
 				time: 225
-			},{
+			}, {
 				x: defender.x-20,
 				y: defender.y+10,
 				z: defender.z,
@@ -6770,39 +6770,39 @@ var BattleMoveAnims = {
 			var attacker = args[0];
 			var defender = args[1];
 
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: defender.x+40-40,
 				y: defender.y+80,
 				z: defender.z,
 				scale: 1,
 				opacity: 0
-			},{
+			}, {
 				x: defender.x+40,
 				y: defender.y,
 				scale: 1,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: defender.x-40-40,
 				y: defender.y+20+80,
 				z: defender.z,
 				scale: 1,
 				opacity: 0,
 				time: 150
-			},{
+			}, {
 				x: defender.x-40,
 				y: defender.y+20,
 				scale: 1,
 				opacity: 0.5
 			}, 'decel', 'explode');
-			battle.showEffect('mistball',{
+			battle.showEffect('mistball', {
 				x: defender.x+10-40,
 				y: defender.y-20+80,
 				z: defender.z,
 				scale: 1,
 				opacity: 0,
 				time: 300
-			},{
+			}, {
 				x: defender.x-40,
 				y: defender.y+20,
 				scale: 1,