diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
| commit | b67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch) | |
| tree | b07bb0bb43aeba2c7cfef97213578fb815ccb266 /include/palette.h | |
| parent | 5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
I hope this fixes the conflicts
Diffstat (limited to 'include/palette.h')
| -rw-r--r-- | include/palette.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/palette.h b/include/palette.h index cb03699a6..41cef4048 100644 --- a/include/palette.h +++ b/include/palette.h @@ -67,5 +67,6 @@ void BeginFastPaletteFade(u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); +void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7); #endif // GUARD_PALETTE_H |