Merge pull request #434 from red031000/master

fix some types

9 files changed, 18 insertions, 20 deletions

diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c
index 1c91afde..2b7e36ec 100644
--- a/arm9/modules/21/src/mod21_02254854.c
+++ b/arm9/modules/21/src/mod21_02254854.c
@@ -29,7 +29,7 @@ THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param
     UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(8, sizeof(UnkStruct02254854));
     if (alloced != NULL)
     {
-        if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, struct TextPrinter *))MOD21_02254930, (struct TextPrinter *)alloced, 1))
+        if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, void *))MOD21_02254930, (void *)alloced, 1))
         {
             *param0 = alloced;
             return TRUE;
diff --git a/arm9/src/palette.c b/arm9/src/palette.c
index 82252594..902bb386 100644
--- a/arm9/src/palette.c
+++ b/arm9/src/palette.c
@@ -209,9 +209,8 @@ THUMB_FUNC u32 FUN_02003210(struct PaletteData *paletteData,
             paletteData->unk118_0 = 1;
             paletteData->unk11c = 0;
 
-            // wtf is that?
-            FUN_0200CA44((void (*)(u32, struct TextPrinter *))FUN_02003464,
-                (struct TextPrinter *)paletteData,
+            FUN_0200CA44((void (*)(u32, void *))FUN_02003464,
+                (void *)paletteData,
                 (u32)(-2));
         }
     }
diff --git a/arm9/src/text.c b/arm9/src/text.c
index 8ca16d55..e8c76722 100644
--- a/arm9/src/text.c
+++ b/arm9/src/text.c
@@ -29,7 +29,7 @@ THUMB_FUNC void SetFontsPointer(const struct FontInfo *fonts)
     gFonts = fonts;
 }
 
-THUMB_FUNC u8 FUN_0201BCC8(void (*func)(u32, struct TextPrinter *), struct TextPrinter *printer, u32 param2)
+THUMB_FUNC u8 FUN_0201BCC8(void (*func)(u32, void *), void *printer, u32 param2)
 {
     u32 *r4 = UNK_021C5714;
     s32 i;
@@ -192,7 +192,7 @@ THUMB_FUNC u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 s
     {
         printer->textSpeedBottom--;
         printer->textSpeedTop = 1;
-        printer->minLetterSpacing = FUN_0201BCC8(RunTextPrinter, printer, 1);
+        printer->minLetterSpacing = FUN_0201BCC8((void (*)(u32, void *))RunTextPrinter, printer, 1);
         return printer->minLetterSpacing;
     }
     else
diff --git a/arm9/src/unk_020051F4.c b/arm9/src/unk_020051F4.c
index 1d3679c8..6da250d5 100644
--- a/arm9/src/unk_020051F4.c
+++ b/arm9/src/unk_020051F4.c
@@ -570,8 +570,7 @@ THUMB_FUNC void FUN_02005AE0(u32 param0, u32 param1)
     ((u8 *)ptr)[7] = 0;
 
     ptr[0] = param0;
-    u32 r0 = (u32)FUN_0200CA44(
-        (void (*)(u32, struct TextPrinter *))FUN_02005B2C, (struct TextPrinter *)ptr, 0);
+    u32 r0 = (u32)FUN_0200CA44((void (*)(u32, void *))FUN_02005B2C, (void *)ptr, 0);
     ptr[1] = r0;
     *r6 = r0;
 }
diff --git a/arm9/src/unk_020061E8.c b/arm9/src/unk_020061E8.c
index 424fea34..6b9f8ead 100644
--- a/arm9/src/unk_020061E8.c
+++ b/arm9/src/unk_020061E8.c
@@ -5,7 +5,7 @@
 

 extern struct TextPrinter *FUN_0201B6C8(void);

 

-THUMB_FUNC BOOL FUN_020061E8(void (*r0)(u32, struct TextPrinter *), u32 r1, u32 r2, u32 r3)

+THUMB_FUNC BOOL FUN_020061E8(void (*r0)(u32, void *), u32 r1, u32 r2, u32 r3)

 {

     void * r4;

     if(r1 != 0)

diff --git a/arm9/src/unk_0200CA44.c b/arm9/src/unk_0200CA44.c
index 6ffed8be..a9a9f7c6 100644
--- a/arm9/src/unk_0200CA44.c
+++ b/arm9/src/unk_0200CA44.c
@@ -2,25 +2,25 @@
 #include "main.h"
 #include "unk_0200CA44.h"
 
-extern BOOL FUN_0201B60C(void *, void (*)(u32, struct TextPrinter *), struct TextPrinter *, u32);
+extern BOOL FUN_0201B60C(void *, void (*)(u32, void *), void *, u32);
 extern void FUN_0201B6A0(s32);
 
-THUMB_FUNC BOOL FUN_0200CA44(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2)
+THUMB_FUNC BOOL FUN_0200CA44(void (*r0)(u32, void *), void * r1, u32 r2)
 {
     return FUN_0201B60C(gMain.unk18, r0, r1, r2);
 }
 
-THUMB_FUNC BOOL FUN_0200CA60(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2)
+THUMB_FUNC BOOL FUN_0200CA60(void (*r0)(u32, void *), void * r1, u32 r2)
 {
     return FUN_0201B60C(gMain.unk1C, r0, r1, r2);
 }
 
-THUMB_FUNC BOOL FUN_0200CA7C(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2)
+THUMB_FUNC BOOL FUN_0200CA7C(void (*r0)(u32, void *), void * r1, u32 r2)
 {
     return FUN_0201B60C(gMain.unk24, r0, r1, r2);
 }
 
-THUMB_FUNC BOOL FUN_0200CA98(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2)
+THUMB_FUNC BOOL FUN_0200CA98(void (*r0)(u32, void *), void * r1, u32 r2)
 {
     return FUN_0201B60C(gMain.unk20, r0, r1, r2);
 }
diff --git a/include/text.h b/include/text.h
index ad0698a0..6ecf1b08 100644
--- a/include/text.h
+++ b/include/text.h
@@ -76,7 +76,7 @@ struct FontInfo
 };
 
 void SetFontsPointer(const struct FontInfo *fonts);
-u8 FUN_0201BCC8(void (*func)(u32, struct TextPrinter *), struct TextPrinter *printer, u32 param2);
+u8 FUN_0201BCC8(void (*func)(u32, void *), void *printer, u32 param2);
 void FUN_0201BCFC(u32 param0);
 BOOL FUN_0201BD44(u32 param0);
 void FUN_0201BD5C(void);
diff --git a/include/unk_020061E8.h b/include/unk_020061E8.h
index d94ea88f..121900c3 100644
--- a/include/unk_020061E8.h
+++ b/include/unk_020061E8.h
@@ -4,7 +4,7 @@
 #include "nitro/types.h"

 #include "text.h"

 

-BOOL FUN_020061E8(void (*r0)(u32, struct TextPrinter *), u32 r1, u32 r2, u32 r3);

+BOOL FUN_020061E8(void (*r0)(u32, void *), u32 r1, u32 r2, u32 r3);

 void FUN_0200621C(s32 r0);

 

 #endif // POKEDIAMOND_UNK_020061E8_H

diff --git a/include/unk_0200CA44.h b/include/unk_0200CA44.h
index 6dd208c3..065f3fc0 100644
--- a/include/unk_0200CA44.h
+++ b/include/unk_0200CA44.h
@@ -3,10 +3,10 @@
 
 #include "text.h"
 
-BOOL FUN_0200CA44(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2);
-BOOL FUN_0200CA60(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2);
-BOOL FUN_0200CA7C(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2);
-BOOL FUN_0200CA98(void (*r0)(u32, struct TextPrinter *), struct TextPrinter * r1, u32 r2);
+BOOL FUN_0200CA44(void (*r0)(u32, void *), void * r1, u32 r2);
+BOOL FUN_0200CA60(void (*r0)(u32, void *), void * r1, u32 r2);
+BOOL FUN_0200CA7C(void (*r0)(u32, void *), void * r1, u32 r2);
+BOOL FUN_0200CA98(void (*r0)(u32, void *), void * r1, u32 r2);
 void FUN_0200CAB4(s32 unk1);
 
 #endif //POKEDIAMOND_UNK_0200CA44_H