From 0b8aa7b0dc86d57f06a2b01476aa4cff19c23a7d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 26 Jan 2025 12:08:26 -0300 Subject: [PATCH] Temp fixes --- src/field_weather.c | 2 ++ src/fieldmap.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/field_weather.c b/src/field_weather.c index 0326e6528e..2bca450744 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -898,12 +898,14 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex, bool8 allowFog) // 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), gDecompressionBuffer + 2 * OBJ_PLTT_ID(spritePaletteIndex), PLTT_SIZE_4BPP ); + */ } void ApplyWeatherColorMapToPals(u8 startPalIndex, u8 numPalettes) diff --git a/src/fieldmap.c b/src/fieldmap.c index 2cd8f0db85..7d9926f1de 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -901,7 +901,7 @@ static void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u1 // All 'gTilesetPalettes_' arrays should have ALIGNED(4) in them, // but we use SmartCopy here just in case they don't if (skipFaded) { - CpuSmartCopy16(tileset->palettes[NUM_PALS_IN_PRIMARY], &gPlttBufferUnfaded[destOffset], size); + CpuCopy16(tileset->palettes[NUM_PALS_IN_PRIMARY], &gPlttBufferUnfaded[destOffset], size); } else LoadPaletteFast(tileset->palettes[NUM_PALS_IN_PRIMARY], destOffset, size); low = NUM_PALS_IN_PRIMARY;