Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-06-02 22:04:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

apply OW_SEASONS config to field effect palette

Browse Source
This commit is contained in:
cawtds 2024-10-31 18:53:04 +01:00
parent f7c12bc4f0
commit be6aa8f12f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/battle_bg.c
View File

@ -397,8 +397,9 @@ static u8 GetBattleTerrainByMapScene(u8 mapBattleScene)
return BATTLE_TERRAIN_PLAIN; 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_SPRING] = &gBattleTerrainPalette_Grass,
[SEASON_SUMMER] = &gBattleTerrainPalette_GrassSummer, [SEASON_SUMMER] = &gBattleTerrainPalette_GrassSummer,
@ -412,12 +413,11 @@ static const void* const sSeasonBattleBackgrounds[][SEASON_WINTER + 1] =
const void* GetBattleBackgroundPalette(u16 terrain) const void* GetBattleBackgroundPalette(u16 terrain)
{ {
u8 i; if (!OW_SEASONS)
for (i = 0; sSeasonBattleBackgrounds[i][SEASON_SPRING] != NULL; i++) return gBattleTerrainInfo[terrain].background.palette;
{
if (sSeasonBattleBackgrounds[i][SEASON_SPRING] == gBattleTerrainInfo[terrain].background.palette) if (sSeasonBattleBackgrounds[terrain][gLoadedSeason] != NULL)
return sSeasonBattleBackgrounds[i][gLoadedSeason]; return sSeasonBattleBackgrounds[terrain][gLoadedSeason];
}
return gBattleTerrainInfo[terrain].background.palette; return gBattleTerrainInfo[terrain].background.palette;
} }

4
src/field_effect.c
View File

@ -495,8 +495,12 @@ static void FieldEffectScript_LoadFadedPal(const u8 **script)
*script += sizeof(u32); *script += sizeof(u32);
} }
// TODO: field effect refactoring
static const struct SpritePalette* GetFieldEffectPalette(u32 fldEff) static const struct SpritePalette* GetFieldEffectPalette(u32 fldEff)
{ {
if (!OW_SEASONS)
return gFieldEffectPalettes[fldEff][SEASON_SPRING];
if (gFieldEffectPalettes[fldEff][gLoadedSeason] != NULL) if (gFieldEffectPalettes[fldEff][gLoadedSeason] != NULL)
return gFieldEffectPalettes[fldEff][gLoadedSeason]; return gFieldEffectPalettes[fldEff][gLoadedSeason];
return gFieldEffectPalettes[fldEff][SEASON_SPRING]; return gFieldEffectPalettes[fldEff][SEASON_SPRING];