From 9fcf7d2453bcb199a1987dc3cb3099c621bd03ab Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Thu, 28 Jan 2021 13:51:39 -0700
Subject: [PATCH] zero terrain timers for steel roll, remove unused move
 effectd

---
 include/constants/battle.h   | 3 +--
 src/battle_script_commands.c | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/constants/battle.h b/include/constants/battle.h
index f9e34d88be..48616d6cd1 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -342,8 +342,7 @@
 #define MOVE_EFFECT_THROAT_CHOP         0x43
 #define MOVE_EFFECT_INCINERATE          0x44
 #define MOVE_EFFECT_BUG_BITE            0x45
-#define MOVE_EFFECT_BURNING_JEALOUSY    0x46
-#define NUM_MOVE_EFFECTS                0x47
+#define NUM_MOVE_EFFECTS                0x46
 
 #define MOVE_EFFECT_AFFECTS_USER        0x4000
 #define MOVE_EFFECT_CERTAIN             0x8000
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d2bcf86b67..bdefc61c66 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8428,15 +8428,19 @@ static void Cmd_various(void)
         switch (gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)
         {
         case STATUS_FIELD_MISTY_TERRAIN:
+            gFieldTimers.mistyTerrainTimer = 0;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             break;
         case STATUS_FIELD_GRASSY_TERRAIN:
+            gFieldTimers.grassyTerrainTimer = 0;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
             break;
         case STATUS_FIELD_ELECTRIC_TERRAIN:
+            gFieldTimers.electricTerrainTimer = 0;
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             break;
         case STATUS_FIELD_PSYCHIC_TERRAIN:
+            gFieldTimers.psychicTerrainTimer = 0;
             gBattleCommunication[MULTISTRING_CHOOSER] = 3;
             break;
         default: