From be6aa8f12f756213cc6c8f36efaaa4d8e7e30cfd Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Thu, 31 Oct 2024 18:53:04 +0100
Subject: [PATCH] apply OW_SEASONS config to field effect palette

---
 src/battle_bg.c    | 14 +++++++-------
 src/field_effect.c |  4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/battle_bg.c b/src/battle_bg.c
index 665572c25..f8558a25f 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -397,8 +397,9 @@ static u8 GetBattleTerrainByMapScene(u8 mapBattleScene)
     return BATTLE_TERRAIN_PLAIN;
 }
 
-static const void* const sSeasonBattleBackgrounds[][SEASON_WINTER + 1] =
+static const void* const sSeasonBattleBackgrounds[BATTLE_TERRAIN_COUNT][SEASON_WINTER + 1] =
 {
+    [BATTLE_TERRAIN_GRASS] = 
     {
         [SEASON_SPRING] = &gBattleTerrainPalette_Grass,
         [SEASON_SUMMER] = &gBattleTerrainPalette_GrassSummer,
@@ -412,12 +413,11 @@ static const void* const sSeasonBattleBackgrounds[][SEASON_WINTER + 1] =
 
 const void* GetBattleBackgroundPalette(u16 terrain)
 {
-    u8 i;
-    for (i = 0; sSeasonBattleBackgrounds[i][SEASON_SPRING] != NULL; i++)
-    {
-        if (sSeasonBattleBackgrounds[i][SEASON_SPRING] == gBattleTerrainInfo[terrain].background.palette)
-            return sSeasonBattleBackgrounds[i][gLoadedSeason];
-    }
+    if (!OW_SEASONS)
+        return gBattleTerrainInfo[terrain].background.palette;
+
+    if (sSeasonBattleBackgrounds[terrain][gLoadedSeason] != NULL)
+        return sSeasonBattleBackgrounds[terrain][gLoadedSeason];
     return gBattleTerrainInfo[terrain].background.palette;
 }
 
diff --git a/src/field_effect.c b/src/field_effect.c
index a0f6be2f5..01a8177d5 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -495,8 +495,12 @@ static void FieldEffectScript_LoadFadedPal(const u8 **script)
     *script += sizeof(u32);
 }
 
+// TODO: field effect refactoring
 static const struct SpritePalette* GetFieldEffectPalette(u32 fldEff)
 {
+    if (!OW_SEASONS)
+        return gFieldEffectPalettes[fldEff][SEASON_SPRING];
+
     if (gFieldEffectPalettes[fldEff][gLoadedSeason] != NULL)
         return gFieldEffectPalettes[fldEff][gLoadedSeason];
     return gFieldEffectPalettes[fldEff][SEASON_SPRING];