diff --git a/js/battle.js b/js/battle.js
index 47eb38aea..fbe340c4f 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -2439,9 +2439,25 @@ function Battle(frame, logFrame, noPreload) {
 				break;
 			case 'sleeptalk':
 			default:
-				self.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
+				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>!');
+				}
 				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 + "\"");
+			}
 		}
 		pokemon.lastmove = move.id;
 		self.lastmove = move.id;
diff --git a/js/battledata.js b/js/battledata.js
index 8aa93ee2c..2f60d85b6 100644
--- a/js/battledata.js
+++ b/js/battledata.js
@@ -649,6 +649,16 @@ var Tools = {
 			if (num.length < 3) num = '0' + num;
 			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
+		};
+
 		if (pokemon.shiny) back += '-shiny';
 		if (window.BattlePokemonSprites && BattlePokemonSprites[pokemon.speciesid] && BattlePokemonSprites[pokemon.speciesid][facing]) {
 			var url = Tools.resourcePrefix + 'sprites/bwani'+back;