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;