diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 1f8b42801d..6f13c34495 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -11589,9 +11589,9 @@ static void Cmd_setfieldweather(void)
 {
     CMD_ARGS(u8 weather);
 
-    u8 weather = cmd->weather;
+    u8 battleWeatherId = cmd->weather;
 
-    if (!TryChangeBattleWeather(gBattlerAttacker, weather, FALSE))
+    if (!TryChangeBattleWeather(gBattlerAttacker, battleWeatherId, FALSE))
     {
         gBattleStruct->moveResultFlags[gBattlerTarget] |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED;
@@ -11599,7 +11599,7 @@ static void Cmd_setfieldweather(void)
         return;
     }
 
-    switch (weather)
+    switch (battleWeatherId)
     {
     case BATTLE_WEATHER_RAIN:
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_RAIN;
diff --git a/src/battle_util.c b/src/battle_util.c
index 2323a28ce7..04b6f59956 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1684,6 +1684,7 @@ static bool32 TryEndTurnWeather(void)
 
     if (gWishFutureKnock.weatherDuration > 0 && --gWishFutureKnock.weatherDuration == 0)
     {
+        gBattleWeather = B_WEATHER_NONE;
         gBattleCommunication[MULTISTRING_CHOOSER] = sBattleWeatherInfo[currBattleWeather].endMessage;
         BattleScriptExecute(BattleScript_WeatherFaded);
         effect++;