From a0881b8e8d38a9e0cd4cfb2bb7f56b50f0c07077 Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sat, 20 May 2023 17:10:45 +0200
Subject: [PATCH] Terrains freeze the game after player mon faints (#3016)

---
 src/battle_util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 8678054bb9..2856eece7c 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2056,6 +2056,8 @@ static bool32 EndTurnTerrain(u32 terrainFlag, u32 stringTableId)
 {
     if (gFieldStatuses & terrainFlag)
     {
+        if (terrainFlag & STATUS_FIELD_GRASSY_TERRAIN)
+            BattleScriptExecute(BattleScript_GrassyTerrainHeals);
         if (!(gFieldStatuses & STATUS_FIELD_TERRAIN_PERMANENT) && --gFieldTimers.terrainTimer == 0)
         {
             gFieldStatuses &= ~terrainFlag;
@@ -2065,10 +2067,8 @@ static bool32 EndTurnTerrain(u32 terrainFlag, u32 stringTableId)
                 gBattleCommunication[MULTISTRING_CHOOSER] = stringTableId;
                 BattleScriptExecute(BattleScript_TerrainEnds);
             }
+            return TRUE;
         }
-        if (terrainFlag & STATUS_FIELD_GRASSY_TERRAIN)
-            BattleScriptExecute(BattleScript_GrassyTerrainHeals);
-        return TRUE;
     }
     return FALSE;
 }
@@ -6807,7 +6807,7 @@ static bool32 GetMentalHerbEffect(u8 battlerId)
 static u8 TryConsumeMirrorHerb(u8 battlerId, bool32 execute)
 {
     u8 effect = 0;
-    
+
     if (gProtectStructs[battlerId].eatMirrorHerb) {
         gLastUsedItem = gBattleMons[battlerId].item;
         gBattleScripting.savedBattler = gBattlerAttacker;