From 74f074f5f39da88848cf80a6bfd3463f7fad3a17 Mon Sep 17 00:00:00 2001
From: CallmeEchoo <65783283+CallmeEchoo@users.noreply.github.com>
Date: Wed, 3 May 2023 16:26:41 +0200
Subject: [PATCH] ai scoring for snow and hail relation

we generally dont want to ecourage to use snow when hail is up and vice versa to avoid looping between the two weathers if score adds up. so we return false in the ShouldSetX functions if either weather is up
We also reduce score by a little as further disincentive to loop and since both effect are so similar that switching between them is usually not a good idea
---
 src/battle_ai_main.c | 12 ++++++++----
 src/battle_ai_util.c |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c
index 1fd07ef79f..76bf2261e6 100644
--- a/src/battle_ai_main.c
+++ b/src/battle_ai_main.c
@@ -280,7 +280,7 @@ void Ai_InitPartyStruct(void)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
             AI_PARTY->mons[B_SIDE_PLAYER][i].isFainted = TRUE;
-        
+
         if (isOmniscient)
         {
             u32 j;
@@ -1578,14 +1578,18 @@ static s16 AI_CheckBadMove(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
                 score -= 8;
             break;
         case EFFECT_HAIL:
-            if (gBattleWeather & (B_WEATHER_HAIL | B_WEATHER_PRIMAL_ANY) // should hail be discouraged if snow is up?
+            if (gBattleWeather & (B_WEATHER_HAIL | B_WEATHER_PRIMAL_ANY)
              || PartnerMoveEffectIsWeather(BATTLE_PARTNER(battlerAtk), AI_DATA->partnerMove))
                 score -= 8;
+            else if (gBattleWeather & B_WEATHER_SNOW)
+                score -= 2; // mainly to prevent looping between hail and snow
             break;
         case EFFECT_SNOWSCAPE:
-            if (gBattleWeather & (B_WEATHER_SNOW | B_WEATHER_PRIMAL_ANY) // should snow be discouraged if hail is up?
+            if (gBattleWeather & (B_WEATHER_SNOW | B_WEATHER_PRIMAL_ANY)
              || PartnerMoveEffectIsWeather(BATTLE_PARTNER(battlerAtk), AI_DATA->partnerMove))
                 score -= 8;
+            else if (gBattleWeather & B_WEATHER_HAIL)
+                score -= 2; // mainly to prevent looping between hail and snow
             break;
         case EFFECT_ATTRACT:
             if (!AI_CanBeInfatuated(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef],
@@ -3977,7 +3981,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
                 score += 2;
         }
         break;
-    case EFFECT_SNOWSCAPE: // any other reasons? 
+    case EFFECT_SNOWSCAPE:
         if (ShouldSetSnow(battlerAtk, AI_DATA->abilities[battlerAtk], AI_DATA->holdEffects[battlerAtk]))
         {
             if ((HasMoveEffect(battlerAtk, EFFECT_AURORA_VEIL) || HasMoveEffect(BATTLE_PARTNER(battlerAtk), EFFECT_AURORA_VEIL))
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 02af845344..13d70f28f2 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -1580,7 +1580,7 @@ bool32 ShouldSetHail(u8 battler, u16 ability, u16 holdEffect)
 {
     if (!AI_WeatherHasEffect())
         return FALSE;
-    else if (gBattleWeather & B_WEATHER_HAIL) // dont set hail if snow is up? 
+    else if (gBattleWeather & (B_WEATHER_HAIL | B_WEATHER_SNOW))
         return FALSE;
 
     if (ability == ABILITY_SNOW_CLOAK
@@ -1650,11 +1650,11 @@ bool32 ShouldSetSun(u8 battlerAtk, u16 atkAbility, u16 holdEffect)
     return FALSE;
 }
 
-bool32 ShouldSetSnow(u8 battler, u16 ability, u16 holdEffect) // any other reasons snow should be set? 
+bool32 ShouldSetSnow(u8 battler, u16 ability, u16 holdEffect)
 {
     if (!AI_WeatherHasEffect())
         return FALSE;
-    else if (gBattleWeather & B_WEATHER_SNOW) // dont set snow if hail is up? 
+    else if (gBattleWeather & (B_WEATHER_SNOW | B_WEATHER_HAIL))
         return FALSE;
 
     if (ability == ABILITY_SNOW_CLOAK