diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 8c3e744c1..aa6c10bcb 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 00e323d20..45cba507b 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++;
             }