Handled Mimicry's interaction with Steel Roller's effect

asm/macros/battle_script.inc

@@ -1883,6 +1883,10 @@
 	.4byte \ptr
 	.endm
 
+	.macro trytorevertmimicry
+	various BS_ATTACKER, VARIOUS_TRY_TO_REVERT_MIMICRY
+	.endm
+
 @ helpful macros
 	.macro setstatchanger stat:req, stages:req, down:req
 	setbyte sSTATCHANGER \stat | \stages << 3 | \down << 7

data/battle_scripts_1.s

@@ -660,6 +660,7 @@ BattleScript_EffectRemoveTerrain:
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
 	removeterrain
+	trytorevertmimicry
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 4, BattleScript_MoveEnd
 	printfromtable gTerrainEndingStringIds
 	waitmessage B_WAIT_TIME_LONG

include/constants/battle_script_commands.h

@@ -199,6 +199,7 @@
 #define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED    126
 #define VARIOUS_SET_ATTACKER_STICKY_WEB_USER    127
 #define VARIOUS_TRY_TO_APPLY_MIMICRY            128
+#define VARIOUS_TRY_TO_REVERT_MIMICRY           129
 
 // Cmd_manipulatedamage
 #define DMG_CHANGE_SIGN            0

src/battle_script_commands.c

@@ -9039,6 +9039,13 @@ static void Cmd_various(void)
             gBattlescriptCurrInstr += 7;
         return;
     }
+    case VARIOUS_TRY_TO_REVERT_MIMICRY:
+        for (i = 0; i < gBattlersCount; i++)
+        {
+            if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+                RestoreBattlerOriginalTypes(i);
+        }
+        break;
     }
 
     gBattlescriptCurrInstr += 3;