diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 54dce3448..8c8e1ff0d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6975,8 +6975,6 @@ BattleScript_TerrainEnds_Ret:: playanimation BS_ATTACKER, B_ANIM_RESTORE_BG return -BattleScript_GrassyTerrainEnds: - setbyte cMULTISTRING_CHOOSER, B_MSG_TERRAINENDS_GRASS BattleScript_TerrainEnds:: call BattleScript_TerrainEnds_Ret end2 @@ -9166,7 +9164,6 @@ BattleScript_GrassyTerrainLoopIncrement:: BattleScript_GrassyTerrainLoopEnd:: bicword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_TERRAIN_PERMANENT, BattleScript_GrassyTerrainHealEnd - jumpifbyte CMP_EQUAL, gFieldTimers + 5, 0, BattleScript_GrassyTerrainEnds BattleScript_GrassyTerrainHealEnd: end2 diff --git a/src/battle_util.c b/src/battle_util.c index 2856eece7..975921c96 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2062,11 +2062,8 @@ static bool32 EndTurnTerrain(u32 terrainFlag, u32 stringTableId) { gFieldStatuses &= ~terrainFlag; TryToRevertMimicry(); - if (!(terrainFlag & STATUS_FIELD_GRASSY_TERRAIN)) - { - gBattleCommunication[MULTISTRING_CHOOSER] = stringTableId; - BattleScriptExecute(BattleScript_TerrainEnds); - } + gBattleCommunication[MULTISTRING_CHOOSER] = stringTableId; + BattleScriptExecute(BattleScript_TerrainEnds); return TRUE; } }