summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Calixte <remicalixte.rmc@gmail.com>2021-04-19 19:10:37 +0200
committerRémi Calixte <remicalixte.rmc@gmail.com>2021-04-19 19:12:49 +0200
commit61b2d69a68e03e39aaa97ae39969987b52c08c28 (patch)
tree43bfeb30a95c5ed013b74bcc179a359884c90ce5
parentb9b637fb049e9c08b1b857b69aa74f6056ff9ac7 (diff)
update externs
-rw-r--r--arm9/src/unk_0202F150.c4
-rw-r--r--arm9/src/unk_02031480.c2
-rw-r--r--arm9/src/unk_0205FA2C.c12
-rw-r--r--include/unk_0202F150.h1
-rw-r--r--include/unk_02031480.h2
-rw-r--r--include/unk_0205FA2C.h1
6 files changed, 10 insertions, 12 deletions
diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c
index d36c5794..c728ddf1 100644
--- a/arm9/src/unk_0202F150.c
+++ b/arm9/src/unk_0202F150.c
@@ -1,4 +1,5 @@
#include "unk_0202F150.h"
+#include "unk_02031480.h"
struct
{
u8 unk00;
@@ -9,7 +10,6 @@ vu8 UNK_02105D58 = 4;
vu8 UNK_02105D59 = 4;
extern int FUN_02033534();
-extern void FUN_02031480(u32 param0);
extern void FUN_0202D7D8(u8 *param0, u32 param1, struct UnkStruct0202F150_sub1 *param2);
extern u32 FUN_0200CA60(void (*param0)(), u32 param1, u32 param2);
extern void FUN_0202D394(struct UnkStruct0202F150_sub1 *param0, u8 *param1, u32 param2);
@@ -19,7 +19,6 @@ extern void FUN_0202D330(void (*param0)(int));
extern u32 FUN_0202E66C(u32 param0, u32 param1);
extern void MOD04_021D83C0();
extern u32 FUN_0202E784();
-extern void FUN_020314D0();
extern void FUN_0202DBA4();
extern void FUN_0200CAB4(u32 param0);
extern void FUN_0202D824(u8 *param0);
@@ -30,7 +29,6 @@ extern void FUN_02031CDC();
extern void FUN_0202EBD0(u16 param0);
extern void FUN_0202ED70(u32 param0);
extern void FUN_020335F4(u32 param0);
-extern void FUN_020315A4();
extern void FUN_0202E538();
extern u32 MOD04_021D78FC(void *param0, u32 param1);
extern u32 FUN_0202CBD4();
diff --git a/arm9/src/unk_02031480.c b/arm9/src/unk_02031480.c
index a8ce6474..9639cd74 100644
--- a/arm9/src/unk_02031480.c
+++ b/arm9/src/unk_02031480.c
@@ -190,7 +190,7 @@ THUMB_FUNC BOOL FUN_020316AC(u32 param0, void *param1)
return FALSE;
}
-THUMB_FUNC u8 *FUN_020316E0(u32 param0)
+THUMB_FUNC u8 *FUN_020316E0(int param0)
{
if (UNK_021C59FC->unk248[param0] != 0)
{
diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c
index 7bcdf950..9c4d7c8f 100644
--- a/arm9/src/unk_0205FA2C.c
+++ b/arm9/src/unk_0205FA2C.c
@@ -8,11 +8,9 @@ extern void FUN_0207C2A4(struct UnkPlayerStruct2_0205FA2C *ptr, struct PlayerDat
extern u32 FUN_0203384C(u32 *param0);
extern u32 *FUN_02038790(struct UnkStruct_0204639C *param0, u16 param1, u16 param2);
extern u16 *GetVarPointer(struct UnkSavStruct80 *arg, u16);
-extern u32 FUN_02031190();
-extern u32 FUN_020316E0(u32 param0);
-extern u16 MOD06_02244660(struct UnkStruct_0204639C *param0, u32 param1);
-extern u16 MOD06_022446BC(struct UnkStruct_0204639C *param0, u32 param1);
-extern u16 MOD06_022446E0(struct UnkStruct_0204639C *param0, u32 param1);
+extern u16 MOD06_02244660(struct UnkStruct_0204639C *param0, u8 *param1);
+extern u16 MOD06_022446BC(struct UnkStruct_0204639C *param0, u8 *param1);
+extern u16 MOD06_022446E0(struct UnkStruct_0204639C *param0, u8 *param1);
extern void FUN_0202A5CC(u32 param0, u32 param1);
extern u32 FUN_0202A5D0(u32 param0);
extern u32 FUN_0202A150(struct UnkStruct_02029FB0 *param0, u32 param1);
@@ -282,8 +280,8 @@ THUMB_FUNC int FUN_0205FD70(struct UnkStruct_0204639C *param0)
{
struct UnkStruct_0204639C *res = FUN_02046528(param0);
u16 *res2 = (u16 *)FUN_0204652C(param0);
- u32 res3 = FUN_020316E0(1 - FUN_02031190());
- if (res3 == 0)
+ u8 *res3 = FUN_020316E0(1 - FUN_02031190());
+ if (res3 == NULL)
{
return 0;
}
diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h
index 77fb4f7d..4542cdd1 100644
--- a/include/unk_0202F150.h
+++ b/include/unk_0202F150.h
@@ -7,6 +7,7 @@
#include "heap.h"
#include "main.h"
#include "unk_0202D858.h"
+#include "unk_02031480.h"
struct UnkStruct0202F150_sub1
{
diff --git a/include/unk_02031480.h b/include/unk_02031480.h
index 48cfbd14..975f0796 100644
--- a/include/unk_02031480.h
+++ b/include/unk_02031480.h
@@ -23,7 +23,7 @@ THUMB_FUNC int FUN_02031640(u32 param0, u8 param1);
THUMB_FUNC void FUN_02031668();
THUMB_FUNC void FUN_0203168C();
THUMB_FUNC BOOL FUN_020316AC(u32 param0, void *param1);
-THUMB_FUNC u8 *FUN_020316E0(u32 param0);
+THUMB_FUNC u8 *FUN_020316E0(int param0);
THUMB_FUNC void FUN_02031704(u32 param0, u32 param1, void *param2);
THUMB_FUNC u32 FUN_02031730();
diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h
index 99cf7606..e65507b7 100644
--- a/include/unk_0205FA2C.h
+++ b/include/unk_0205FA2C.h
@@ -13,6 +13,7 @@
#include "unk_0202A8F4.h"
#include "unk_0204639C.h"
#include "unk_0206BB28.h"
+#include "unk_02031480.h"
struct UnkPlayerStruct1_0205FA2C
{