From d64dc2bbe890f210d653fede84151bd37ca1bc98 Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Sun, 24 Oct 2021 17:55:37 +1300
Subject: [PATCH 01/16] Sleep moves don't check target's type

Dark types aren't immune to Hypnosis, Ghost types aren't immune to Yawn or Lovely Kiss, so this check isn't needed.
---
 src/battle_ai_util.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index fef6e6c6ff..0c3bf717a9 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -2606,7 +2606,6 @@ bool32 AI_CanSleep(u8 battler, u16 ability)
 bool32 AI_CanPutToSleep(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move, u16 partnerMove)
 {
     if (!AI_CanSleep(battlerDef, defAbility)
-      || AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0
       || DoesSubstituteBlockMove(battlerAtk, battlerDef, move)
       || PartnerMoveEffectIsStatusSameTarget(BATTLE_PARTNER(battlerAtk), battlerDef, partnerMove))   // shouldn't try to sleep mon that partner is trying to make sleep
         return FALSE;

From bbe2eccf62c210926739a324d4d001dd1e7bbcda Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Sun, 24 Oct 2021 17:57:06 +1300
Subject: [PATCH 02/16] Fix typo

CanBeParayzed to CanBeParalyzed
---
 src/battle_ai_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 0c3bf717a9..dc2be7fd51 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -2653,7 +2653,7 @@ bool32 AI_CanPoison(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move, u16
     return TRUE;
 }
 
-static bool32 CanBeParayzed(u8 battler, u16 ability)
+static bool32 CanBeParalyzed(u8 battler, u16 ability)
 {
     if (ability == ABILITY_LIMBER
       || IS_BATTLER_OF_TYPE(battler, TYPE_ELECTRIC)
@@ -2665,7 +2665,7 @@ static bool32 CanBeParayzed(u8 battler, u16 ability)
 
 bool32 AI_CanParalyze(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move, u16 partnerMove)
 {
-    if (!CanBeParayzed(battlerDef, defAbility)
+    if (!CanBeParalyzed(battlerDef, defAbility)
       || AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0
       || gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_SAFEGUARD
       || DoesSubstituteBlockMove(battlerAtk, battlerDef, move)

From 4310868bee6d4ddb0f8a238ef1d003896a79b7d7 Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Sun, 24 Oct 2021 18:49:17 +1300
Subject: [PATCH 03/16] AI handles multi-strike and fixed dmg moves

Does not account for Parental Bond or Beat Up yet as those require some functions from #1676.
---
 include/battle_util.h |  5 ++-
 src/battle_ai_util.c  | 90 +++++++++++++++++++++++++++++++++++++++----
 src/battle_util.c     | 26 +++++++++++++
 3 files changed, 113 insertions(+), 8 deletions(-)

diff --git a/include/battle_util.h b/include/battle_util.h
index ee7337ef2d..5ffc901c3e 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -156,7 +156,7 @@ void BufferStatChange(u8 battlerId, u8 statId, u8 stringId);
 void DoBurmyFormChange(u32 monId);
 bool32 BlocksPrankster(u16 move, u8 battlerPrankster, u8 battlerDef, bool32 checkTarget);
 
-// ability checks
+// Ability checks
 bool32 IsRolePlayBannedAbilityAtk(u16 ability);
 bool32 IsRolePlayBannedAbility(u16 ability);
 bool32 IsSkillSwapBannedAbility(u16 ability);
@@ -173,4 +173,7 @@ bool32 CanBeFrozen(u8 battlerId);
 bool32 CanBeConfused(u8 battlerId);
 bool32 IsBattlerTerrainAffected(u8 battlerId, u32 terrainFlag);
 
+// Move checks
+bool8 IsTwoStrikesMove(u16 move);
+
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index dc2be7fd51..cf9980ee48 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -733,20 +733,85 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
     else
         dmg = (critDmg + normalDmg * (critChance - 1)) / critChance;
 
-    // handle dynamic move damage
+    // Handle dynamic move damage
     switch (gBattleMoves[move].effect)
     {
     case EFFECT_LEVEL_DAMAGE:
     case EFFECT_PSYWAVE:
-        //psywave's expected damage is equal to the user's level
-        dmg = gBattleMons[battlerAtk].level;
+    {
+        // Psywave's expected damage is equal to the user's level
+        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
+            dmg = 0;
+        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
+            dmg = 2 * gBattleMons[battlerAtk].level;
+        else
+            dmg = gBattleMons[battlerAtk].level;
         break;
+    }
     case EFFECT_DRAGON_RAGE:
-        dmg = 40;
+    {
+        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
+            dmg = 0;
+        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
+            dmg = 80;
+        else
+            dmg = 40;
         break;
+    }
     case EFFECT_SONICBOOM:
-        dmg = 20;
+    {
+        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
+            dmg = 0;
+        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
+            dmg = 40;
+        else
+            dmg = 20;
         break;
+    }
+    case EFFECT_MULTI_HIT:
+    {
+        if (AI_DATA->atkAbility == ABILITY_SKILL_LINK)
+            dmg *= 5;
+        else
+            dmg *= 3; // Average number of hits is three
+        break;
+    }
+    case EFFECT_TRIPLE_KICK:
+    {
+        if (AI_DATA->atkAbility == ABILITY_SKILL_LINK)
+            dmg *= 6; // Skill Link ensures the 2nd and 3rd hits will connect if the first does
+        else
+            dmg *= 5; // Triple Kick/Triple Axel's average power is almost 5x its base power
+        break;
+    }
+    case EFFECT_ENDEAVOR:
+    {
+        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
+            dmg = 0;
+        else
+            // If target has less HP than user, Endeavor does no damage
+            dmg = max(0, gBattleMons[battlerDef].hp - gBattleMons[battlerAtk].hp);
+        break;
+    }
+    case EFFECT_SUPER_FANG:
+    {
+        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
+            dmg = 0;
+        // Two hits of Super Fang halves HP twice, leaving target with 25% HP
+        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
+            dmg = gBattleMons[battlerDef].hp * 3 / 4;
+        else
+            dmg = gBattleMons[battlerDef].hp / 2;
+        break;
+    }
+    case EFFECT_FINAL_GAMBIT:
+    {
+        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
+            dmg = 0;
+        else
+            dmg = gBattleMons[battlerAtk].hp;
+        break;
+    }
     //case EFFECT_METAL_BURST:
     //case EFFECT_COUNTER:
     default:
@@ -755,6 +820,17 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
         break;
     }
 
+    // Handle other multi-strike moves
+    if (IsTwoStrikesMove(move))
+    {
+        dmg *= 2;
+    }
+    else if (move == MOVE_SURGING_STRIKES 
+             || (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH))
+    {
+        dmg *= 3;
+    }
+
     RestoreBattlerData(battlerAtk);
     RestoreBattlerData(battlerDef);
 
@@ -2653,7 +2729,7 @@ bool32 AI_CanPoison(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move, u16
     return TRUE;
 }
 
-static bool32 CanBeParalyzed(u8 battler, u16 ability)
+static bool32 AI_CanBeParalyzed(u8 battler, u16 ability)
 {
     if (ability == ABILITY_LIMBER
       || IS_BATTLER_OF_TYPE(battler, TYPE_ELECTRIC)
@@ -2665,7 +2741,7 @@ static bool32 CanBeParalyzed(u8 battler, u16 ability)
 
 bool32 AI_CanParalyze(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move, u16 partnerMove)
 {
-    if (!CanBeParalyzed(battlerDef, defAbility)
+    if (!AI_CanBeParalyzed(battlerDef, defAbility)
       || AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0
       || gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_SAFEGUARD
       || DoesSubstituteBlockMove(battlerAtk, battlerDef, move)
diff --git a/src/battle_util.c b/src/battle_util.c
index 33dd0f5de1..cc9e2fc164 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -217,6 +217,20 @@ static const u16 sEntrainmentTargetSimpleBeamBannedAbilities[] =
     ABILITY_GULP_MISSILE,
 };
 
+static const u16 sTwoStrikeMoves[] =
+{
+    MOVE_BONEMERANG,
+    MOVE_DOUBLE_HIT,
+    MOVE_DOUBLE_IRON_BASH,
+    MOVE_DOUBLE_KICK,
+    MOVE_DRAGON_DARTS,
+    MOVE_DUAL_CHOP,
+    MOVE_DUAL_WINGBEAT,
+    MOVE_GEAR_GRIND,
+    MOVE_TWINEEDLE,
+    0xFFFF
+};
+
 bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move)
 {
     u32 ability = GetBattlerAbility(battlerAtk);
@@ -9509,3 +9523,15 @@ bool32 BlocksPrankster(u16 move, u8 battlerPrankster, u8 battlerDef, bool32 chec
     #endif
     return FALSE;
 }
+
+bool8 IsTwoStrikesMove(u16 move)
+{
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(sTwoStrikeMoves); i++)
+    {
+        if (move == sTwoStrikeMoves[i])
+            return TRUE;
+    }
+    return FALSE;
+}

From 4faa0776415f31b371bc44311799d1b758a8585c Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Tue, 26 Oct 2021 13:41:08 +1300
Subject: [PATCH 04/16] Triple Kick, Super Fang tweaks

Ignore accuracy for Triple Kick and assume all hits will connect. Super Fang always does at least 1 damage, so this should be accounted for.
---
 src/battle_ai_util.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index cf9980ee48..3535e800c1 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -778,10 +778,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
     }
     case EFFECT_TRIPLE_KICK:
     {
-        if (AI_DATA->atkAbility == ABILITY_SKILL_LINK)
-            dmg *= 6; // Skill Link ensures the 2nd and 3rd hits will connect if the first does
-        else
-            dmg *= 5; // Triple Kick/Triple Axel's average power is almost 5x its base power
+        dmg *= 6;
         break;
     }
     case EFFECT_ENDEAVOR:
@@ -799,9 +796,9 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
             dmg = 0;
         // Two hits of Super Fang halves HP twice, leaving target with 25% HP
         else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
-            dmg = gBattleMons[battlerDef].hp * 3 / 4;
+            dmg = max(1, gBattleMons[battlerDef].hp * 3 / 4);
         else
-            dmg = gBattleMons[battlerDef].hp / 2;
+            dmg = max(1, gBattleMons[battlerDef].hp / 2);
         break;
     }
     case EFFECT_FINAL_GAMBIT:

From 8af882348a504d953997baa2faf5a50c12e59009 Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Tue, 2 Nov 2021 16:56:12 +1300
Subject: [PATCH 05/16] Fix Parental Bond Super Fang

Min damage should be 2
---
 src/battle_ai_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 3535e800c1..9478d73439 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -796,7 +796,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
             dmg = 0;
         // Two hits of Super Fang halves HP twice, leaving target with 25% HP
         else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
-            dmg = max(1, gBattleMons[battlerDef].hp * 3 / 4);
+            dmg = max(2, gBattleMons[battlerDef].hp * 3 / 4);
         else
             dmg = max(1, gBattleMons[battlerDef].hp / 2);
         break;

From 69b42de0d9b054617a946cfa37064749b43c5013 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sat, 30 Oct 2021 20:40:05 -0300
Subject: [PATCH 06/16] Implemented Mimicry Thanks to AsparagusEduardo for
 helping me optimize RestoreBattlerOriginalTypes.

---
 asm/macros/battle_script.inc               |  5 ++
 data/battle_scripts_1.s                    | 23 ++++++++
 include/battle_scripts.h                   |  2 +
 include/battle_util.h                      |  2 +
 include/constants/battle_script_commands.h |  1 +
 include/constants/battle_string_ids.h      |  3 +-
 src/battle_message.c                       |  2 +
 src/battle_script_commands.c               | 16 ++++++
 src/battle_util.c                          | 62 +++++++++++++++++++++-
 9 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 8fd7606343..f288cfeaf6 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1874,6 +1874,11 @@
 	.4byte \ptr
 	.endm
 
+	.macro trytoapplymimicry battler:req, ptr:req
+	various \battler, VARIOUS_TRY_TO_APPLY_MIMICRY
+	.4byte \ptr
+	.endm
+
 @ helpful macros
 	.macro setstatchanger stat:req, stages:req, down:req
 	setbyte sSTATCHANGER \stat | \stages << 3 | \down << 7
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index df0048ad9c..8c3e744c19 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1908,8 +1908,25 @@ BattleScript_EffectPsychicTerrain:
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG, NULL
 	call BattleScript_TerrainSeedLoop
+	jumpifabilitypresent ABILITY_MIMICRY, BattleScript_ApplyMimicry
 	goto BattleScript_MoveEnd
 
+BattleScript_ApplyMimicry::
+	savetarget
+	setbyte gBattlerTarget, 0
+BattleScript_MimicryLoopIter:
+	copybyte sBATTLER, gBattlerTarget
+	trytoapplymimicry BS_TARGET, BattleScript_MimicryLoop_NextBattler
+	copybyte gBattlerAbility, sBATTLER
+	call BattleScript_AbilityPopUp
+	printstring STRINGID_BATTLERTYPECHANGEDTO
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_MimicryLoop_NextBattler:
+	addbyte gBattlerTarget, 0x1
+	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_MimicryLoopIter
+	restoretarget
+	end
+
 BattleScript_EffectTopsyTurvy:
 	attackcanceler
 	attackstring
@@ -7957,6 +7974,12 @@ BattleScript_ColorChangeActivates::
 	waitmessage B_WAIT_TIME_LONG
 	return
 
+BattleScript_MimicryActivatesEnd3::
+	call BattleScript_AbilityPopUp
+	printstring STRINGID_BATTLERTYPECHANGEDTO
+	waitmessage B_WAIT_TIME_LONG
+	end3
+
 BattleScript_ProteanActivates::
 	call BattleScript_AbilityPopUp
 	printstring STRINGID_PKMNCHANGEDTYPE
diff --git a/include/battle_scripts.h b/include/battle_scripts.h
index 403af9515e..537d9cb815 100644
--- a/include/battle_scripts.h
+++ b/include/battle_scripts.h
@@ -404,5 +404,7 @@ extern const u8 BattleScript_PrimalReversion[];
 extern const u8 BattleScript_HyperspaceFuryRemoveProtect[];
 extern const u8 BattleScript_SelectingNotAllowedMoveGorillaTactics[];
 extern const u8 BattleScript_WanderingSpiritActivates[];
+extern const u8 BattleScript_MimicryActivatesEnd3[];
+extern const u8 BattleScript_ApplyMimicry[];
 
 #endif // GUARD_BATTLE_SCRIPTS_H
diff --git a/include/battle_util.h b/include/battle_util.h
index 7f267308d4..62a7e1db64 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -157,6 +157,8 @@ void DoBurmyFormChange(u32 monId);
 bool32 BlocksPrankster(u16 move, u8 battlerPrankster, u8 battlerDef, bool32 checkTarget);
 u16 GetUsedHeldItem(u8 battler);
 bool32 IsBattlerWeatherAffected(u8 battlerId, u32 weatherFlags);
+void TryToApplyMimicry(u8 battlerId, bool8 various);
+void RestoreBattlerOriginalTypes(u8 battlerId);
 
 // ability checks
 bool32 IsRolePlayBannedAbilityAtk(u16 ability);
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index fb1142f481..ee6cd4c7f7 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -197,6 +197,7 @@
 #define VARIOUS_UPDATE_ABILITY_POPUP            124
 #define VARIOUS_JUMP_IF_WEATHER_AFFECTED        125
 #define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED    126
+#define VARIOUS_TRY_TO_APPLY_MIMICRY            127
 
 // Cmd_manipulatedamage
 #define DMG_CHANGE_SIGN            0
diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h
index 27b39475a4..c4161c68fe 100644
--- a/include/constants/battle_string_ids.h
+++ b/include/constants/battle_string_ids.h
@@ -599,8 +599,9 @@
 #define STRINGID_BROKETHROUGHPROTECTION               596
 #define STRINGID_ABILITYALLOWSONLYMOVE                597
 #define STRINGID_SWAPPEDABILITIES                     598
+#define STRINGID_BATTLERTYPECHANGEDTO                 599
 
-#define BATTLESTRINGS_COUNT                           599
+#define BATTLESTRINGS_COUNT                           600
 
 // The below IDs are all indexes into battle message tables,
 // used to determine which of a set of messages to print.
diff --git a/src/battle_message.c b/src/battle_message.c
index 37919ddcab..30a8670ac0 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -725,9 +725,11 @@ static const u8 sText_ButHoopaCantUseIt[] = _("But Hoopa can't use it\nthe way i
 static const u8 sText_BrokeThroughProtection[] = _("It broke through the\n{B_DEF_NAME_WITH_PREFIX}'s protection!");
 static const u8 sText_AbilityAllowsOnlyMove[] = _("{B_ATK_ABILITY} allows the\nuse of only {B_CURRENT_MOVE}!\p");
 static const u8 sText_SwappedAbilities[] = _("{B_DEF_NAME_WITH_PREFIX} swapped Abilities\nwith its target!");
+static const u8 sText_BattlerTypeChangedTo[] = _("{B_BUFF1}'s type\nchanged to {B_BUFF2}!");
 
 const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
 {
+    [STRINGID_BATTLERTYPECHANGEDTO - 12] = sText_BattlerTypeChangedTo,
     [STRINGID_SWAPPEDABILITIES - 12] = sText_SwappedAbilities,
     [STRINGID_ABILITYALLOWSONLYMOVE - 12] = sText_AbilityAllowsOnlyMove,
     [STRINGID_BROKETHROUGHPROTECTION - 12] = sText_BrokeThroughProtection,
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 9e779da1ba..2f4e8c46b5 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -54,6 +54,7 @@
 #include "constants/rgb.h"
 #include "data.h"
 #include "constants/party_menu.h"
+#include "battle_util.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct Evolution gEvolutionTable[][EVOS_PER_MON];
@@ -9004,6 +9005,21 @@ static void Cmd_various(void)
             gBattlescriptCurrInstr += 7;
         }
         return;
+    case VARIOUS_TRY_TO_APPLY_MIMICRY:
+    {
+        bool8 isMimicryDone = FALSE;
+
+        if (GetBattlerAbility(gActiveBattler) == ABILITY_MIMICRY)
+        {
+            TryToApplyMimicry(gActiveBattler, TRUE);
+            isMimicryDone = TRUE;
+        }
+        if (!isMimicryDone)
+            gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
+        else
+            gBattlescriptCurrInstr += 7;
+        return;
+    }
     }
 
     gBattlescriptCurrInstr += 3;
diff --git a/src/battle_util.c b/src/battle_util.c
index 224cb1af14..00e323d20c 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1894,6 +1894,46 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
     return imprisonedMoves;
 }
 
+void RestoreBattlerOriginalTypes(u8 battlerId)
+{
+    gBattleMons[battlerId].type1 = gBaseStats[gBattleMons[battlerId].species].type1;
+    gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2;
+}
+
+void TryToApplyMimicry(u8 battlerId, bool8 various)
+{
+    u32 moveType, move;
+
+    GET_MOVE_TYPE(move, moveType);
+    switch (gFieldStatuses)
+    {
+    case STATUS_FIELD_ELECTRIC_TERRAIN:
+        moveType = TYPE_ELECTRIC;
+        break;
+    case STATUS_FIELD_MISTY_TERRAIN:
+        moveType = TYPE_FAIRY;
+        break;
+    case STATUS_FIELD_GRASSY_TERRAIN:
+        moveType = TYPE_GRASS;
+        break;
+    case STATUS_FIELD_PSYCHIC_TERRAIN:
+        moveType = TYPE_PSYCHIC;
+        break;
+    default:
+        moveType = 0;
+        break;
+    }
+
+    if (moveType != 0 && !IS_BATTLER_OF_TYPE(battlerId, moveType))
+    {
+        SET_BATTLER_TYPE(battlerId, moveType);
+        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, battlerId, gBattlerPartyIndexes[battlerId])
+        PREPARE_TYPE_BUFFER(gBattleTextBuff2, moveType);
+        if (!various)
+            BattleScriptPushCursorAndCallback(BattleScript_MimicryActivatesEnd3);
+    }
+}
+
 enum
 {
     ENDTURN_ORDER,
@@ -2278,6 +2318,9 @@ u8 DoFieldEndTurnEffects(void)
               && (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.electricTerrainTimer == 0))
             {
                 gFieldStatuses &= ~(STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT);
+                for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                    if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+                        RestoreBattlerOriginalTypes(i);
                 BattleScriptExecute(BattleScript_ElectricTerrainEnds);
                 effect++;
             }
@@ -2288,6 +2331,9 @@ u8 DoFieldEndTurnEffects(void)
               && (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.mistyTerrainTimer == 0))
             {
                 gFieldStatuses &= ~(STATUS_FIELD_MISTY_TERRAIN);
+                for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                    if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+                        RestoreBattlerOriginalTypes(i);
                 BattleScriptExecute(BattleScript_MistyTerrainEnds);
                 effect++;
             }
@@ -2298,8 +2344,12 @@ u8 DoFieldEndTurnEffects(void)
             {
                 if (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT)
                   && (gFieldTimers.grassyTerrainTimer == 0 || --gFieldTimers.grassyTerrainTimer == 0))
+                {
                     gFieldStatuses &= ~(STATUS_FIELD_GRASSY_TERRAIN);
-
+                    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                        if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+                            RestoreBattlerOriginalTypes(i);
+                }
                 BattleScriptExecute(BattleScript_GrassyTerrainHeals);
                 effect++;
             }
@@ -2310,6 +2360,9 @@ u8 DoFieldEndTurnEffects(void)
               && (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.psychicTerrainTimer == 0))
             {
                 gFieldStatuses &= ~(STATUS_FIELD_PSYCHIC_TERRAIN);
+                for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                    if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+                        RestoreBattlerOriginalTypes(i);
                 BattleScriptExecute(BattleScript_PsychicTerrainEnds);
                 effect++;
             }
@@ -4380,6 +4433,13 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
                 effect++;
             }
             break;
+        case ABILITY_MIMICRY:
+            if (gBattleMons[battler].hp != 0 && gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)
+            {
+                TryToApplyMimicry(battler, FALSE);
+                effect++;
+            }
+            break;
         }
         break;
     case ABILITYEFFECT_ENDTURN: // 1

From f0d7c75ec899bf3962794eb19f2be9b1f8099222 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Wed, 3 Nov 2021 17:48:04 -0300
Subject: [PATCH 07/16] Syntax corrections

---
 data/battle_scripts_1.s | 2 +-
 src/battle_util.c       | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 8c3e744c19..aa6c10bcbd 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1925,7 +1925,7 @@ BattleScript_MimicryLoop_NextBattler:
 	addbyte gBattlerTarget, 0x1
 	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_MimicryLoopIter
 	restoretarget
-	end
+	goto BattleScript_MoveEnd
 
 BattleScript_EffectTopsyTurvy:
 	attackcanceler
diff --git a/src/battle_util.c b/src/battle_util.c
index 00e323d20c..45cba507bc 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2319,8 +2319,10 @@ u8 DoFieldEndTurnEffects(void)
             {
                 gFieldStatuses &= ~(STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT);
                 for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                {
                     if (GetBattlerAbility(i) == ABILITY_MIMICRY)
                         RestoreBattlerOriginalTypes(i);
+                }
                 BattleScriptExecute(BattleScript_ElectricTerrainEnds);
                 effect++;
             }
@@ -2332,8 +2334,10 @@ u8 DoFieldEndTurnEffects(void)
             {
                 gFieldStatuses &= ~(STATUS_FIELD_MISTY_TERRAIN);
                 for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                {
                     if (GetBattlerAbility(i) == ABILITY_MIMICRY)
                         RestoreBattlerOriginalTypes(i);
+                }
                 BattleScriptExecute(BattleScript_MistyTerrainEnds);
                 effect++;
             }
@@ -2347,8 +2351,10 @@ u8 DoFieldEndTurnEffects(void)
                 {
                     gFieldStatuses &= ~(STATUS_FIELD_GRASSY_TERRAIN);
                     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                    {
                         if (GetBattlerAbility(i) == ABILITY_MIMICRY)
                             RestoreBattlerOriginalTypes(i);
+                    }
                 }
                 BattleScriptExecute(BattleScript_GrassyTerrainHeals);
                 effect++;
@@ -2361,8 +2367,10 @@ u8 DoFieldEndTurnEffects(void)
             {
                 gFieldStatuses &= ~(STATUS_FIELD_PSYCHIC_TERRAIN);
                 for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+                {
                     if (GetBattlerAbility(i) == ABILITY_MIMICRY)
                         RestoreBattlerOriginalTypes(i);
+                }
                 BattleScriptExecute(BattleScript_PsychicTerrainEnds);
                 effect++;
             }

From 05850f0f65cbdbbbd0ee466aeceff512bc25cae2 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Wed, 3 Nov 2021 22:05:02 -0300
Subject: [PATCH 08/16] Refactored UndoFormChange to make it more user friendly

---
 src/battle_util.c | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 196ce0268e..f32c9875b3 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -8954,33 +8954,29 @@ void UndoFormChange(u32 monId, u32 side, bool32 isSwitchingOut)
 {
     u32 i, currSpecies;
     struct Pokemon *party = (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
-    static const u16 species[][2] = // changed form id, default form id
+    static const u16 species[][3] =
     {
-        {SPECIES_MIMIKYU_BUSTED, SPECIES_MIMIKYU},
-        {SPECIES_GRENINJA_ASH, SPECIES_GRENINJA_BATTLE_BOND},
-        {SPECIES_AEGISLASH_BLADE, SPECIES_AEGISLASH},
-        {SPECIES_DARMANITAN_ZEN_MODE, SPECIES_DARMANITAN},
-        {SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED},
-        {SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE},
-        {SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN},
-        {SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO},
-        {SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE},
-        {SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET},
-        {SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW},
-        {SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI},
-        {SPECIES_CRAMORANT_GORGING, SPECIES_CRAMORANT},
-        {SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT},
+        // Changed Form ID             Default Form ID               Should change on switch
+        {SPECIES_MIMIKYU_BUSTED,       SPECIES_MIMIKYU,              FALSE},
+        {SPECIES_GRENINJA_ASH,         SPECIES_GRENINJA_BATTLE_BOND, FALSE},
+        {SPECIES_AEGISLASH_BLADE,      SPECIES_AEGISLASH,            TRUE},
+        {SPECIES_DARMANITAN_ZEN_MODE,  SPECIES_DARMANITAN,           TRUE},
+        {SPECIES_MINIOR,               SPECIES_MINIOR_CORE_RED,      TRUE},
+        {SPECIES_MINIOR_METEOR_BLUE,   SPECIES_MINIOR_CORE_BLUE,     TRUE},
+        {SPECIES_MINIOR_METEOR_GREEN,  SPECIES_MINIOR_CORE_GREEN,    TRUE},
+        {SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO,   TRUE},
+        {SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE,   TRUE},
+        {SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET,   TRUE},
+        {SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW,   TRUE},
+        {SPECIES_WISHIWASHI_SCHOOL,    SPECIES_WISHIWASHI,           TRUE},
+        {SPECIES_CRAMORANT_GORGING,    SPECIES_CRAMORANT,            TRUE},
+        {SPECIES_CRAMORANT_GULPING,    SPECIES_CRAMORANT,            TRUE},
     };
 
-    if (isSwitchingOut) // Don't revert Mimikyu Busted or Ash-Greninja when switching out
-        i = 2;
-    else
-        i = 0;
-
     currSpecies = GetMonData(&party[monId], MON_DATA_SPECIES, NULL);
-    for (; i < ARRAY_COUNT(species); i++)
+    for (i = 0; i < ARRAY_COUNT(species); i++)
     {
-        if (currSpecies == species[i][0])
+        if (currSpecies == species[i][0] && (!isSwitchingOut || species[i][2] == TRUE))
         {
             SetMonData(&party[monId], MON_DATA_SPECIES, &species[i][1]);
             CalculateMonStats(&party[monId]);

From 4466fbd930af4a7b32521936ca40220aaeb1dccc Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Wed, 3 Nov 2021 21:36:33 -0400
Subject: [PATCH 09/16] ai version of CanPoisonType, CanBePoisoned and
 IsAbilityOnSide

---
 include/battle_ai_util.h |  2 +-
 src/battle_ai_main.c     |  2 +-
 src/battle_ai_util.c     | 40 +++++++++++++++++++++++++++++++---------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h
index b8cd53c072..304a8149db 100644
--- a/include/battle_ai_util.h
+++ b/include/battle_ai_util.h
@@ -54,6 +54,7 @@ bool32 IsRecycleEncouragedItem(u16 item);
 bool32 CanKnockOffItem(u8 battler, u16 item);
 bool32 IsAbilityOfRating(u16 ability, s8 rating);
 s8 GetAbilityRating(u16 ability);
+u32 AI_IsAbilityOnSide(u32 battlerId, u32 ability);
 
 // stat stage checks
 bool32 AnyStatIsRaised(u8 battlerId);
@@ -120,7 +121,6 @@ bool32 IsSemiInvulnerable(u8 battlerDef, u16 move);
 
 // status checks
 bool32 AI_CanBeBurned(u8 battler, u16 ability);
-bool32 AI_CanBePoisoned(u8 battler, u16 ability);
 bool32 AI_CanBeConfused(u8 battler, u16 ability);
 bool32 AI_CanSleep(u8 battler, u16 ability);
 bool32 IsBattlerIncapacitated(u8 battler, u16 ability);
diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c
index 84fa7b6349..5263369472 100644
--- a/src/battle_ai_main.c
+++ b/src/battle_ai_main.c
@@ -3999,7 +3999,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
                 score += 2;
             break;
         case HOLD_EFFECT_TOXIC_ORB:
-            if (!ShouldPoisonSelf(battlerAtk, AI_DATA->atkAbility) && AI_CanBePoisoned(battlerDef, AI_DATA->defAbility))
+            if (!ShouldPoisonSelf(battlerAtk, AI_DATA->atkAbility))
                 score += 2;
             break;
         case HOLD_EFFECT_FLAME_ORB:
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 9640df2b40..bf10666f60 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -1065,6 +1065,16 @@ bool32 CanTargetFaintAiWithMod(u8 battlerDef, u8 battlerAtk, s32 hpMod, s32 dmgM
     return FALSE;
 }
 
+u32 AI_IsAbilityOnSide(u32 battlerId, u32 ability)
+{
+    if (IsBattlerAlive(battlerId) && AI_GetAbility(battlerId) == ability)
+        return battlerId + 1;
+    else if (IsBattlerAlive(BATTLE_PARTNER(battlerId)) && AI_GetAbility(BATTLE_PARTNER(battlerId)) == ability)
+        return BATTLE_PARTNER(battlerId) + 1;
+    else
+        return 0;
+}
+
 // does NOT include ability suppression checks
 s32 AI_GetAbility(u32 battlerId)
 {
@@ -2613,20 +2623,32 @@ bool32 AI_CanPutToSleep(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move,
     return TRUE;
 }
 
-bool32 AI_CanBePoisoned(u8 battler, u16 ability)
+static bool32 AI_CanPoisonType(u8 battlerAttacker, u8 battlerTarget)
 {
-    if (ability == ABILITY_IMMUNITY
-      || IsAbilityOnSide(battler, ABILITY_PASTEL_VEIL)
-      || gBattleMons[battler].status1 & STATUS1_ANY
-      || IsAbilityStatusProtected(battler)
-      || gSideStatuses[GetBattlerSide(battler)] & SIDE_STATUS_SAFEGUARD)
+    return ((AI_GetAbility(battlerAttacker) == ABILITY_CORROSION && gBattleMoves[gCurrentMove].split == SPLIT_STATUS)
+            || !(IS_BATTLER_OF_TYPE(battlerTarget, TYPE_POISON) || IS_BATTLER_OF_TYPE(battlerTarget, TYPE_STEEL)));
+}
+
+static bool32 AI_CanBePoisoned(u8 battlerAtk, u8 battlerDef)
+{
+    u16 ability = AI_GetAbility(battlerDef);
+    
+    if (!(AI_CanPoisonType(battlerAtk, battlerDef))
+     || gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_SAFEGUARD
+     || gBattleMons[battlerDef].status1 & STATUS1_ANY
+     || ability == ABILITY_IMMUNITY
+     || ability == ABILITY_COMATOSE
+     || AI_IsAbilityOnSide(battlerDef, ABILITY_PASTEL_VEIL)
+     || gBattleMons[battlerDef].status1 & STATUS1_ANY
+     || IsAbilityStatusProtected(battlerDef)
+     || AI_IsTerrainAffected(battlerDef, STATUS_FIELD_MISTY_TERRAIN))
         return FALSE;
     return TRUE;
 }
 
 bool32 ShouldPoisonSelf(u8 battler, u16 ability)
 {
-    if (AI_CanBePoisoned(battler, ability) && (
+    if (AI_CanBePoisoned(battler, battler) && (
      ability == ABILITY_MARVEL_SCALE
       || ability == ABILITY_POISON_HEAL
       || ability == ABILITY_QUICK_FEET
@@ -2641,7 +2663,7 @@ bool32 ShouldPoisonSelf(u8 battler, u16 ability)
 
 bool32 AI_CanPoison(u8 battlerAtk, u8 battlerDef, u16 defAbility, u16 move, u16 partnerMove)
 {
-    if (!AI_CanBePoisoned(battlerDef, defAbility)
+    if (!AI_CanBePoisoned(battlerAtk, battlerDef)
       || AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0
       || DoesSubstituteBlockMove(battlerAtk, battlerDef, move)
       || PartnerMoveEffectIsStatusSameTarget(BATTLE_PARTNER(battlerAtk), battlerDef, partnerMove))
@@ -2744,7 +2766,7 @@ bool32 AI_CanBeInfatuated(u8 battlerAtk, u8 battlerDef, u16 defAbility, u8 atkGe
       || atkGender == defGender
       || atkGender == MON_GENDERLESS
       || defGender == MON_GENDERLESS
-      || IsAbilityOnSide(battlerDef, ABILITY_AROMA_VEIL))
+      || AI_IsAbilityOnSide(battlerDef, ABILITY_AROMA_VEIL))
         return FALSE;
     return TRUE;
 }

From b931e341728e4b4e70c24f4a33d9d1ab4b7c07f8 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Wed, 3 Nov 2021 21:04:34 -0300
Subject: [PATCH 10/16] Handled Mimicry's interaction with Steel Roller's
 effect

---
 asm/macros/battle_script.inc               | 4 ++++
 data/battle_scripts_1.s                    | 1 +
 include/constants/battle_script_commands.h | 1 +
 src/battle_script_commands.c               | 7 +++++++
 4 files changed, 13 insertions(+)

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index b7a60dbbba..1625fe41c1 100644
--- a/asm/macros/battle_script.inc
+++ b/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
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index ac2d9a1a62..88d89ec3fe 100644
--- a/data/battle_scripts_1.s
+++ b/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
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 50db280280..3d7dfbc2b2 100644
--- a/include/constants/battle_script_commands.h
+++ b/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
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 3bfa227bcc..74d52dbb69 100644
--- a/src/battle_script_commands.c
+++ b/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;

From a2574b55cc231b4fa6b44878f0d699e17fecd5c3 Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Thu, 4 Nov 2021 16:09:28 +1300
Subject: [PATCH 11/16] Fix dynamic move damage calculation

Can't check effectiveness here without breaking the AI. After testing, it also appears that it doesn't need to be checked here after all.
---
 src/battle_ai_util.c | 80 +++++++-------------------------------------
 1 file changed, 12 insertions(+), 68 deletions(-)

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index ab7cc6b535..884e0fa374 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -738,95 +738,39 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
     {
     case EFFECT_LEVEL_DAMAGE:
     case EFFECT_PSYWAVE:
-    {
-        // Psywave's expected damage is equal to the user's level
-        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
-            dmg = 0;
-        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
-            dmg = 2 * gBattleMons[battlerAtk].level;
-        else
-            dmg = gBattleMons[battlerAtk].level;
+        dmg = gBattleMons[battlerAtk].level * (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND ? 2 : 1);
         break;
-    }
     case EFFECT_DRAGON_RAGE:
-    {
-        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
-            dmg = 0;
-        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
-            dmg = 80;
-        else
-            dmg = 40;
+        dmg = 40 * (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND ? 2 : 1);
         break;
-    }
     case EFFECT_SONICBOOM:
-    {
-        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
-            dmg = 0;
-        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
-            dmg = 40;
-        else
-            dmg = 20;
+        dmg = 20 * (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND ? 2 : 1);
         break;
-    }
     case EFFECT_MULTI_HIT:
-    {
-        if (AI_DATA->atkAbility == ABILITY_SKILL_LINK)
-            dmg *= 5;
-        else
-            dmg *= 3; // Average number of hits is three
+        dmg *= (AI_DATA->atkAbility == ABILITY_SKILL_LINK ? 5 : 3);
         break;
-    }
     case EFFECT_TRIPLE_KICK:
-    {
-        dmg *= 6;
+        dmg *= (AI_DATA->atkAbility == ABILITY_SKILL_LINK ? 6 : 5);
         break;
-    }
     case EFFECT_ENDEAVOR:
-    {
-        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
-            dmg = 0;
-        else
-            // If target has less HP than user, Endeavor does no damage
-            dmg = max(0, gBattleMons[battlerDef].hp - gBattleMons[battlerAtk].hp);
+        // If target has less HP than user, Endeavor does no damage
+        dmg = max(0, gBattleMons[battlerDef].hp - gBattleMons[battlerAtk].hp);
         break;
-    }
     case EFFECT_SUPER_FANG:
-    {
-        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
-            dmg = 0;
-        // Two hits of Super Fang halves HP twice, leaving target with 25% HP
-        else if (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND)
-            dmg = max(2, gBattleMons[battlerDef].hp * 3 / 4);
-        else
-            dmg = max(1, gBattleMons[battlerDef].hp / 2);
+        dmg = (AI_DATA->atkAbility == ABILITY_PARENTAL_BOND
+            ? max(2, gBattleMons[battlerDef].hp * 3 / 4)
+            : max(1, gBattleMons[battlerDef].hp / 2));
         break;
-    }
     case EFFECT_FINAL_GAMBIT:
-    {
-        if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x0)
-            dmg = 0;
-        else
-            dmg = gBattleMons[battlerAtk].hp;
-        break;
-    }
-    //case EFFECT_METAL_BURST:
-    //case EFFECT_COUNTER:
-    default:
-        //do not add the random factor, it's an average case analysis
-        //dmg *= (100 - (Random() % 10)) / 100;   // add random factor
+        dmg = gBattleMons[battlerAtk].hp;
         break;
     }
 
     // Handle other multi-strike moves
     if (IsTwoStrikesMove(move))
-    {
         dmg *= 2;
-    }
-    else if (move == MOVE_SURGING_STRIKES 
-             || (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH))
-    {
+    else if (move == MOVE_SURGING_STRIKES || (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH))
         dmg *= 3;
-    }
 
     RestoreBattlerData(battlerAtk);
     RestoreBattlerData(battlerDef);

From 7d1009768440b5c28a641f1700a45837af3d871c Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Thu, 4 Nov 2021 17:11:56 +1300
Subject: [PATCH 12/16] Replace IsTwoStrikesMove with FLAG_TWO_STRIKES

Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
---
 include/battle_util.h       |  3 ---
 include/constants/pokemon.h |  1 +
 src/battle_ai_util.c        |  2 +-
 src/battle_util.c           | 26 --------------------------
 src/data/battle_moves.h     | 20 ++++++++++----------
 5 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/include/battle_util.h b/include/battle_util.h
index ac27461bd2..aa2a3d8386 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -175,7 +175,4 @@ bool32 CanBeFrozen(u8 battlerId);
 bool32 CanBeConfused(u8 battlerId);
 bool32 IsBattlerTerrainAffected(u8 battlerId, u32 terrainFlag);
 
-// Move checks
-bool8 IsTwoStrikesMove(u16 move);
-
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 4e776e592b..959148e6c8 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -308,6 +308,7 @@
 #define FLAG_DMG_UNGROUNDED_IGNORE_TYPE_IF_FLYING (1 << 24) // Makes a Ground type move do 1x damage to flying and levitating targets
 #define FLAG_THAW_USER                            (1 << 25)
 #define FLAG_HIT_IN_SUBSTITUTE                    (1 << 26) // Hyperspace Fury
+#define FLAG_TWO_STRIKES                          (1 << 27) // A move with this flag will strike twice, and may apply its effect on each hit
 
 // Split defines.
 #define SPLIT_PHYSICAL  0x0
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 884e0fa374..4fd01418c2 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -767,7 +767,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef)
     }
 
     // Handle other multi-strike moves
-    if (IsTwoStrikesMove(move))
+    if (gBattleMoves[move].flags & FLAG_TWO_STRIKES)
         dmg *= 2;
     else if (move == MOVE_SURGING_STRIKES || (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH))
         dmg *= 3;
diff --git a/src/battle_util.c b/src/battle_util.c
index 82d6ddcbd9..05c7af1229 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -217,20 +217,6 @@ static const u16 sEntrainmentTargetSimpleBeamBannedAbilities[] =
     ABILITY_GULP_MISSILE,
 };
 
-static const u16 sTwoStrikeMoves[] =
-{
-    MOVE_BONEMERANG,
-    MOVE_DOUBLE_HIT,
-    MOVE_DOUBLE_IRON_BASH,
-    MOVE_DOUBLE_KICK,
-    MOVE_DRAGON_DARTS,
-    MOVE_DUAL_CHOP,
-    MOVE_DUAL_WINGBEAT,
-    MOVE_GEAR_GRIND,
-    MOVE_TWINEEDLE,
-    0xFFFF
-};
-
 bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move)
 {
     u32 ability = GetBattlerAbility(battlerAtk);
@@ -9620,15 +9606,3 @@ bool32 IsBattlerWeatherAffected(u8 battlerId, u32 weatherFlags)
     }
     return FALSE;
 }
-
-bool8 IsTwoStrikesMove(u16 move)
-{
-    u32 i;
-
-    for (i = 0; i < ARRAY_COUNT(sTwoStrikeMoves); i++)
-    {
-        if (move == sTwoStrikeMoves[i])
-            return TRUE;
-    }
-    return FALSE;
-}
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 97d61202a4..f4ace39155 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -378,7 +378,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -649,7 +649,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 20,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -2460,7 +2460,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -7267,7 +7267,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -8367,7 +8367,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -8575,7 +8575,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -10726,9 +10726,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     [MOVE_DOUBLE_IRON_BASH] =
     {
         #if B_UPDATED_MOVE_DATA >= GEN_8
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST | FLAG_SHEER_FORCE_BOOST,
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST | FLAG_SHEER_FORCE_BOOST | FLAG_TWO_STRIKES,
         #else
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST | FLAG_SHEER_FORCE_BOOST,
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST | FLAG_SHEER_FORCE_BOOST | FLAG_TWO_STRIKES,
         #endif
         .effect = EFFECT_DOUBLE_IRON_BASH,
         .power = 60,
@@ -10850,7 +10850,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -11480,7 +11480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_TWO_STRIKES,
         .split = SPLIT_PHYSICAL,
     },
 

From 2728f13eedce96ae3bd3c9cc18e2e14055749565 Mon Sep 17 00:00:00 2001
From: Jaizu <jaizu85@gmail.com>
Date: Thu, 4 Nov 2021 09:58:55 +0100
Subject: [PATCH 13/16] Fix comment typo

---
 src/battle_script_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ee9379d8d1..d76dd82830 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12817,7 +12817,7 @@ static void Cmd_handleballthrow(void)
             gBattleSpritesDataPtr->animationData->criticalCaptureSuccess = 0;
             if (CriticalCapture(odds))
             {
-                maxShakes = 1;  //critical capture doesn't gauarantee capture
+                maxShakes = 1;  //critical capture doesn't guarantee capture
                 gBattleSpritesDataPtr->animationData->isCriticalCapture = 1;
             }
             else

From 6b10801ee8f511d5cd3ed413c8016274798c94c9 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 4 Nov 2021 10:43:33 -0400
Subject: [PATCH 14/16] convert AI_IsabilityOnSide to bool

---
 include/battle_ai_util.h | 2 +-
 src/battle_ai_util.c     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h
index 304a8149db..b6df2168ea 100644
--- a/include/battle_ai_util.h
+++ b/include/battle_ai_util.h
@@ -54,7 +54,7 @@ bool32 IsRecycleEncouragedItem(u16 item);
 bool32 CanKnockOffItem(u8 battler, u16 item);
 bool32 IsAbilityOfRating(u16 ability, s8 rating);
 s8 GetAbilityRating(u16 ability);
-u32 AI_IsAbilityOnSide(u32 battlerId, u32 ability);
+bool32 AI_IsAbilityOnSide(u32 battlerId, u32 ability);
 
 // stat stage checks
 bool32 AnyStatIsRaised(u8 battlerId);
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index bf10666f60..a080349799 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -1065,14 +1065,14 @@ bool32 CanTargetFaintAiWithMod(u8 battlerDef, u8 battlerAtk, s32 hpMod, s32 dmgM
     return FALSE;
 }
 
-u32 AI_IsAbilityOnSide(u32 battlerId, u32 ability)
+bool32 AI_IsAbilityOnSide(u32 battlerId, u32 ability)
 {
     if (IsBattlerAlive(battlerId) && AI_GetAbility(battlerId) == ability)
-        return battlerId + 1;
+        return TRUE;
     else if (IsBattlerAlive(BATTLE_PARTNER(battlerId)) && AI_GetAbility(BATTLE_PARTNER(battlerId)) == ability)
-        return BATTLE_PARTNER(battlerId) + 1;
+        return TRUE;
     else
-        return 0;
+        return FALSE;
 }
 
 // does NOT include ability suppression checks

From 4f251e6ec2b8cd4cb9339dec7a825e7c5d5f9100 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Thu, 4 Nov 2021 12:13:55 -0300
Subject: [PATCH 15/16] Moved VARIOUS_TRY_TO_REVERT_MIMICRY to
 VARIOUS_REMOVE_TERRAIN

---
 asm/macros/battle_script.inc               |  4 ----
 data/battle_scripts_1.s                    |  1 -
 include/constants/battle_script_commands.h |  1 -
 src/battle_script_commands.c               | 12 +++++-------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 1625fe41c1..b7a60dbbba 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1883,10 +1883,6 @@
 	.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
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 88d89ec3fe..ac2d9a1a62 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -660,7 +660,6 @@ 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
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 3d7dfbc2b2..50db280280 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -199,7 +199,6 @@
 #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
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 74d52dbb69..d615e0b350 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8865,6 +8865,11 @@ static void Cmd_various(void)
             break;
         }
         gFieldStatuses &= ~STATUS_FIELD_TERRAIN_ANY;    // remove the terrain
+        for (i = 0; i < gBattlersCount; i++) // restore the types of Pokémon with Mimicry
+        {
+            if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+                RestoreBattlerOriginalTypes(i);
+        }
         break;
     case VARIOUS_JUMP_IF_PRANKSTER_BLOCKED:
         if (BlocksPrankster(gCurrentMove, gBattlerAttacker, gActiveBattler, TRUE))
@@ -9039,13 +9044,6 @@ 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;

From b64d506809c2b84e9a6ae1e91b9d081b5b37b71e Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Thu, 4 Nov 2021 12:20:31 -0300
Subject: [PATCH 16/16] Made a function to lift Mimicry's effect

---
 include/battle_util.h        |  1 +
 src/battle_script_commands.c |  6 +-----
 src/battle_util.c            | 35 +++++++++++++++--------------------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/include/battle_util.h b/include/battle_util.h
index 62a7e1db64..cb196519ea 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -158,6 +158,7 @@ bool32 BlocksPrankster(u16 move, u8 battlerPrankster, u8 battlerDef, bool32 chec
 u16 GetUsedHeldItem(u8 battler);
 bool32 IsBattlerWeatherAffected(u8 battlerId, u32 weatherFlags);
 void TryToApplyMimicry(u8 battlerId, bool8 various);
+void TryToRevertMimicry(void);
 void RestoreBattlerOriginalTypes(u8 battlerId);
 
 // ability checks
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d615e0b350..d056bfa5a5 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8865,11 +8865,7 @@ static void Cmd_various(void)
             break;
         }
         gFieldStatuses &= ~STATUS_FIELD_TERRAIN_ANY;    // remove the terrain
-        for (i = 0; i < gBattlersCount; i++) // restore the types of Pokémon with Mimicry
-        {
-            if (GetBattlerAbility(i) == ABILITY_MIMICRY)
-                RestoreBattlerOriginalTypes(i);
-        }
+        TryToRevertMimicry(); // restore the types of Pokémon with Mimicry
         break;
     case VARIOUS_JUMP_IF_PRANKSTER_BLOCKED:
         if (BlocksPrankster(gCurrentMove, gBattlerAttacker, gActiveBattler, TRUE))
diff --git a/src/battle_util.c b/src/battle_util.c
index a924722eb6..b3cf608190 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1934,6 +1934,17 @@ void TryToApplyMimicry(u8 battlerId, bool8 various)
     }
 }
 
+void TryToRevertMimicry(void)
+{
+    s32 i;
+
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
+    {
+        if (GetBattlerAbility(i) == ABILITY_MIMICRY)
+            RestoreBattlerOriginalTypes(i);
+    }
+}
+
 enum
 {
     ENDTURN_ORDER,
@@ -2318,11 +2329,7 @@ u8 DoFieldEndTurnEffects(void)
               && (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.electricTerrainTimer == 0))
             {
                 gFieldStatuses &= ~(STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT);
-                for (i = 0; i < MAX_BATTLERS_COUNT; i++)
-                {
-                    if (GetBattlerAbility(i) == ABILITY_MIMICRY)
-                        RestoreBattlerOriginalTypes(i);
-                }
+                TryToRevertMimicry();
                 BattleScriptExecute(BattleScript_ElectricTerrainEnds);
                 effect++;
             }
@@ -2333,11 +2340,7 @@ u8 DoFieldEndTurnEffects(void)
               && (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.mistyTerrainTimer == 0))
             {
                 gFieldStatuses &= ~(STATUS_FIELD_MISTY_TERRAIN);
-                for (i = 0; i < MAX_BATTLERS_COUNT; i++)
-                {
-                    if (GetBattlerAbility(i) == ABILITY_MIMICRY)
-                        RestoreBattlerOriginalTypes(i);
-                }
+                TryToRevertMimicry();
                 BattleScriptExecute(BattleScript_MistyTerrainEnds);
                 effect++;
             }
@@ -2350,11 +2353,7 @@ u8 DoFieldEndTurnEffects(void)
                   && (gFieldTimers.grassyTerrainTimer == 0 || --gFieldTimers.grassyTerrainTimer == 0))
                 {
                     gFieldStatuses &= ~(STATUS_FIELD_GRASSY_TERRAIN);
-                    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
-                    {
-                        if (GetBattlerAbility(i) == ABILITY_MIMICRY)
-                            RestoreBattlerOriginalTypes(i);
-                    }
+                    TryToRevertMimicry();
                 }
                 BattleScriptExecute(BattleScript_GrassyTerrainHeals);
                 effect++;
@@ -2366,11 +2365,7 @@ u8 DoFieldEndTurnEffects(void)
               && (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.psychicTerrainTimer == 0))
             {
                 gFieldStatuses &= ~(STATUS_FIELD_PSYCHIC_TERRAIN);
-                for (i = 0; i < MAX_BATTLERS_COUNT; i++)
-                {
-                    if (GetBattlerAbility(i) == ABILITY_MIMICRY)
-                        RestoreBattlerOriginalTypes(i);
-                }
+                TryToRevertMimicry();
                 BattleScriptExecute(BattleScript_PsychicTerrainEnds);
                 effect++;
             }