3 files changed, 37 insertions, 76 deletions
diff --git a/include/palette.h b/include/palette.h
new file mode 100644
index 00000000..3ef00fcb
--- /dev/null
+++ b/include/palette.h
@@ -0,0 +1,31 @@
+#include "global.h"
+#include "filesystem.h"
+#include "unk_02002F08.h"
+
+void FUN_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 size);
+void CopyPaletteFromNarc(NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest);
+void PaletteData_CopyPalette(struct PaletteData *paletteData, u32 srcIdx, u16 srcOffset, u32 destIdx, u16 destOffset, u16 size);
+u16 *PaletteData_GetUnfadedBuf(struct PaletteData *paletteData, u32 index);
+u16 *PaletteData_GetFadedBuf(struct PaletteData *paletteData, u32 index);
+u32 FUN_02003210(struct PaletteData *paletteData, u16 param1, u16 param2, s16 delay, u8 startY, u8 targetY, u16 color);
+u8 IsPaletteSelected(u16 selectedPalettes, u16 index);
+void FUN_02003328(struct PaletteData *param0, u16 param1);
+void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2);
+void FUN_020033A4(struct PaletteFadeControl *paletteFade, u16 selectedPalettes, s16 delay, u8 startY, u8 targetY, u16 color);
+void FUN_02003464(u32 param0, struct PaletteData *param1);
+void FUN_02003500(struct PaletteData *param0);
+void FUN_02003520(struct PaletteData *param0);
+void FUN_02003540(struct PaletteData *paletteData, u8 index, u32 param2);
+void FUN_0200359C(struct PaletteData *paletteData, u32 index, u32 param2);
+void FUN_020035F8(u16 *src, u16 *dest, struct PaletteFadeControl *fadeCtrl, u32 numEntries);
+void FUN_02003684(struct PaletteData *paletteData, u8 index, struct PaletteFadeControl *fadeCtrl);
+void FUN_0200372C(struct PaletteData *paletteData);
+u16 FUN_020038E4(struct PaletteData *paletteData);
+void FUN_020038F0(struct PaletteData *paletteData, u32 param1);
+void PaletteData_FillPalette(struct PaletteData *paletteData, u32 index, u32 selection, u16 value, u16 startOffset, u16 endOffset);
+void BlendPalette(u16 *src, u16 *dest, u16 numEntries, u8 coeff, u16 blendColor);
+void BlendPaletteUnfaded(struct PaletteData *paletteData, u32 index, u16 offset, u16 numEntries, u8 coeff, u16 blendColor);
+void BlendPalettes(u16 *src, u16 *dest, u16 selectedPalettes, u8 coeff, u16 blendColor);
+void BlendPalettesUnfaded(struct PaletteData *paletteData, u32 index, u16 selectedPalettes, u8 coeff, u16 blendColor);
+void TintPalette_CustomTone(u16 *palette, u32 count, u32 rTone, u32 gTone, u32 bTone);
+void FUN_02003B40(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, u32 index, u32 size, u16 offset, u32 rTone, u32 gTone, u32 bTone);
diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
index c4bfeddd..e155f716 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -59,26 +59,11 @@ u32 FUN_02002F90(struct String *str);
 s32 FUN_02002F9C(u32 param0, struct String *str);
 struct PaletteData *FUN_02002FD0(u32 heap_id);
 void FUN_02002FEC(struct PaletteData *ptr);
-void PaletteData_SetBuffers(
-    struct PaletteData *param0, u32 param1, void *param2, void *param3, u32 size);
-void PaletteData_AllocBuffers(struct PaletteData *param0, u32 param1, u32 size, u32 heap_id);
-void PaletteData_FreeBuffers(struct PaletteData *param0, u32 param1);
-void PaletteData_LoadPalette(
-    struct PaletteData *param0, const void *param1, u32 param2, u32 offset, u16 size);
-void PaletteData_LoadFromNarc(struct PaletteData *param0,
-    NarcId narcId,
-    s32 memberId,
-    u32 heap_id,
-    u32 param4,
-    u32 size,
-    u16 offset,
-    u16 param7);
-void PaletteData_LoadNarc(struct PaletteData *param0,
-    NarcId narcId,
-    s32 memberId,
-    u32 heap_id,
-    u32 param4,
-    u32 size,
-    u16 offset);
+void PaletteData_SetBuffers(struct PaletteData *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size);
+void PaletteData_AllocBuffers(struct PaletteData *paletteData, u32 index, u32 size, u32 heap_id);
+void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 index);
+void PaletteData_LoadPalette(struct PaletteData *paletteData, const void *src, u32 index, u32 offset, u16 size);
+void PaletteData_LoadFromNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, u32 index, u32 size, u16 offset, u16 param7);
+void PaletteData_LoadNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, u32 index, u32 size, u16 offset);
 
 #endif // POKEDIAMOND_UNK_02002F08_H
diff --git a/include/unk_020030E8.h b/include/unk_020030E8.h
deleted file mode 100644
index bf71ca7f..00000000
--- a/include/unk_020030E8.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "global.h"
-#include "filesystem.h"
-#include "unk_02002F08.h"
-
-void FUN_02003108(struct PaletteData *param0, u32 param1, u16 param2, u32 param3);
-void CopyPaletteFromNarc(NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest);
-void PaletteData_CopyPalette(
-    struct PaletteData *param0, u32 param1, u16 param2, u32 param3, u16 param4, u16 param5);
-u16 *PaletteData_GetUnfadedBuf(struct PaletteData *param0, u32 param1);
-u16 *PaletteData_GetFadedBuf(struct PaletteData *param0, u32 param1);
-u32 FUN_02003210(struct PaletteData *param0,
-    u16 param1,
-    u16 param2,
-    s16 param3,
-    u8 param6,
-    u8 param7,
-    u16 param8);
-u8 IsPaletteSelected(u16 param0, u16 param1);
-void FUN_02003328(struct PaletteData *param0, u16 param1);
-void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2);
-void FUN_020033A4(struct PaletteFadeControl *param0,
-    u16 param1,
-    s16 param2,
-    u8 param3,
-    u8 param4,
-    u16 param5);
-void FUN_02003464(u32 param0, struct PaletteData *param1);
-void FUN_02003500(struct PaletteData *param0);
-void FUN_02003520(struct PaletteData *param0);
-void FUN_02003540(struct PaletteData *param0, u8 param1, u32 param2);
-void FUN_0200359C(struct PaletteData *param0, u32 param1, u32 param2);
-void FUN_020035F8(u16 *param0, u16 *param1, struct PaletteFadeControl *param2, u32 param3);
-void FUN_02003684(
-    struct PaletteData *param0, u8 param1, struct PaletteFadeControl *param2);
-void FUN_0200372C(struct PaletteData *param0);
-u16 FUN_020038E4(struct PaletteData *param0);
-void FUN_020038F0(struct PaletteData *param0, u32 param1);
-void PaletteData_FillPalette(
-    struct PaletteData *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5);
-void BlendPalette(u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4);
-void BlendPaletteUnfaded(
-    struct PaletteData *param0, u32 param1, u16 param2, u16 param3, u8 param4, u16 param5);
-void BlendPalettes(u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4);
-void BlendPalettesUnfaded(struct PaletteData *param0, u32 param1, u16 param2, u8 param3, u16 param4);
-void TintPalette_CustomTone(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
-void FUN_02003B40(struct PaletteData *param0,
-    NarcId narcId,
-    s32 memberId,
-    u32 heap_id,
-    u32 param4,
-    u32 param5,
-    u16 param6,
-    u32 param7,
-    u32 param8,
-    u32 param9);