From 3987b060988a0400a0a6eef8e5559f40f1cf8fd6 Mon Sep 17 00:00:00 2001
From: Marty-D <math_man70@hotmail.com>
Date: Thu, 25 Jun 2015 12:30:43 -0400
Subject: [PATCH] Correct Mental Herb message

---
 js/battle.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/js/battle.js b/js/battle.js
index 0f85871d9..3186d3dae 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -3942,13 +3942,6 @@ var Battle = (function () {
 					this.resultAnim(poke, 'Focus Band', 'neutral', animDelay);
 					actions += "" + poke.getName() + ' hung on using its Focus Band!';
 					break;
-				case 'mentalherb':
-					poke.removeVolatile('taunt');
-					poke.removeVolatile('encore');
-					poke.removeVolatile('torment');
-					this.resultAnim(poke, 'Cured', 'good', animDelay);
-					actions += "" + poke.getName() + " used its " + item.name + " to come back to its senses!";
-					break;
 				case 'whiteherb':
 					actions += "" + poke.getName() + " returned its status to normal using its White Herb!";
 					break;
@@ -4389,10 +4382,13 @@ var Battle = (function () {
 					actions += "" + poke.getName() + "'s Heal Block wore off!";
 					break;
 				case 'attract':
-					if (!kwargs.silent) {
-						this.resultAnim(poke, 'Attract&nbsp;ended', 'good', animDelay);
+					this.resultAnim(poke, 'Attract&nbsp;ended', 'good', animDelay);
+					if (fromeffect.id === 'oblivious') {
 						actions += '' + poke.getName() + " got over its infatuation.";
 					}
+					if (fromeffect.id === 'mentalherb') {
+						actions += "" + poke.getName() + " cured its infatuation status using its " + fromeffect.name + "!";
+					}
 					break;
 				case 'taunt':
 					this.resultAnim(poke, 'Taunt&nbsp;ended', 'good', animDelay);