palette

1 files changed, 28 insertions, 30 deletions

diff --git a/include/palette.h b/include/palette.h
index 300236d1e..145d6e6b6 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -3,8 +3,6 @@
 
 #include "global.h"
 
-#include "global.h"
-
 #define gPaletteFade_selectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade
 #define gPaletteFade_blendCnt         (gPaletteFade.multipurpose1) // hardware fade
 #define gPaletteFade_delay            (gPaletteFade.multipurpose2) // normal and hardware fade
@@ -13,10 +11,15 @@
 #define PLTT_BUFFER_SIZE 0x200
 #define PLTT_DECOMP_BUFFER_SIZE (PLTT_BUFFER_SIZE * 2)
 
+#define PALETTE_FADE_STATUS_DELAY 2
+#define PALETTE_FADE_STATUS_ACTIVE 1
+#define PALETTE_FADE_STATUS_DONE 0
+#define PALETTE_FADE_STATUS_LOADING 0xFF
+
 enum
 {
     FAST_FADE_IN_FROM_WHITE,
-    FAST_FADE_OUT_TO_WHTIE,
+    FAST_FADE_OUT_TO_WHITE,
     FAST_FADE_IN_FROM_BLACK,
     FAST_FADE_OUT_TO_BLACK,
 };
@@ -39,44 +42,39 @@ struct PaletteFadeControl
     u16 softwareFadeFinishing:1;
     u16 objPaletteToggle:1;
     u8 deltaY:4; // rate of change of blend coefficient
+    u32 unused;
 };
 
 extern struct PaletteFadeControl gPaletteFade;
 extern u32 gPlttBufferTransferPending;
-extern u8 *gUnknown_203AAB0;
 extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE];
 extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE];
 
-void LoadCompressedPalette(const void *, u16, u16);
-void LoadPalette(const void *, u16, u16);
-void FillPalette(u16, u16, u16);
+void LoadCompressedPalette(const u32 *src, u16 offset, u16 size);
+void LoadPalette(const void *src, u16 offset, u16 size);
+void FillPalette(u16 value, u16 offset, u16 size);
 void TransferPlttBuffer(void);
 u8 UpdatePaletteFade(void);
 void ResetPaletteFade(void);
 void ReadPlttIntoBuffers(void);
-bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
-bool8 unref_sub_8073D3C(u32, u8, u8, u8, u16);
-void unref_sub_8073D84(u8, u32 *);
-void ResetPaletteStructByUid(u16);
-void ResetPaletteStruct(u8);
-void ResetPaletteFadeControl();
-void unref_sub_8074168(u16);
-void unref_sub_8074194(u16);
-void InvertPlttBuffer(u32);
-void TintPlttBuffer(u32, s8, s8, s8);
-void UnfadePlttBuffer(u32);
-void BeginFastPaletteFade(u8);
-void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
-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);
+bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u16 blendColor);
+void ResetPaletteFadeControl(void);
+void InvertPlttBuffer(u32 selectedPalettes);
+void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b);
+void UnfadePlttBuffer(u32 selectedPalettes);
+void BeginFastPaletteFade(u8 submode);
+void BeginHardwarePaletteFade(u8 blendCnt, u8 delay, u8 y, u8 targetY, u8 shouldResetBlendRegisters);
+void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color);
+void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color);
+void TintPalette_GrayScale(u16 *palette, u16 count);
+void TintPalette_GrayScale2(u16 *palette, u16 count);
+void TintPalette_SepiaTone(u16 *palette, u16 count);
+void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 bTone);
+void sub_80716F8(const u16 *src, u16 *dst, u16 count, u8 a4);
+void sub_80717A8(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7);
+bool32 sub_807185C(u8 var);
 void sub_8071898(void);
-
-extern struct PaletteFadeControl gPaletteFade;
+void ResetPaletteStructByUid(u16 a1);
+void ResetPaletteStruct(u8 paletteNum);
 
 #endif // GUARD_PALETTE_H