From 6850ab1f5f9c68553fcc8efb6dd7afe6170a3ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Fri, 26 Mar 2021 18:58:24 +0100
Subject: nonmatching

---
 include/unk_02016B94.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 include/unk_02016B94.h

(limited to 'include')

diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
new file mode 100644
index 00000000..b1dbfcda
--- /dev/null
+++ b/include/unk_02016B94.h
@@ -0,0 +1,64 @@
+#ifndef POKEDIAMOND_UNK_02016B94_H
+#define POKEDIAMOND_UNK_02016B94_H
+
+
+#include "global.h"
+#include "GX_layers.h"
+#include "gx.h"
+#include "heap.h"
+
+struct UnkStruct1 {
+    u32 unk00;
+    u32 unk04;
+    u32 unk08;
+    u32 unk0c;
+
+    u8 unk10;
+    u8 unk11;
+    u8 unk12;
+    u8 unk13;
+    u8 unk14;
+    u8 unk15;
+    u8 unk16;
+    u8 unk17; //probably paddding
+    u32 unk18;
+};
+
+
+
+struct UnkStruct2 {
+    u32 unk00;
+    u32 unk04;
+
+
+    struct InnerStruct {
+        u32 unk08;
+        u32 unk0c;
+        u32 unk10;
+
+        u32 unk14;
+        u32 unk18;
+
+        u8 unk1c;
+        u8 unk1d;
+        u8 unk1e;
+        u8 unk1f;
+        u16 unk20;
+        u16 unk22; //probably padding
+        u32 unk24;
+        u32 unk28;
+        u32 unk2c;
+        u32 unk30;
+    } unk08[8];
+};
+
+
+THUMB_FUNC void *FUN_02016B94(u32 heap_id);
+THUMB_FUNC u32 FUN_02016BB8(u32 *param0);
+THUMB_FUNC void FUN_02016BBC(u32 *param0);
+THUMB_FUNC void FUN_02016BF4(u32 *param0, u32 param1);
+THUMB_FUNC void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3);
+
+
+
+#endif //POKEDIAMOND_UNK_02016B94_H
\ No newline at end of file
-- 
cgit v1.2.3


From 5200f263fc773b5bfb246af68619d96822a321b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 13 May 2021 19:38:55 +0200
Subject: more decomps

---
 include/unk_02016B94.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index b1dbfcda..0ecf4f56 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -6,6 +6,9 @@
 #include "GX_layers.h"
 #include "gx.h"
 #include "heap.h"
+#include "math_util.h"
+#include "MI_uncompress.h"
+#include "OS_cache.h"
 
 struct UnkStruct1 {
     u32 unk00;
@@ -32,7 +35,7 @@ struct UnkStruct2 {
 
 
     struct InnerStruct {
-        u32 unk08;
+        void *unk08;
         u32 unk0c;
         u32 unk10;
 
@@ -61,4 +64,5 @@ THUMB_FUNC void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStr
 
 
 
-#endif //POKEDIAMOND_UNK_02016B94_H
\ No newline at end of file
+
+#endif //POKEDIAMOND_UNK_02016B94_H
-- 
cgit v1.2.3


From b9775f239f86191af5cb1ee8f58f4fbcdc7e4b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 20 May 2021 09:37:43 +0200
Subject: remaining decomps

---
 include/unk_02016B94.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index 0ecf4f56..eaf764ad 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -31,7 +31,8 @@ struct UnkStruct1 {
 
 struct UnkStruct2 {
     u32 unk00;
-    u32 unk04;
+    u16 unk04;
+    u16 unk06;
 
 
     struct InnerStruct {
-- 
cgit v1.2.3


From c1a0ef9536ef8bcc2d7b7047f6154f32a6fea542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 20 May 2021 09:57:50 +0200
Subject: headers cleanup

---
 include/unk_02016B94.h | 274 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 256 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index eaf764ad..0183e96c 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -1,16 +1,16 @@
 #ifndef POKEDIAMOND_UNK_02016B94_H
 #define POKEDIAMOND_UNK_02016B94_H
 
-
 #include "global.h"
 #include "GX_layers.h"
+#include "MI_uncompress.h"
+#include "OS_cache.h"
 #include "gx.h"
 #include "heap.h"
 #include "math_util.h"
-#include "MI_uncompress.h"
-#include "OS_cache.h"
 
-struct UnkStruct1 {
+struct UnkStruct1
+{
     u32 unk00;
     u32 unk04;
     u32 unk08;
@@ -23,19 +23,18 @@ struct UnkStruct1 {
     u8 unk14;
     u8 unk15;
     u8 unk16;
-    u8 unk17; //probably paddding
+    u8 unk17; // probably paddding
     u32 unk18;
 };
 
-
-
-struct UnkStruct2 {
+struct UnkStruct2
+{
     u32 unk00;
     u16 unk04;
     u16 unk06;
 
-
-    struct InnerStruct {
+    struct InnerStruct
+    {
         void *unk08;
         u32 unk0c;
         u32 unk10;
@@ -48,7 +47,7 @@ struct UnkStruct2 {
         u8 unk1e;
         u8 unk1f;
         u16 unk20;
-        u16 unk22; //probably padding
+        u16 unk22; // probably padding
         u32 unk24;
         u32 unk28;
         u32 unk2c;
@@ -56,14 +55,253 @@ struct UnkStruct2 {
     } unk08[8];
 };
 
+struct UnkStruct3
+{
+    void *unk00;
+    u16 unk04;
+    u16 unk06;
+};
 
-THUMB_FUNC void *FUN_02016B94(u32 heap_id);
-THUMB_FUNC u32 FUN_02016BB8(u32 *param0);
-THUMB_FUNC void FUN_02016BBC(u32 *param0);
-THUMB_FUNC void FUN_02016BF4(u32 *param0, u32 param1);
-THUMB_FUNC void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3);
-
+struct UnkStruct4
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 unk5;
+    u16 unk6;
+};
 
+struct Window
+{
+    struct UnkStruct2 *unk00;
+    u8 unk04;
+    u8 unk05;
+    u8 unk06;
+    u8 unk07;
+    u8 unk08;
+    u8 unk09;
+    u16 unk0a : 15;
+    u16 unk0b : 1;
+    void *unk0c;
+};
 
+void *FUN_02016B94(u32 heap_id);
+u32 FUN_02016BB8(u32 *param0);
+void FUN_02016BBC(u32 *param0);
+void FUN_02016BF4(u32 *param0, u32 param1);
+void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3);
+void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u8 param3);
+u8 FUN_020177DC(u8 param0, u32 param1);
+void FUN_02017850(u32 param0, u8 *param1, u8 *param2);
+void FUN_020178A0(struct UnkStruct2 *param0, u32 param1);
+void FUN_020178BC(u32 param0, u32 param1);
+void FUN_0201797C(u32 param0, GX_LayerToggle toggle);
+void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 val);
+u32 FUN_02017B48(struct UnkStruct2 *param0, u32 param1);
+u32 FUN_02017B54(struct UnkStruct2 *param0, u32 param1);
+void FUN_02017B60(struct UnkStruct2 *param0,
+    u32 param1,
+    u32 param2,
+    u32 param3,
+    u32 param4,
+    u32 param5,
+    u32 param6);
+void FUN_02017B8C(struct InnerStruct *param0, u32 param1, u32 val);
+void FUN_02017BD0(
+    struct UnkStruct2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
+void FUN_02017C6C(struct UnkStruct2 *param0, u32 param1);
+void FUN_02017C98(const void *param0, void *param1, u32 param2);
+void FUN_02017CD0(struct UnkStruct2 *param0, u32 param1);
+void FUN_02017CE8(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size);
+void FUN_02017DFC(struct UnkStruct2 *param0, u32 param1, void *param2, u32 param3);
+void FUN_02017E14(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void FUN_02017E40(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size);
+void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id);
+void FUN_02017F48(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size);
+void FUN_02017FE4(u32 param0, u32 param1);
+u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2);
+u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3);
+void FUN_02018148(
+    struct UnkStruct2 *param0, u32 param1, u32 *param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018170(struct UnkStruct2 *param0,
+    u32 param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u32 *param6,
+    u8 param7,
+    u8 param8,
+    u8 param9,
+    u8 param10);
+void FUN_020181EC(struct UnkStruct2 *param0,
+    u32 param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u32 *param6,
+    u8 param7,
+    u8 param8,
+    u8 param9,
+    u8 param10);
+void FUN_02018268(struct InnerStruct *param0,
+    u8 param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u16 *param5,
+    u8 param6,
+    u8 param7,
+    u8 param8,
+    u8 param9,
+    u8 param10);
+void FUN_020183DC(struct InnerStruct *param0,
+    u8 param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u8 *param5,
+    u8 param6,
+    u8 param7,
+    u8 param8,
+    u8 param9,
+    u8 param10);
+void FUN_02018540(struct UnkStruct2 *param0,
+    u32 param1,
+    u16 param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u8 param6,
+    u8 param7);
+void FUN_02018590(
+    struct InnerStruct *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018640(
+    struct InnerStruct *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5);
+void FUN_020186B4(
+    struct UnkStruct2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018744(struct UnkStruct2 *param0, u32 param1);
+void FUN_02018768(struct UnkStruct2 *param0, u32 param1, u16 param2);
+void FUN_0201878C(struct UnkStruct2 *param0, u32 param1, u16 param2);
+void *FUN_020187B0(u32 param0);
+void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3);
+u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2];
+void *FUN_0201886C(struct UnkStruct2 *param0, u32 param1);
+u16 FUN_02018878(struct UnkStruct2 *param0, u32 param1);
+u8 FUN_02018884(struct UnkStruct2 *param0, u32 param1);
+void FUN_02018A60(struct UnkStruct3 *param0,
+    struct UnkStruct3 *param1,
+    u16 param2,
+    u16 param3,
+    u16 param4,
+    u16 param5,
+    u16 param6,
+    u16 param7,
+    u16 param8);
+void FUN_02018CA0(struct UnkStruct3 *param0,
+    struct UnkStruct3 *param1,
+    u16 param2,
+    u16 param3,
+    u16 param4,
+    u16 param5,
+    u16 param6,
+    u16 param7,
+    u16 param8);
+void FUN_02018E88(
+    struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+void FUN_02018F4C(
+    struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+void *FUN_02018FF4(u32 heap_id, s32 size);
+void FUN_0201901C(struct Window *param0);
+BOOL FUN_02019048(struct Window *param0);
+void FUN_02019064(struct UnkStruct2 *param0,
+    struct Window *param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u8 param6,
+    u8 param7,
+    u16 param8);
+void FUN_020190EC(
+    struct UnkStruct2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
+void FUN_02019150(struct UnkStruct2 *param0, struct Window *param1, struct UnkStruct4 *param2);
+void FUN_02019178(struct Window *param0);
+void FUN_020191A4(struct Window *param0, int param1);
+void CopyWindowToVram(struct Window *param0);
+void FUN_02019220(struct Window *param0);
+void FUN_02019270(struct Window *param0);
+void FUN_0201928C(struct Window *param0, u8 param1, u8 param2);
+void FUN_020192B8(struct Window *param0);
+void FUN_020192D4(struct Window *param0);
+void FUN_02019358(struct Window *param0);
+void FUN_020193B4(struct Window *param0);
+void FUN_02019444(struct Window *param0);
+void FUN_0201949C(struct Window *window);
+void FUN_020194C8(struct Window *window);
+void FUN_020194E0(struct Window *window);
+void FUN_0201951C(struct Window *window);
+void FUN_02019548(struct Window *window);
+void FUN_02019570(struct Window *window);
+void FUN_0201958C(struct Window *window);
+void FUN_020195A8(struct Window *window);
+void FUN_020195D0(struct Window *window);
+void FUN_020195E4(struct Window *window);
+void FUN_0201960C(struct Window *window);
+void FUN_02019620(struct Window *window, u8 param1);
+void FUN_02019658(struct Window *window,
+    void *param1,
+    u16 param2,
+    u16 param3,
+    u16 param4,
+    u16 param5,
+    u16 param6,
+    u16 param7,
+    u16 param8,
+    u16 param9);
+void FUN_02019684(struct Window *window,
+    void *param1,
+    u16 param2,
+    u16 param3,
+    u16 param4,
+    u16 param5,
+    u16 param6,
+    u16 param7,
+    u16 param8,
+    u16 param9,
+    u16 param10);
+void FUN_020196F4(struct Window *window, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5);
+void FUN_0201974C(
+    struct Window *window, u32 *param1, u32 param2, u32 param3, u16 param4, u16 param5, u32 param6);
+void FUN_0201A8C8(struct Window *window, u32 param1, u8 param2, u8 param3);
+void FUN_0201A8E8(struct Window *window, u32 param1, u8 param2, u8 param3);
+void FUN_0201A9D4(struct Window *window, u32 param1, u8 param2, u8 param3);
+u8 FUN_0201AB08(struct Window *window);
+u8 FUN_0201AB0C(struct Window *window);
+u8 FUN_0201AB10(struct Window *window);
+u8 FUN_0201AB14(struct Window *window);
+u8 FUN_0201AB18(struct Window *window);
+void FUN_0201AB1C(struct Window *window, u8 param1);
+void FUN_0201AB20(struct Window *window, u8 param1);
+void FUN_0201AB24(struct Window *window, u8 param1);
+u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path);
+u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path);
+void FUN_0201AB60(struct UnkStruct2 *param0);
+void FUN_0201AB78(struct UnkStruct2 *param0);
+void FUN_0201AC68(struct UnkStruct2 *param0, u32 param1);
+void FUN_0201AC78(struct UnkStruct2 *param0);
+void FUN_0201AEE4(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3);
+void FUN_0201AF08(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3);
+void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u32 val);
+void FUN_0201AF50(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3);
+void FUN_0201AF74(struct InnerStruct *param0, u32 param1, u32 val);
+u32 FUN_0201AFBC(struct UnkStruct2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4);
+void FUN_0201B118(struct UnkStruct2 *param0, u8 param1, u8 *param2);
 
-#endif //POKEDIAMOND_UNK_02016B94_H
+#endif // POKEDIAMOND_UNK_02016B94_H
-- 
cgit v1.2.3


From 056db847ca93551cbcadcd79a264c360ba86519d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 20 May 2021 18:32:19 +0200
Subject: fix compiler warnings

---
 include/unk_02016B94.h | 65 ++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 28 deletions(-)

(limited to 'include')

diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index 0183e96c..f4e57737 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -9,6 +9,10 @@
 #include "heap.h"
 #include "math_util.h"
 
+#define reg_G2_BG2P (u32 *)0x4000020
+#define reg_G2_BG3P (u32 *)0x4000030
+#define reg_G2S_DB_BG2P (u32 *)0x4001020
+#define reg_G2S_DB_BG3P (u32 *)0x4001030
 struct UnkStruct1
 {
     u32 unk00;
@@ -39,8 +43,8 @@ struct UnkStruct2
         u32 unk0c;
         u32 unk10;
 
-        u32 unk14;
-        u32 unk18;
+        fx32 unk14;
+        fx32 unk18;
 
         u8 unk1c;
         u8 unk1d;
@@ -48,10 +52,10 @@ struct UnkStruct2
         u8 unk1f;
         u16 unk20;
         u16 unk22; // probably padding
-        u32 unk24;
-        u32 unk28;
-        u32 unk2c;
-        u32 unk30;
+        fx32 unk24;
+        fx32 unk28;
+        fx32 unk2c;
+        fx32 unk30;
     } unk08[8];
 };
 
@@ -87,28 +91,28 @@ struct Window
     void *unk0c;
 };
 
-void *FUN_02016B94(u32 heap_id);
+struct UnkStruct2 *FUN_02016B94(u32 heap_id);
 u32 FUN_02016BB8(u32 *param0);
-void FUN_02016BBC(u32 *param0);
+void FUN_02016BBC(const struct GraphicsModes *modes);
 void FUN_02016BF4(u32 *param0, u32 param1);
 void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3);
 void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u8 param3);
 u8 FUN_020177DC(u8 param0, u32 param1);
 void FUN_02017850(u32 param0, u8 *param1, u8 *param2);
 void FUN_020178A0(struct UnkStruct2 *param0, u32 param1);
-void FUN_020178BC(u32 param0, u32 param1);
+void FUN_020178BC(u32 param0, u16 param1);
 void FUN_0201797C(u32 param0, GX_LayerToggle toggle);
-void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 val);
-u32 FUN_02017B48(struct UnkStruct2 *param0, u32 param1);
-u32 FUN_02017B54(struct UnkStruct2 *param0, u32 param1);
+void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 val);
+fx32 FUN_02017B48(struct UnkStruct2 *param0, u32 param1);
+fx32 FUN_02017B54(struct UnkStruct2 *param0, u32 param1);
 void FUN_02017B60(struct UnkStruct2 *param0,
     u32 param1,
     u32 param2,
-    u32 param3,
-    u32 param4,
-    u32 param5,
-    u32 param6);
-void FUN_02017B8C(struct InnerStruct *param0, u32 param1, u32 val);
+    fx32 param3,
+    struct Mtx22 *param4,
+    fx32 param5,
+    fx32 param6);
+void FUN_02017B8C(struct InnerStruct *param0, u32 param1, fx32 val);
 void FUN_02017BD0(
     struct UnkStruct2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
 void FUN_02017C6C(struct UnkStruct2 *param0, u32 param1);
@@ -117,24 +121,29 @@ void FUN_02017CD0(struct UnkStruct2 *param0, u32 param1);
 void FUN_02017CE8(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017DFC(struct UnkStruct2 *param0, u32 param1, void *param2, u32 param3);
-void FUN_02017E14(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void FUN_02017E14(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017E40(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id);
-void FUN_02017F48(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017F48(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
 void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017FE4(u32 param0, u32 param1);
 u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2);
 u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3);
-void FUN_02018148(
-    struct UnkStruct2 *param0, u32 param1, u32 *param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018148(struct UnkStruct2 *param0,
+    u32 param1,
+    void *param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u8 param6);
 void FUN_02018170(struct UnkStruct2 *param0,
     u32 param1,
     u8 param2,
     u8 param3,
     u8 param4,
     u8 param5,
-    u32 *param6,
+    void *param6,
     u8 param7,
     u8 param8,
     u8 param9,
@@ -145,7 +154,7 @@ void FUN_020181EC(struct UnkStruct2 *param0,
     u8 param3,
     u8 param4,
     u8 param5,
-    u32 *param6,
+    void *param6,
     u8 param7,
     u8 param8,
     u8 param9,
@@ -296,11 +305,11 @@ void FUN_0201AB60(struct UnkStruct2 *param0);
 void FUN_0201AB78(struct UnkStruct2 *param0);
 void FUN_0201AC68(struct UnkStruct2 *param0, u32 param1);
 void FUN_0201AC78(struct UnkStruct2 *param0);
-void FUN_0201AEE4(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3);
-void FUN_0201AF08(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3);
-void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u32 val);
-void FUN_0201AF50(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3);
-void FUN_0201AF74(struct InnerStruct *param0, u32 param1, u32 val);
+void FUN_0201AEE4(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3);
+void FUN_0201AF08(struct UnkStruct2 *param0, u32 param1, u32 param2, u16 param3);
+void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u16 val);
+void FUN_0201AF50(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3);
+void FUN_0201AF74(struct InnerStruct *param0, u32 param1, fx32 val);
 u32 FUN_0201AFBC(struct UnkStruct2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4);
 void FUN_0201B118(struct UnkStruct2 *param0, u8 param1, u8 *param2);
 
-- 
cgit v1.2.3


From fb002e4c21e5a4e4a2b4afa151ea725f16d86d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 20 May 2021 18:33:34 +0200
Subject: remove obsolete externs

---
 include/script.h        |  4 +++-
 include/text_02054590.h | 13 +++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/script.h b/include/script.h
index cb41889d..92d586b6 100644
--- a/include/script.h
+++ b/include/script.h
@@ -4,6 +4,8 @@
 #include "global.h"
 #include "msgdata.h"
 #include "save_block_2.h"
+#include "unk_02016B94.h"
+
 
 struct ScriptContext;
 
@@ -26,7 +28,7 @@ struct UnkStruct_02046444
 struct UnkSavStruct80
 {
     u8 padding[0x8];
-    u32 unk08;
+    struct UnkStruct2 *unk08;
     struct SaveBlock2 *saveBlock2; //0xC
     struct UnkStruct_0204639C *unk10;
     u8 padding2[0x8];
diff --git a/include/text_02054590.h b/include/text_02054590.h
index 725bd9b4..6c5090e7 100644
--- a/include/text_02054590.h
+++ b/include/text_02054590.h
@@ -3,15 +3,16 @@
 
 #include "global.h"
 #include "options.h"
+#include "unk_02016B94.h"
 
 void FUN_02054590(u32 param0, u32 param1);
-void FUN_020545B8(u32 param0, u32 param1, u32 param2);
-void FUN_02054608(u32 *param0, struct Options *options);
-void FUN_0205464C(u32 *param0);
+void FUN_020545B8(struct UnkStruct2 *param0, struct Window *param1, u32 param2);
+void FUN_02054608(struct Window *param0, struct Options *options);
+void FUN_0205464C(struct Window *param0);
 u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3);
 u16 DrawFieldMessage(u8 windowId, const u16 *str, u8 fontId, u32 speed, u8 a4, u32 a5);
 u8 FUN_020546C8(u32 param0);
-void FUN_020546E0(u32 param0, u32 param1, u32 param2, u32 param3);
-void FUN_02054744(u32 *param0, u32 param1, u32 param2);
+void FUN_020546E0(struct UnkStruct2 *param0, struct Window *param1, u32 param2, u32 param3);
+void FUN_02054744(struct Window *param0, u32 param1, u32 param2);
 
-#endif //POKEDIAMOND_UNK_02054590_H
+#endif // POKEDIAMOND_UNK_02054590_H
-- 
cgit v1.2.3


From 8df65ef7a08ee617dc858e4f40429c01f866f1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 20 May 2021 19:22:55 +0200
Subject: more extern cleanups

---
 include/GX_layers.h           | 27 ++++++++++++++++++++++++---
 include/error_message_reset.h | 24 ------------------------
 include/script_buffers.h      |  5 +++--
 include/text.h                |  3 ++-
 4 files changed, 29 insertions(+), 30 deletions(-)

(limited to 'include')

diff --git a/include/GX_layers.h b/include/GX_layers.h
index e94fb4ec..69fdc198 100644
--- a/include/GX_layers.h
+++ b/include/GX_layers.h
@@ -3,9 +3,6 @@
 
 
 #include "global.h"
-#include "GX_vramcnt.h"
-#include "error_message_reset.h"
-#include "gx.h"
 
 struct GX_LayerData
 {
@@ -20,6 +17,30 @@ typedef enum {
 } GX_LayerToggle;
 
 
+struct GraphicsBanks
+{
+    s32 bg;
+    s32 bgextpltt;
+    s32 subbg;
+    s32 subbgextpltt;
+    s32 obj;
+    s32 objextpltt;
+    s32 subobj;
+    s32 subobjextpltt;
+    s32 tex;
+    s32 texpltt;
+};
+
+
+struct GraphicsModes {
+    u32 mode1;
+    u32 mode2;
+    u32 mode3;
+    u32 mode4;
+};
+
+
+
 THUMB_FUNC void GX_SetBanks(const struct GraphicsBanks *banks);
 THUMB_FUNC void GX_DisableEngineALayers();
 THUMB_FUNC void GX_EngineAToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle);
diff --git a/include/error_message_reset.h b/include/error_message_reset.h
index d12cbf33..8c44c0a8 100644
--- a/include/error_message_reset.h
+++ b/include/error_message_reset.h
@@ -9,30 +9,6 @@
 #include "text.h"
 
 
-
-struct GraphicsBanks
-{
-    s32 bg;
-    s32 bgextpltt;
-    s32 subbg;
-    s32 subbgextpltt;
-    s32 obj;
-    s32 objextpltt;
-    s32 subobj;
-    s32 subobjextpltt;
-    s32 tex;
-    s32 texpltt;
-};
-
-
-struct GraphicsModes {
-    u32 mode1;
-    u32 mode2;
-    u32 mode3;
-    u32 mode4;
-};
-
-
 THUMB_FUNC void VBlankHandler();
 THUMB_FUNC void PrintErrorMessageAndReset();
 
diff --git a/include/script_buffers.h b/include/script_buffers.h
index d0fff528..20de53de 100644
--- a/include/script_buffers.h
+++ b/include/script_buffers.h
@@ -4,6 +4,7 @@
 #include "pokemon.h"
 #include "pokemon_storage_system.h"
 #include "trainer_data.h"
+#include "unk_02016B94.h"
 
 struct UnkStruct_0200AA80_sub_sub
 {
@@ -105,7 +106,7 @@ void StringExpandPlaceholders(struct ScrStrBufs * mgr, struct String * dest, str
 void ScrStrBufs_ResetBuffers(struct ScrStrBufs * mgr);
 struct UnkStruct_0200B870 * MessagePrinter_new(u32 r5, u32 r6, u32 sp4, u32 r4);
 void MessagePrinter_delete(struct UnkStruct_0200B870 * a0);
-void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, int a2, int a3, int a4);
-void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, int sp30, int r5, int r7);
+void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window *a2, int a3, int a4);
+void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, struct Window *sp30, int r5, int r7);
 
 #endif //POKEDIAMOND_SCRIPT_BUFFERS_H
diff --git a/include/text.h b/include/text.h
index 40f4d03a..0874f21d 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,11 +2,12 @@
 #define POKEDIAMOND_TEXT_H
 
 #include "global.h"
+#include "unk_02016B94.h"
 
 struct TextPrinterTemplate
 {
     const u16* currentChar;
-    u32 windowId;
+    struct Window *windowId;
     u8 padding[1];
     u8 fontId;
     u8 x;
-- 
cgit v1.2.3


From d2caf0745621b35455cd6d82ffe55d3a6d40235a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Thu, 20 May 2021 19:25:56 +0200
Subject: struct renaming

---
 include/script.h        |   2 +-
 include/text_02054590.h |   4 +-
 include/unk_02016B94.h  | 116 ++++++++++++++++++++++++------------------------
 3 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'include')

diff --git a/include/script.h b/include/script.h
index 92d586b6..01bba305 100644
--- a/include/script.h
+++ b/include/script.h
@@ -28,7 +28,7 @@ struct UnkStruct_02046444
 struct UnkSavStruct80
 {
     u8 padding[0x8];
-    struct UnkStruct2 *unk08;
+    struct UnkStruct_02016B94_2 *unk08;
     struct SaveBlock2 *saveBlock2; //0xC
     struct UnkStruct_0204639C *unk10;
     u8 padding2[0x8];
diff --git a/include/text_02054590.h b/include/text_02054590.h
index 6c5090e7..57560595 100644
--- a/include/text_02054590.h
+++ b/include/text_02054590.h
@@ -6,13 +6,13 @@
 #include "unk_02016B94.h"
 
 void FUN_02054590(u32 param0, u32 param1);
-void FUN_020545B8(struct UnkStruct2 *param0, struct Window *param1, u32 param2);
+void FUN_020545B8(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2);
 void FUN_02054608(struct Window *param0, struct Options *options);
 void FUN_0205464C(struct Window *param0);
 u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3);
 u16 DrawFieldMessage(u8 windowId, const u16 *str, u8 fontId, u32 speed, u8 a4, u32 a5);
 u8 FUN_020546C8(u32 param0);
-void FUN_020546E0(struct UnkStruct2 *param0, struct Window *param1, u32 param2, u32 param3);
+void FUN_020546E0(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2, u32 param3);
 void FUN_02054744(struct Window *param0, u32 param1, u32 param2);
 
 #endif // POKEDIAMOND_UNK_02054590_H
diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index f4e57737..b19fd625 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -13,7 +13,7 @@
 #define reg_G2_BG3P (u32 *)0x4000030
 #define reg_G2S_DB_BG2P (u32 *)0x4001020
 #define reg_G2S_DB_BG3P (u32 *)0x4001030
-struct UnkStruct1
+struct UnkStruct_02016B94_1
 {
     u32 unk00;
     u32 unk04;
@@ -31,13 +31,13 @@ struct UnkStruct1
     u32 unk18;
 };
 
-struct UnkStruct2
+struct UnkStruct_02016B94_2
 {
     u32 unk00;
     u16 unk04;
     u16 unk06;
 
-    struct InnerStruct
+    struct UnkStruct_02016B94_2_sub
     {
         void *unk08;
         u32 unk0c;
@@ -59,14 +59,14 @@ struct UnkStruct2
     } unk08[8];
 };
 
-struct UnkStruct3
+struct UnkStruct_02016B94_3
 {
     void *unk00;
     u16 unk04;
     u16 unk06;
 };
 
-struct UnkStruct4
+struct UnkStruct_02016B94_4
 {
     u8 unk0;
     u8 unk1;
@@ -79,7 +79,7 @@ struct UnkStruct4
 
 struct Window
 {
-    struct UnkStruct2 *unk00;
+    struct UnkStruct_02016B94_2 *unk00;
     u8 unk04;
     u8 unk05;
     u8 unk06;
@@ -91,53 +91,53 @@ struct Window
     void *unk0c;
 };
 
-struct UnkStruct2 *FUN_02016B94(u32 heap_id);
+struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id);
 u32 FUN_02016BB8(u32 *param0);
 void FUN_02016BBC(const struct GraphicsModes *modes);
 void FUN_02016BF4(u32 *param0, u32 param1);
-void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3);
-void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u8 param3);
+void FUN_02016C18(struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3);
+void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3);
 u8 FUN_020177DC(u8 param0, u32 param1);
 void FUN_02017850(u32 param0, u8 *param1, u8 *param2);
-void FUN_020178A0(struct UnkStruct2 *param0, u32 param1);
+void FUN_020178A0(struct UnkStruct_02016B94_2 *param0, u32 param1);
 void FUN_020178BC(u32 param0, u16 param1);
 void FUN_0201797C(u32 param0, GX_LayerToggle toggle);
-void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 val);
-fx32 FUN_02017B48(struct UnkStruct2 *param0, u32 param1);
-fx32 FUN_02017B54(struct UnkStruct2 *param0, u32 param1);
-void FUN_02017B60(struct UnkStruct2 *param0,
+void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 val);
+fx32 FUN_02017B48(struct UnkStruct_02016B94_2 *param0, u32 param1);
+fx32 FUN_02017B54(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02017B60(struct UnkStruct_02016B94_2 *param0,
     u32 param1,
     u32 param2,
     fx32 param3,
     struct Mtx22 *param4,
     fx32 param5,
     fx32 param6);
-void FUN_02017B8C(struct InnerStruct *param0, u32 param1, fx32 val);
+void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val);
 void FUN_02017BD0(
-    struct UnkStruct2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
-void FUN_02017C6C(struct UnkStruct2 *param0, u32 param1);
+    struct UnkStruct_02016B94_2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
+void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1);
 void FUN_02017C98(const void *param0, void *param1, u32 param2);
-void FUN_02017CD0(struct UnkStruct2 *param0, u32 param1);
-void FUN_02017CE8(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02017CE8(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size);
-void FUN_02017DFC(struct UnkStruct2 *param0, u32 param1, void *param2, u32 param3);
-void FUN_02017E14(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
-void FUN_02017E40(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017DFC(struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3);
+void FUN_02017E14(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017E40(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id);
-void FUN_02017F48(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void FUN_02017F48(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
 void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017FE4(u32 param0, u32 param1);
 u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2);
 u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3);
-void FUN_02018148(struct UnkStruct2 *param0,
+void FUN_02018148(struct UnkStruct_02016B94_2 *param0,
     u32 param1,
     void *param2,
     u8 param3,
     u8 param4,
     u8 param5,
     u8 param6);
-void FUN_02018170(struct UnkStruct2 *param0,
+void FUN_02018170(struct UnkStruct_02016B94_2 *param0,
     u32 param1,
     u8 param2,
     u8 param3,
@@ -148,7 +148,7 @@ void FUN_02018170(struct UnkStruct2 *param0,
     u8 param8,
     u8 param9,
     u8 param10);
-void FUN_020181EC(struct UnkStruct2 *param0,
+void FUN_020181EC(struct UnkStruct_02016B94_2 *param0,
     u32 param1,
     u8 param2,
     u8 param3,
@@ -159,7 +159,7 @@ void FUN_020181EC(struct UnkStruct2 *param0,
     u8 param8,
     u8 param9,
     u8 param10);
-void FUN_02018268(struct InnerStruct *param0,
+void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0,
     u8 param1,
     u8 param2,
     u8 param3,
@@ -170,7 +170,7 @@ void FUN_02018268(struct InnerStruct *param0,
     u8 param8,
     u8 param9,
     u8 param10);
-void FUN_020183DC(struct InnerStruct *param0,
+void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0,
     u8 param1,
     u8 param2,
     u8 param3,
@@ -181,7 +181,7 @@ void FUN_020183DC(struct InnerStruct *param0,
     u8 param8,
     u8 param9,
     u8 param10);
-void FUN_02018540(struct UnkStruct2 *param0,
+void FUN_02018540(struct UnkStruct_02016B94_2 *param0,
     u32 param1,
     u16 param2,
     u8 param3,
@@ -190,22 +190,22 @@ void FUN_02018540(struct UnkStruct2 *param0,
     u8 param6,
     u8 param7);
 void FUN_02018590(
-    struct InnerStruct *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+    struct UnkStruct_02016B94_2_sub *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
 void FUN_02018640(
-    struct InnerStruct *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5);
+    struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5);
 void FUN_020186B4(
-    struct UnkStruct2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
-void FUN_02018744(struct UnkStruct2 *param0, u32 param1);
-void FUN_02018768(struct UnkStruct2 *param0, u32 param1, u16 param2);
-void FUN_0201878C(struct UnkStruct2 *param0, u32 param1, u16 param2);
+    struct UnkStruct_02016B94_2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2);
+void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2);
 void *FUN_020187B0(u32 param0);
 void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3);
 u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2];
-void *FUN_0201886C(struct UnkStruct2 *param0, u32 param1);
-u16 FUN_02018878(struct UnkStruct2 *param0, u32 param1);
-u8 FUN_02018884(struct UnkStruct2 *param0, u32 param1);
-void FUN_02018A60(struct UnkStruct3 *param0,
-    struct UnkStruct3 *param1,
+void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u32 param1);
+u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1);
+u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02018A60(struct UnkStruct_02016B94_3 *param0,
+    struct UnkStruct_02016B94_3 *param1,
     u16 param2,
     u16 param3,
     u16 param4,
@@ -213,8 +213,8 @@ void FUN_02018A60(struct UnkStruct3 *param0,
     u16 param6,
     u16 param7,
     u16 param8);
-void FUN_02018CA0(struct UnkStruct3 *param0,
-    struct UnkStruct3 *param1,
+void FUN_02018CA0(struct UnkStruct_02016B94_3 *param0,
+    struct UnkStruct_02016B94_3 *param1,
     u16 param2,
     u16 param3,
     u16 param4,
@@ -223,13 +223,13 @@ void FUN_02018CA0(struct UnkStruct3 *param0,
     u16 param7,
     u16 param8);
 void FUN_02018E88(
-    struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+    struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
 void FUN_02018F4C(
-    struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+    struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
 void *FUN_02018FF4(u32 heap_id, s32 size);
 void FUN_0201901C(struct Window *param0);
 BOOL FUN_02019048(struct Window *param0);
-void FUN_02019064(struct UnkStruct2 *param0,
+void FUN_02019064(struct UnkStruct_02016B94_2 *param0,
     struct Window *param1,
     u8 param2,
     u8 param3,
@@ -239,8 +239,8 @@ void FUN_02019064(struct UnkStruct2 *param0,
     u8 param7,
     u16 param8);
 void FUN_020190EC(
-    struct UnkStruct2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
-void FUN_02019150(struct UnkStruct2 *param0, struct Window *param1, struct UnkStruct4 *param2);
+    struct UnkStruct_02016B94_2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
+void FUN_02019150(struct UnkStruct_02016B94_2 *param0, struct Window *param1, struct UnkStruct_02016B94_4 *param2);
 void FUN_02019178(struct Window *param0);
 void FUN_020191A4(struct Window *param0, int param1);
 void CopyWindowToVram(struct Window *param0);
@@ -301,16 +301,16 @@ void FUN_0201AB20(struct Window *window, u8 param1);
 void FUN_0201AB24(struct Window *window, u8 param1);
 u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path);
 u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path);
-void FUN_0201AB60(struct UnkStruct2 *param0);
-void FUN_0201AB78(struct UnkStruct2 *param0);
-void FUN_0201AC68(struct UnkStruct2 *param0, u32 param1);
-void FUN_0201AC78(struct UnkStruct2 *param0);
-void FUN_0201AEE4(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3);
-void FUN_0201AF08(struct UnkStruct2 *param0, u32 param1, u32 param2, u16 param3);
-void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u16 val);
-void FUN_0201AF50(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3);
-void FUN_0201AF74(struct InnerStruct *param0, u32 param1, fx32 val);
-u32 FUN_0201AFBC(struct UnkStruct2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4);
-void FUN_0201B118(struct UnkStruct2 *param0, u8 param1, u8 *param2);
+void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0);
+void FUN_0201AB78(struct UnkStruct_02016B94_2 *param0);
+void FUN_0201AC68(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_0201AC78(struct UnkStruct_02016B94_2 *param0);
+void FUN_0201AEE4(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3);
+void FUN_0201AF08(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u16 param3);
+void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, u16 val);
+void FUN_0201AF50(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3);
+void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val);
+u32 FUN_0201AFBC(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4);
+void FUN_0201B118(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 *param2);
 
 #endif // POKEDIAMOND_UNK_02016B94_H
-- 
cgit v1.2.3


From 412bd487ed5513e52ad47f6eb3709b4d1aab1353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sat, 22 May 2021 18:58:41 +0200
Subject: better field names for Window struct

---
 include/unk_02016B94.h | 60 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index 6ec223e0..a13f1634 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -83,11 +83,11 @@ struct Window
     u8 unk04;
     u8 unk05;
     u8 unk06;
-    u8 unk07;
-    u8 unk08;
+    u8 width;
+    u8 height;
     u8 unk09;
-    u16 unk0a : 15;
-    u16 unk0b : 1;
+    u16 unk0a_0 : 15;
+    u16 unk0b_15 : 1;
     void *unk0c;
 };
 
@@ -95,7 +95,8 @@ struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id);
 u32 FUN_02016BB8(u32 *param0);
 void FUN_02016BBC(const struct GraphicsModes *modes);
 void FUN_02016BF4(u32 *param0, u32 param1);
-void FUN_02016C18(struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3);
+void FUN_02016C18(
+    struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3);
 void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3);
 u8 FUN_020177DC(u8 param0, u32 param1);
 void FUN_02017850(u32 param0, u8 *param1, u8 *param2);
@@ -113,19 +114,26 @@ void FUN_02017B60(struct UnkStruct_02016B94_2 *param0,
     fx32 param5,
     fx32 param6);
 void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val);
-void FUN_02017BD0(
-    struct UnkStruct_02016B94_2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
+void FUN_02017BD0(struct UnkStruct_02016B94_2 *param0,
+    u32 param1,
+    struct Mtx22 *param2,
+    fx32 param3,
+    fx32 param4);
 void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1);
 void FUN_02017C98(const void *param0, void *param1, u32 param2);
 void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1);
-void FUN_02017CE8(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017CE8(
+    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017DFC(struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3);
-void FUN_02017E14(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
-void FUN_02017E40(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017E14(
+    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017E40(
+    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
 void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id);
-void FUN_02017F48(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void FUN_02017F48(
+    struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
 void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size);
 void FUN_02017FE4(u32 param0, u32 param1);
 u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2);
@@ -189,12 +197,22 @@ void FUN_02018540(struct UnkStruct_02016B94_2 *param0,
     u8 param5,
     u8 param6,
     u8 param7);
-void FUN_02018590(
-    struct UnkStruct_02016B94_2_sub *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0,
+    u16 param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u8 param6);
 void FUN_02018640(
     struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5);
-void FUN_020186B4(
-    struct UnkStruct_02016B94_2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_020186B4(struct UnkStruct_02016B94_2 *param0,
+    u32 param1,
+    u8 param2,
+    u8 param3,
+    u8 param4,
+    u8 param5,
+    u8 param6);
 void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1);
 void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2);
 void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2);
@@ -238,9 +256,15 @@ void FUN_02019064(struct UnkStruct_02016B94_2 *param0,
     u8 param6,
     u8 param7,
     u16 param8);
-void FUN_020190EC(
-    struct UnkStruct_02016B94_2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
-void FUN_02019150(struct UnkStruct_02016B94_2 *param0, struct Window *param1, struct UnkStruct_02016B94_4 *param2);
+void FUN_020190EC(struct UnkStruct_02016B94_2 *param0,
+    struct Window *param1,
+    u8 param2,
+    u8 param3,
+    u16 param4,
+    u8 param5);
+void FUN_02019150(struct UnkStruct_02016B94_2 *param0,
+    struct Window *param1,
+    struct UnkStruct_02016B94_4 *param2);
 void FUN_02019178(struct Window *param0);
 void FUN_020191A4(struct Window *param0, int param1);
 void CopyWindowToVram(struct Window *param0);
-- 
cgit v1.2.3


From 452a77b6be0a8ecaab453eed4a9031b7b19b3815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Calixte?= <remicalixte.rmc@gmail.com>
Date: Sun, 23 May 2021 09:17:30 +0200
Subject: decompile unk_0200BA78.s

---
 include/unk_0200BA78.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 include/unk_0200BA78.h

(limited to 'include')

diff --git a/include/unk_0200BA78.h b/include/unk_0200BA78.h
new file mode 100644
index 00000000..2efe233e
--- /dev/null
+++ b/include/unk_0200BA78.h
@@ -0,0 +1,19 @@
+#ifndef POKEDIAMOND_UNK_0200BA78_H
+#define POKEDIAMOND_UNK_0200BA78_H
+
+#include "global.h"
+#include "script_buffers.h"
+
+void FUN_0200BA78(struct UnkStruct_0200B870 *param0,
+    int param1,
+    u32 value,
+    u32 n,
+    enum PrintingMode mode,
+    struct Window *window,
+    int x,
+    int y);
+
+void FUN_0200BAAC(
+    struct UnkStruct_0200B870 *param0, u32 value, u32 n, enum PrintingMode mode, void *dest);
+
+#endif // POKEDIAMOND_UNK_0200BA78_H
-- 
cgit v1.2.3


From 0313fd88500d74f9200bdecc637ba99d8daddc7a Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 23 May 2021 13:39:07 -0500
Subject: decomp 020337E8

---
 include/unk_020337E8.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 include/unk_020337E8.h

(limited to 'include')

diff --git a/include/unk_020337E8.h b/include/unk_020337E8.h
new file mode 100644
index 00000000..0a1addf9
--- /dev/null
+++ b/include/unk_020337E8.h
@@ -0,0 +1,25 @@
+#ifndef POKEDIAMOND_UNK_020337E8_H
+#define POKEDIAMOND_UNK_020337E8_H
+
+#include "global.h"
+#include "save_block_2.h"
+
+// Dummy struct until DWC_account
+struct DWC_Struct
+{
+    int unk0;
+};
+
+struct DWC_token
+{
+    // size: 0xC
+    u8 fill0[0xC];
+};
+
+int FUN_020337E8(u32 heap_id);
+void FUN_0203380C(struct DWC_Struct *);
+int FUN_02033830(struct DWC_Struct *);
+BOOL FUN_0203384C(struct SaveBlock2 *);
+
+
+#endif //  POKEDIAMOND_UNK_020337E8_H
-- 
cgit v1.2.3


From bc341bc17833d80eae32d8f09509b401830f54d0 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 23 May 2021 14:27:17 -0500
Subject: address review

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

(limited to 'include')

diff --git a/include/unk_020337E8.h b/include/unk_020337E8.h
index 0a1addf9..228570ea 100644
--- a/include/unk_020337E8.h
+++ b/include/unk_020337E8.h
@@ -7,7 +7,7 @@
 // Dummy struct until DWC_account
 struct DWC_Struct
 {
-    int unk0;
+    s32 unk0;
 };
 
 struct DWC_token
@@ -16,9 +16,9 @@ struct DWC_token
     u8 fill0[0xC];
 };
 
-int FUN_020337E8(u32 heap_id);
+s32 FUN_020337E8(u32 heap_id);
 void FUN_0203380C(struct DWC_Struct *);
-int FUN_02033830(struct DWC_Struct *);
+s32 FUN_02033830(struct DWC_Struct *);
 BOOL FUN_0203384C(struct SaveBlock2 *);
 
 
-- 
cgit v1.2.3