From 9bff34f5ed78da1c6dea8e6a5a19458160616029 Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 31 Mar 2021 09:47:13 -0400 Subject: Decompile scrcmd_13 --- include/scrcmd.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index dd43e586..4c155f0b 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -106,6 +106,12 @@ BOOL ScrCmd_Unk0048(struct ScriptContext *ctx); BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx); BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx); +//scrcmd_13.c +BOOL ScrCmd_Unk0253(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0254(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0255(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0256(struct ScriptContext* ctx); + //scrcmd_coins.c BOOL ScrCmd_Unk0075(struct ScriptContext* ctx); BOOL ScrCmd_Unk0076(struct ScriptContext* ctx); -- cgit v1.2.3 From 8958487e95618eaea84f4aaa02f68d3ef467a874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 3 Apr 2021 11:57:44 +0200 Subject: decomp unk_0205FA2C.s --- include/unk_0205FA2C.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 include/unk_0205FA2C.h (limited to 'include') diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h new file mode 100644 index 00000000..7418c4a3 --- /dev/null +++ b/include/unk_0205FA2C.h @@ -0,0 +1,34 @@ +#ifndef POKEDIAMOND_UNK_0205FA2C_H +#define POKEDIAMOND_UNK_0205FA2C_H + + +#include "global.h" +#include "MI_memory.h" +#include "bag.h" +#include "heap.h" +#include "party.h" +#include "player_data.h" +#include "unk_0202A8F4.h" +#include "unk_0204639C.h" +#include "unk_0206BB28.h" +#include "unk_02029FB0.h" +#include "unk_020286F8.h" + + +const u8 UNK_020F7454[] = { + 0x00, + 0x01, + 0x02, + 0x04, + 0x03, + 0x05, + 0x06, + 0x07, + 0x08, + 0x00, + 0x00, + 0x00, +}; + + +#endif //POKEDIAMOND_UNK_0205FA2C_H \ No newline at end of file -- cgit v1.2.3 From b20e00af7417022971bdf37870b66ccb8d3c52a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 3 Apr 2021 15:11:23 +0200 Subject: better structs and signatures --- include/unk_0205FA2C.h | 108 +++++++++++++++++++++++++++++++++++++++++++++++++ include/unk_0206BB28.h | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index 7418c4a3..7875b5e9 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -8,6 +8,7 @@ #include "heap.h" #include "party.h" #include "player_data.h" +#include "script.h" #include "unk_0202A8F4.h" #include "unk_0204639C.h" #include "unk_0206BB28.h" @@ -31,4 +32,111 @@ const u8 UNK_020F7454[] = { }; +struct UnkPlayerStruct1_0205FA2C +{ + /* 0x00 */ struct PlayerParty *player_party; + /* 0x04 */ struct Bag *bag; + u32 unk08; + /* 0x0c */ struct Options *options; + u32 unk10[4]; + u8 unk20; + u8 unk21; + u8 unk22; + u8 unk23; + u32 unk24[2]; + u8 unk2c[6]; + u8 unk32:4; + u8 unk322:4; + u8 unk33; + u32 unk34[3]; +}; + + +struct UnkPlayerStruct2_0205FA2C { + /* 0x00 */ struct PlayerParty *player_party; + /* 0x04 */ struct Options *options; + u32 unk08; + u32 unk0c; + u8 unk10; + u8 unk11; + u8 unk12; + /* 0x04 */ u8 party_count; + u8 unk14; + u8 unk15[3]; + u16 unk18; + u16 unk1a; + /* 0x1c */ BOOL IsNatDex; + void *unk20; + u32 unk24; + u32 unk28; + u32 unk2c; + +}; + + + +struct UnkCallbackStruct1_0205FA2C { + u32 unk00; + u32 unk04; + u8 unk08; + u8 unk09; + u8 unk0a; + u8 unk0b; + u8 unk0c; + u8 unk0d; + u8 unk0e[6]; + void **unk14; +}; + + + + +struct UnkCallbackStruct2_0205FA2C { + u32 unk00; + u32 unk04; + u32 *unk08; + u32 unk0c; + u16 unk10; + u16 unk12; + u16 unk14; +}; + + + + + + +THUMB_FUNC u32 FUN_0205FA2C(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); +THUMB_FUNC u32 FUN_0205FAD8(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FB34(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); +THUMB_FUNC u32 FUN_0205FBC0(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0); +THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, + void **param1, + u8 param2, + u8 param3, + u8 param4, + u8 param5, + u8 param6, + u8 param7); + +THUMB_FUNC u32 FUN_0205FC9C(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FCC4(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0); +THUMB_FUNC void FUN_0205FD38(struct UnkStruct_0204639C *param0, u16 param1, u16 param2, u16 param3); + + +THUMB_FUNC int FUN_0205FD70(struct UnkStruct_0204639C *param0); +THUMB_FUNC void FUN_0205FDDC(struct UnkStruct_0204639C *param0, u16 param1, u16 param2); + +THUMB_FUNC u32 FUN_0205FE10(struct SaveBlock2 *sav2); +THUMB_FUNC u32 FUN_0205FF5C(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02060044(u16 **param0, u32 *param1); +THUMB_FUNC u32 FUN_02060064(u32 param0); +THUMB_FUNC u32 FUN_02060070(u32 param0); +THUMB_FUNC u32 FUN_0206007C(struct SaveBlock2 *sav2); +THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2); +THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2); +THUMB_FUNC BOOL FUN_02060144(u32 **param0); + #endif //POKEDIAMOND_UNK_0205FA2C_H \ No newline at end of file diff --git a/include/unk_0206BB28.h b/include/unk_0206BB28.h index ff60e220..44997e73 100644 --- a/include/unk_0206BB28.h +++ b/include/unk_0206BB28.h @@ -5,8 +5,8 @@ #include "pokedex.h" #include "pokemon.h" -BOOL FUN_0206BB28(struct SaveBlock2 * sav2); -BOOL FUN_0206BB34(struct Pokedex * pokedex); +BOOL SavArray_IsNatDexEnabled(struct SaveBlock2 * sav2); +BOOL Pokedex_IsNatDexEnabled(struct Pokedex * pokedex); u32 FUN_0206BB48(BOOL isNationalDex, u32 species); #endif //POKEDIAMOND_UNK_0206BB28_H -- cgit v1.2.3 From 44a082830ef1aaff60449d9dc2b01fdcf8300e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 3 Apr 2021 15:18:24 +0200 Subject: remove extern declaration --- include/unk_0205FA2C.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'include') diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index 7875b5e9..c8d6da6d 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -16,22 +16,6 @@ #include "unk_020286F8.h" -const u8 UNK_020F7454[] = { - 0x00, - 0x01, - 0x02, - 0x04, - 0x03, - 0x05, - 0x06, - 0x07, - 0x08, - 0x00, - 0x00, - 0x00, -}; - - struct UnkPlayerStruct1_0205FA2C { /* 0x00 */ struct PlayerParty *player_party; -- cgit v1.2.3 From c54ec6c98fa9ac1affed7fb1233e9b9aa84a27c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 3 Apr 2021 18:10:46 +0200 Subject: run clang-format --- include/unk_0205FA2C.h | 52 ++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) (limited to 'include') diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index c8d6da6d..99cf7606 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -1,7 +1,6 @@ #ifndef POKEDIAMOND_UNK_0205FA2C_H #define POKEDIAMOND_UNK_0205FA2C_H - #include "global.h" #include "MI_memory.h" #include "bag.h" @@ -9,12 +8,11 @@ #include "party.h" #include "player_data.h" #include "script.h" +#include "unk_020286F8.h" +#include "unk_02029FB0.h" #include "unk_0202A8F4.h" #include "unk_0204639C.h" #include "unk_0206BB28.h" -#include "unk_02029FB0.h" -#include "unk_020286F8.h" - struct UnkPlayerStruct1_0205FA2C { @@ -29,14 +27,14 @@ struct UnkPlayerStruct1_0205FA2C u8 unk23; u32 unk24[2]; u8 unk2c[6]; - u8 unk32:4; - u8 unk322:4; + u8 unk32 : 4; + u8 unk322 : 4; u8 unk33; u32 unk34[3]; }; - -struct UnkPlayerStruct2_0205FA2C { +struct UnkPlayerStruct2_0205FA2C +{ /* 0x00 */ struct PlayerParty *player_party; /* 0x04 */ struct Options *options; u32 unk08; @@ -54,12 +52,10 @@ struct UnkPlayerStruct2_0205FA2C { u32 unk24; u32 unk28; u32 unk2c; - }; - - -struct UnkCallbackStruct1_0205FA2C { +struct UnkCallbackStruct1_0205FA2C +{ u32 unk00; u32 unk04; u8 unk08; @@ -72,10 +68,8 @@ struct UnkCallbackStruct1_0205FA2C { void **unk14; }; - - - -struct UnkCallbackStruct2_0205FA2C { +struct UnkCallbackStruct2_0205FA2C +{ u32 unk00; u32 unk04; u32 *unk08; @@ -85,15 +79,14 @@ struct UnkCallbackStruct2_0205FA2C { u16 unk14; }; - - - - - -THUMB_FUNC u32 FUN_0205FA2C(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); -THUMB_FUNC u32 FUN_0205FAD8(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); -THUMB_FUNC u32 FUN_0205FB34(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); -THUMB_FUNC u32 FUN_0205FBC0(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FA2C( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); +THUMB_FUNC u32 FUN_0205FAD8( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FB34( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); +THUMB_FUNC u32 FUN_0205FBC0( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, void **param1, @@ -104,12 +97,13 @@ THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, u8 param6, u8 param7); -THUMB_FUNC u32 FUN_0205FC9C(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); -THUMB_FUNC u32 FUN_0205FCC4(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FC9C( + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FCC4( + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FD38(struct UnkStruct_0204639C *param0, u16 param1, u16 param2, u16 param3); - THUMB_FUNC int FUN_0205FD70(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FDDC(struct UnkStruct_0204639C *param0, u16 param1, u16 param2); @@ -123,4 +117,4 @@ THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2); THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2); THUMB_FUNC BOOL FUN_02060144(u32 **param0); -#endif //POKEDIAMOND_UNK_0205FA2C_H \ No newline at end of file +#endif // POKEDIAMOND_UNK_0205FA2C_H \ No newline at end of file -- cgit v1.2.3 From 8132e1e5678b0bde7421acf7600c223854fe7c01 Mon Sep 17 00:00:00 2001 From: tgsm Date: Mon, 5 Apr 2021 12:41:20 -0400 Subject: Decompile scrcmd_16 -> scrcmd_daycare --- include/scrcmd.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index 4c155f0b..3ea5c916 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -134,6 +134,24 @@ BOOL ScrCmd_Unk0072(struct ScriptContext* ctx); BOOL ScrCmd_Unk0073(struct ScriptContext* ctx); BOOL ScrCmd_Unk0074(struct ScriptContext* ctx); +//scrcmd_daycare.c +BOOL ScrCmd_Unk016D(struct ScriptContext* ctx); +BOOL ScrCmd_Unk016E(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01A8(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01A9(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01A4(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01AA(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01AE(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01AF(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01B0(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01BC(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01BE(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01BF(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01A5(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01A6(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01A7(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01AD(struct ScriptContext* ctx); + //scrcmd_18.c BOOL ScrCmd_GiveMon(struct ScriptContext* ctx); -- cgit v1.2.3 From 3f493d7ab6c45e17e515fd9901450935a6a08f14 Mon Sep 17 00:00:00 2001 From: tgsm Date: Mon, 5 Apr 2021 20:55:25 -0400 Subject: Decompile scrcmd_11 --- include/scrcmd.h | 11 +++++++++++ include/unk_02029FB0.h | 2 ++ 2 files changed, 13 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index 3ea5c916..fcae3549 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -106,6 +106,17 @@ BOOL ScrCmd_Unk0048(struct ScriptContext *ctx); BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx); BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx); +//scrcmd_11.c +BOOL ScrCmd_Unk017D(struct ScriptContext* ctx); +BOOL ScrCmd_Unk017E(struct ScriptContext* ctx); +BOOL ScrCmd_Unk017F(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0180(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0181(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0182(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0183(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0184(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0185(struct ScriptContext* ctx); + //scrcmd_13.c BOOL ScrCmd_Unk0253(struct ScriptContext* ctx); BOOL ScrCmd_Unk0254(struct ScriptContext* ctx); diff --git a/include/unk_02029FB0.h b/include/unk_02029FB0.h index 0185bff4..9ce6451d 100644 --- a/include/unk_02029FB0.h +++ b/include/unk_02029FB0.h @@ -1,6 +1,8 @@ #ifndef POKEDIAMOND_UNK_02029FB0_H #define POKEDIAMOND_UNK_02029FB0_H +struct Pokedex; + struct UnkStruct_02029FB0 { u8 unk[0x14C]; -- cgit v1.2.3 From cbe18ecb3e513a30da11aaef1ef22cd855c60d7a Mon Sep 17 00:00:00 2001 From: tgsm Date: Thu, 8 Apr 2021 21:31:13 -0400 Subject: Decompile scrcmd_4 -> scrcmd_names --- include/scrcmd.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index fcae3549..dd55ce70 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -106,6 +106,50 @@ BOOL ScrCmd_Unk0048(struct ScriptContext *ctx); BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx); BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx); +//scrcmd_4.c +BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx); +BOOL ScrCmd_GetRivalName(struct ScriptContext* ctx); +BOOL ScrCmd_GetFriendName(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00D0(struct ScriptContext* ctx); +BOOL ScrCmd_GetItemName(struct ScriptContext* ctx); +BOOL ScrCmd_GetPocketName(struct ScriptContext* ctx); +BOOL ScrCmd_GetTMHMMoveName(struct ScriptContext* ctx); +BOOL ScrCmd_GetMoveName(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00D5(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0280(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00D6(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0251(struct ScriptContext* ctx); +BOOL ScrCmd_GetPoketchAppName(struct ScriptContext* ctx); +BOOL ScrCmd_GetTrainerClassName(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00D9(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00DA(struct ScriptContext* ctx); +struct String* FUN_02040AE4(u32 msg_no, u32 heap_id); +BOOL ScrCmd_Unk00DB(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00DC(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00DD(struct ScriptContext* ctx); +BOOL ScrCmd_GetDecorationName(struct ScriptContext* ctx); +BOOL ScrCmd_GetUndergroundTrapName(struct ScriptContext* ctx); +BOOL ScrCmd_GetUndergroundItemName(struct ScriptContext* ctx); +BOOL ScrCmd_Unk00E2(struct ScriptContext* ctx); +BOOL ScrCmd_Unk017B(struct ScriptContext* ctx); +BOOL ScrCmd_GetNatureName(struct ScriptContext* ctx); +BOOL ScrCmd_GetFashionName(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0272(struct ScriptContext* ctx); +BOOL ScrCmd_GetPokemonMoveName(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0232(struct ScriptContext* ctx); +BOOL ScrCmd_GetSealName(struct ScriptContext* ctx); +BOOL ScrCmd_GetItemNameWithIndefArticle(struct ScriptContext* ctx); +BOOL ScrCmd_GetItemNamePlural(struct ScriptContext* ctx); +BOOL ScrCmd_GetDecorationNameWithArticle(struct ScriptContext* ctx); +BOOL ScrCmd_GetUndergroundTrapNameWithArticle(struct ScriptContext* ctx); +BOOL ScrCmd_GetUndergroundItemNameWithArticle(struct ScriptContext* ctx); +BOOL ScrCmd_Unk02C9(struct ScriptContext* ctx); +BOOL ScrCmd_Unk02CA(struct ScriptContext* ctx); +BOOL ScrCmd_GetFashionNameWithArticle(struct ScriptContext* ctx); +BOOL ScrCmd_Unk02CC(struct ScriptContext* ctx); +BOOL ScrCmd_GetSealNamePlural(struct ScriptContext* ctx); +BOOL ScrCmd_CapitalizeFirstChar(struct ScriptContext* ctx); + //scrcmd_11.c BOOL ScrCmd_Unk017D(struct ScriptContext* ctx); BOOL ScrCmd_Unk017E(struct ScriptContext* ctx); -- cgit v1.2.3 From f37e674e468b37a6f30abdbdf4f68ead98c3afb1 Mon Sep 17 00:00:00 2001 From: tgsm Date: Fri, 9 Apr 2021 13:41:02 -0400 Subject: scrcmd_25: Fix naming --- include/scrcmd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index dd55ce70..c47e909d 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -231,9 +231,9 @@ BOOL ScrCmd_Unk0081(struct ScriptContext* ctx); BOOL ScrCmd_Unk0082(struct ScriptContext* ctx); //scrcmd_25.c -BOOL ScrCmd_Unk02EF(struct ScriptContext* ctx); -BOOL ScrCmd_Unk02F0(struct ScriptContext* ctx); -BOOL ScrCmd_Unk02F1(struct ScriptContext* ctx); -BOOL ScrCmd_Unk02F2(struct ScriptContext* ctx); +BOOL ScrCmd_Unk023F(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0240(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0241(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0242(struct ScriptContext* ctx); #endif //POKEDIAMOND_SCRCMD_H -- cgit v1.2.3 From 91ba9c6177680893e43d7f59a04858950aaf069a Mon Sep 17 00:00:00 2001 From: tgsm Date: Sat, 10 Apr 2021 00:24:56 -0400 Subject: Decompile scrcmd_23 --- include/scrcmd.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index c47e909d..120a0c96 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -230,6 +230,24 @@ BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx); BOOL ScrCmd_Unk0081(struct ScriptContext* ctx); BOOL ScrCmd_Unk0082(struct ScriptContext* ctx); +//scrcmd_23.c +BOOL ScrCmd_Unk0083(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0084(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0085(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0086(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0087(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0088(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0089(struct ScriptContext* ctx); +BOOL ScrCmd_Unk008A(struct ScriptContext* ctx); +BOOL ScrCmd_Unk008B(struct ScriptContext* ctx); +BOOL ScrCmd_Unk008C(struct ScriptContext* ctx); +BOOL ScrCmd_Unk008D(struct ScriptContext* ctx); +BOOL ScrCmd_Unk008E(struct ScriptContext* ctx); +BOOL ScrCmd_Unk008F(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0090(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0091(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0092(struct ScriptContext* ctx); + //scrcmd_25.c BOOL ScrCmd_Unk023F(struct ScriptContext* ctx); BOOL ScrCmd_Unk0240(struct ScriptContext* ctx); -- cgit v1.2.3 From 8e3505c4162c51c3870fbe371fa46c061e6d8b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 10 Apr 2021 17:47:33 +0200 Subject: headers --- include/unk_0202F150.h | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 include/unk_0202F150.h (limited to 'include') diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h new file mode 100644 index 00000000..801fc3ed --- /dev/null +++ b/include/unk_0202F150.h @@ -0,0 +1,198 @@ +#ifndef POKEDIAMOND_UNK_0202F150_H +#define POKEDIAMOND_UNK_0202F150_H + +#include "global.h" +#include "MI_memory.h" +#include "heap.h" +#include "main.h" +#include "RTC_api.h" + + +struct UnkStruct1 +{ + u8 unk000[2][38]; + u8 unk04c[264]; + u8 unk154[2][192]; + u8 unk2D4[384]; + u32 unk454; + u32 unk458; + u32 unk45C; + u32 unk460; + u32 unk464; + u8 unk468[0x8]; + u32 unk470; + u8 unk474[0x8]; + struct + { + u32 unk00; + u32 unk04; + u32 unk08; + } unk47C[8]; + u32 unk4DC; + u8 unk4E0[0x8]; + struct + { + u32 unk00; + u32 unk04; + u32 unk08; + } unk4E8[8]; + u32 unk548; + u8 unk54C[32]; + u8 unk56C[32]; + struct + { + u32 unk00; + u32 unk04; + u16 unk08; + u8 unk0a; + u8 unk0b; + } unk58C[8]; + u32 unk5EC; + u32 unk5F0; + u16 unk5F4; + u8 unk5F6; + u8 unk5F7; + s64 unk5F8[3]; + u16 unk610[8]; + u8 unk620[0x8]; + u16 unk628; + u8 unk62A; + u8 unk62B; + u8 unk62C; + s8 unk62D; + u16 unk62E; + u32 unk630; + u32 unk634; + u32 unk638[8]; + u32 unk658; + u16 unk65C; + u8 unk65E; + u8 unk65F[8]; + u8 unk667[8]; + u8 unk66F[8]; + u8 unk677[4]; + u8 unk67B; + u8 unk67C; + u8 unk67D; + u8 unk67E; + u8 unk67F; + u8 unk680; + u8 unk681; + u8 unk682; + u8 unk683; + u8 unk684; + u8 unk685; + u8 unk686; + u8 unk687; + u8 unk688; + u8 unk689; + u8 unk68A; + u8 unk68B; +}; + +struct UnkStruct2 +{ + u32 unk00; + u32 unk04; + u16 unk08; + u8 unk0a; +}; + + +THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1); +THUMB_FUNC void FUN_0202F2F0(); +THUMB_FUNC void FUN_0202F5A4(); +THUMB_FUNC void FUN_0202F820(u32 param0); +THUMB_FUNC void FUN_0202F8D4(); +THUMB_FUNC void FUN_0202F910(u32 param0); +THUMB_FUNC u32 FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3); +THUMB_FUNC u32 FUN_0202F950(u32 param0, u32 param1, u32 param2); +THUMB_FUNC void FUN_0202F984(); +THUMB_FUNC void FUN_0202F9E0(u32 param0); +THUMB_FUNC void FUN_0202FA10(); +THUMB_FUNC void FUN_0202FA1C(); +THUMB_FUNC u8 FUN_0202FA28(); +THUMB_FUNC u32 FUN_0202FA48(); +THUMB_FUNC void FUN_0202FA5C(); +THUMB_FUNC u32 FUN_0202FB18(u32 param0); +THUMB_FUNC void FUN_0202FB20(); +THUMB_FUNC void FUN_0202FB58(); +THUMB_FUNC u32 FUN_0202FB80(); +THUMB_FUNC void FUN_0202FC60(); +THUMB_FUNC void FUN_0202FC80(); +THUMB_FUNC void FUN_0202FCA8(); +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_0203026C(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC void FUN_020303BC(u32 param0, u32 param1, u16 param2); +THUMB_FUNC void FUN_020303F4(u32 param0, u8 *param1, u16 param2); +THUMB_FUNC void FUN_020304D4(u32 param0); +THUMB_FUNC void FUN_020304F0(u32 param0); +THUMB_FUNC void FUN_0203050C(); +THUMB_FUNC void FUN_02030674(); +THUMB_FUNC void FUN_020307A8(); +THUMB_FUNC void FUN_020307BC(); +THUMB_FUNC void FUN_020307D0(); +THUMB_FUNC u32 FUN_020307E4(u8 *param0, u32 param1); +THUMB_FUNC void FUN_0203086C(); +THUMB_FUNC u32 FUN_02030870(u8 *param0); +THUMB_FUNC u32 FUN_02030930(u8 *param0); +THUMB_FUNC void FUN_02030A00(u8 *param0); +THUMB_FUNC u32 FUN_02030A78(u32 param0, u32 param1, u32 param2); +THUMB_FUNC u32 FUN_02030ADC(u32 param0, u32 param1, u32 param2); +THUMB_FUNC u32 FUN_02030B3C(u32 param0, u32 param1, u32 param2); +THUMB_FUNC u32 FUN_02030BC4(u32 param0, u32 param1, u32 param2); +THUMB_FUNC u32 FUN_02030C4C(u32 param0, u32 param1); +THUMB_FUNC int FUN_02030C58(); +THUMB_FUNC void FUN_02030C70(u32 param0, u32 param1, u32 param2, u32 param3, void *param4); +THUMB_FUNC void FUN_02030C8C( + s16 *param0, u32 param1, u32 param2, u32 param3, struct UnkStruct2 *param4); +THUMB_FUNC void FUN_02030DA4(); +THUMB_FUNC void FUN_02030DFC(); +THUMB_FUNC u32 FUN_02030E7C(u16 param0); +THUMB_FUNC u32 FUN_02030F20(); +THUMB_FUNC u32 FUN_02030F40(); +THUMB_FUNC void FUN_02030F60(u8 param0); +THUMB_FUNC u8 FUN_02030F74(u32 param0); +THUMB_FUNC u32 FUN_02030F88(u32 param0); +THUMB_FUNC void FUN_02030FA8(); +THUMB_FUNC void FUN_02030FC8(); +THUMB_FUNC u32 FUN_02030FE0(); +THUMB_FUNC void FUN_02031000(u32 param0, u32 param1, u32 param2); +THUMB_FUNC void FUN_0203105C(u32 param0, u32 param1, u32 param2); +THUMB_FUNC void FUN_02031088(); +THUMB_FUNC void FUN_0203110C(u32 param0, u32 param1, u8 *param2); +THUMB_FUNC void FUN_02031134(u32 param0, u32 param1, u8 *param2); +THUMB_FUNC void FUN_0203115C(u32 param0, u32 param1, u8 *param2); +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 int FUN_02031228(u16 param0); +THUMB_FUNC u32 FUN_02031248(u32 param0); +THUMB_FUNC u32 FUN_02031258(u32 param0); +THUMB_FUNC void FUN_02031268(u8 param0); +THUMB_FUNC u8 FUN_02031280(); +THUMB_FUNC void FUN_0203129C(); +THUMB_FUNC void FUN_020312BC(u32 param0); +THUMB_FUNC void FUN_02031354(u32 param0); +THUMB_FUNC u32 FUN_02031370(); +THUMB_FUNC u32 FUN_02031388(); +THUMB_FUNC void FUN_020313A0(u8 param0); +THUMB_FUNC void FUN_020313B4(u8 param0, u32 param1); +THUMB_FUNC u32 FUN_020313CC(u32 param0); +THUMB_FUNC u32 FUN_020313EC(); +THUMB_FUNC void FUN_02031400(u32 param0); +THUMB_FUNC u32 FUN_02031438(); +THUMB_FUNC void FUN_02031454(); +THUMB_FUNC void FUN_02031468(); + + + + +#endif //POKEDIAMOND_UNK_0202F150_H + -- cgit v1.2.3 From f85c9d736760dace9ce94560747c9985a3e93ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 10 Apr 2021 19:21:51 +0200 Subject: fix warnings --- include/unk_0202F150.h | 90 ++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 50 deletions(-) (limited to 'include') diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 801fc3ed..2cb96f82 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -7,6 +7,22 @@ #include "main.h" #include "RTC_api.h" +struct UnkStruct3 { + u32 unk00; + u16 unk04; + u16 unk06; + u32 unk08; +}; + +struct UnkStruct2 +{ + u32 unk00; + void *unk04; + u16 unk08; + u8 unk0a; +}; + + struct UnkStruct1 { @@ -14,39 +30,19 @@ struct UnkStruct1 u8 unk04c[264]; u8 unk154[2][192]; u8 unk2D4[384]; - u32 unk454; - u32 unk458; - u32 unk45C; - u32 unk460; - u32 unk464; - u8 unk468[0x8]; - u32 unk470; - u8 unk474[0x8]; - struct - { - u32 unk00; - u32 unk04; - u32 unk08; - } unk47C[8]; - u32 unk4DC; - u8 unk4E0[0x8]; - struct - { - u32 unk00; - u32 unk04; - u32 unk08; - } unk4E8[8]; + void *unk454; + void *unk458; + void *unk45C; + void *unk460; + struct UnkStruct3 unk464; + struct UnkStruct3 unk470; + struct UnkStruct3 unk47C[8]; + struct UnkStruct3 unk4DC; + struct UnkStruct3 unk4E8[8]; u32 unk548; u8 unk54C[32]; u8 unk56C[32]; - struct - { - u32 unk00; - u32 unk04; - u16 unk08; - u8 unk0a; - u8 unk0b; - } unk58C[8]; + struct UnkStruct2 unk58C[8]; u32 unk5EC; u32 unk5F0; u16 unk5F4; @@ -90,21 +86,15 @@ struct UnkStruct1 u8 unk68B; }; -struct UnkStruct2 -{ - u32 unk00; - u32 unk04; - u16 unk08; - u8 unk0a; -}; + THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1); THUMB_FUNC void FUN_0202F2F0(); THUMB_FUNC void FUN_0202F5A4(); -THUMB_FUNC void FUN_0202F820(u32 param0); +THUMB_FUNC void FUN_0202F820(int param0); THUMB_FUNC void FUN_0202F8D4(); -THUMB_FUNC void FUN_0202F910(u32 param0); +THUMB_FUNC void FUN_0202F910(int param0); THUMB_FUNC u32 FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3); THUMB_FUNC u32 FUN_0202F950(u32 param0, u32 param1, u32 param2); THUMB_FUNC void FUN_0202F984(); @@ -127,7 +117,7 @@ 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_0203026C(u32 param0, u8 *param1, u32 param2); -THUMB_FUNC void FUN_020303BC(u32 param0, u32 param1, u16 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_020304D4(u32 param0); THUMB_FUNC void FUN_020304F0(u32 param0); @@ -141,15 +131,15 @@ THUMB_FUNC void FUN_0203086C(); THUMB_FUNC u32 FUN_02030870(u8 *param0); THUMB_FUNC u32 FUN_02030930(u8 *param0); THUMB_FUNC void FUN_02030A00(u8 *param0); -THUMB_FUNC u32 FUN_02030A78(u32 param0, u32 param1, u32 param2); -THUMB_FUNC u32 FUN_02030ADC(u32 param0, u32 param1, u32 param2); -THUMB_FUNC u32 FUN_02030B3C(u32 param0, u32 param1, u32 param2); -THUMB_FUNC u32 FUN_02030BC4(u32 param0, u32 param1, u32 param2); -THUMB_FUNC u32 FUN_02030C4C(u32 param0, u32 param1); +THUMB_FUNC u32 FUN_02030A78(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC u32 FUN_02030ADC(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC u32 FUN_02030BC4(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC u32 FUN_02030C4C(u32 param0, u8 *param1); THUMB_FUNC int FUN_02030C58(); -THUMB_FUNC void FUN_02030C70(u32 param0, u32 param1, u32 param2, u32 param3, void *param4); +THUMB_FUNC void FUN_02030C70(u32 param0, u32 param1, u32 param2, void *param3, struct UnkStruct2 *param4); THUMB_FUNC void FUN_02030C8C( - s16 *param0, u32 param1, u32 param2, u32 param3, struct UnkStruct2 *param4); + s16 *param0, u32 param1, void *param2, u32 param3, struct UnkStruct2 *param4); THUMB_FUNC void FUN_02030DA4(); THUMB_FUNC void FUN_02030DFC(); THUMB_FUNC u32 FUN_02030E7C(u16 param0); @@ -161,8 +151,8 @@ THUMB_FUNC u32 FUN_02030F88(u32 param0); THUMB_FUNC void FUN_02030FA8(); THUMB_FUNC void FUN_02030FC8(); THUMB_FUNC u32 FUN_02030FE0(); -THUMB_FUNC void FUN_02031000(u32 param0, u32 param1, u32 param2); -THUMB_FUNC void FUN_0203105C(u32 param0, u32 param1, u32 param2); +THUMB_FUNC void FUN_02031000(u32 param0, u8 *param1, u32 param2); +THUMB_FUNC void FUN_0203105C(u32 param0, u8 *param1, u32 param2); THUMB_FUNC void FUN_02031088(); THUMB_FUNC void FUN_0203110C(u32 param0, u32 param1, u8 *param2); THUMB_FUNC void FUN_02031134(u32 param0, u32 param1, u8 *param2); @@ -178,7 +168,7 @@ THUMB_FUNC u32 FUN_02031258(u32 param0); THUMB_FUNC void FUN_02031268(u8 param0); THUMB_FUNC u8 FUN_02031280(); THUMB_FUNC void FUN_0203129C(); -THUMB_FUNC void FUN_020312BC(u32 param0); +THUMB_FUNC void FUN_020312BC(s64 *param0); THUMB_FUNC void FUN_02031354(u32 param0); THUMB_FUNC u32 FUN_02031370(); THUMB_FUNC u32 FUN_02031388(); -- cgit v1.2.3 From f5eabfb0d118057d2533d3bd2558a560bd15a5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 10 Apr 2021 19:38:22 +0200 Subject: polish struct usage --- include/unk_0202F150.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 2cb96f82..3b8e90a2 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -7,14 +7,14 @@ #include "main.h" #include "RTC_api.h" -struct UnkStruct3 { +struct UnkStruct0202F150_sub1 { u32 unk00; - u16 unk04; - u16 unk06; + s16 unk04; + s16 unk06; u32 unk08; }; -struct UnkStruct2 +struct UnkStruct0202F150_sub2 { u32 unk00; void *unk04; @@ -24,7 +24,7 @@ struct UnkStruct2 -struct UnkStruct1 +struct UnkStruct0202F150 { u8 unk000[2][38]; u8 unk04c[264]; @@ -34,15 +34,15 @@ struct UnkStruct1 void *unk458; void *unk45C; void *unk460; - struct UnkStruct3 unk464; - struct UnkStruct3 unk470; - struct UnkStruct3 unk47C[8]; - struct UnkStruct3 unk4DC; - struct UnkStruct3 unk4E8[8]; + struct UnkStruct0202F150_sub1 unk464; + struct UnkStruct0202F150_sub1 unk470; + struct UnkStruct0202F150_sub1 unk47C[8]; + struct UnkStruct0202F150_sub1 unk4DC; + struct UnkStruct0202F150_sub1 unk4E8[8]; u32 unk548; u8 unk54C[32]; u8 unk56C[32]; - struct UnkStruct2 unk58C[8]; + struct UnkStruct0202F150_sub2 unk58C[8]; u32 unk5EC; u32 unk5F0; u16 unk5F4; @@ -137,9 +137,9 @@ THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2); THUMB_FUNC u32 FUN_02030BC4(u32 param0, u8 *param1, u32 param2); THUMB_FUNC u32 FUN_02030C4C(u32 param0, u8 *param1); THUMB_FUNC int FUN_02030C58(); -THUMB_FUNC void FUN_02030C70(u32 param0, u32 param1, u32 param2, void *param3, struct UnkStruct2 *param4); +THUMB_FUNC void FUN_02030C70(u32 param0, u32 param1, u32 param2, void *param3, struct UnkStruct0202F150_sub2 *param4); THUMB_FUNC void FUN_02030C8C( - s16 *param0, u32 param1, void *param2, u32 param3, struct UnkStruct2 *param4); + struct UnkStruct0202F150_sub1 *param0, u32 param1, void *param2, u32 param3, struct UnkStruct0202F150_sub2 *param4); THUMB_FUNC void FUN_02030DA4(); THUMB_FUNC void FUN_02030DFC(); THUMB_FUNC u32 FUN_02030E7C(u16 param0); -- cgit v1.2.3 From c34e74ae7cdd91bef14cf5f160329b5cbf3c9504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 10 Apr 2021 23:24:10 +0200 Subject: formatting --- include/unk_0202F150.h | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'include') diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 3b8e90a2..3996c1c8 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -3,15 +3,16 @@ #include "global.h" #include "MI_memory.h" +#include "RTC_api.h" #include "heap.h" #include "main.h" -#include "RTC_api.h" -struct UnkStruct0202F150_sub1 { - u32 unk00; - s16 unk04; - s16 unk06; - u32 unk08; +struct UnkStruct0202F150_sub1 +{ + u32 unk00; + s16 unk04; + s16 unk06; + u32 unk08; }; struct UnkStruct0202F150_sub2 @@ -22,8 +23,6 @@ struct UnkStruct0202F150_sub2 u8 unk0a; }; - - struct UnkStruct0202F150 { u8 unk000[2][38]; @@ -86,9 +85,6 @@ struct UnkStruct0202F150 u8 unk68B; }; - - - THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1); THUMB_FUNC void FUN_0202F2F0(); THUMB_FUNC void FUN_0202F5A4(); @@ -137,9 +133,13 @@ THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2); THUMB_FUNC u32 FUN_02030BC4(u32 param0, u8 *param1, u32 param2); THUMB_FUNC u32 FUN_02030C4C(u32 param0, u8 *param1); THUMB_FUNC int FUN_02030C58(); -THUMB_FUNC void FUN_02030C70(u32 param0, u32 param1, u32 param2, void *param3, struct UnkStruct0202F150_sub2 *param4); -THUMB_FUNC void FUN_02030C8C( - struct UnkStruct0202F150_sub1 *param0, u32 param1, void *param2, u32 param3, struct UnkStruct0202F150_sub2 *param4); +THUMB_FUNC void FUN_02030C70( + u32 param0, u32 param1, u32 param2, void *param3, struct UnkStruct0202F150_sub2 *param4); +THUMB_FUNC void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0, + u32 param1, + void *param2, + u32 param3, + struct UnkStruct0202F150_sub2 *param4); THUMB_FUNC void FUN_02030DA4(); THUMB_FUNC void FUN_02030DFC(); THUMB_FUNC u32 FUN_02030E7C(u16 param0); @@ -181,8 +181,4 @@ THUMB_FUNC u32 FUN_02031438(); THUMB_FUNC void FUN_02031454(); THUMB_FUNC void FUN_02031468(); - - - -#endif //POKEDIAMOND_UNK_0202F150_H - +#endif // POKEDIAMOND_UNK_0202F150_H -- cgit v1.2.3 From 2023f223aa3cfce3d8e17cddf3833dc8510c443e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Fri, 16 Apr 2021 11:57:16 +0200 Subject: decomp unk_0202D858.s --- include/unk_0202D858.h | 10 ++++++++++ include/unk_0202F150.h | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 include/unk_0202D858.h (limited to 'include') diff --git a/include/unk_0202D858.h b/include/unk_0202D858.h new file mode 100644 index 00000000..210821d0 --- /dev/null +++ b/include/unk_0202D858.h @@ -0,0 +1,10 @@ +#ifndef POKEDIAMOND_UNK_0202D858_H +#define POKEDIAMOND_UNK_0202D858_H + +#include "global.h" + +THUMB_FUNC u8 FUN_0202D858(u16 param0); +THUMB_FUNC u8 FUN_0202D884(u16 param0); +THUMB_FUNC u32 FUN_0202D8B0(int param0); + +#endif // POKEDIAMOND_UNK_0202D858_H diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 3996c1c8..77fb4f7d 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -6,6 +6,7 @@ #include "RTC_api.h" #include "heap.h" #include "main.h" +#include "unk_0202D858.h" struct UnkStruct0202F150_sub1 { @@ -163,8 +164,8 @@ THUMB_FUNC u32 FUN_020311DC(u32 param0); THUMB_FUNC u32 FUN_020311E8(); THUMB_FUNC u32 FUN_020311F0(); THUMB_FUNC int FUN_02031228(u16 param0); -THUMB_FUNC u32 FUN_02031248(u32 param0); -THUMB_FUNC u32 FUN_02031258(u32 param0); +THUMB_FUNC int FUN_02031248(u32 param0); +THUMB_FUNC int FUN_02031258(u32 param0); THUMB_FUNC void FUN_02031268(u8 param0); THUMB_FUNC u8 FUN_02031280(); THUMB_FUNC void FUN_0203129C(); -- cgit v1.2.3 From dcb4eea28034cb3be345736dbc9bb223f3ace92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Fri, 16 Apr 2021 15:19:40 +0200 Subject: decompile unk_02031480.s --- include/unk_02031480.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 include/unk_02031480.h (limited to 'include') diff --git a/include/unk_02031480.h b/include/unk_02031480.h new file mode 100644 index 00000000..48cfbd14 --- /dev/null +++ b/include/unk_02031480.h @@ -0,0 +1,30 @@ +#ifndef POKEDIAMOND_UNK_02031480_H +#define POKEDIAMOND_UNK_02031480_H + +#include "global.h" +#include "MI_memory.h" +#include "heap.h" +#include "unk_0202F150.h" + +THUMB_FUNC void FUN_02031480(u32 heap_id); +THUMB_FUNC void FUN_020314D0(); +THUMB_FUNC BOOL FUN_020314E8(); +THUMB_FUNC void FUN_020314FC(u8 param0, u32 param1, u8 *param2); +THUMB_FUNC void FUN_02031560(u32 param0, u32 param1, u8 *param2); +THUMB_FUNC void FUN_02031574(u32 param0, u32 param1, u8 *param2); +THUMB_FUNC void FUN_02031588(u8 param0); +THUMB_FUNC void FUN_020315A4(); +THUMB_FUNC BOOL FUN_020315D8(u8 param0); +THUMB_FUNC u8 FUN_020315FC(u8 index); +THUMB_FUNC void FUN_0203160C(u32 param0, u32 param1, u8 *param2); +THUMB_FUNC u32 FUN_02031628(); +THUMB_FUNC void FUN_0203162C(u8 param0, u8 param1); +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 void FUN_02031704(u32 param0, u32 param1, void *param2); +THUMB_FUNC u32 FUN_02031730(); + +#endif // POKEDIAMOND_UNK_02031480_H -- cgit v1.2.3 From 61b2d69a68e03e39aaa97ae39969987b52c08c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Mon, 19 Apr 2021 19:10:37 +0200 Subject: update externs --- include/unk_0202F150.h | 1 + include/unk_02031480.h | 2 +- include/unk_0205FA2C.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') 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 { -- cgit v1.2.3 From 88aa75fe3e94f1aac0368b6dbcfaf75614066a8a Mon Sep 17 00:00:00 2001 From: tgsm Date: Thu, 29 Apr 2021 07:31:45 -0400 Subject: Decompile unk_0204B0A0 --- include/sav_system_info.h | 2 ++ include/unk_0204B0A0.h | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 include/unk_0204B0A0.h (limited to 'include') diff --git a/include/sav_system_info.h b/include/sav_system_info.h index 696cfe07..bded91f7 100644 --- a/include/sav_system_info.h +++ b/include/sav_system_info.h @@ -3,6 +3,8 @@ #include "RTC_api.h" +struct SaveBlock2; + struct UnkSaveStruct_0202376C_sub { /* 0x00 */ u32 field_00; diff --git a/include/unk_0204B0A0.h b/include/unk_0204B0A0.h new file mode 100644 index 00000000..8d37e354 --- /dev/null +++ b/include/unk_0204B0A0.h @@ -0,0 +1,25 @@ +#ifndef POKEDIAMOND_UNK_0204B0A0_H +#define POKEDIAMOND_UNK_0204B0A0_H + +#include "RTC_api.h" +#include "RTC_convert.h" +#include "sav_system_info.h" +#include "script.h" + +void FUN_0204B0F8(struct UnkSavStruct80* unk); +void FUN_0204B130(struct UnkSavStruct80* unk, struct UnkSaveStruct_0202376C_sub* rtc_info, struct RTCDate* date); +void FUN_0204B158(struct UnkSavStruct80* unk, struct UnkSaveStruct_0202376C_sub* rtc_info, struct RTCDate* date, struct RTCTime* time); +void FUN_0204B1DC(struct UnkSavStruct80* unk, s32 a1); +void FUN_0204B270(struct UnkSavStruct80* unk, s32 a1, struct RTCTime* time); +u32 Script_GetTimeOfDay(struct UnkSavStruct80* unk); +u32 Script_GetMonth(struct UnkSavStruct80* unk); +u32 Script_GetDay(struct UnkSavStruct80* unk); +RTCWeek Script_GetWeekday(struct UnkSavStruct80* unk); +u32 Script_GetHour(struct UnkSavStruct80* unk); +u32 Script_GetMinute(struct UnkSavStruct80* unk); +void Script_SavRTC_x24toDateTime(struct UnkSavStruct80* unk, struct RTCDate* date, struct RTCTime* time); +void Script_SavRTC_x2CtoDateTime(struct UnkSavStruct80* unk, struct RTCDate* date, struct RTCTime* time); +void Script_SavRTC_DateTimeTox2C(struct UnkSavStruct80* unk); +BOOL FUN_0204B33C(struct UnkSavStruct80* unk); + +#endif -- cgit v1.2.3 From cf188406f006750ec7206e3dd2a6818c767729eb Mon Sep 17 00:00:00 2001 From: tgsm Date: Fri, 30 Apr 2021 04:30:27 -0400 Subject: Fix a bunch of function signatures A bunch of functions were thought to be returning/taking in an unk_204639c but they actually return/take an unksavstruct80. This fixes that, and also changes a couple of struct members, so this might be useful for scrcmd. --- include/script.h | 3 ++- include/unk_0204639C.h | 12 +++++++----- include/unk_0205FA2C.h | 14 +++++++------- 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/script.h b/include/script.h index 9a7270c2..bb237523 100644 --- a/include/script.h +++ b/include/script.h @@ -28,7 +28,8 @@ struct UnkSavStruct80 u8 padding[0x8]; u32 unk08; struct SaveBlock2 *saveBlock2; //0xC - u8 padding2[0xC]; + struct UnkStruct_0204639C *unk10; + u8 padding2[0x8]; u32 *mapId; //0x1C u8 padding3[0x18]; u32 unk38; diff --git a/include/unk_0204639C.h b/include/unk_0204639C.h index cff2241f..cebe192d 100644 --- a/include/unk_0204639C.h +++ b/include/unk_0204639C.h @@ -1,6 +1,8 @@ #ifndef GUARD_UNK_0204639C_H #define GUARD_UNK_0204639C_H +#include "script.h" + struct UnkStruct_0204639C; typedef BOOL (*UnkStruct_0204639C_cb)(struct UnkStruct_0204639C * ); @@ -13,18 +15,18 @@ struct UnkStruct_0204639C u32 * unkC; struct UnkStruct_0204639C * unk10; void * unk14; - struct UnkStruct_0204639C * unk18; + struct UnkSavStruct80 * unk18; u32 * unk1C; }; extern void LoadOverlay_MODULE_05(void *); -extern void FUN_020373D4(struct UnkStruct_0204639C *, u32, u32); +extern void FUN_020373D4(struct UnkSavStruct80 *, u32, u32); extern BOOL FUN_020373AC(void *); extern BOOL FUN_0203739C(void *); extern BOOL FUN_020373C4(void *); -struct UnkStruct_0204639C * FUN_0204639C(struct UnkStruct_0204639C * r5, UnkStruct_0204639C_cb r6, u32 * r7); -void FUN_020463CC(struct UnkStruct_0204639C * r5, UnkStruct_0204639C_cb r4, u32 * r6); +struct UnkStruct_0204639C * FUN_0204639C(struct UnkSavStruct80 * r5, UnkStruct_0204639C_cb r6, u32 * r7); +void FUN_020463CC(struct UnkSavStruct80 * r5, UnkStruct_0204639C_cb r4, u32 * r6); void FUN_020463EC(struct UnkStruct_0204639C * r4, UnkStruct_0204639C_cb r1, u32 * r2); void FUN_0204640C(struct UnkStruct_0204639C * r4, UnkStruct_0204639C_cb r1, u32 * r2); BOOL FUN_02046420(struct UnkStruct_0204639C * r5); @@ -37,6 +39,6 @@ void FUN_02046500(struct UnkStruct_0204639C * r6, u32 r5, u32 r4); u32 * FUN_0204652C(struct UnkStruct_0204639C * r0); u32 * FUN_02046530(struct UnkStruct_0204639C * r0); u32 FUN_02046534(struct UnkStruct_0204639C * r0); -struct UnkStruct_0204639C * FUN_02046528(struct UnkStruct_0204639C *); +struct UnkSavStruct80 * FUN_02046528(struct UnkStruct_0204639C *); #endif //GUARD_UNK_0204639C_H diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index e65507b7..19279a6c 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -81,13 +81,13 @@ struct UnkCallbackStruct2_0205FA2C }; THUMB_FUNC u32 FUN_0205FA2C( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1, u32 heap_id); THUMB_FUNC u32 FUN_0205FAD8( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC u32 FUN_0205FB34( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1, u32 heap_id); THUMB_FUNC u32 FUN_0205FBC0( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, void **param1, @@ -99,9 +99,9 @@ THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, u8 param7); THUMB_FUNC u32 FUN_0205FC9C( - struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC u32 FUN_0205FCC4( - struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FD38(struct UnkStruct_0204639C *param0, u16 param1, u16 param2, u16 param3); @@ -118,4 +118,4 @@ THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2); THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2); THUMB_FUNC BOOL FUN_02060144(u32 **param0); -#endif // POKEDIAMOND_UNK_0205FA2C_H \ No newline at end of file +#endif // POKEDIAMOND_UNK_0205FA2C_H -- cgit v1.2.3 From 6b6c7eab5f18fb21b6ca40795b1042d3bcf85ff3 Mon Sep 17 00:00:00 2001 From: fyren Date: Sat, 1 May 2021 12:09:14 +0200 Subject: decompile unk_0206015C --- include/unk_0206015C.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 include/unk_0206015C.h (limited to 'include') diff --git a/include/unk_0206015C.h b/include/unk_0206015C.h new file mode 100644 index 00000000..75d75c53 --- /dev/null +++ b/include/unk_0206015C.h @@ -0,0 +1,60 @@ +#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 +{ + u32 unk0; + u32 unk4; + u32 unk8; + u8 unkC; + u8 unkD; +}; + +struct UnkStruct_0204652C +{ + void* unk0; + u32 unk4; + u32 unk8; + u8 action; + u8 unkD; // some kind of counter? + u8 unkE; // some kind of counter? +}; + +THUMB_FUNC void FUN_0206015C(struct UnkSavStruct80* savStruct); +THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C * unkStruct0); + -- cgit v1.2.3 From ce5a50546d48ebe03adee670db617ec0deb30060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 1 May 2021 12:59:57 +0200 Subject: decompile unk_02031734.s --- include/unk_02031734.h | 223 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 include/unk_02031734.h (limited to 'include') diff --git a/include/unk_02031734.h b/include/unk_02031734.h new file mode 100644 index 00000000..0bfdc910 --- /dev/null +++ b/include/unk_02031734.h @@ -0,0 +1,223 @@ +#ifndef POKEDIAMOND_UNK_02031734_H +#define POKEDIAMOND_UNK_02031734_H + + +#include "global.h" +#include "MI_memory.h" +#include "heap.h" +#include "player_data.h" +#include "unk_0202F150.h" +#include "game_init.h" +#include "unk_0202F150.h" + + +struct UnkStruct_02031734_const1 +{ + u32 unk00[3]; +}; + +struct UnkStruct_02031734_const2 +{ + u32 unk00[2]; +}; + + +struct UnkStruct_02031734 +{ + void *unk00; + u8 unk04[6]; + s64 unk0C; + s64 unk14; + s64 unk1C; + void (*unk24)(); + struct SaveBlock2 *unk28; + struct PlayerData *unk2C; + u32 unk30; + u32 unk34; + u16 unk38; + u16 unk3A; + u8 unk3C; + u8 unk3D; + u8 unk3E; + u8 unk3F; + u8 unk40; + u8 unk41; + u8 unk42; + u8 unk43; + u8 unk44; + u8 unk45; + u8 unk46; + u8 unk47; + u8 unk48; + u8 unk49; + u8 unk4A; + u8 unk4B; + u8 unk4C; + u8 unk4D; + u8 unk4E; + u8 unk4F; +}; + + + + +THUMB_FUNC void FUN_02031734(struct SaveBlock2 *sav2, u8 param1); +THUMB_FUNC void FUN_020317C0(); +THUMB_FUNC BOOL FUN_02031810(); +THUMB_FUNC void FUN_02031824(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02031860(); +THUMB_FUNC void FUN_02031880(); +THUMB_FUNC void FUN_020318A4(u8 param0); +THUMB_FUNC void FUN_020318B4(); +THUMB_FUNC BOOL FUN_020318C4(); +THUMB_FUNC void FUN_02031914(); +THUMB_FUNC void FUN_02031924(); +THUMB_FUNC void FUN_02031934(); +THUMB_FUNC void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3); +THUMB_FUNC void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3); +THUMB_FUNC void FUN_020319D8(u8 param0); +THUMB_FUNC void FUN_020319F4(); +THUMB_FUNC void FUN_02031A08(); +THUMB_FUNC void FUN_02031A24(); +THUMB_FUNC BOOL FUN_02031A2C(); +THUMB_FUNC void FUN_02031A7C(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02031AC8(u8 param0); +THUMB_FUNC s32 FUN_02031AF4(); +THUMB_FUNC BOOL FUN_02031B2C(); +THUMB_FUNC void FUN_02031B50(); +THUMB_FUNC u32 FUN_02031BD0(); +THUMB_FUNC void FUN_02031BF4(); +THUMB_FUNC void FUN_02031C10(); +THUMB_FUNC void FUN_02031C2C(); +THUMB_FUNC void FUN_02031C54(); +THUMB_FUNC void FUN_02031C64(); +THUMB_FUNC void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1); +THUMB_FUNC void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1); +THUMB_FUNC void FUN_02031CDC(); +THUMB_FUNC void FUN_02031D20(void (*param0)(), u16 param1); +THUMB_FUNC void FUN_02031D30(); +THUMB_FUNC void FUN_02031E08(); +THUMB_FUNC void FUN_02031E8C(); +THUMB_FUNC void FUN_02031EE0(); +THUMB_FUNC void FUN_02031F60(); +THUMB_FUNC void FUN_02031FC8(); +THUMB_FUNC void FUN_02032028(); +THUMB_FUNC void FUN_02032040(); +THUMB_FUNC void FUN_02032058(); +THUMB_FUNC void FUN_020320C4(); +THUMB_FUNC void FUN_02032118(); +THUMB_FUNC void FUN_02032138(); +THUMB_FUNC void FUN_0203213C(); +THUMB_FUNC void FUN_02032140(); +THUMB_FUNC void FUN_02032178(); +THUMB_FUNC void FUN_02032194(); +THUMB_FUNC void FUN_020321B8(); +THUMB_FUNC void FUN_020321D0(); +THUMB_FUNC void FUN_02032218(); +THUMB_FUNC void FUN_02032234(); +THUMB_FUNC void FUN_0203224C(); +THUMB_FUNC void FUN_02032290(); +THUMB_FUNC void FUN_02032298(); +THUMB_FUNC void FUN_020322C0(); +THUMB_FUNC void FUN_020322F8(); +THUMB_FUNC void FUN_0203230C(); +THUMB_FUNC void FUN_0203234C(); +THUMB_FUNC void FUN_02032364(); +THUMB_FUNC void FUN_02032378(); +THUMB_FUNC void FUN_020323B8(); +THUMB_FUNC void FUN_020323BC(); +THUMB_FUNC void FUN_020323CC(); +THUMB_FUNC void FUN_020323DC(); +THUMB_FUNC void FUN_02032424(); +THUMB_FUNC void FUN_02032440(); +THUMB_FUNC void FUN_02032478(); +THUMB_FUNC void FUN_020324C8(); +THUMB_FUNC void FUN_020324F8(); +THUMB_FUNC void FUN_02032510(); +THUMB_FUNC void FUN_02032578(); +THUMB_FUNC void FUN_020325D0(); +THUMB_FUNC void FUN_02032628(); +THUMB_FUNC void FUN_02032640(); +THUMB_FUNC void FUN_0203266C(); +THUMB_FUNC void FUN_020326D0(); +THUMB_FUNC void FUN_02032738(); +THUMB_FUNC void FUN_0203279C(); +THUMB_FUNC void FUN_020327B4(); +THUMB_FUNC void FUN_020327B8(); +THUMB_FUNC void FUN_020327FC(); +THUMB_FUNC void FUN_02032850(); +THUMB_FUNC void FUN_02032888(); +THUMB_FUNC void FUN_020328C0(u8 param0); +THUMB_FUNC void FUN_020328E4(); +THUMB_FUNC void FUN_020328F4(u8 param0); +THUMB_FUNC void FUN_02032924(); +THUMB_FUNC void FUN_0203293C(); +THUMB_FUNC void FUN_02032978(); +THUMB_FUNC void FUN_020329F4(); +THUMB_FUNC void FUN_02032A8C(u8 param0, u32 param1, u8 *param2); +THUMB_FUNC void FUN_02032AEC(u32 param0, u32 param1, u8 *param2); +THUMB_FUNC u32 FUN_02032B68(); +THUMB_FUNC void FUN_02032B6C(u8 param0); +THUMB_FUNC void FUN_02032B84(); +THUMB_FUNC void FUN_02032B8C(); +THUMB_FUNC void FUN_02032BD0(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02032C0C(); +THUMB_FUNC u32 FUN_02032C28(); +THUMB_FUNC void FUN_02032C6C(u32 param0, u32 param1); +THUMB_FUNC void FUN_02032CF4(); +THUMB_FUNC void FUN_02032D44(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02032D80(); +THUMB_FUNC u8 FUN_02032D9C(); +THUMB_FUNC BOOL FUN_02032DAC(); +THUMB_FUNC void FUN_02032E00(); +THUMB_FUNC void FUN_02032E48(); +THUMB_FUNC void FUN_02032E8C(); +THUMB_FUNC void FUN_02032E90(); +THUMB_FUNC void FUN_02032EA8(); +THUMB_FUNC void FUN_02032EAC(); +THUMB_FUNC void FUN_02032EB0(); +THUMB_FUNC void FUN_02032F20(u32 param0); +THUMB_FUNC void FUN_02032F34(); +THUMB_FUNC void FUN_02032F98(); +THUMB_FUNC u32 FUN_02032FDC(u8 param0); +THUMB_FUNC u32 FUN_0203300C(); +THUMB_FUNC void FUN_02033060(); +THUMB_FUNC void FUN_020330A0(); +THUMB_FUNC void FUN_020330E4(); +THUMB_FUNC u8 FUN_02033128(); +THUMB_FUNC u32 FUN_02033138(); +THUMB_FUNC u32 FUN_02033154(); +THUMB_FUNC u32 FUN_02033180(); +THUMB_FUNC void FUN_0203318C(); +THUMB_FUNC void FUN_020331C4(); +THUMB_FUNC void FUN_020331E8(); +THUMB_FUNC void FUN_02033208(); +THUMB_FUNC void FUN_0203323C(); +THUMB_FUNC u32 FUN_02033250(); +THUMB_FUNC void FUN_02033288(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_020332DC(); +THUMB_FUNC void FUN_02033310(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02033364(); +THUMB_FUNC u32 FUN_02033398(); +THUMB_FUNC void FUN_020333F0(); +THUMB_FUNC void FUN_0203341C(); +THUMB_FUNC void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1); +THUMB_FUNC void *FUN_020334DC(); +THUMB_FUNC void FUN_020334E8(u8 param0, u8 param1); +THUMB_FUNC u8 FUN_02033510(); +THUMB_FUNC s32 FUN_02033534(); +THUMB_FUNC u8 FUN_0203354C(); +THUMB_FUNC void FUN_02033564(void *src); +THUMB_FUNC void FUN_02033578(void *dst); +THUMB_FUNC u32 FUN_02033590(); +THUMB_FUNC void FUN_020335A4(u8 param0); +THUMB_FUNC u8 FUN_020335B8(); +THUMB_FUNC void FUN_020335D0(s32 param0); +THUMB_FUNC void FUN_020335E0(); +THUMB_FUNC void FUN_020335F0(); +THUMB_FUNC void FUN_020335F4(); +THUMB_FUNC BOOL FUN_02033678(); +THUMB_FUNC u32 FUN_020336A0(u8 param0); + + +#endif //POKEDIAMOND_UNK_0202F150_H \ No newline at end of file -- cgit v1.2.3 From 56e5d2eac8ed953e9f52b5ae760fcfa72cc6a91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 1 May 2021 13:00:21 +0200 Subject: remove obsolete externs --- include/unk_0202F150.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 4542cdd1..49c58a52 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -105,7 +105,7 @@ THUMB_FUNC void FUN_0202FA5C(); THUMB_FUNC u32 FUN_0202FB18(u32 param0); THUMB_FUNC void FUN_0202FB20(); THUMB_FUNC void FUN_0202FB58(); -THUMB_FUNC u32 FUN_0202FB80(); +THUMB_FUNC BOOL FUN_0202FB80(); THUMB_FUNC void FUN_0202FC60(); THUMB_FUNC void FUN_0202FC80(); THUMB_FUNC void FUN_0202FCA8(); @@ -145,7 +145,7 @@ THUMB_FUNC void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0, THUMB_FUNC void FUN_02030DA4(); THUMB_FUNC void FUN_02030DFC(); THUMB_FUNC u32 FUN_02030E7C(u16 param0); -THUMB_FUNC u32 FUN_02030F20(); +THUMB_FUNC s32 FUN_02030F20(); THUMB_FUNC u32 FUN_02030F40(); THUMB_FUNC void FUN_02030F60(u8 param0); THUMB_FUNC u8 FUN_02030F74(u32 param0); -- cgit v1.2.3 From f447c9f02c12d2434f48ccf82cedfab0ea16b5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 1 May 2021 13:04:52 +0200 Subject: formatting --- include/unk_02031734.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/unk_02031734.h b/include/unk_02031734.h index 0bfdc910..c8098aec 100644 --- a/include/unk_02031734.h +++ b/include/unk_02031734.h @@ -1,15 +1,12 @@ #ifndef POKEDIAMOND_UNK_02031734_H #define POKEDIAMOND_UNK_02031734_H - #include "global.h" #include "MI_memory.h" +#include "game_init.h" #include "heap.h" #include "player_data.h" #include "unk_0202F150.h" -#include "game_init.h" -#include "unk_0202F150.h" - struct UnkStruct_02031734_const1 { @@ -21,7 +18,6 @@ struct UnkStruct_02031734_const2 u32 unk00[2]; }; - struct UnkStruct_02031734 { void *unk00; @@ -58,9 +54,6 @@ struct UnkStruct_02031734 u8 unk4F; }; - - - THUMB_FUNC void FUN_02031734(struct SaveBlock2 *sav2, u8 param1); THUMB_FUNC void FUN_020317C0(); THUMB_FUNC BOOL FUN_02031810(); @@ -219,5 +212,4 @@ THUMB_FUNC void FUN_020335F4(); THUMB_FUNC BOOL FUN_02033678(); THUMB_FUNC u32 FUN_020336A0(u8 param0); - -#endif //POKEDIAMOND_UNK_0202F150_H \ No newline at end of file +#endif // POKEDIAMOND_UNK_0202F150_H \ No newline at end of file -- cgit v1.2.3 From 62f567932f7e0eee6e8e354cde7e83472cb51887 Mon Sep 17 00:00:00 2001 From: fyren Date: Sat, 1 May 2021 23:07:29 +0200 Subject: fixing small issues in unk_0206015C --- include/unk_0206015C.h | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'include') 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 -- cgit v1.2.3 From aaaa27e731b1a39fbb35e21ff88f4944d74c9f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 2 May 2021 09:54:51 +0200 Subject: replace nonmatchings with an inline function --- include/unk_02031734.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/unk_02031734.h b/include/unk_02031734.h index c8098aec..bcfc3f84 100644 --- a/include/unk_02031734.h +++ b/include/unk_02031734.h @@ -22,9 +22,7 @@ struct UnkStruct_02031734 { void *unk00; u8 unk04[6]; - s64 unk0C; - s64 unk14; - s64 unk1C; + s64 unk0C[3]; void (*unk24)(); struct SaveBlock2 *unk28; struct PlayerData *unk2C; @@ -54,6 +52,15 @@ struct UnkStruct_02031734 u8 unk4F; }; + +inline u32 compute(s64 *param0, u32 param1) +{ + param0[0] = param0[1] * param0[0] + param0[2]; + + return (u32)(((s64)((u64)(param0[0]) >> 32) * param1) >> 32); +} + + THUMB_FUNC void FUN_02031734(struct SaveBlock2 *sav2, u8 param1); THUMB_FUNC void FUN_020317C0(); THUMB_FUNC BOOL FUN_02031810(); @@ -87,7 +94,7 @@ THUMB_FUNC void FUN_02031C64(); THUMB_FUNC void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1); THUMB_FUNC void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1); THUMB_FUNC void FUN_02031CDC(); -THUMB_FUNC void FUN_02031D20(void (*param0)(), u16 param1); +THUMB_FUNC void FUN_02031D20(void (*param0)(), u32 param1); THUMB_FUNC void FUN_02031D30(); THUMB_FUNC void FUN_02031E08(); THUMB_FUNC void FUN_02031E8C(); -- cgit v1.2.3 From a036306c5554d2d7088c07ea0c08c7b718a6508a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 2 May 2021 10:04:55 +0200 Subject: fix line endings --- include/unk_02031734.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/unk_02031734.h b/include/unk_02031734.h index bcfc3f84..53b1e0b7 100644 --- a/include/unk_02031734.h +++ b/include/unk_02031734.h @@ -219,4 +219,4 @@ THUMB_FUNC void FUN_020335F4(); THUMB_FUNC BOOL FUN_02033678(); THUMB_FUNC u32 FUN_020336A0(u8 param0); -#endif // POKEDIAMOND_UNK_0202F150_H \ No newline at end of file +#endif // POKEDIAMOND_UNK_0202F150_H -- cgit v1.2.3 From fe7f18002c7987ef744b5024151ca0903e4317fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 2 May 2021 10:14:04 +0200 Subject: cleanup header --- include/unk_02031734.h | 321 ++++++++++++++++++++++++------------------------- 1 file changed, 157 insertions(+), 164 deletions(-) (limited to 'include') diff --git a/include/unk_02031734.h b/include/unk_02031734.h index 53b1e0b7..baf3901f 100644 --- a/include/unk_02031734.h +++ b/include/unk_02031734.h @@ -2,11 +2,6 @@ #define POKEDIAMOND_UNK_02031734_H #include "global.h" -#include "MI_memory.h" -#include "game_init.h" -#include "heap.h" -#include "player_data.h" -#include "unk_0202F150.h" struct UnkStruct_02031734_const1 { @@ -52,7 +47,6 @@ struct UnkStruct_02031734 u8 unk4F; }; - inline u32 compute(s64 *param0, u32 param1) { param0[0] = param0[1] * param0[0] + param0[2]; @@ -60,163 +54,162 @@ inline u32 compute(s64 *param0, u32 param1) return (u32)(((s64)((u64)(param0[0]) >> 32) * param1) >> 32); } - -THUMB_FUNC void FUN_02031734(struct SaveBlock2 *sav2, u8 param1); -THUMB_FUNC void FUN_020317C0(); -THUMB_FUNC BOOL FUN_02031810(); -THUMB_FUNC void FUN_02031824(struct SaveBlock2 *sav2); -THUMB_FUNC void FUN_02031860(); -THUMB_FUNC void FUN_02031880(); -THUMB_FUNC void FUN_020318A4(u8 param0); -THUMB_FUNC void FUN_020318B4(); -THUMB_FUNC BOOL FUN_020318C4(); -THUMB_FUNC void FUN_02031914(); -THUMB_FUNC void FUN_02031924(); -THUMB_FUNC void FUN_02031934(); -THUMB_FUNC void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3); -THUMB_FUNC void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3); -THUMB_FUNC void FUN_020319D8(u8 param0); -THUMB_FUNC void FUN_020319F4(); -THUMB_FUNC void FUN_02031A08(); -THUMB_FUNC void FUN_02031A24(); -THUMB_FUNC BOOL FUN_02031A2C(); -THUMB_FUNC void FUN_02031A7C(struct SaveBlock2 *sav2); -THUMB_FUNC void FUN_02031AC8(u8 param0); -THUMB_FUNC s32 FUN_02031AF4(); -THUMB_FUNC BOOL FUN_02031B2C(); -THUMB_FUNC void FUN_02031B50(); -THUMB_FUNC u32 FUN_02031BD0(); -THUMB_FUNC void FUN_02031BF4(); -THUMB_FUNC void FUN_02031C10(); -THUMB_FUNC void FUN_02031C2C(); -THUMB_FUNC void FUN_02031C54(); -THUMB_FUNC void FUN_02031C64(); -THUMB_FUNC void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1); -THUMB_FUNC void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1); -THUMB_FUNC void FUN_02031CDC(); -THUMB_FUNC void FUN_02031D20(void (*param0)(), u32 param1); -THUMB_FUNC void FUN_02031D30(); -THUMB_FUNC void FUN_02031E08(); -THUMB_FUNC void FUN_02031E8C(); -THUMB_FUNC void FUN_02031EE0(); -THUMB_FUNC void FUN_02031F60(); -THUMB_FUNC void FUN_02031FC8(); -THUMB_FUNC void FUN_02032028(); -THUMB_FUNC void FUN_02032040(); -THUMB_FUNC void FUN_02032058(); -THUMB_FUNC void FUN_020320C4(); -THUMB_FUNC void FUN_02032118(); -THUMB_FUNC void FUN_02032138(); -THUMB_FUNC void FUN_0203213C(); -THUMB_FUNC void FUN_02032140(); -THUMB_FUNC void FUN_02032178(); -THUMB_FUNC void FUN_02032194(); -THUMB_FUNC void FUN_020321B8(); -THUMB_FUNC void FUN_020321D0(); -THUMB_FUNC void FUN_02032218(); -THUMB_FUNC void FUN_02032234(); -THUMB_FUNC void FUN_0203224C(); -THUMB_FUNC void FUN_02032290(); -THUMB_FUNC void FUN_02032298(); -THUMB_FUNC void FUN_020322C0(); -THUMB_FUNC void FUN_020322F8(); -THUMB_FUNC void FUN_0203230C(); -THUMB_FUNC void FUN_0203234C(); -THUMB_FUNC void FUN_02032364(); -THUMB_FUNC void FUN_02032378(); -THUMB_FUNC void FUN_020323B8(); -THUMB_FUNC void FUN_020323BC(); -THUMB_FUNC void FUN_020323CC(); -THUMB_FUNC void FUN_020323DC(); -THUMB_FUNC void FUN_02032424(); -THUMB_FUNC void FUN_02032440(); -THUMB_FUNC void FUN_02032478(); -THUMB_FUNC void FUN_020324C8(); -THUMB_FUNC void FUN_020324F8(); -THUMB_FUNC void FUN_02032510(); -THUMB_FUNC void FUN_02032578(); -THUMB_FUNC void FUN_020325D0(); -THUMB_FUNC void FUN_02032628(); -THUMB_FUNC void FUN_02032640(); -THUMB_FUNC void FUN_0203266C(); -THUMB_FUNC void FUN_020326D0(); -THUMB_FUNC void FUN_02032738(); -THUMB_FUNC void FUN_0203279C(); -THUMB_FUNC void FUN_020327B4(); -THUMB_FUNC void FUN_020327B8(); -THUMB_FUNC void FUN_020327FC(); -THUMB_FUNC void FUN_02032850(); -THUMB_FUNC void FUN_02032888(); -THUMB_FUNC void FUN_020328C0(u8 param0); -THUMB_FUNC void FUN_020328E4(); -THUMB_FUNC void FUN_020328F4(u8 param0); -THUMB_FUNC void FUN_02032924(); -THUMB_FUNC void FUN_0203293C(); -THUMB_FUNC void FUN_02032978(); -THUMB_FUNC void FUN_020329F4(); -THUMB_FUNC void FUN_02032A8C(u8 param0, u32 param1, u8 *param2); -THUMB_FUNC void FUN_02032AEC(u32 param0, u32 param1, u8 *param2); -THUMB_FUNC u32 FUN_02032B68(); -THUMB_FUNC void FUN_02032B6C(u8 param0); -THUMB_FUNC void FUN_02032B84(); -THUMB_FUNC void FUN_02032B8C(); -THUMB_FUNC void FUN_02032BD0(struct SaveBlock2 *sav2); -THUMB_FUNC void FUN_02032C0C(); -THUMB_FUNC u32 FUN_02032C28(); -THUMB_FUNC void FUN_02032C6C(u32 param0, u32 param1); -THUMB_FUNC void FUN_02032CF4(); -THUMB_FUNC void FUN_02032D44(struct SaveBlock2 *sav2); -THUMB_FUNC void FUN_02032D80(); -THUMB_FUNC u8 FUN_02032D9C(); -THUMB_FUNC BOOL FUN_02032DAC(); -THUMB_FUNC void FUN_02032E00(); -THUMB_FUNC void FUN_02032E48(); -THUMB_FUNC void FUN_02032E8C(); -THUMB_FUNC void FUN_02032E90(); -THUMB_FUNC void FUN_02032EA8(); -THUMB_FUNC void FUN_02032EAC(); -THUMB_FUNC void FUN_02032EB0(); -THUMB_FUNC void FUN_02032F20(u32 param0); -THUMB_FUNC void FUN_02032F34(); -THUMB_FUNC void FUN_02032F98(); -THUMB_FUNC u32 FUN_02032FDC(u8 param0); -THUMB_FUNC u32 FUN_0203300C(); -THUMB_FUNC void FUN_02033060(); -THUMB_FUNC void FUN_020330A0(); -THUMB_FUNC void FUN_020330E4(); -THUMB_FUNC u8 FUN_02033128(); -THUMB_FUNC u32 FUN_02033138(); -THUMB_FUNC u32 FUN_02033154(); -THUMB_FUNC u32 FUN_02033180(); -THUMB_FUNC void FUN_0203318C(); -THUMB_FUNC void FUN_020331C4(); -THUMB_FUNC void FUN_020331E8(); -THUMB_FUNC void FUN_02033208(); -THUMB_FUNC void FUN_0203323C(); -THUMB_FUNC u32 FUN_02033250(); -THUMB_FUNC void FUN_02033288(struct SaveBlock2 *sav2); -THUMB_FUNC void FUN_020332DC(); -THUMB_FUNC void FUN_02033310(struct SaveBlock2 *sav2); -THUMB_FUNC void FUN_02033364(); -THUMB_FUNC u32 FUN_02033398(); -THUMB_FUNC void FUN_020333F0(); -THUMB_FUNC void FUN_0203341C(); -THUMB_FUNC void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1); -THUMB_FUNC void *FUN_020334DC(); -THUMB_FUNC void FUN_020334E8(u8 param0, u8 param1); -THUMB_FUNC u8 FUN_02033510(); -THUMB_FUNC s32 FUN_02033534(); -THUMB_FUNC u8 FUN_0203354C(); -THUMB_FUNC void FUN_02033564(void *src); -THUMB_FUNC void FUN_02033578(void *dst); -THUMB_FUNC u32 FUN_02033590(); -THUMB_FUNC void FUN_020335A4(u8 param0); -THUMB_FUNC u8 FUN_020335B8(); -THUMB_FUNC void FUN_020335D0(s32 param0); -THUMB_FUNC void FUN_020335E0(); -THUMB_FUNC void FUN_020335F0(); -THUMB_FUNC void FUN_020335F4(); -THUMB_FUNC BOOL FUN_02033678(); -THUMB_FUNC u32 FUN_020336A0(u8 param0); +void FUN_02031734(struct SaveBlock2 *sav2, u8 param1); +void FUN_020317C0(); +BOOL FUN_02031810(); +void FUN_02031824(struct SaveBlock2 *sav2); +void FUN_02031860(); +void FUN_02031880(); +void FUN_020318A4(u8 param0); +void FUN_020318B4(); +BOOL FUN_020318C4(); +void FUN_02031914(); +void FUN_02031924(); +void FUN_02031934(); +void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3); +void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3); +void FUN_020319D8(u8 param0); +void FUN_020319F4(); +void FUN_02031A08(); +void FUN_02031A24(); +BOOL FUN_02031A2C(); +void FUN_02031A7C(struct SaveBlock2 *sav2); +void FUN_02031AC8(u8 param0); +s32 FUN_02031AF4(); +BOOL FUN_02031B2C(); +void FUN_02031B50(); +u32 FUN_02031BD0(); +void FUN_02031BF4(); +void FUN_02031C10(); +void FUN_02031C2C(); +void FUN_02031C54(); +void FUN_02031C64(); +void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1); +void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1); +void FUN_02031CDC(); +void FUN_02031D20(void (*param0)(), u32 param1); +void FUN_02031D30(); +void FUN_02031E08(); +void FUN_02031E8C(); +void FUN_02031EE0(); +void FUN_02031F60(); +void FUN_02031FC8(); +void FUN_02032028(); +void FUN_02032040(); +void FUN_02032058(); +void FUN_020320C4(); +void FUN_02032118(); +void FUN_02032138(); +void FUN_0203213C(); +void FUN_02032140(); +void FUN_02032178(); +void FUN_02032194(); +void FUN_020321B8(); +void FUN_020321D0(); +void FUN_02032218(); +void FUN_02032234(); +void FUN_0203224C(); +void FUN_02032290(); +void FUN_02032298(); +void FUN_020322C0(); +void FUN_020322F8(); +void FUN_0203230C(); +void FUN_0203234C(); +void FUN_02032364(); +void FUN_02032378(); +void FUN_020323B8(); +void FUN_020323BC(); +void FUN_020323CC(); +void FUN_020323DC(); +void FUN_02032424(); +void FUN_02032440(); +void FUN_02032478(); +void FUN_020324C8(); +void FUN_020324F8(); +void FUN_02032510(); +void FUN_02032578(); +void FUN_020325D0(); +void FUN_02032628(); +void FUN_02032640(); +void FUN_0203266C(); +void FUN_020326D0(); +void FUN_02032738(); +void FUN_0203279C(); +void FUN_020327B4(); +void FUN_020327B8(); +void FUN_020327FC(); +void FUN_02032850(); +void FUN_02032888(); +void FUN_020328C0(u8 param0); +void FUN_020328E4(); +void FUN_020328F4(u8 param0); +void FUN_02032924(); +void FUN_0203293C(); +void FUN_02032978(); +void FUN_020329F4(); +void FUN_02032A8C(u8 param0, u32 param1, u8 *param2); +void FUN_02032AEC(u32 param0, u32 param1, u8 *param2); +u32 FUN_02032B68(); +void FUN_02032B6C(u8 param0); +void FUN_02032B84(); +void FUN_02032B8C(); +void FUN_02032BD0(struct SaveBlock2 *sav2); +void FUN_02032C0C(); +u32 FUN_02032C28(); +void FUN_02032C6C(u32 param0, u32 param1); +void FUN_02032CF4(); +void FUN_02032D44(struct SaveBlock2 *sav2); +void FUN_02032D80(); +u8 FUN_02032D9C(); +BOOL FUN_02032DAC(); +void FUN_02032E00(); +void FUN_02032E48(); +void FUN_02032E8C(); +void FUN_02032E90(); +void FUN_02032EA8(); +void FUN_02032EAC(); +void FUN_02032EB0(); +void FUN_02032F20(u32 param0); +void FUN_02032F34(); +void FUN_02032F98(); +u32 FUN_02032FDC(u8 param0); +u32 FUN_0203300C(); +void FUN_02033060(); +void FUN_020330A0(); +void FUN_020330E4(); +u8 FUN_02033128(); +u32 FUN_02033138(); +u32 FUN_02033154(); +u32 FUN_02033180(); +void FUN_0203318C(); +void FUN_020331C4(); +void FUN_020331E8(); +void FUN_02033208(); +void FUN_0203323C(); +u32 FUN_02033250(); +void FUN_02033288(struct SaveBlock2 *sav2); +void FUN_020332DC(); +void FUN_02033310(struct SaveBlock2 *sav2); +void FUN_02033364(); +u32 FUN_02033398(); +void FUN_020333F0(); +void FUN_0203341C(); +void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1); +void *FUN_020334DC(); +void FUN_020334E8(u8 param0, u8 param1); +u8 FUN_02033510(); +s32 FUN_02033534(); +u8 FUN_0203354C(); +void FUN_02033564(void *src); +void FUN_02033578(void *dst); +u32 FUN_02033590(); +void FUN_020335A4(u8 param0); +u8 FUN_020335B8(); +void FUN_020335D0(s32 param0); +void FUN_020335E0(); +void FUN_020335F0(); +void FUN_020335F4(); +BOOL FUN_02033678(); +u32 FUN_020336A0(u8 param0); #endif // POKEDIAMOND_UNK_0202F150_H -- cgit v1.2.3 From 6120ebe7e78f500432708631891feb32bc974be2 Mon Sep 17 00:00:00 2001 From: tgsm Date: Mon, 3 May 2021 08:19:11 -0400 Subject: Decompile scrcmd_21 -> scrcmd_flags --- include/scrcmd.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index 120a0c96..f895323f 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -220,6 +220,28 @@ BOOL ScrCmd_Unk01F3(struct ScriptContext* ctx); //scrcmd_20.c BOOL ScrCmd_Unk02A6(struct ScriptContext* ctx); +//scrcmd_flags.c +BOOL ScrCmd_HasSinnohDex(struct ScriptContext* ctx); +BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0159(struct ScriptContext* ctx); +BOOL ScrCmd_Unk015A(struct ScriptContext* ctx); +BOOL ScrCmd_HasBadge(struct ScriptContext* ctx); +BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx); +BOOL ScrCmd_Unk015E(struct ScriptContext* ctx); +BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx); +BOOL ScrCmd_Unk015F(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0160(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0161(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0162(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0163(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0164(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0165(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0166(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0167(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01CF(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01D0(struct ScriptContext* ctx); +BOOL ScrCmd_Unk01D1(struct ScriptContext* ctx); + //scrcmd_items.c BOOL ScrCmd_GiveItem(struct ScriptContext* ctx); BOOL ScrCmd_TakeItem(struct ScriptContext* ctx); -- cgit v1.2.3 From fead56db333c9eb3024ad4483c26a11a66ffe9f1 Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 5 May 2021 14:10:45 -0400 Subject: Decompile unk_0208890C --- include/script.h | 4 +++- include/unk_0208890C.h | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 include/unk_0208890C.h (limited to 'include') diff --git a/include/script.h b/include/script.h index bb237523..cb41889d 100644 --- a/include/script.h +++ b/include/script.h @@ -37,7 +37,9 @@ struct UnkSavStruct80 u32 unk60; u8 padding5[0x14]; u32 unk78; - u8 padding6[0x2C]; + u8 padding6[0x1C]; + void *unk98; + u8 padding7[0xC]; struct UnkStruct_02046444 * unkA8; }; diff --git a/include/unk_0208890C.h b/include/unk_0208890C.h new file mode 100644 index 00000000..9ec040a1 --- /dev/null +++ b/include/unk_0208890C.h @@ -0,0 +1,25 @@ +#ifndef POKEDIAMOND_UNK_0208890C_H +#define POKEDIAMOND_UNK_0208890C_H + +struct Bag; +struct Options; +struct PlayerData; +struct SaveBlock2; + +struct UnkStruct_0208890C +{ + u8 padding[0x4]; + void* unk4; + void* unk8; + struct SaveBlock2* sav2; + struct PlayerData* player; + struct Bag* bag; + struct Options* options; + void* unk1C; +}; + +struct UnkStruct_0208890C* FUN_0208890C(void*, struct SaveBlock2* sav2, u32 heap_id, void*); +void FUN_02088950(struct UnkSavStruct80*, struct UnkStruct_0208890C*); +struct UnkStruct_0208890C* FUN_02088960(struct UnkSavStruct80*, void*, u32 heap_id); + +#endif -- cgit v1.2.3 From 5cdb95f4e0fb866fdbf219ab112d69be21c59a2e Mon Sep 17 00:00:00 2001 From: tgsm Date: Fri, 7 May 2021 13:32:25 -0400 Subject: Decompile scrcmd_8 --- include/scrcmd.h | 3 +++ include/unk_020286F8.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index f895323f..86bb4f51 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -150,6 +150,9 @@ BOOL ScrCmd_Unk02CC(struct ScriptContext* ctx); BOOL ScrCmd_GetSealNamePlural(struct ScriptContext* ctx); BOOL ScrCmd_CapitalizeFirstChar(struct ScriptContext* ctx); +//scrcmd_8.c +BOOL ScrCmd_Unk021D(struct ScriptContext* ctx); + //scrcmd_11.c BOOL ScrCmd_Unk017D(struct ScriptContext* ctx); BOOL ScrCmd_Unk017E(struct ScriptContext* ctx); diff --git a/include/unk_020286F8.h b/include/unk_020286F8.h index 3d81753a..99ecd982 100644 --- a/include/unk_020286F8.h +++ b/include/unk_020286F8.h @@ -21,10 +21,10 @@ void FUN_02028788(struct UnkSaveStruct_020286F8 * ptr, u32 i, u32 j); u32 FUN_020287A4(struct UnkSaveStruct_020286F8 * ptr); u16 * FUN_020287A8(struct UnkSaveStruct_020286F8 * ptr, u32 i, u32 j); void FUN_020287C0(struct UnkSaveStruct_020286F8 * ptr, u32 i, u32 j, struct String * k); -void FUN_020287EC(struct UnkSaveStruct_020286F8 * ptr, u32 i, u8 j); +void FUN_020287EC(struct UnkSaveStruct_020286F8 * ptr, u32 i, u32 j); u8 FUN_020287F8(struct UnkSaveStruct_020286F8 * ptr, u32 i); u8 FUN_02028804(struct UnkSaveStruct_020286F8 * ptr, u32 i); -void FUN_02028810(struct UnkSaveStruct_020286F8 * ptr, u32 i, u8 j); +void FUN_02028810(struct UnkSaveStruct_020286F8 * ptr, u32 i, u32 j); struct UnkSaveStruct_020286F8 * FUN_0202881C(struct SaveBlock2 * sav2); BOOL FUN_02028828(struct UnkSaveStruct_020286F8 * ptr, u32 i); BOOL FUN_02028840(struct UnkSaveStruct_020286F8 * ptr, int i); -- cgit v1.2.3 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