From f5a8bba54cff08f8a65b2c8aeb1910ff2afbade0 Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Sat, 21 Nov 2015 22:27:48 -0500
Subject: [PATCH] Fix default heal messages

And avoid repeating Ability names upon activation.
---
 js/battle.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/js/battle.js b/js/battle.js
index 584ef5b28..c8f9ce13b 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -3385,9 +3385,6 @@ var Battle = (function () {
 					case 'aquaring':
 						actions += "Aqua Ring restored " + poke.getLowerName() + "'s HP!";
 						break;
-					case 'raindish': case 'dryskin': case 'icebody':
-						actions += "" + poke.getName() + "'s " + effect.name + " heals it!";
-						break;
 					case 'healingwish':
 						actions += "The healing wish came true for " + poke.getLowerName() + "!";
 						this.lastmove = 'healing-wish';
@@ -3417,15 +3414,15 @@ var Battle = (function () {
 					default:
 						if (kwargs.absorb) {
 							actions += "" + poke.getName() + "'s " + effect.name + " absorbs the attack!";
-						} else if (effect.id) {
+						} else if (effect.id && effect.effectType !== 'Ability') {
 							actions += "" + poke.getName() + " restored HP using its " + effect.name + "!";
 						} else {
-							actions += poke.getName() + ' regained health!';
+							actions += poke.getName() + ' restored its HP.';
 						}
 						break;
 					}
 				} else {
-					actions += poke.getName() + ' regained health!';
+					actions += poke.getName() + ' restored its HP.';
 				}
 				break;
 			case '-sethp':