2 files changed, 41 insertions, 41 deletions
diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
index 859e44b0..d5553eb2 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -5,7 +5,7 @@
 #include "gf_gfx_loader.h"
 #include "string16.h"
 
-struct UnkStruct_02002F08_sub_sub
+struct PaletteControl
 {
     u16 unk00;
 
@@ -21,17 +21,17 @@ struct UnkStruct_02002F08_sub_sub
     u16 unk06_a : 6;
 };
 
-struct UnkStruct_02002F08_sub
+struct Palette
 {
-    u16 *unk00;
-    u16 *unk04;
-    u32 unk08;
-    struct UnkStruct_02002F08_sub_sub unk0c;
+    u16 *unfadedBuf;
+    u16 *fadedBuf;
+    u32 bufSize;
+    struct PaletteControl unk0c;
 };
 
-struct UnkStruct_02002F08
+struct PaletteData
 {
-    struct UnkStruct_02002F08_sub unk000[14];
+    struct Palette pltt[14];
 
     u16 unk118_0 : 2;
     u16 unk118_2 : 14;
@@ -48,15 +48,15 @@ u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 param3);
 u32 FUN_02002F58(const u16 *str);
 u32 FUN_02002F90(struct String *str);
 s32 FUN_02002F9C(u32 param0, struct String *str);
-struct UnkStruct_02002F08 *FUN_02002FD0(u32 heap_id);
-void FUN_02002FEC(struct UnkStruct_02002F08 *ptr);
-void FUN_02002FF4(
-    struct UnkStruct_02002F08 *param0, u32 param1, void *param2, void *param3, u32 size);
-void FUN_02003008(struct UnkStruct_02002F08 *param0, u32 param1, u32 size, u32 heap_id);
-void FUN_02003038(struct UnkStruct_02002F08 *param0, u32 param1);
-void FUN_02003054(
-    struct UnkStruct_02002F08 *param0, const void *param1, u32 param2, u32 offset, u16 size);
-void FUN_02003084(struct UnkStruct_02002F08 *param0,
+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,
@@ -64,7 +64,7 @@ void FUN_02003084(struct UnkStruct_02002F08 *param0,
     u32 size,
     u16 offset,
     u16 param7);
-void FUN_020030E8(struct UnkStruct_02002F08 *param0,
+void PaletteData_LoadNarc(struct PaletteData *param0,
     NarcId narcId,
     s32 memberId,
     u32 heap_id,
diff --git a/include/unk_020030E8.h b/include/unk_020030E8.h
index f211b611..346b9715 100644
--- a/include/unk_020030E8.h
+++ b/include/unk_020030E8.h
@@ -2,13 +2,13 @@
 #include "filesystem.h"
 #include "unk_02002F08.h"
 
-void FUN_02003108(struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u32 param3);
+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(
-    struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u32 param3, u16 param4, u16 param5);
-u16 *FUN_020031FC(struct UnkStruct_02002F08 *param0, u32 param1);
-u16 *FUN_02003204(struct UnkStruct_02002F08 *param0, u32 param1);
-u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
+    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);
+u32 FUN_02003210(struct PaletteData *param0,
     u16 param1,
     u16 param2,
     s16 param3,
@@ -16,34 +16,34 @@ u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
     u8 param7,
     u16 param8);
 u8 FUN_02003314(u16 param0, u16 param1);
-void FUN_02003328(struct UnkStruct_02002F08 *param0, u16 param1);
-void FUN_02003368(s32 param0, struct UnkStruct_02002F08_sub *param1, u16 *param2);
-void FUN_020033A4(struct UnkStruct_02002F08_sub_sub *param0,
+void FUN_02003328(struct PaletteData *param0, u16 param1);
+void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2);
+void FUN_020033A4(struct PaletteControl *param0,
     u16 param1,
     s16 param2,
     u8 param3,
     u8 param4,
     u16 param5);
-void FUN_02003464(u32 param0, struct UnkStruct_02002F08 *param1);
-void FUN_02003500(struct UnkStruct_02002F08 *param0);
-void FUN_02003520(struct UnkStruct_02002F08 *param0);
-void FUN_02003540(struct UnkStruct_02002F08 *param0, u8 param1, u32 param2);
-void FUN_0200359C(struct UnkStruct_02002F08 *param0, u32 param1, u32 param2);
-void FUN_020035F8(u16 *param0, u16 *param1, struct UnkStruct_02002F08_sub_sub *param2, u32 param3);
+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 PaletteControl *param2, u32 param3);
 void FUN_02003684(
-    struct UnkStruct_02002F08 *param0, u8 param1, struct UnkStruct_02002F08_sub_sub *param2);
-void FUN_0200372C(struct UnkStruct_02002F08 *param0);
-u16 FUN_020038E4(struct UnkStruct_02002F08 *param0);
-void FUN_020038F0(struct UnkStruct_02002F08 *param0, u32 param1);
+    struct PaletteData *param0, u8 param1, struct PaletteControl *param2);
+void FUN_0200372C(struct PaletteData *param0);
+u16 FUN_020038E4(struct PaletteData *param0);
+void FUN_020038F0(struct PaletteData *param0, u32 param1);
 void FUN_02003914(
-    struct UnkStruct_02002F08 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5);
+    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(
-    struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u16 param3, u8 param4, u16 param5);
+    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 UnkStruct_02002F08 *param0, u32 param1, u16 param2, u8 param3, u16 param4);
-void FUN_02003AC4(u16 *param0, u16 param1, u32 param2, u32 param3, u32 param4);
-void FUN_02003B40(struct UnkStruct_02002F08 *param0,
+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 FUN_02003B40(struct PaletteData *param0,
     NarcId narcId,
     s32 memberId,
     u32 heap_id,