atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made BlendPalettesFine global.

Browse source
This commit is contained in:
Ariel Antonitis 2021-04-24 02:56:16 -04:00
parent a160012dbf
commit 0cc6c7b111
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/palette.h
View file

@ -84,6 +84,7 @@ void UnfadePlttBuffer(u32);
void BeginFastPaletteFade(u8); void BeginFastPaletteFade(u8);
void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color); 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 BlendPalettesUnfaded(u32, u8, u16);
void BlendPalettesGradually(u32 selectedPalettes, s8 delay, u8 coeff, u8 coeffTarget, u16 color, u8 priority, u8 id); void BlendPalettesGradually(u32 selectedPalettes, s8 delay, u8 coeff, u8 coeffTarget, u16 color, u8 priority, u8 id);
void TimeBlendPalette(u16 palOffset, u32 coeff, u32 blendColor); void TimeBlendPalette(u16 palOffset, u32 coeff, u32 blendColor);

3
src/palette.c
View file

@ -55,7 +55,6 @@ static u8 UpdateTimeOfDayPaletteFade(void);
static void UpdateBlendRegisters(void); static void UpdateBlendRegisters(void);
static bool8 IsSoftwarePaletteFadeFinishing(void); static bool8 IsSoftwarePaletteFadeFinishing(void);
static void Task_BlendPalettesGradually(u8 taskId); 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 // palette buffers require alignment with agbcc because
// unaligned word reads are issued in BlendPalette otherwise // unaligned word reads are issued in BlendPalette otherwise
@ -993,7 +992,7 @@ static bool8 IsSoftwarePaletteFadeFinishing(void)
} }
// optimized based on lucktyphlosion's BlendPalettesFine // 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; s32 newR, newG, newB;
if (!palettes) if (!palettes)