2 files changed, 34 insertions, 25 deletions
diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
index d5553eb2..c4bfeddd 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -5,19 +5,28 @@
 #include "gf_gfx_loader.h"
 #include "string16.h"
 
-struct PaletteControl
+
+struct PlttData
+{
+    u16 r:5; // red
+    u16 g:5; // green
+    u16 b:5; // blue
+    u16 unused_15:1;
+};
+
+struct PaletteFadeControl
 {
-    u16 unk00;
+    u16 selectedPalettes;
 
-    u16 unk02_0 : 6;
-    u16 unk02_6 : 5;
-    u16 unk02_b : 5;
+    u16 delay : 6;
+    u16 y : 5;
+    u16 targetY : 5;
 
-    u16 unk04_0 : 15;
-    u16 unk04_f : 1;
+    u16 blendColor : 15;
+    u16 yDec : 1;
 
-    u16 unk06_0 : 4;
-    u16 unk06_4 : 6;
+    u16 deltaY : 4;
+    u16 delayCounter : 6;
     u16 unk06_a : 6;
 };
 
@@ -26,7 +35,7 @@ struct Palette
     u16 *unfadedBuf;
     u16 *fadedBuf;
     u32 bufSize;
-    struct PaletteControl unk0c;
+    struct PaletteFadeControl fadeCtrl;
 };
 
 struct PaletteData
@@ -34,7 +43,7 @@ struct PaletteData
     struct Palette pltt[14];
 
     u16 unk118_0 : 2;
-    u16 unk118_2 : 14;
+    u16 activeFadePalettes : 14;
     u16 unk11a_0 : 14;
     u16 unk11a_e : 1;
     u16 unk11a_f : 1;
diff --git a/include/unk_020030E8.h b/include/unk_020030E8.h
index 346b9715..bf71ca7f 100644
--- a/include/unk_020030E8.h
+++ b/include/unk_020030E8.h
@@ -3,11 +3,11 @@
 #include "unk_02002F08.h"
 
 void FUN_02003108(struct PaletteData *param0, u32 param1, u16 param2, u32 param3);
-void FUN_0200317C(NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest);
-void FUN_020031B8(
+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 *FUN_020031FC(struct PaletteData *param0, u32 param1);
-u16 *FUN_02003204(struct PaletteData *param0, u32 param1);
+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,
@@ -15,10 +15,10 @@ u32 FUN_02003210(struct PaletteData *param0,
     u8 param6,
     u8 param7,
     u16 param8);
-u8 FUN_02003314(u16 param0, u16 param1);
+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 PaletteControl *param0,
+void FUN_020033A4(struct PaletteFadeControl *param0,
     u16 param1,
     s16 param2,
     u8 param3,
@@ -29,20 +29,20 @@ 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 PaletteControl *param2, u32 param3);
+void FUN_020035F8(u16 *param0, u16 *param1, struct PaletteFadeControl *param2, u32 param3);
 void FUN_02003684(
-    struct PaletteData *param0, u8 param1, struct PaletteControl *param2);
+    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 FUN_02003914(
+void PaletteData_FillPalette(
     struct PaletteData *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5);
-void FUN_02003974(u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4);
-void FUN_020039E8(
+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 FUN_02003A30(u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4);
-void FUN_02003A64(struct PaletteData *param0, u32 param1, u16 param2, u8 param3, u16 param4);
-void FUN_02003AC4(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+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,