struct renaming

3 files changed, 61 insertions, 61 deletions

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