diff options
Diffstat (limited to 'arm9/src')
-rw-r--r-- | arm9/src/palette.c | 5 | ||||
-rw-r--r-- | arm9/src/text.c | 4 | ||||
-rw-r--r-- | arm9/src/unk_020051F4.c | 3 | ||||
-rw-r--r-- | arm9/src/unk_020061E8.c | 2 | ||||
-rw-r--r-- | arm9/src/unk_0200CA44.c | 10 |
5 files changed, 11 insertions, 13 deletions
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); } |