From 4db053befefe7de45be31ca31b009388ce17ce21 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Sat, 25 Apr 2015 21:58:09 -0500
Subject: [PATCH] Revert "Show fail message when status is blocked by Sub"

This was implemented exactly the wrong way and showed fail messages
in a lot of situations they shouldn't show up, such as when
Close Combat's Def/SpD drops didn't happen.

This reverts commit 1edc40f93617c7968f932fc2d86754939f2e2119.
---
 data/moves.js      | 3 +--
 data/scripts.js    | 1 -
 mods/gen5/moves.js | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/data/moves.js b/data/moves.js
index f3cef300af..7c80d5fd9d 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -13446,8 +13446,7 @@ exports.BattleMovedex = {
 				}
 				var damage = this.getDamage(source, target, move);
 				if (!damage) {
-					if (damage === 0) return null;
-					return false;
+					return null;
 				}
 				damage = this.runEvent('SubDamage', target, source, move, damage);
 				if (!damage) {
diff --git a/data/scripts.js b/data/scripts.js
index c738d52c07..a8b7d8c565 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -388,7 +388,6 @@ exports.BattleScripts = {
 			hitResult = true;
 		}
 		if (!hitResult) {
-			if (hitResult === false) this.add('-fail', target);
 			return false;
 		}
 
diff --git a/mods/gen5/moves.js b/mods/gen5/moves.js
index 7c25c9b412..f57d498186 100644
--- a/mods/gen5/moves.js
+++ b/mods/gen5/moves.js
@@ -841,8 +841,7 @@ exports.BattleMovedex = {
 				}
 				var damage = this.getDamage(source, target, move);
 				if (!damage) {
-					if (damage === 0) return null;
-					return false;
+					return null;
 				}
 				damage = this.runEvent('SubDamage', target, source, move, damage);
 				if (!damage) {