From bcb357be5609108cdcc4a75d46324c2e41f704c5 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Mon, 1 Apr 2013 19:08:33 -0700
Subject: [PATCH] April Fool's 2013 ends

---
 js/battle.js     | 35 ++++++++++++++++++-----------------
 js/battledata.js | 16 ++++++++--------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/js/battle.js b/js/battle.js
index fbe340c4f..0c51ce532 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -2439,25 +2439,26 @@ function Battle(frame, logFrame, noPreload) {
 				break;
 			case 'sleeptalk':
 			default:
-				if (move.id === 'earthquake') {
-					self.message(pokemon.getName() + ' used <strong>Fissure</strong>!');
-					self.message('Just kidding! It was <strong>Earthquake</strong>!');
-				} else {
-					self.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
-				}
+				// April Fool's 2013
+				// if (move.id === 'earthquake') {
+				// 	self.message(pokemon.getName() + ' used <strong>Fissure</strong>!');
+				// 	self.message('Just kidding! It was <strong>Earthquake</strong>!');
+				// }
+				self.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
 				break;
 			}
-			if (move.id === 'taunt') {
-				var quotes = [
-					"Yo mama so fat, she 4x resists Ice- and Fire-type attacks!",
-					"Yo mama so ugly, Captivate raises her opponent's Special Attack!",
-					"Yo mama so dumb, she lowers her Special Attack when she uses Nasty Plot!",
-					"Yo mama so fat, Smogon switched to Pokemon Showdown because PO had an integer overflow bug when you used Grass Knot against her!",
-					"Yo mama so dumb, she thought Sylveon would be Light Type!"
-				];
-				var quote = quotes[(self.p1.name.charCodeAt(2) + self.p2.name.charCodeAt(2) + self.turn) % quotes.length];
-				self.message(pokemon.getName() + " said, \"" + quote + "\"");
-			}
+			// April Fool's 2013
+			// if (move.id === 'taunt') {
+			// 	var quotes = [
+			// 		"Yo mama so fat, she 4x resists Ice- and Fire-type attacks!",
+			// 		"Yo mama so ugly, Captivate raises her opponent's Special Attack!",
+			// 		"Yo mama so dumb, she lowers her Special Attack when she uses Nasty Plot!",
+			// 		"Yo mama so fat, Smogon switched to Pokemon Showdown because PO had an integer overflow bug when you used Grass Knot against her!",
+			// 		"Yo mama so dumb, she thought Sylveon would be Light Type!"
+			// 	];
+			// 	var quote = quotes[(self.p1.name.charCodeAt(2) + self.p2.name.charCodeAt(2) + self.turn) % quotes.length];
+			// 	self.message(pokemon.getName() + " said, \"" + quote + "\"");
+			// }
 		}
 		pokemon.lastmove = move.id;
 		self.lastmove = move.id;
diff --git a/js/battledata.js b/js/battledata.js
index dcd58b35b..c0ade4465 100644
--- a/js/battledata.js
+++ b/js/battledata.js
@@ -669,14 +669,14 @@ var Tools = {
 			cryurl = Tools.resourcePrefix + 'audio/cries/' + num + '.wav';
 		}
 
-		// april fool's
-		return {
-			w: 96,
-			h: 96,
-			url: Tools.resourcePrefix + 'sprites/afd'+back+'/' + spriteid + '.png',
-			cryurl: cryurl,
-			isBackSprite: isBack
-		};
+		// April Fool's 2013
+		// return {
+		// 	w: 96,
+		// 	h: 96,
+		// 	url: Tools.resourcePrefix + 'sprites/afd'+back+'/' + spriteid + '.png',
+		// 	cryurl: cryurl,
+		// 	isBackSprite: isBack
+		// };
 
 		if (pokemon.shiny) back += '-shiny';
 		if (window.BattlePokemonSprites && BattlePokemonSprites[pokemon.speciesid] && BattlePokemonSprites[pokemon.speciesid][facing]) {