diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-03 06:59:28 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-03 06:59:28 +0800 |
commit | 26a71921863214c4eb0af3f8320c321b51d0102e (patch) | |
tree | c39d533ff9ac7af61b69507577493316f3ffc4ea /include/palette.h | |
parent | 6a063cf74ad8168e9080c1f3be20e5dfe3c3187c (diff) | |
parent | d58bf398b2b83a326d23d14d531de7f45a1058bb (diff) |
Merge branch 'master' into battle
Diffstat (limited to 'include/palette.h')
-rw-r--r-- | include/palette.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/palette.h b/include/palette.h index 06b9b1f6f..300236d1e 100644 --- a/include/palette.h +++ b/include/palette.h @@ -71,7 +71,11 @@ void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); void sub_80716F8(const u16 *, u16 *, u16, u8); void TintPalette_GrayScale(u16 *, u16); +void TintPalette_GrayScale2(u16 *, u16); void TintPalette_SepiaTone(u16 *, u16); +void sub_80717A8(u32, s8, u8, u8, u16, u8, u8); +bool32 sub_807185C(u8); +void sub_8071898(void); extern struct PaletteFadeControl gPaletteFade; |