diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3018deade5..d6ea879a22 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6913,7 +6913,9 @@ BattleScript_MoveUsedPsychicTerrainPrevents:: waitmessage 0x40 goto BattleScript_MoveEnd -BattleScript_GrassyTerrainLoop:: +BattleScript_GrassyTerrainHeals:: + setbyte gBattleCommunication, 0 +BattleScript_GrassyTerrainLoop: copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1 checkgrassyterrainheal BS_ATTACKER, BattleScript_GrassyTerrainLoopIncrement printstring STRINGID_GRASSYTERRAINHEALS diff --git a/include/battle_scripts.h b/include/battle_scripts.h index edbe47f469..af407d05ed 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -302,7 +302,7 @@ extern const u8 BattleScript_SpectralThiefSteal[]; extern const u8 BattleScript_StatUpMsg[]; extern const u8 BattleScript_DefiantActivates[]; extern const u8 BattleScript_PowderMoveNoEffect[]; -extern const u8 BattleScript_GrassyTerrainLoop[]; +extern const u8 BattleScript_GrassyTerrainHeals[]; extern const u8 BattleScript_VCreateStatLoss[]; extern const u8 BattleScript_SpikyShieldEffect[]; extern const u8 BattleScript_KingsShieldEffect[]; diff --git a/src/battle_util.c b/src/battle_util.c index e9ed5ed2ef..247fc631a8 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1308,7 +1308,7 @@ u8 DoFieldEndTurnEffects(void) { if (gFieldTimers.grassyTerrainTimer == 0 || --gFieldTimers.grassyTerrainTimer == 0) gFieldStatuses &= ~(STATUS_FIELD_GRASSY_TERRAIN); - BattleScriptExecute(BattleScript_GrassyTerrainLoop); + BattleScriptExecute(BattleScript_GrassyTerrainHeals); effect++; } gBattleStruct->turnCountersTracker++;