From 17f024a5179351f68eba823f61f02f2c2f934112 Mon Sep 17 00:00:00 2001 From: SNBeast Date: Sun, 27 Jun 2021 19:03:01 -0400 Subject: Decompile unk_02088DD8.s --- include/unk_02088DD8.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/unk_02088DD8.h b/include/unk_02088DD8.h index 318a98fb..41e7232e 100644 --- a/include/unk_02088DD8.h +++ b/include/unk_02088DD8.h @@ -1,6 +1,10 @@ #ifndef POKEDIAMOND_UNK_02088DD8_H #define POKEDIAMOND_UNK_02088DD8_H +#include "unk_020377F0.h" + +extern void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl); + struct Options; struct PlayerData; struct Pokemon; @@ -16,4 +20,9 @@ struct UnkStruct_02088DD8 u8 padding2[0x2]; }; +struct UnkStruct_02088DD8* FUN_02088DD8(u32 r0); +void FUN_02088DF0(struct UnkStruct_02037CF0 *r0); +void* Maybe_GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); +BOOL FUN_02088EF8(u16 *r0); + #endif -- cgit v1.2.3 From 93c3498a65ff4e47367a5d98bd9c6f8fe1f33f89 Mon Sep 17 00:00:00 2001 From: SNBeast Date: Sun, 27 Jun 2021 19:16:57 -0400 Subject: Not maybe, if I am wrong let me be corrected --- include/unk_02088DD8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/unk_02088DD8.h b/include/unk_02088DD8.h index 41e7232e..78ff4827 100644 --- a/include/unk_02088DD8.h +++ b/include/unk_02088DD8.h @@ -22,7 +22,7 @@ struct UnkStruct_02088DD8 struct UnkStruct_02088DD8* FUN_02088DD8(u32 r0); void FUN_02088DF0(struct UnkStruct_02037CF0 *r0); -void* Maybe_GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); +void* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); BOOL FUN_02088EF8(u16 *r0); #endif -- cgit v1.2.3 From 029dab952d33320442fe2a46879b32175c536a79 Mon Sep 17 00:00:00 2001 From: SNBeast Date: Mon, 28 Jun 2021 23:18:38 -0400 Subject: Another code review's suggestions --- include/unk_02088DD8.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/unk_02088DD8.h b/include/unk_02088DD8.h index 78ff4827..7b023c56 100644 --- a/include/unk_02088DD8.h +++ b/include/unk_02088DD8.h @@ -3,8 +3,6 @@ #include "unk_020377F0.h" -extern void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl); - struct Options; struct PlayerData; struct Pokemon; @@ -20,9 +18,9 @@ struct UnkStruct_02088DD8 u8 padding2[0x2]; }; -struct UnkStruct_02088DD8* FUN_02088DD8(u32 r0); +struct UnkStruct_02088DD8* FUN_02088DD8(u32 heap_id); void FUN_02088DF0(struct UnkStruct_02037CF0 *r0); -void* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); +u16* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); BOOL FUN_02088EF8(u16 *r0); #endif -- cgit v1.2.3 From 837cd799f76c81e762113bb46dd50176ac614dde Mon Sep 17 00:00:00 2001 From: tgsm Date: Tue, 29 Jun 2021 02:46:32 -0500 Subject: Decompile unk_02034188 --- include/unk_02034188.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 include/unk_02034188.h (limited to 'include') diff --git a/include/unk_02034188.h b/include/unk_02034188.h new file mode 100644 index 00000000..02ade1f0 --- /dev/null +++ b/include/unk_02034188.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_UNK_02034188_H +#define POKEDIAMOND_UNK_02034188_H + +void ShowWFCUserInfoWarning(u32 heap_id, u32 a1); + +#endif -- cgit v1.2.3 From 0b35e2ff770f77b17504f7e72780f8af6c4a6e2d Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 19:11:50 -0500 Subject: unk_02064E20 matching --- include/unk_02064E20.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 include/unk_02064E20.h (limited to 'include') diff --git a/include/unk_02064E20.h b/include/unk_02064E20.h new file mode 100644 index 00000000..5a00f5d1 --- /dev/null +++ b/include/unk_02064E20.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_UNK_02064E20_H +#define POKEDIAMOND_UNK_02064E20_H + +void FUN_02064E20(struct UnkSavStruct80* unk0); + +#endif // POKEDIAMOND_UNK_02064E20_H -- cgit v1.2.3 From 2b644a764835f018c78778f99efbfbaaa3471016 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 20:18:05 -0500 Subject: unk_020061E8 matching --- include/unk_020061E8.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/unk_020061E8.h (limited to 'include') diff --git a/include/unk_020061E8.h b/include/unk_020061E8.h new file mode 100644 index 00000000..a2d571bf --- /dev/null +++ b/include/unk_020061E8.h @@ -0,0 +1,9 @@ +#ifndef POKEDIAMOND_UNK_020061E8_H +#define POKEDIAMOND_UNK_020061E8_H + +#include "text.h" + +BOOL FUN_020061E8(void (*r0)(u32, struct TextPrinter *), u32 r1, u32 r2, u32 r3); +void FUN_0200621C(s32 r0); + +#endif // POKEDIAMOND_UNK_020061E8_H -- cgit v1.2.3 From 24f7cbde0538943fed6ab2185122e7d0c0522795 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 20:42:04 -0500 Subject: unk_020222E8 matching --- include/unk_020222E8.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 include/unk_020222E8.h (limited to 'include') diff --git a/include/unk_020222E8.h b/include/unk_020222E8.h new file mode 100644 index 00000000..ac6e1932 --- /dev/null +++ b/include/unk_020222E8.h @@ -0,0 +1,11 @@ +#ifndef POKEDIAMOND_UNK_020222E8_H +#define POKEDIAMOND_UNK_020222E8_H + +void * FUN_020222E8(); +void * FUN_020222F0(); +void * FUN_020222F8(); +void * FUN_02022300(); +void * FUN_02022308(); +void * FUN_02022310(); + +#endif // POKEDIAMOND_UNK_020222E8_H -- cgit v1.2.3 From c2bf79632520de7963788973b32649db3c55ff97 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 21:19:22 -0500 Subject: Added some includes --- include/unk_020061E8.h | 1 + include/unk_02064E20.h | 2 ++ 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/unk_020061E8.h b/include/unk_020061E8.h index a2d571bf..d94ea88f 100644 --- a/include/unk_020061E8.h +++ b/include/unk_020061E8.h @@ -1,6 +1,7 @@ #ifndef POKEDIAMOND_UNK_020061E8_H #define POKEDIAMOND_UNK_020061E8_H +#include "nitro/types.h" #include "text.h" BOOL FUN_020061E8(void (*r0)(u32, struct TextPrinter *), u32 r1, u32 r2, u32 r3); diff --git a/include/unk_02064E20.h b/include/unk_02064E20.h index 5a00f5d1..a9bcd0e0 100644 --- a/include/unk_02064E20.h +++ b/include/unk_02064E20.h @@ -1,6 +1,8 @@ #ifndef POKEDIAMOND_UNK_02064E20_H #define POKEDIAMOND_UNK_02064E20_H +#include "script.h" + void FUN_02064E20(struct UnkSavStruct80* unk0); #endif // POKEDIAMOND_UNK_02064E20_H -- cgit v1.2.3 From 50cfe8341dd239857d0d1a0c87dbb08849de51d0 Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 30 Jun 2021 21:47:57 -0500 Subject: Name unk_02034188 -> wfc_user_info_warning --- include/unk_02034188.h | 6 ------ include/wfc_user_info_warning.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 include/unk_02034188.h create mode 100644 include/wfc_user_info_warning.h (limited to 'include') diff --git a/include/unk_02034188.h b/include/unk_02034188.h deleted file mode 100644 index 02ade1f0..00000000 --- a/include/unk_02034188.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEDIAMOND_UNK_02034188_H -#define POKEDIAMOND_UNK_02034188_H - -void ShowWFCUserInfoWarning(u32 heap_id, u32 a1); - -#endif diff --git a/include/wfc_user_info_warning.h b/include/wfc_user_info_warning.h new file mode 100644 index 00000000..2ddb8890 --- /dev/null +++ b/include/wfc_user_info_warning.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_WFC_USER_INFO_WARNING_H +#define POKEDIAMOND_WFC_USER_INFO_WARNING_H + +void ShowWFCUserInfoWarning(u32 heap_id, u32 a1); + +#endif -- cgit v1.2.3