From 7939894b183d6fa0741ae4bebead5a94324b0ff9 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Sat, 27 Apr 2024 23:31:37 -0400 Subject: [PATCH] fix: object event palettes can be loaded during fadeout --- src/field_weather.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/field_weather.c b/src/field_weather.c index e859cf856a..bd15ad0742 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -871,6 +871,15 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex, bool8 allowFog) } break; } + // If faded out, i.e due to fadescreenswapbuffers, + // Copy unfaded palette to pal decomp buffer + // so it will be restored on fade-in + if (gPaletteFade.y == 16) + CpuFastCopy( + gPlttBufferUnfaded + OBJ_PLTT_ID(spritePaletteIndex), + gPaletteDecompressionBuffer + 2*OBJ_PLTT_ID(spritePaletteIndex), + PLTT_SIZE_4BPP + ); } void ApplyWeatherColorMapToPal(u8 paletteIndex) // now unused / obselete