From 0d99c3cbc17514149081de794f2d5ec55e7ab88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 8 May 2021 12:04:27 +0200 Subject: decompile unk_0202E29C.s --- include/unk_0202E29C.h | 137 +++++++++++++++++++++++++++++++++++++++++++++++++ include/unk_0202F150.h | 6 +-- 2 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 include/unk_0202E29C.h (limited to 'include') diff --git a/include/unk_0202E29C.h b/include/unk_0202E29C.h new file mode 100644 index 00000000..d755d3f5 --- /dev/null +++ b/include/unk_0202E29C.h @@ -0,0 +1,137 @@ +#ifndef POKEDIAMOND_UNK_0202E29C_H +#define POKEDIAMOND_UNK_0202E29C_H + +#include "global.h" +#include "mail_message.h" +#include "player_data.h" + +struct UnkStruct2_sub4 { + u32 unk00; + u8 unk04; + u8 unk05; + u8 unk06; + u8 unk07; + u8 unk08[8]; + struct PlayerData unk10; + u8 unk30[0x40]; +}; + +struct UnkStruct2_sub +{ + u32 unk00; + u8 unk04[6]; + u8 unk0A[0x2C]; + u16 unk36; + u8 unk38[0x18]; + struct UnkStruct2_sub4 unk50; +}; + +struct UnkStruct2_sub3 +{ + struct MailMessage unk00; + struct PlayerData unk08; + u8 unk28[0x20]; + u8 unk48[0x4]; + u8 unk4C; + u8 unk4D[7]; +}; + +struct UnkStruct2_sub2 +{ + u32 unk00; + u8 unk04; + u8 unk05; + u8 unk06; + struct UnkStruct2_sub3 unk08; +}; + +struct UnkStruct2 +{ + struct UnkStruct2_sub3 unk000; + struct UnkStruct2_sub unk054[16]; + u8 unkC54[8][6]; + u16 unkC84[16]; + void *unkCA4; + struct MailMessage unkCA8; + u32 unkCB0; + u8 unkCB4; + struct PlayerData *unkCB8; + void *unkCBC; + u32 unkCC0; + struct UnkStruct2_sub2 unkCC4; + u8 unkD20[0x84]; + u16 unkDA4; + u16 unkDA6; + u8 unkDA8; + u8 unkDA9; + u8 unkDAA; + u8 unkDAB; + u8 unkDAC; + u8 unkDAD; + u8 unkDAE[0x2]; +}; + + +void FUN_0202E29C(struct PlayerData *player_data); +BOOL FUN_0202E344(); +BOOL FUN_0202E358(u8 *param0, u8 *param1, s32 param2); +void FUN_0202E380(struct UnkStruct2_sub *param0, u32 param1); +void FUN_0202E470(u32 param0, u32 param1); +void FUN_0202E488(); +void FUN_0202E49C(); +BOOL FUN_0202E4C8(); +BOOL FUN_0202E4DC(); +void FUN_0202E4F0(); +void FUN_0202E500(); +void FUN_0202E538(); +void FUN_0202E56C(u32 param0); +void FUN_0202E594(); +BOOL FUN_0202E5F8(u32 param0, u32 param1, u32 param2); +u32 FUN_0202E66C(u32 param0, u32 param1); +u32 FUN_0202E6F0(); +BOOL FUN_0202E784(); +void FUN_0202E7B0(u32 param0); +void FUN_0202E7D8(); +u32 FUN_0202E810(); +s32 FUN_0202E844(u32 param0); +u8 FUN_0202E878(); +void FUN_0202E88C(); +s32 FUN_0202E8A0(s32 param0); +s32 FUN_0202E8D0(s32 param0); +s32 FUN_0202E8F4(); +s32 FUN_0202E950(); +void FUN_0202E9AC(u32 param0, struct PlayerData *player_data); +u32 FUN_0202E9E8(u32 param0); +void FUN_0202EA54(); +void FUN_0202EA9C(); +void FUN_0202EB7C(); +void FUN_0202EBD0(u16 param0); +void FUN_0202ED70(u16 param0); +u32 FUN_0202ED84(u16 param0); +u32 FUN_0202EDB8(); +BOOL FUN_0202EDD8(); +BOOL FUN_0202EDF8(); +u32 FUN_0202EE0C(); +u32 FUN_0202EE24(); +BOOL FUN_0202EE44(); +BOOL FUN_0202EE60(); +void FUN_0202EE84(u32 param0); +void FUN_0202EEB0(u32 param0); +u32 FUN_0202EEE8(u16 param0); +struct UnkStruct2_sub *FUN_0202EF18(u32 param0); +struct UnkStruct2_sub4 *FUN_0202EF44(s32 param0); +struct PlayerData *FUN_0202EF70(); +struct PlayerData *FUN_0202EF84(int param0); +void FUN_0202EFAC(u8 *param0, s32 param1); +BOOL FUN_0202EFE4(u8 *param0); +u32 FUN_0202F03C(); +void FUN_0202F05C(); +void FUN_0202F078(struct MailMessage *mail_message); +void FUN_0202F094(void *param0); +void FUN_0202F0B8(); +u32 FUN_0202F0DC(u8 param0); +BOOL FUN_0202F104(); +void FUN_0202F10C(struct UnkStruct2_sub3 *param0); +u8 *FUN_0202F124(u32 param0); + +#endif // POKEDIAMOND_UNK_0202E29C_H diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 49c58a52..4e19812a 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -113,10 +113,10 @@ THUMB_FUNC void FUN_0202FCCC(); THUMB_FUNC u32 FUN_0202FE2C(int param0); THUMB_FUNC void FUN_0202FEEC(); THUMB_FUNC void FUN_02030074(); -THUMB_FUNC void FUN_02030238(u32 param0, void *param1, u32 param2); +THUMB_FUNC void FUN_02030238(u32 param0, u8 *param1, u32 param2); THUMB_FUNC void FUN_0203026C(u32 param0, u8 *param1, u32 param2); -THUMB_FUNC void FUN_020303BC(u32 param0, u8 *param1, u16 param2); -THUMB_FUNC void FUN_020303F4(u32 param0, u8 *param1, u16 param2); +THUMB_FUNC void FUN_020303BC(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC void FUN_020303F4(u32 param0, u8 *param1, u32 param2); THUMB_FUNC void FUN_020304D4(u32 param0); THUMB_FUNC void FUN_020304F0(u32 param0); THUMB_FUNC void FUN_0203050C(); -- cgit v1.2.3 From 0a89ace18db732440c498c1684e287e164b6d76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 8 May 2021 12:28:24 +0200 Subject: externs cleanup --- include/unk_0202E29C.h | 4 ++-- include/unk_0202F150.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/unk_0202E29C.h b/include/unk_0202E29C.h index d755d3f5..1339ca09 100644 --- a/include/unk_0202E29C.h +++ b/include/unk_0202E29C.h @@ -5,7 +5,8 @@ #include "mail_message.h" #include "player_data.h" -struct UnkStruct2_sub4 { +struct UnkStruct2_sub4 +{ u32 unk00; u8 unk04; u8 unk05; @@ -71,7 +72,6 @@ struct UnkStruct2 u8 unkDAE[0x2]; }; - void FUN_0202E29C(struct PlayerData *player_data); BOOL FUN_0202E344(); BOOL FUN_0202E358(u8 *param0, u8 *param1, s32 param2); diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 4e19812a..ea0846c6 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -146,7 +146,7 @@ THUMB_FUNC void FUN_02030DA4(); THUMB_FUNC void FUN_02030DFC(); THUMB_FUNC u32 FUN_02030E7C(u16 param0); THUMB_FUNC s32 FUN_02030F20(); -THUMB_FUNC u32 FUN_02030F40(); +THUMB_FUNC BOOL FUN_02030F40(); THUMB_FUNC void FUN_02030F60(u8 param0); THUMB_FUNC u8 FUN_02030F74(u32 param0); THUMB_FUNC u32 FUN_02030F88(u32 param0); @@ -163,7 +163,7 @@ THUMB_FUNC u16 FUN_02031190(); THUMB_FUNC u32 FUN_020311D0(u32 param0, u8 *param1); THUMB_FUNC u32 FUN_020311DC(u32 param0); THUMB_FUNC u32 FUN_020311E8(); -THUMB_FUNC u32 FUN_020311F0(); +THUMB_FUNC BOOL FUN_020311F0(); THUMB_FUNC int FUN_02031228(u16 param0); THUMB_FUNC int FUN_02031248(u32 param0); THUMB_FUNC int FUN_02031258(u32 param0); -- cgit v1.2.3 From 5f893fd3ce282c293c42a3e5421aa8256972f90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 8 May 2021 12:31:19 +0200 Subject: better struct names --- include/unk_0202E29C.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/unk_0202E29C.h b/include/unk_0202E29C.h index 1339ca09..d4316336 100644 --- a/include/unk_0202E29C.h +++ b/include/unk_0202E29C.h @@ -5,7 +5,7 @@ #include "mail_message.h" #include "player_data.h" -struct UnkStruct2_sub4 +struct UnkStruct_0202E29C_sub4 { u32 unk00; u8 unk04; @@ -17,17 +17,17 @@ struct UnkStruct2_sub4 u8 unk30[0x40]; }; -struct UnkStruct2_sub +struct UnkStruct_0202E29C_sub { u32 unk00; u8 unk04[6]; u8 unk0A[0x2C]; u16 unk36; u8 unk38[0x18]; - struct UnkStruct2_sub4 unk50; + struct UnkStruct_0202E29C_sub4 unk50; }; -struct UnkStruct2_sub3 +struct UnkStruct_0202E29C_sub3 { struct MailMessage unk00; struct PlayerData unk08; @@ -37,19 +37,19 @@ struct UnkStruct2_sub3 u8 unk4D[7]; }; -struct UnkStruct2_sub2 +struct UnkStruct_0202E29C_sub2 { u32 unk00; u8 unk04; u8 unk05; u8 unk06; - struct UnkStruct2_sub3 unk08; + struct UnkStruct_0202E29C_sub3 unk08; }; -struct UnkStruct2 +struct UnkStruct_0202E29C { - struct UnkStruct2_sub3 unk000; - struct UnkStruct2_sub unk054[16]; + struct UnkStruct_0202E29C_sub3 unk000; + struct UnkStruct_0202E29C_sub unk054[16]; u8 unkC54[8][6]; u16 unkC84[16]; void *unkCA4; @@ -59,7 +59,7 @@ struct UnkStruct2 struct PlayerData *unkCB8; void *unkCBC; u32 unkCC0; - struct UnkStruct2_sub2 unkCC4; + struct UnkStruct_0202E29C_sub2 unkCC4; u8 unkD20[0x84]; u16 unkDA4; u16 unkDA6; @@ -75,7 +75,7 @@ struct UnkStruct2 void FUN_0202E29C(struct PlayerData *player_data); BOOL FUN_0202E344(); BOOL FUN_0202E358(u8 *param0, u8 *param1, s32 param2); -void FUN_0202E380(struct UnkStruct2_sub *param0, u32 param1); +void FUN_0202E380(struct UnkStruct_0202E29C_sub *param0, u32 param1); void FUN_0202E470(u32 param0, u32 param1); void FUN_0202E488(); void FUN_0202E49C(); @@ -118,8 +118,8 @@ BOOL FUN_0202EE60(); void FUN_0202EE84(u32 param0); void FUN_0202EEB0(u32 param0); u32 FUN_0202EEE8(u16 param0); -struct UnkStruct2_sub *FUN_0202EF18(u32 param0); -struct UnkStruct2_sub4 *FUN_0202EF44(s32 param0); +struct UnkStruct_0202E29C_sub *FUN_0202EF18(u32 param0); +struct UnkStruct_0202E29C_sub4 *FUN_0202EF44(s32 param0); struct PlayerData *FUN_0202EF70(); struct PlayerData *FUN_0202EF84(int param0); void FUN_0202EFAC(u8 *param0, s32 param1); @@ -131,7 +131,7 @@ void FUN_0202F094(void *param0); void FUN_0202F0B8(); u32 FUN_0202F0DC(u8 param0); BOOL FUN_0202F104(); -void FUN_0202F10C(struct UnkStruct2_sub3 *param0); +void FUN_0202F10C(struct UnkStruct_0202E29C_sub3 *param0); u8 *FUN_0202F124(u32 param0); #endif // POKEDIAMOND_UNK_0202E29C_H -- cgit v1.2.3