From 697c2313123690ebb4af45629cbc337d19941d04 Mon Sep 17 00:00:00 2001 From: red031000 Date: Mon, 9 Nov 2020 19:49:19 +0000 Subject: start decompiling mod21_02254854 --- arm9/modules/21/include/mod21_02254854.h | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 arm9/modules/21/include/mod21_02254854.h (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h new file mode 100644 index 00000000..061e7e4b --- /dev/null +++ b/arm9/modules/21/include/mod21_02254854.h @@ -0,0 +1,8 @@ +#ifndef POKEDIAMOND_MOD21_02254854_H +#define POKEDIAMOND_MOD21_02254854_H + +#include "nitro/types.h" + +BOOL MOD21_02254854(u32 *param0, u32 param1, u32 param2, u32 param3); + +#endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From ebbcd4c9d985bd3c66e45fee6cf201525d501633 Mon Sep 17 00:00:00 2001 From: red031000 Date: Tue, 10 Nov 2020 16:38:39 +0000 Subject: mod21_0225489C --- arm9/modules/21/include/mod21_02254854.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index 061e7e4b..dc68ebeb 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -3,6 +3,19 @@ #include "nitro/types.h" -BOOL MOD21_02254854(u32 *param0, u32 param1, u32 param2, u32 param3); +typedef struct UnkStruct02254854 +{ + u8 bytearray[8]; + u8 padding0[8]; + BOOL Unk10; + u32 Unk14[2]; + u8 padding1[4]; + u32 Unk20; + u32 Unk24; + u32 Unk28; +} UnkStruct02254854; + +BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3); +BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3); #endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From 32fbb72519542c49ac8c33cdc8f4ebf7d808871c Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 12 Nov 2020 18:15:46 +0000 Subject: mod21_02254918 --- arm9/modules/21/include/mod21_02254854.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index dc68ebeb..c04959b3 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -17,5 +17,6 @@ typedef struct UnkStruct02254854 BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3); BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3); +void MOD21_02254918(UnkStruct02254854 *param0); #endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From bc3be40047d1b9ec45e7b355dff2280e7c5faa0a Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 14 Nov 2020 00:07:14 +0000 Subject: more mod 21 --- arm9/modules/21/include/mod21_02254854.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index c04959b3..dabacf1c 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -18,5 +18,8 @@ typedef struct UnkStruct02254854 BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3); BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3); void MOD21_02254918(UnkStruct02254854 *param0); +void MOD21_02254930(u32 param0, UnkStruct02254854 *param1); +void MOD21_0225496C(UnkStruct02254854 *param0); +void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3); #endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From 89476f60f8b7bdef718c566252421922c1ace7a2 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 18 Nov 2020 14:22:17 +0000 Subject: mod21_02254990 --- arm9/modules/21/include/mod21_02254854.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index dabacf1c..26ef3e87 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -21,5 +21,6 @@ void MOD21_02254918(UnkStruct02254854 *param0); void MOD21_02254930(u32 param0, UnkStruct02254854 *param1); void MOD21_0225496C(UnkStruct02254854 *param0); void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3); +void MOD21_02254990(UnkStruct02254854 * param0, u8 param1); #endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From 18795a69f067096ce79e9aa3ca8bfa41ca0e400c Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 18 Nov 2020 14:39:57 +0000 Subject: mod21_022549A4 --- arm9/modules/21/include/mod21_02254854.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index 26ef3e87..e6b6c3cf 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -22,5 +22,6 @@ void MOD21_02254930(u32 param0, UnkStruct02254854 *param1); void MOD21_0225496C(UnkStruct02254854 *param0); void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3); void MOD21_02254990(UnkStruct02254854 * param0, u8 param1); +BOOL MOD21_022549A4(UnkStruct02254854 * param0); #endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From c3419a42429718f57f3de5d19e2cd44a18e53033 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 18 Nov 2020 18:19:26 +0000 Subject: fully decomp mod21_02254854.o --- arm9/modules/21/include/mod21_02254854.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index e6b6c3cf..b501962e 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -23,5 +23,7 @@ void MOD21_0225496C(UnkStruct02254854 *param0); void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3); void MOD21_02254990(UnkStruct02254854 * param0, u8 param1); BOOL MOD21_022549A4(UnkStruct02254854 * param0); +BOOL MOD21_022549E4(UnkStruct02254854 * param0); +BOOL MOD21_02254A38(UnkStruct02254854 * param0); #endif //POKEDIAMOND_MOD21_02254854_H -- cgit v1.2.3 From b929414450ac7ee42268815a4a6c913a955476e4 Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 19 Nov 2020 18:57:14 +0000 Subject: start decompiling mod21_02254A6C --- arm9/modules/21/include/mod21_02254A6C.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 arm9/modules/21/include/mod21_02254A6C.h (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h new file mode 100644 index 00000000..9c37ecc5 --- /dev/null +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -0,0 +1,17 @@ +#ifndef POKEDIAMOND_MOD21_02254A6C_H +#define POKEDIAMOND_MOD21_02254A6C_H + +#include "nitro/types.h" + +typedef struct UnkStruct02254A6C +{ + void *Unk00; + u32 Unk04; + u32 Unk08[1]; + u8 padding0[0x24]; + u32 Unk30[1]; +} UnkStruct02254A6C; + +BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); + +#endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 0a7108543bb346f86b6688b11e45cd478df3d890 Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 19 Nov 2020 21:10:49 +0000 Subject: mod21_02254AD4 --- arm9/modules/21/include/mod21_02254A6C.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 9c37ecc5..71bc78e7 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -13,5 +13,6 @@ typedef struct UnkStruct02254A6C } UnkStruct02254A6C; BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); +void MOD21_02254AD4(void *param0, void *param1); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 2e10bebe00a1c459c13854230a3014881d02e312 Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 19 Nov 2020 22:16:42 +0000 Subject: a bit of cleanup --- arm9/modules/21/include/mod21_02254854.h | 1 + arm9/modules/21/include/mod21_02254A6C.h | 1 + 2 files changed, 2 insertions(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index b501962e..cc716a1d 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -2,6 +2,7 @@ #define POKEDIAMOND_MOD21_02254854_H #include "nitro/types.h" +#include "mod21_02254A6C.h" typedef struct UnkStruct02254854 { diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 71bc78e7..493c2746 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -14,5 +14,6 @@ typedef struct UnkStruct02254A6C BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); +void MOD21_02254B04(void *param0); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 408f6b2f49ab9bfd4523c373f2342af7d2fe63cf Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 2 Dec 2020 21:30:04 +0000 Subject: MOD21_02254B10 --- arm9/modules/21/include/mod21_02254854.h | 2 +- arm9/modules/21/include/mod21_02254A6C.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index cc716a1d..26501f35 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -12,7 +12,7 @@ typedef struct UnkStruct02254854 u32 Unk14[2]; u8 padding1[4]; u32 Unk20; - u32 Unk24; + void *Unk24; u32 Unk28; } UnkStruct02254854; diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 493c2746..64857190 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -15,5 +15,6 @@ typedef struct UnkStruct02254A6C BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); void MOD21_02254B04(void *param0); +void MOD21_02254B10(u32 *param0, u32 param1); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 21ff3852f8fd49e9f491a2a12fb81d43e5147727 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 2 Dec 2020 22:14:27 +0000 Subject: 2 more funcs --- arm9/modules/21/include/mod21_02254A6C.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 64857190..c2eba5b7 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -16,5 +16,7 @@ BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); void MOD21_02254B04(void *param0); void MOD21_02254B10(u32 *param0, u32 param1); +BOOL MOD21_02254B34(void *param0, u32 param1); +BOOL MOD21_02254B40(void *param0); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 8c4c85d47a2457e524eb63f91ef32f2c8cd8c38d Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 5 Dec 2020 21:19:20 +0000 Subject: two mod 21 funcs --- arm9/modules/21/include/mod21_02254A6C.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index c2eba5b7..d0fc3284 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -12,11 +12,19 @@ typedef struct UnkStruct02254A6C u32 Unk30[1]; } UnkStruct02254A6C; +typedef struct UnkStruct02254B60 +{ + u32 Unk00; + u32 Unk04; +} UnkStruct02254B60; + BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); void MOD21_02254B04(void *param0); void MOD21_02254B10(u32 *param0, u32 param1); BOOL MOD21_02254B34(void *param0, u32 param1); BOOL MOD21_02254B40(void *param0); +BOOL MOD21_02254B4C(void *param0); +BOOL MOD21_02254B60(u32 param0, void *param1); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 87be48c985eeb0c1c8faf2817898f4cef3d4830f Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 5 Dec 2020 22:31:04 +0000 Subject: small cleanup + another func --- arm9/modules/21/include/mod21_02254A6C.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index d0fc3284..5376e325 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -26,5 +26,6 @@ BOOL MOD21_02254B34(void *param0, u32 param1); BOOL MOD21_02254B40(void *param0); BOOL MOD21_02254B4C(void *param0); BOOL MOD21_02254B60(u32 param0, void *param1); +BOOL MOD21_02254BF4(u32 param0, void *param1); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From a3060d816a528bdef9f5b6da7246c423a46fce61 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 6 Dec 2020 19:50:02 +0000 Subject: almost finished --- arm9/modules/21/include/mod21_02254A6C.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 5376e325..568ec26f 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -3,20 +3,17 @@ #include "nitro/types.h" -typedef struct UnkStruct02254A6C +typedef struct UnkStruct02254A6C UnkStruct02254A6C; + +struct UnkStruct02254A6C { - void *Unk00; + UnkStruct02254A6C *Unk00; u32 Unk04; u32 Unk08[1]; - u8 padding0[0x24]; + u32 Unk0C; + u8 padding0[0x20]; u32 Unk30[1]; -} UnkStruct02254A6C; - -typedef struct UnkStruct02254B60 -{ - u32 Unk00; - u32 Unk04; -} UnkStruct02254B60; +}; BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); @@ -27,5 +24,7 @@ BOOL MOD21_02254B40(void *param0); BOOL MOD21_02254B4C(void *param0); BOOL MOD21_02254B60(u32 param0, void *param1); BOOL MOD21_02254BF4(u32 param0, void *param1); +BOOL MOD21_02254C14(u32 param0, void *param1); +BOOL MOD21_02254C40(u32 param0, void *param1); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3 From 12c64ee79eabced2a1cc1fc83209be37142bc44c Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 11 Dec 2020 21:07:34 +0000 Subject: match all of module 21 --- arm9/modules/21/include/mod21_02254A6C.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arm9/modules/21/include') diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 568ec26f..bae9cab6 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -15,6 +15,13 @@ struct UnkStruct02254A6C u32 Unk30[1]; }; +typedef struct UnkOverlayStruct1 +{ + u32 number; + BOOL (*func)(u32 param0, void *param1); + u32 Unk08; +} UnkOverlayStruct1; //todo should probably be in mod 20 header + BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); void MOD21_02254B04(void *param0); @@ -26,5 +33,6 @@ BOOL MOD21_02254B60(u32 param0, void *param1); BOOL MOD21_02254BF4(u32 param0, void *param1); BOOL MOD21_02254C14(u32 param0, void *param1); BOOL MOD21_02254C40(u32 param0, void *param1); +void MOD21_02254C5C(UnkStruct02254A6C *param0); #endif //POKEDIAMOND_MOD21_02254A6C_H -- cgit v1.2.3