diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 10:37:04 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 10:37:04 -0400 |
| commit | de6f8fc978e5297d3f425d2d6c8517e9bb8e75ff (patch) | |
| tree | 9a4e1be7cbadd711196e5efa1fafb9bfd2bba843 /arm9/modules/21/src | |
| parent | 616cd9b1c1cf789ae990d4236085d1a6748d3850 (diff) | |
Merge conflicting prototypes
Diffstat (limited to 'arm9/modules/21/src')
| -rw-r--r-- | arm9/modules/21/src/mod21_02254854.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c index a9a7599d..1c91afde 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, void *))MOD21_02254930, alloced, (void *)1)) + if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, struct TextPrinter *))MOD21_02254930, (struct TextPrinter *)alloced, 1)) { *param0 = alloced; return TRUE; |