From 6ed67e61ef078048f054581d0c5a795aa4eb98c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Mon, 31 May 2021 21:52:55 +0200 Subject: decompile unk_0200BB14.s --- include/unk_0200BB14.h | 181 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 include/unk_0200BB14.h (limited to 'include') diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h new file mode 100644 index 00000000..973a9a65 --- /dev/null +++ b/include/unk_0200BB14.h @@ -0,0 +1,181 @@ +#include "global.h" + +struct UnkStruct1 +{ + u32 unk000; + u32 unk004; + u32 unk008; + u8 unk00c[0x12c]; +}; + +struct UnkStruct2 +{ + u8 unk00[0xc]; + u32 unk0c[6]; + u8 unk24[0x34]; +}; + +struct UnkStruct3 +{ + u32 unk00; + s16 unk04; + s16 unk06; + u16 unk08; + u16 unk0a; + u32 unk0c; + u32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u32 unk20; + u32 unk24; +}; + +struct UnkStruct4 +{ + u32 unk00; + u32 unk04; + s32 unk08; + s32 unk0c; + s32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u16 unk20; + u32 unk24; + u32 unk28; + u32 unk2c; +}; + +struct UnkStruct1 *FUN_0200BB14(u32 heap_id); +struct UnkStruct2 *FUN_0200BB34(struct UnkStruct1 *param0); +u32 FUN_0200BB68(u32 param0); +u32 FUN_0200BB6C(u32 *param0, u32 *param1, u32 *param2, u32 param3); +u32 FUN_0200BBF0(u32 *param0, u32 *param1, u32 param2); +void FUN_0200BC14(u32 param0); +void FUN_0200BC1C(u32 *param0); +void FUN_0200BC30(); +void FUN_0200BC38(); +void FUN_0200BC40(u32 *param0); +void FUN_0200BC4C(u32 *param0); +void FUN_0200BC5C(u32 *param0); +void FUN_0200BCB0(u32 *param0); +void FUN_0200BCD0(u32 *param0, void *param1); +void FUN_0200BCE0(u32 *param0, u32 *param1); +void FUN_0200BD04(u32 *param0); +u32 FUN_0200BD20(u32 *param0, u32 *param1, u32 *param2); +u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct3 *param2); +u32 FUN_0200BE74(u32 *param0, + u32 *param1, + u32 param2, + s16 param3, + s16 param4, + s16 param5, + u16 param6, + u32 param7, + u32 param8, + u32 param9, + u32 param10, + u32 param11, + u32 param12, + u32 param13); +u32 FUN_0200BF60(u32 *param0, u32 *param1, u32 *param2); +u32 FUN_0200C00C( + u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); +s32 FUN_0200C06C(u32 *param0, + u32 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + u32 param6, + u32 param7); +u8 FUN_0200C0DC(u32 param0, + u32 param1, + u32 *param2, + u32 *param3, + u32 param4, + u32 param5, + u32 param6, + u32 param7, + u32 param8, + u32 param9); +u32 FUN_0200C124(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +u32 FUN_0200C13C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +u32 *FUN_0200C154(u32 *param0, u32 *param1, u32 *param2); +u32 FUN_0200C334(u32 *param0, u32 param1); +u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2); +u32 FUN_0200C358(u32 *param0, u32 param1); +u32 FUN_0200C368(u32 *param0, u32 param1); +u32 FUN_0200C378(u32 *param0, u32 param1); +u32 FUN_0200C388(u32 *param0, u32 param1); +void FUN_0200C398(u32 param0, u32 *param1); +void FUN_0200C3DC(u32 *param0); +u32 FUN_0200C404( + u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); +u32 FUN_0200C474(u32 *param0, u32 param1); +u32 FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); +u32 FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); +u32 FUN_0200C548(u32 param0, u32 *param1, u32 param2); +void FUN_0200C59C(u32 param0); +void FUN_0200C5A8(u32 *param0); +void FUN_0200C5B4(u32 *param0, u32 param1); +void FUN_0200C5C0(u32 *param0, u32 param1); +u32 FUN_0200C5CC(u32 *param0); +void FUN_0200C5D8(u32 param0, u32 param1); +void FUN_0200C5E0(u32 *param0, u32 param1); +void FUN_0200C5EC(u32 param0, u32 param1); +void FUN_0200C5F4(u32 *param0, u32 param1); +u32 FUN_0200C600(u32 param0); +u32 FUN_0200C608(u32 *param0); +void FUN_0200C614(u32 param0); +void FUN_0200C61C(u32 *param0); +void FUN_0200C628(u32 param0); +void FUN_0200C630(u32 *param0); +void FUN_0200C63C(u32 param0, u32 param1); +void FUN_0200C644(u32 *param0, u32 param1); +u8 FUN_0200C650(u32 param0); +u8 FUN_0200C658(u32 *param0); +void FUN_0200C664(u32 param0, u32 param1); +void FUN_0200C66C(u32 *param0, u32 param1); +void FUN_0200C678(u32 param0, u32 param1); +void FUN_0200C680(u32 *param0, u32 param1); +u8 FUN_0200C68C(u32 *param0); +void FUN_0200C698(u32 param0, u32 param1); +u8 FUN_0200C6A4(u32 *param0); +void FUN_0200C6B0(u32 *param0, u32 param1); +void FUN_0200C6BC(u32 param0, u32 param1); +void FUN_0200C6C4(u32 *param0, u32 param1); +u16 FUN_0200C6D0(u32 param0); +u16 FUN_0200C6D8(u32 *param0); +void FUN_0200C6E4(u32 param0, u32 param1, u32 param2); +void FUN_0200C714(u32 *param0, u32 param1, u32 param2); +void FUN_0200C720(u32 param0, u32 param1, u32 param2, u32 param3); +void FUN_0200C750(u32 *param0, u32 param1, u32 param2, u32 param3); +void FUN_0200C75C(u32 param0, u16 *param1, u16 *param2); +void FUN_0200C7A0(u32 *param0, u16 *param1, u16 *param2); +void FUN_0200C7AC(u32 param0, u16 *param1, u16 *param2, u32 param3); +void FUN_0200C7F0(u32 *param0, u16 *param1, u16 *param2, u32 param3); +void FUN_0200C7FC(u32 param0, u16 *param1, u16 *param2); +void FUN_0200C82C(u32 *param0, u16 *param1, u16 *param2); +void FUN_0200C838(u32 param0, u32 param1); +void FUN_0200C840(u32 *param0, u32 param1); +void FUN_0200C84C(u32 param0, f32 param1, f32 param2); +void FUN_0200C884(u32 *param0, f32 param1, f32 param2); +void FUN_0200C890(u32 param0, u16 param1); +void FUN_0200C898(u32 *param0, u16 param1); +void FUN_0200C8A4(u32 param0, u32 param1); +void FUN_0200C8BC(u32 *param0, u32 param1); +void FUN_0200C8C8(u32 param0, u32 param1); +void FUN_0200C8D0(u32 *param0, u32 param1); +void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2); +void FUN_0200C8F8(u32 *param0, u32 param1); +void FUN_0200C904(u32 param0, u32 param1); +void FUN_0200C90C(u32 *param0, u32 param1); +u32 FUN_0200C918( + u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); +u32 FUN_0200C978( + u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); +void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +u32 FUN_0200CA40(u32 *param0); -- cgit v1.2.3 From f8e4e3e590fd2e4fb2aaafda7a269a874b952af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 1 Jun 2021 19:57:57 +0200 Subject: fewer ugly array access --- include/unk_0200BB14.h | 82 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 29 deletions(-) (limited to 'include') diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index 973a9a65..33fe0aee 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -5,14 +5,19 @@ struct UnkStruct1 u32 unk000; u32 unk004; u32 unk008; - u8 unk00c[0x12c]; + u32 unk00c; + u8 unk010[0x128]; }; struct UnkStruct2 { - u8 unk00[0xc]; + u32 unk00; + u32 unk04; + u32 *unk08; u32 unk0c[6]; - u8 unk24[0x34]; + u32 *unk24[6]; + u32 unk3c[6]; + s32 unk54; }; struct UnkStruct3 @@ -31,10 +36,14 @@ struct UnkStruct3 u32 unk24; }; +struct UnkStruct7 { + u8 unk00[0x24]; +}; + struct UnkStruct4 { u32 unk00; - u32 unk04; + struct UnkStruct7 *unk04; s32 unk08; s32 unk0c; s32 unk10; @@ -47,23 +56,38 @@ struct UnkStruct4 u32 unk2c; }; + + + +struct UnkStruct6 { + struct UnkStruct7 *unk0; + u32 unk4; +}; +struct UnkStruct5 { + u32 unk00; + struct UnkStruct7 *unk04; + struct UnkStruct6 *unk08; + u32 unk0c; +}; + + struct UnkStruct1 *FUN_0200BB14(u32 heap_id); struct UnkStruct2 *FUN_0200BB34(struct UnkStruct1 *param0); u32 FUN_0200BB68(u32 param0); -u32 FUN_0200BB6C(u32 *param0, u32 *param1, u32 *param2, u32 param3); -u32 FUN_0200BBF0(u32 *param0, u32 *param1, u32 param2); +u32 FUN_0200BB6C(struct UnkStruct1 *param0, u32 *param1, u32 *param2, u32 param3); +u32 FUN_0200BBF0(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 param2); void FUN_0200BC14(u32 param0); void FUN_0200BC1C(u32 *param0); void FUN_0200BC30(); void FUN_0200BC38(); -void FUN_0200BC40(u32 *param0); -void FUN_0200BC4C(u32 *param0); -void FUN_0200BC5C(u32 *param0); +void FUN_0200BC40(struct UnkStruct2 *param0); +void FUN_0200BC4C(struct UnkStruct2 *param0); +void FUN_0200BC5C(struct UnkStruct2 *param0); void FUN_0200BCB0(u32 *param0); -void FUN_0200BCD0(u32 *param0, void *param1); -void FUN_0200BCE0(u32 *param0, u32 *param1); +void FUN_0200BCD0(struct UnkStruct1 *param0, struct UnkStruct2 *param1); +void FUN_0200BCE0(struct UnkStruct1 *param0, struct UnkStruct2 *param1); void FUN_0200BD04(u32 *param0); -u32 FUN_0200BD20(u32 *param0, u32 *param1, u32 *param2); +u32 FUN_0200BD20(struct UnkStruct1 *param0, struct UnkStruct2 *param1, const char **param2); u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct3 *param2); u32 FUN_0200BE74(u32 *param0, u32 *param1, @@ -79,40 +103,40 @@ u32 FUN_0200BE74(u32 *param0, u32 param11, u32 param12, u32 param13); -u32 FUN_0200BF60(u32 *param0, u32 *param1, u32 *param2); +u32 FUN_0200BF60(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 *param2); u32 FUN_0200C00C( - u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); + u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); s32 FUN_0200C06C(u32 *param0, - u32 *param1, + struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, - u32 param7); + s32 param7); u8 FUN_0200C0DC(u32 param0, u32 param1, u32 *param2, - u32 *param3, + struct UnkStruct2 *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, - u32 param9); -u32 FUN_0200C124(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); -u32 FUN_0200C13C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); -u32 *FUN_0200C154(u32 *param0, u32 *param1, u32 *param2); + s32 param9); +u32 FUN_0200C124(u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); +u32 FUN_0200C13C(u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); +struct UnkStruct5 *FUN_0200C154(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 *param2); u32 FUN_0200C334(u32 *param0, u32 param1); u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2); -u32 FUN_0200C358(u32 *param0, u32 param1); -u32 FUN_0200C368(u32 *param0, u32 param1); -u32 FUN_0200C378(u32 *param0, u32 param1); -u32 FUN_0200C388(u32 *param0, u32 param1); -void FUN_0200C398(u32 param0, u32 *param1); +u32 FUN_0200C358(struct UnkStruct2 *param0, u32 param1); +u32 FUN_0200C368(struct UnkStruct2 *param0, u32 param1); +u32 FUN_0200C378(struct UnkStruct2 *param0, u32 param1); +u32 FUN_0200C388(struct UnkStruct2 *param0, u32 param1); +void FUN_0200C398(struct UnkStruct1 *param0, struct UnkStruct2 *param1); void FUN_0200C3DC(u32 *param0); u32 FUN_0200C404( - u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); + u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); u32 FUN_0200C474(u32 *param0, u32 param1); u32 FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); u32 FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); @@ -173,9 +197,9 @@ void FUN_0200C8F8(u32 *param0, u32 param1); void FUN_0200C904(u32 param0, u32 param1); void FUN_0200C90C(u32 *param0, u32 param1); u32 FUN_0200C918( - u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); + u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); u32 FUN_0200C978( - u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); + u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); u32 FUN_0200CA40(u32 *param0); -- cgit v1.2.3 From 8e4dda14ff3f4390af69d52b928f987f3618e9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 1 Jun 2021 20:02:08 +0200 Subject: rename structs --- include/unk_0200BB14.h | 74 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'include') diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index 33fe0aee..6c4cb22c 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -1,6 +1,6 @@ #include "global.h" -struct UnkStruct1 +struct UnkStruct_0200BB14_1 { u32 unk000; u32 unk004; @@ -9,7 +9,7 @@ struct UnkStruct1 u8 unk010[0x128]; }; -struct UnkStruct2 +struct UnkStruct_0200BB14_2 { u32 unk00; u32 unk04; @@ -20,7 +20,7 @@ struct UnkStruct2 s32 unk54; }; -struct UnkStruct3 +struct UnkStruct_0200BB14_3 { u32 unk00; s16 unk04; @@ -36,14 +36,14 @@ struct UnkStruct3 u32 unk24; }; -struct UnkStruct7 { +struct UnkStruct_0200BB14_sub { u8 unk00[0x24]; }; -struct UnkStruct4 +struct UnkStruct_0200BB14_4 { u32 unk00; - struct UnkStruct7 *unk04; + struct UnkStruct_0200BB14_sub *unk04; s32 unk08; s32 unk0c; s32 unk10; @@ -59,36 +59,36 @@ struct UnkStruct4 -struct UnkStruct6 { - struct UnkStruct7 *unk0; +struct UnkStruct_0200BB14_6 { + struct UnkStruct_0200BB14_sub *unk0; u32 unk4; }; -struct UnkStruct5 { +struct UnkStruct_0200BB14_5 { u32 unk00; - struct UnkStruct7 *unk04; - struct UnkStruct6 *unk08; + struct UnkStruct_0200BB14_sub *unk04; + struct UnkStruct_0200BB14_6 *unk08; u32 unk0c; }; -struct UnkStruct1 *FUN_0200BB14(u32 heap_id); -struct UnkStruct2 *FUN_0200BB34(struct UnkStruct1 *param0); +struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id); +struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0); u32 FUN_0200BB68(u32 param0); -u32 FUN_0200BB6C(struct UnkStruct1 *param0, u32 *param1, u32 *param2, u32 param3); -u32 FUN_0200BBF0(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 param2); +u32 FUN_0200BB6C(struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3); +u32 FUN_0200BBF0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2); void FUN_0200BC14(u32 param0); void FUN_0200BC1C(u32 *param0); void FUN_0200BC30(); void FUN_0200BC38(); -void FUN_0200BC40(struct UnkStruct2 *param0); -void FUN_0200BC4C(struct UnkStruct2 *param0); -void FUN_0200BC5C(struct UnkStruct2 *param0); +void FUN_0200BC40(struct UnkStruct_0200BB14_2 *param0); +void FUN_0200BC4C(struct UnkStruct_0200BB14_2 *param0); +void FUN_0200BC5C(struct UnkStruct_0200BB14_2 *param0); void FUN_0200BCB0(u32 *param0); -void FUN_0200BCD0(struct UnkStruct1 *param0, struct UnkStruct2 *param1); -void FUN_0200BCE0(struct UnkStruct1 *param0, struct UnkStruct2 *param1); +void FUN_0200BCD0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); +void FUN_0200BCE0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200BD04(u32 *param0); -u32 FUN_0200BD20(struct UnkStruct1 *param0, struct UnkStruct2 *param1, const char **param2); -u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct3 *param2); +u32 FUN_0200BD20(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2); +u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2); u32 FUN_0200BE74(u32 *param0, u32 *param1, u32 param2, @@ -103,11 +103,11 @@ u32 FUN_0200BE74(u32 *param0, u32 param11, u32 param12, u32 param13); -u32 FUN_0200BF60(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 *param2); +u32 FUN_0200BF60(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); u32 FUN_0200C00C( - u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); + u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); s32 FUN_0200C06C(u32 *param0, - struct UnkStruct2 *param1, + struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, @@ -117,26 +117,26 @@ s32 FUN_0200C06C(u32 *param0, u8 FUN_0200C0DC(u32 param0, u32 param1, u32 *param2, - struct UnkStruct2 *param3, + struct UnkStruct_0200BB14_2 *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, s32 param9); -u32 FUN_0200C124(u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); -u32 FUN_0200C13C(u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); -struct UnkStruct5 *FUN_0200C154(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 *param2); +u32 FUN_0200C124(u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); +u32 FUN_0200C13C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); +struct UnkStruct_0200BB14_5 *FUN_0200C154(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); u32 FUN_0200C334(u32 *param0, u32 param1); u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2); -u32 FUN_0200C358(struct UnkStruct2 *param0, u32 param1); -u32 FUN_0200C368(struct UnkStruct2 *param0, u32 param1); -u32 FUN_0200C378(struct UnkStruct2 *param0, u32 param1); -u32 FUN_0200C388(struct UnkStruct2 *param0, u32 param1); -void FUN_0200C398(struct UnkStruct1 *param0, struct UnkStruct2 *param1); +u32 FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1); +u32 FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1); +u32 FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1); +u32 FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1); +void FUN_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200C3DC(u32 *param0); u32 FUN_0200C404( - u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); + u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); u32 FUN_0200C474(u32 *param0, u32 param1); u32 FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); u32 FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); @@ -197,9 +197,9 @@ void FUN_0200C8F8(u32 *param0, u32 param1); void FUN_0200C904(u32 param0, u32 param1); void FUN_0200C90C(u32 *param0, u32 param1); u32 FUN_0200C918( - u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); + u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); u32 FUN_0200C978( - u32 *param0, struct UnkStruct2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); + u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); u32 FUN_0200CA40(u32 *param0); -- cgit v1.2.3 From fda07fecf5c113c5fa9c861f737fead0c0e1dac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 1 Jun 2021 20:56:33 +0200 Subject: use better types --- include/unk_0200BB14.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index 6c4cb22c..d6e530dc 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -74,8 +74,8 @@ struct UnkStruct_0200BB14_5 { struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id); struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0); u32 FUN_0200BB68(u32 param0); -u32 FUN_0200BB6C(struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3); -u32 FUN_0200BBF0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2); +BOOL FUN_0200BB6C(struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3); +BOOL FUN_0200BBF0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2); void FUN_0200BC14(u32 param0); void FUN_0200BC1C(u32 *param0); void FUN_0200BC30(); @@ -87,7 +87,7 @@ void FUN_0200BCB0(u32 *param0); void FUN_0200BCD0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200BCE0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200BD04(u32 *param0); -u32 FUN_0200BD20(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2); +BOOL FUN_0200BD20(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2); u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2); u32 FUN_0200BE74(u32 *param0, u32 *param1, @@ -103,8 +103,8 @@ u32 FUN_0200BE74(u32 *param0, u32 param11, u32 param12, u32 param13); -u32 FUN_0200BF60(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); -u32 FUN_0200C00C( +BOOL FUN_0200BF60(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); +BOOL FUN_0200C00C( u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); s32 FUN_0200C06C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, @@ -135,12 +135,12 @@ u32 FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1); u32 FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1); void FUN_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200C3DC(u32 *param0); -u32 FUN_0200C404( +BOOL FUN_0200C404( u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); -u32 FUN_0200C474(u32 *param0, u32 param1); -u32 FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); -u32 FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); -u32 FUN_0200C548(u32 param0, u32 *param1, u32 param2); +BOOL FUN_0200C474(u32 *param0, u32 param1); +BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); +BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); +BOOL FUN_0200C548(u32 param0, u32 *param1, u32 param2); void FUN_0200C59C(u32 param0); void FUN_0200C5A8(u32 *param0); void FUN_0200C5B4(u32 *param0, u32 param1); @@ -196,9 +196,9 @@ void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2); void FUN_0200C8F8(u32 *param0, u32 param1); void FUN_0200C904(u32 param0, u32 param1); void FUN_0200C90C(u32 *param0, u32 param1); -u32 FUN_0200C918( +BOOL FUN_0200C918( u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); -u32 FUN_0200C978( +BOOL FUN_0200C978( u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); -- cgit v1.2.3 From 0bf0edfc394e301d80e10357f778a3451267e50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 1 Jun 2021 20:57:30 +0200 Subject: add header guards --- include/unk_0200BB14.h | 80 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index d6e530dc..a252fd93 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -1,3 +1,6 @@ +#ifndef POKEDIAMOND_UNK_0200BB14_H +#define POKEDIAMOND_UNK_0200BB14_H + #include "global.h" struct UnkStruct_0200BB14_1 @@ -36,7 +39,8 @@ struct UnkStruct_0200BB14_3 u32 unk24; }; -struct UnkStruct_0200BB14_sub { +struct UnkStruct_0200BB14_sub +{ u8 unk00[0x24]; }; @@ -56,26 +60,25 @@ struct UnkStruct_0200BB14_4 u32 unk2c; }; - - - -struct UnkStruct_0200BB14_6 { +struct UnkStruct_0200BB14_6 +{ struct UnkStruct_0200BB14_sub *unk0; u32 unk4; }; -struct UnkStruct_0200BB14_5 { +struct UnkStruct_0200BB14_5 +{ u32 unk00; struct UnkStruct_0200BB14_sub *unk04; struct UnkStruct_0200BB14_6 *unk08; u32 unk0c; }; - struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id); struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0); u32 FUN_0200BB68(u32 param0); BOOL FUN_0200BB6C(struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3); -BOOL FUN_0200BBF0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2); +BOOL FUN_0200BBF0( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2); void FUN_0200BC14(u32 param0); void FUN_0200BC1C(u32 *param0); void FUN_0200BC30(); @@ -87,7 +90,8 @@ void FUN_0200BCB0(u32 *param0); void FUN_0200BCD0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200BCE0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200BD04(u32 *param0); -BOOL FUN_0200BD20(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2); +BOOL FUN_0200BD20( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2); u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2); u32 FUN_0200BE74(u32 *param0, u32 *param1, @@ -103,9 +107,15 @@ u32 FUN_0200BE74(u32 *param0, u32 param11, u32 param12, u32 param13); -BOOL FUN_0200BF60(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); -BOOL FUN_0200C00C( - u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); +BOOL FUN_0200BF60( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); +BOOL FUN_0200C00C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); s32 FUN_0200C06C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, @@ -124,9 +134,20 @@ u8 FUN_0200C0DC(u32 param0, u32 param7, u32 param8, s32 param9); -u32 FUN_0200C124(u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); -u32 FUN_0200C13C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, s32 param5); -struct UnkStruct_0200BB14_5 *FUN_0200C154(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); +u32 FUN_0200C124(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + s32 param5); +u32 FUN_0200C13C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + s32 param5); +struct UnkStruct_0200BB14_5 *FUN_0200C154( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); u32 FUN_0200C334(u32 *param0, u32 param1); u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2); u32 FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1); @@ -135,8 +156,13 @@ u32 FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1); u32 FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1); void FUN_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); void FUN_0200C3DC(u32 *param0); -BOOL FUN_0200C404( - u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); +BOOL FUN_0200C404(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); BOOL FUN_0200C474(u32 *param0, u32 param1); BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); @@ -196,10 +222,22 @@ void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2); void FUN_0200C8F8(u32 *param0, u32 param1); void FUN_0200C904(u32 param0, u32 param1); void FUN_0200C90C(u32 *param0, u32 param1); -BOOL FUN_0200C918( - u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); -BOOL FUN_0200C978( - u32 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2, u32 param3, u32 param4, u32 param5, s32 param6); +BOOL FUN_0200C918(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); +BOOL FUN_0200C978(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); u32 FUN_0200CA40(u32 *param0); + +#endif // POKEDIAMOND_UNK_0200BB14_H -- cgit v1.2.3