summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-07-04 16:45:07 +0300
committerGitHub <noreply@github.com>2020-07-04 16:45:07 +0300
commitd323eca0eca3ff8814c63e84174d07ced99e22f9 (patch)
treeceab94a6f81d1b6668e388cac95185a41acb5bd4 /arm9/src
parente98796d798d5fad453538d3febc3f2cf6c698d82 (diff)
parentdc06934d12b2b1e840bba06e2b242e345a823200 (diff)
Merge branch 'master' into master
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/unk_0200CA44.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arm9/src/unk_0200CA44.c b/arm9/src/unk_0200CA44.c
index 5c422ba7..90b07f59 100644
--- a/arm9/src/unk_0200CA44.c
+++ b/arm9/src/unk_0200CA44.c
@@ -2,27 +2,27 @@
#include "main.h"
#include "unk_0200CA44.h"
-extern void FUN_0201B60C(s32, u16, u16, u16);
+extern void FUN_0201B60C(s32, void (*)(void *, void *), void *, void *);
extern void FUN_0201B6A0(s32);
-THUMB_FUNC void FUN_0200CA44(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA44(void (*r0)(void *, void *), void * r1, void * r2)
{
- FUN_0201B60C(gUnknown21C48B8.unk18,r0,r1,r2);
+ FUN_0201B60C(gUnknown21C48B8.unk18, r0, r1, r2);
}
-THUMB_FUNC void FUN_0200CA60(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA60(void (*r0)(void *, void *), void * r1, void * r2)
{
- FUN_0201B60C(gUnknown21C48B8.unk1C,r0,r1,r2);
+ FUN_0201B60C(gUnknown21C48B8.unk1C, r0, r1, r2);
}
-THUMB_FUNC void FUN_0200CA7C(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA7C(void (*r0)(void *, void *), void * r1, void * r2)
{
- FUN_0201B60C(gUnknown21C48B8.unk24,r0,r1,r2);
+ FUN_0201B60C(gUnknown21C48B8.unk24, r0, r1, r2);
}
-THUMB_FUNC void FUN_0200CA98(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA98(void (*r0)(void *, void *), void * r1, void * r2)
{
- FUN_0201B60C(gUnknown21C48B8.unk20,r0,r1,r2);
+ FUN_0201B60C(gUnknown21C48B8.unk20, r0, r1, r2);
}
THUMB_FUNC void FUN_0200CAB4(s32 unk1)