diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-14 12:11:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 12:11:50 -0500 |
| commit | 355f014909bf3ee3669229b69901fc1ccfb51787 (patch) | |
| tree | c7b4d3d861e9af7659383704f28b02c3f54d58fc /include | |
| parent | 0c1d33da4f6db7b90913586a39ed60ea2b13f39e (diff) | |
| parent | 7a008a944aaac6e34d6425eb650a1886448395e1 (diff) | |
Merge pull request #354 from DizzyEggg/move_blendpal
Move blend_palette to util
Diffstat (limited to 'include')
| -rw-r--r-- | include/blend_palette.h | 6 | ||||
| -rw-r--r-- | include/util.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/blend_palette.h b/include/blend_palette.h deleted file mode 100644 index a00847bc3..000000000 --- a/include/blend_palette.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GUARD_BLEND_PALETTE_H -#define GUARD_BLEND_PALETTE_H - -void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); - -#endif // GUARD_BLEND_PALETTE_H diff --git a/include/util.h b/include/util.h index 63887b13f..997c8f713 100644 --- a/include/util.h +++ b/include/util.h @@ -13,5 +13,6 @@ int CountTrailingZeroBits(u32 value); u16 CalcCRC16(u8 *data, s32 length); u16 CalcCRC16WithTable(u8 *data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length); +void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); #endif // GUARD_UTIL_H |