From b27aae4db38ab23353ce64eb420b8e287c70032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 09:12:49 +0200
Subject: decompile unk_020030E8.s

---
 include/unk_02002F08.h | 69 ++++++++++++++++++++++++++++++++++++++------------
 include/unk_020030E8.h | 32 +++++++++++++++++++++++
 2 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 include/unk_020030E8.h

(limited to 'include')

diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
index 773d9246..755fe05b 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -6,19 +6,41 @@
 #include "string16.h"
 
 
+struct UnkStruct_02002F08_sub_sub {
+    u16 unk00;
+
+    u16 unk02_0: 6;
+    u16 unk02_6: 5;
+    u16 unk02_b: 5;
+
+    u16 unk04_0: 15;
+    u16 unk04_f: 1;
+
+    u16 unk06_0: 4;
+    u16 unk06_4: 6;
+    u16 unk06_a: 6;
+};
+
+struct UnkStruct_02002F08_sub
+{
+    u16 *unk00;
+    u16 *unk04;
+    u32 unk08;
+    struct UnkStruct_02002F08_sub_sub unk0c;
+};
+
 struct UnkStruct_02002F08
 {
-    struct
-    {
-        u16 *unk00;
-        u16 *unk04;
-        u32 unk08;
-        u32 unk0c;
-        u32 unk10;
-    } unk000[14];
-
-    u32 unk118;
-    u32 unk11c;
+    struct UnkStruct_02002F08_sub unk000[14];
+
+    u16 unk118_0 : 2;
+    u16 unk118_2 : 14;
+    u16 unk11a_0 : 14;
+    u16 unk11a_e : 1;
+    u16 unk11a_f : 1;
+    u8 unk11c;
+    u8 unk11d;
+    u16 unk11e;
 };
 
 s32 FUN_02002F08(u32 param0, struct String *str, u32 param2);
@@ -28,11 +50,26 @@ 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_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, NarcId narcId, s32 memberId, u32 heap_id, u32 param4, u32 size, u16 offset, u16 param7);
-void FUN_020030E8(struct UnkStruct_02002F08 *param0, NarcId narcId, s32 memberId, u32 heap_id, u32 param4, u32 size, u16 offset);
+void FUN_02003054(
+    struct UnkStruct_02002F08 *param0, const void *param1, u32 param2, u32 offset, u16 size);
+void FUN_02003084(struct UnkStruct_02002F08 *param0,
+    NarcId narcId,
+    s32 memberId,
+    u32 heap_id,
+    u32 param4,
+    u32 size,
+    u16 offset,
+    u16 param7);
+void FUN_020030E8(struct UnkStruct_02002F08 *param0,
+    NarcId narcId,
+    s32 memberId,
+    u32 heap_id,
+    u32 param4,
+    u32 size,
+    u16 offset);
 
-#endif //POKEDIAMOND_UNK_02002F08_H
+#endif // POKEDIAMOND_UNK_02002F08_H
diff --git a/include/unk_020030E8.h b/include/unk_020030E8.h
new file mode 100644
index 00000000..3b5ff7f4
--- /dev/null
+++ b/include/unk_020030E8.h
@@ -0,0 +1,32 @@
+#include "global.h"
+#include "filesystem.h"
+#include "unk_02002F08.h"
+
+
+void FUN_02003108(struct UnkStruct_02002F08 *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, u16 param1, u16 param2, s16 param3, u8 param6, 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, 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_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);
+void FUN_02003914(struct UnkStruct_02002F08 *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);
+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, NarcId narcId, s32 memberId, u32 heap_id, u32 param4, u32 param5, u16 param6, u32 param7, u32 param8, u32 param9);
-- 
cgit v1.2.3


From 807fb0c97bb0edf6b6d288bf70aeb8aa934b7e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 09:13:42 +0200
Subject: format

---
 include/unk_02002F08.h | 20 ++++++++++----------
 include/unk_020030E8.h | 39 +++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
index 755fe05b..859e44b0 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -5,20 +5,20 @@
 #include "gf_gfx_loader.h"
 #include "string16.h"
 
-
-struct UnkStruct_02002F08_sub_sub {
+struct UnkStruct_02002F08_sub_sub
+{
     u16 unk00;
 
-    u16 unk02_0: 6;
-    u16 unk02_6: 5;
-    u16 unk02_b: 5;
+    u16 unk02_0 : 6;
+    u16 unk02_6 : 5;
+    u16 unk02_b : 5;
 
-    u16 unk04_0: 15;
-    u16 unk04_f: 1;
+    u16 unk04_0 : 15;
+    u16 unk04_f : 1;
 
-    u16 unk06_0: 4;
-    u16 unk06_4: 6;
-    u16 unk06_a: 6;
+    u16 unk06_0 : 4;
+    u16 unk06_4 : 6;
+    u16 unk06_a : 6;
 };
 
 struct UnkStruct_02002F08_sub
diff --git a/include/unk_020030E8.h b/include/unk_020030E8.h
index 3b5ff7f4..f211b611 100644
--- a/include/unk_020030E8.h
+++ b/include/unk_020030E8.h
@@ -2,31 +2,54 @@
 #include "filesystem.h"
 #include "unk_02002F08.h"
 
-
 void FUN_02003108(struct UnkStruct_02002F08 *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);
+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, u16 param1, u16 param2, s16 param3, u8 param6, u8 param7, u16 param8);
+u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
+    u16 param1,
+    u16 param2,
+    s16 param3,
+    u8 param6,
+    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, u16 param1, s16 param2, u8 param3, u8 param4, u16 param5);
+void FUN_020033A4(struct UnkStruct_02002F08_sub_sub *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_02003684(struct UnkStruct_02002F08 *param0, u8 param1, struct UnkStruct_02002F08_sub_sub *param2);
+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);
-void FUN_02003914(struct UnkStruct_02002F08 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5);
+void FUN_02003914(
+    struct UnkStruct_02002F08 *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);
+void FUN_020039E8(
+    struct UnkStruct_02002F08 *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, NarcId narcId, s32 memberId, u32 heap_id, u32 param4, u32 param5, u16 param6, u32 param7, u32 param8, u32 param9);
+void FUN_02003B40(struct UnkStruct_02002F08 *param0,
+    NarcId narcId,
+    s32 memberId,
+    u32 heap_id,
+    u32 param4,
+    u32 param5,
+    u16 param6,
+    u32 param7,
+    u32 param8,
+    u32 param9);
-- 
cgit v1.2.3


From 9000931f5c47a0b6e8ee6f2ac0069db61868bd32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 10:37:38 +0200
Subject: document palette stuff from unk_02002F08.c

---
 include/unk_02002F08.h | 36 ++++++++++++++++++------------------
 include/unk_020030E8.h | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'include')

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,
-- 
cgit v1.2.3


From ba803600ac7ceef20799ee7b0c4da0409cbbbea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 12:23:19 +0200
Subject: partially document unk_020030E8.c

---
 include/unk_02002F08.h | 31 ++++++++++++++++++++-----------
 include/unk_020030E8.h | 28 ++++++++++++++--------------
 2 files changed, 34 insertions(+), 25 deletions(-)

(limited to 'include')

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,
-- 
cgit v1.2.3


From a89d505d8364ce739756750a45983312980a1ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 12:28:22 +0200
Subject: rename unk_020030E8.c to palette.c

---
 include/palette.h      | 31 ++++++++++++++++++++++++++++
 include/unk_02002F08.h | 27 ++++++-------------------
 include/unk_020030E8.h | 55 --------------------------------------------------
 3 files changed, 37 insertions(+), 76 deletions(-)
 create mode 100644 include/palette.h
 delete mode 100644 include/unk_020030E8.h

(limited to 'include')

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);
-- 
cgit v1.2.3


From 8dcbcd270574fceed1d2b10053eb11e70170b444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 12:29:23 +0200
Subject: format

---
 include/palette.h      | 53 ++++++++++++++++++++++++++++++++++++++++++--------
 include/unk_02002F08.h | 32 +++++++++++++++++++++---------
 2 files changed, 68 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/palette.h b/include/palette.h
index 3ef00fcb..2eac3a6a 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -3,15 +3,32 @@
 #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);
+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);
+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_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);
@@ -22,10 +39,30 @@ void FUN_02003684(struct PaletteData *paletteData, u8 index, struct PaletteFadeC
 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 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 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 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);
+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 e155f716..be551dc4 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -5,13 +5,12 @@
 #include "gf_gfx_loader.h"
 #include "string16.h"
 
-
 struct PlttData
 {
-    u16 r:5; // red
-    u16 g:5; // green
-    u16 b:5; // blue
-    u16 unused_15:1;
+    u16 r : 5; // red
+    u16 g : 5; // green
+    u16 b : 5; // blue
+    u16 unused_15 : 1;
 };
 
 struct PaletteFadeControl
@@ -59,11 +58,26 @@ 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 *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size);
+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);
+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
-- 
cgit v1.2.3


From c7b7cb66d44554ea4cd2873826deabbade5a52ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 12:36:01 +0200
Subject: add header guards

---
 include/palette.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/palette.h b/include/palette.h
index 2eac3a6a..469c680f 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -1,3 +1,6 @@
+#ifndef POKEDIAMOND_PALETTE_H
+#define POKEDIAMOND_PALETTE_H
+
 #include "global.h"
 #include "filesystem.h"
 #include "unk_02002F08.h"
@@ -66,3 +69,5 @@ void FUN_02003B40(struct PaletteData *paletteData,
     u32 rTone,
     u32 gTone,
     u32 bTone);
+
+#endif // POKEDIAMOND_PALETTE_H
-- 
cgit v1.2.3


From b04c61007e9df8f672d71cd6403cc5d25ad55e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 15:06:48 +0200
Subject: match TintPalette_CustomTone from pokeemerald

---
 include/palette.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/palette.h b/include/palette.h
index 469c680f..2f0e585b 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -58,7 +58,7 @@ void BlendPaletteUnfaded(struct PaletteData *paletteData,
 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 TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 gTone, s32 bTone);
 void FUN_02003B40(struct PaletteData *paletteData,
     NarcId narcId,
     s32 memberId,
-- 
cgit v1.2.3


From 7a3c5d315180fb2d1adef1b7a032ab26bf227ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 15:11:53 +0200
Subject: fix warnings

---
 include/palette.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/palette.h b/include/palette.h
index 2f0e585b..def12c70 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -66,8 +66,8 @@ void FUN_02003B40(struct PaletteData *paletteData,
     u32 index,
     u32 size,
     u16 offset,
-    u32 rTone,
-    u32 gTone,
-    u32 bTone);
+    s32 rTone,
+    s32 gTone,
+    s32 bTone);
 
 #endif // POKEDIAMOND_PALETTE_H
-- 
cgit v1.2.3


From eb17a2e3aa326e613e09c8f6300b2ab10b3f7389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 27 Jun 2021 15:20:28 +0200
Subject: fix file split

---
 include/font.h         |  5 +++
 include/palette.h      | 70 +++++++++++++++++++++++++++++++++++++++++-
 include/unk_02002F08.h | 83 --------------------------------------------------
 3 files changed, 74 insertions(+), 84 deletions(-)
 delete mode 100644 include/unk_02002F08.h

(limited to 'include')

diff --git a/include/font.h b/include/font.h
index 6617f8ef..963e36bc 100644
--- a/include/font.h
+++ b/include/font.h
@@ -27,5 +27,10 @@ u32 FUN_02002E14(u32 param0, struct String *str, u32 param2);
 s32 GetFontAttribute(u8 fontId, s32 attr);
 void FUN_02002ED0(u32 layer, u32 baseAddr, u32 heap_id);
 void FUN_02002EEC(u32 layer, u32 baseAddr, u32 heap_id);
+s32 FUN_02002F08(u32 param0, struct String *str, u32 param2);
+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);
 
 #endif // POKEDIAMOND_FONT_H
diff --git a/include/palette.h b/include/palette.h
index def12c70..7f14ddb4 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -3,8 +3,76 @@
 
 #include "global.h"
 #include "filesystem.h"
-#include "unk_02002F08.h"
 
+struct PlttData
+{
+    u16 r : 5; // red
+    u16 g : 5; // green
+    u16 b : 5; // blue
+    u16 unused_15 : 1;
+};
+
+struct PaletteFadeControl
+{
+    u16 selectedPalettes;
+
+    u16 delay : 6;
+    u16 y : 5;
+    u16 targetY : 5;
+
+    u16 blendColor : 15;
+    u16 yDec : 1;
+
+    u16 deltaY : 4;
+    u16 delayCounter : 6;
+    u16 unk06_a : 6;
+};
+
+struct Palette
+{
+    u16 *unfadedBuf;
+    u16 *fadedBuf;
+    u32 bufSize;
+    struct PaletteFadeControl fadeCtrl;
+};
+
+struct PaletteData
+{
+    struct Palette pltt[14];
+
+    u16 unk118_0 : 2;
+    u16 activeFadePalettes : 14;
+    u16 unk11a_0 : 14;
+    u16 unk11a_e : 1;
+    u16 unk11a_f : 1;
+    u8 unk11c;
+    u8 unk11d;
+    u16 unk11e;
+};
+
+struct PaletteData *FUN_02002FD0(u32 heap_id);
+void FUN_02002FEC(struct PaletteData *ptr);
+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);
 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);
diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
deleted file mode 100644
index be551dc4..00000000
--- a/include/unk_02002F08.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef POKEDIAMOND_UNK_02002F08_H
-#define POKEDIAMOND_UNK_02002F08_H
-
-#include "global.h"
-#include "gf_gfx_loader.h"
-#include "string16.h"
-
-struct PlttData
-{
-    u16 r : 5; // red
-    u16 g : 5; // green
-    u16 b : 5; // blue
-    u16 unused_15 : 1;
-};
-
-struct PaletteFadeControl
-{
-    u16 selectedPalettes;
-
-    u16 delay : 6;
-    u16 y : 5;
-    u16 targetY : 5;
-
-    u16 blendColor : 15;
-    u16 yDec : 1;
-
-    u16 deltaY : 4;
-    u16 delayCounter : 6;
-    u16 unk06_a : 6;
-};
-
-struct Palette
-{
-    u16 *unfadedBuf;
-    u16 *fadedBuf;
-    u32 bufSize;
-    struct PaletteFadeControl fadeCtrl;
-};
-
-struct PaletteData
-{
-    struct Palette pltt[14];
-
-    u16 unk118_0 : 2;
-    u16 activeFadePalettes : 14;
-    u16 unk11a_0 : 14;
-    u16 unk11a_e : 1;
-    u16 unk11a_f : 1;
-    u8 unk11c;
-    u8 unk11d;
-    u16 unk11e;
-};
-
-s32 FUN_02002F08(u32 param0, struct String *str, u32 param2);
-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 PaletteData *FUN_02002FD0(u32 heap_id);
-void FUN_02002FEC(struct PaletteData *ptr);
-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
-- 
cgit v1.2.3