From cedc2e07bda0199fda7e8da7465e2ac0cbe6a0a3 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sun, 14 Nov 2021 13:31:06 +1300 Subject: [PATCH] Fix Cherrim softlock Fix typo that caused infinite loop. --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 6ce984cf4..2c2918a00 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3792,7 +3792,7 @@ u8 TryWeatherFormChange(u8 battler) ret = 0; else if (gBattleMonForms[battler] == 0 && weatherEffect && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & WEATHER_SUN_ANY) ret = 2; - else if (gBattleMonForms[battler] != 0 && (!weatherEffect || holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA || !(gBattleWeather & WEATHER_SUN_ANY))) + else if (gBattleMonForms[battler] != 0 && (!weatherEffect || holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || !(gBattleWeather & WEATHER_SUN_ANY))) ret = 1; }