From 8aecfc7364191e56fb81f43bbf248934f44d1491 Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Mon, 28 Dec 2015 16:57:21 -0500
Subject: [PATCH] Remove type changes when changing forme

---
 js/battle.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/battle.js b/js/battle.js
index d212dfbee..834be1ca2 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -4344,6 +4344,8 @@ var Battle = (function () {
 				var template = Tools.getTemplate(args[2]);
 				var fromeffect = Tools.getEffect(kwargs.from);
 				var spriteData = {'shiny': poke.sprite.sp.shiny};
+				poke.removeVolatile('typeadd');
+				poke.removeVolatile('typechange');
 
 				if (kwargs.silent) {
 					// do nothing