From ae8e6affd9a9bbe0506c43f4cf9986fcefdeb59e Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Fri, 29 Sep 2017 13:36:43 -0400
Subject: [PATCH] Fix even more bugs in
 79a569c7465a216c4b9ae1ff9d87df278fa4bc0f

---
 js/client-battle-tooltips.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/js/client-battle-tooltips.js b/js/client-battle-tooltips.js
index 2d8836eb8..34e2a94c2 100644
--- a/js/client-battle-tooltips.js
+++ b/js/client-battle-tooltips.js
@@ -385,10 +385,13 @@ var BattleTooltips = (function () {
 
 		var template = pokemon;
 		if (!pokemon.types) template = Tools.getTemplate(pokemon.species);
-		if (pokemon.volatiles && pokemon.volatiles.transform && pokemon.volatiles.formechange) {
-			text += '<small>(Transformed into ' + pokemon.volatiles.formechange[2] + ')</small><br />';
-		} else if (pokemon.volatiles && pokemon.volatiles.formechange) {
-			text += '<small>(Forme: ' + pokemon.volatiles.formechange[2] + ')</small><br />';
+		if (pokemon.volatiles && pokemon.volatiles.formechange) {
+			template = Tools.getTemplate(pokemon.volatiles.formechange[2]);
+			if (pokemon.volatiles.transform) {
+				text += '<small>(Transformed into ' + pokemon.volatiles.formechange[2] + ')</small><br />';
+			} else {
+				text += '<small>(Forme: ' + pokemon.volatiles.formechange[2] + ')</small><br />';
+			}
 		}
 
 		var types = this.getPokemonTypes(pokemon);