From 0cc6c7b111e60ee941a5b858a9ce54e19a5d83a3 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 24 Apr 2021 02:56:16 -0400 Subject: [PATCH] Made BlendPalettesFine global. --- include/palette.h | 1 + src/palette.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/palette.h b/include/palette.h index 89de237c23..3b0368aca4 100644 --- a/include/palette.h +++ b/include/palette.h @@ -84,6 +84,7 @@ void UnfadePlttBuffer(u32); void BeginFastPaletteFade(u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color); +void BlendPalettesFine(u32 palettes, u16 *src, u16 *dst, u32 coeff, u32 color); void BlendPalettesUnfaded(u32, u8, u16); void BlendPalettesGradually(u32 selectedPalettes, s8 delay, u8 coeff, u8 coeffTarget, u16 color, u8 priority, u8 id); void TimeBlendPalette(u16 palOffset, u32 coeff, u32 blendColor); diff --git a/src/palette.c b/src/palette.c index 37b30d0c38..8b08eb9e48 100644 --- a/src/palette.c +++ b/src/palette.c @@ -55,7 +55,6 @@ static u8 UpdateTimeOfDayPaletteFade(void); static void UpdateBlendRegisters(void); static bool8 IsSoftwarePaletteFadeFinishing(void); static void Task_BlendPalettesGradually(u8 taskId); -static void BlendPalettesFine(u32 palettes, u16 *src, u16 *dst, u32 coeff, u32 color); // palette buffers require alignment with agbcc because // unaligned word reads are issued in BlendPalette otherwise @@ -993,7 +992,7 @@ static bool8 IsSoftwarePaletteFadeFinishing(void) } // optimized based on lucktyphlosion's BlendPalettesFine -static void BlendPalettesFine(u32 palettes, u16 *src, u16 *dst, u32 coeff, u32 color) { +void BlendPalettesFine(u32 palettes, u16 *src, u16 *dst, u32 coeff, u32 color) { s32 newR, newG, newB; if (!palettes)