summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arm9/src/unk_0206015C.c42
-rw-r--r--include/unk_0206015C.h38
2 files changed, 43 insertions, 37 deletions
diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c
index 07076506..3d295156 100644
--- a/arm9/src/unk_0206015C.c
+++ b/arm9/src/unk_0206015C.c
@@ -1,5 +1,41 @@
#include "unk_0206015C.h"
+#include "heap.h"
+#include "event_data.h"
+#include "main.h"
+
+/* Note to future reader, there might be some errors
+ in the return type / parameters. They are right for this code
+ but they might not be for every code, please do not blindly
+ trust these prototypes if you are decompiling these functions. */
+extern THUMB_FUNC u32 MOD06_02244DB0(u32);
+extern THUMB_FUNC void MOD06_02244DBC(void*);
+extern THUMB_FUNC void MOD06_02244DC4(void*, void*);
+extern THUMB_FUNC void MOD06_02244EF8(void*);
+extern THUMB_FUNC void MOD06_02244F18(void*);
+extern THUMB_FUNC BOOL MOD06_02244F24(void*);
+extern THUMB_FUNC void MOD06_02244F2C(void*);
+extern THUMB_FUNC void* MOD06_02245088(struct UnkSavStruct80 * savStruct);
+extern THUMB_FUNC u32 MOD06_02245114(u32, struct UnkSavStruct80*);
+extern THUMB_FUNC void MOD06_02245190(u32);
+extern THUMB_FUNC void MOD06_02245198(u8, u32);
+extern THUMB_FUNC u32 MOD06_022451F0(u32);
+
+extern THUMB_FUNC void FUN_020054C8(u32);
+extern THUMB_FUNC void FUN_02049160(struct UnkStruct_0204639C*, u32);
+extern THUMB_FUNC void FUN_0204AF84(struct UnkStruct_0204639C*);
+extern THUMB_FUNC void FUN_0204AF3C(struct UnkStruct_0204639C *);
+extern THUMB_FUNC void FUN_0204AFC8(struct UnkStruct_0204639C *);
+extern THUMB_FUNC void FUN_0204B00C(struct UnkStruct_0204639C *);
+extern THUMB_FUNC void FUN_0204C1B4(struct UnkStruct_0204639C*, u32,u32,u32,u32,u32,u32,u32);
+extern THUMB_FUNC u32 FUN_020553A0(u32);
+extern THUMB_FUNC void FUN_0205889C(u32, u32);
+extern THUMB_FUNC void FUN_0205F1C4(struct ScriptState *);
+extern THUMB_FUNC void FUN_0205F1D4(struct ScriptState *);
+extern THUMB_FUNC void FUN_0206367C(struct UnkSavStruct80 *, u32);
+
+
+
THUMB_FUNC void FUN_0206015C(struct UnkSavStruct80 *savStruct)
{
struct UnkStruct_0206015C *unkStruct = AllocFromHeapAtEnd(0xb, 0x10);
@@ -104,10 +140,10 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0)
MOD06_02245190(unkStruct1->unk4);
MOD06_02244DBC(unkStruct1->unk0);
FreeToHeap(unkStruct1);
- return 1;
+ return TRUE;
default:
break;
}
- return 0;
-} \ No newline at end of file
+ return FALSE;
+}
diff --git a/include/unk_0206015C.h b/include/unk_0206015C.h
index 75d75c53..e8a312c2 100644
--- a/include/unk_0206015C.h
+++ b/include/unk_0206015C.h
@@ -1,40 +1,9 @@
+#ifndef UNK_0206015C_H_GUARD
+#define UNK_0206015C_H_GUARD
+
#include "global.h"
#include "script.h"
-#include "main.h"
#include "unk_0204639C.h"
-#include "heap.h"
-#include "event_data.h"
-
-/* Note to future reader, there might be some errors
- in the return type / parameters. They are right for this code
- but they might not be for every code, please do not blindly
- trust these prototypes if you are decompiling these functions. */
-extern THUMB_FUNC u32 MOD06_02244DB0(u32);
-extern THUMB_FUNC void MOD06_02244DBC(void*);
-extern THUMB_FUNC void MOD06_02244DC4(void*, void*);
-extern THUMB_FUNC void MOD06_02244EF8(void*);
-extern THUMB_FUNC void MOD06_02244F18(void*);
-extern THUMB_FUNC BOOL MOD06_02244F24(void*);
-extern THUMB_FUNC void MOD06_02244F2C(void*);
-extern THUMB_FUNC void* MOD06_02245088(struct UnkSavStruct80 * savStruct);
-extern THUMB_FUNC u32 MOD06_02245114(u32, struct UnkSavStruct80*);
-extern THUMB_FUNC void MOD06_02245190(u32);
-extern THUMB_FUNC void MOD06_02245198(u8, u32);
-extern THUMB_FUNC u32 MOD06_022451F0(u32);
-
-extern THUMB_FUNC void FUN_020054C8(u32);
-extern THUMB_FUNC void FUN_02049160(struct UnkStruct_0204639C*, u32);
-extern THUMB_FUNC void FUN_0204AF84(struct UnkStruct_0204639C*);
-extern THUMB_FUNC void FUN_0204AF3C(struct UnkStruct_0204639C *);
-extern THUMB_FUNC void FUN_0204AFC8(struct UnkStruct_0204639C *);
-extern THUMB_FUNC void FUN_0204B00C(struct UnkStruct_0204639C *);
-extern THUMB_FUNC void FUN_0204C1B4(struct UnkStruct_0204639C*, u32,u32,u32,u32,u32,u32,u32);
-extern THUMB_FUNC u32 FUN_020553A0(u32);
-extern THUMB_FUNC void FUN_0205889C(u32, u32);
-extern THUMB_FUNC void FUN_0205F1C4(struct ScriptState *);
-extern THUMB_FUNC void FUN_0205F1D4(struct ScriptState *);
-extern THUMB_FUNC void FUN_0206367C(struct UnkSavStruct80 *, u32);
-
struct UnkStruct_0206015C
{
@@ -58,3 +27,4 @@ struct UnkStruct_0204652C
THUMB_FUNC void FUN_0206015C(struct UnkSavStruct80* savStruct);
THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C * unkStruct0);
+#endif //UNK_0206015C_H_GUARD