From 93cd06195985eaa52d3dca28a42434009369b2cf Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 28 Feb 2017 04:12:14 +0000 Subject: start decompiling script_pokemon_util_80F99CC.c --- include/battle_party_menu.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 include/battle_party_menu.h (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h new file mode 100644 index 000000000..c808cdcd7 --- /dev/null +++ b/include/battle_party_menu.h @@ -0,0 +1,21 @@ +#ifndef GUARD_BATTLE_PARTY_MENU_H +#define GUARD_BATTLE_PARTY_MENU_H + +struct UnknownStruct1 +{ + u8 filler0[0x259]; + u8 unk259; + u8 filler25A[6]; + u8 unk260; + u8 filler261[1]; + u8 unk262; + s16 unk264; + s16 unk266; +}; + +extern u8 unk_2000000[]; + +#define EWRAM_1609D unk_2000000[0x1609D] +#define EWRAM_1B000 (*(struct UnknownStruct1 *)(unk_2000000 + 0x1B000)) + +#endif -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- include/battle_party_menu.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index c808cdcd7..d0ae8da35 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -13,8 +13,23 @@ struct UnknownStruct1 s16 unk266; }; +struct PartyMenuItem +{ + const u8 *text; + TaskFunc func; +}; + +struct PartyPopupMenu +{ + u8 unk0; + u8 unk1; + const u8 *unk4; +}; + extern u8 unk_2000000[]; +void SetUpBattlePokemonMenu(u8); + #define EWRAM_1609D unk_2000000[0x1609D] #define EWRAM_1B000 (*(struct UnknownStruct1 *)(unk_2000000 + 0x1B000)) -- cgit v1.2.3 From ddc846fa6a0d9a13cfba6f52488a66f6f4562a2d Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 27 Apr 2017 15:43:31 +0200 Subject: Sort includes --- include/battle_party_menu.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index d0ae8da35..b9c3ad707 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_PARTY_MENU_H #define GUARD_BATTLE_PARTY_MENU_H +#include "task.h" + struct UnknownStruct1 { u8 filler0[0x259]; -- cgit v1.2.3 From 4c91ef5f49f5f8fb5aff42257807e5480e64dd65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 10 Jun 2017 23:37:25 -0500 Subject: move rom_8094928.c into battle_party_menu.c --- include/battle_party_menu.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index b9c3ad707..11752296b 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -3,7 +3,8 @@ #include "task.h" -struct UnknownStruct1 +// TODO: Unify all of the 0x0201B000 structs +struct Struct201B000 { u8 filler0[0x259]; u8 unk259; @@ -33,6 +34,6 @@ extern u8 unk_2000000[]; void SetUpBattlePokemonMenu(u8); #define EWRAM_1609D unk_2000000[0x1609D] -#define EWRAM_1B000 (*(struct UnknownStruct1 *)(unk_2000000 + 0x1B000)) +#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000)) #endif -- cgit v1.2.3 From 0de38858f641934699ce934e2bdb3dc1495baec9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 16 Jun 2017 17:46:13 -0500 Subject: decompile sub_8121E10 - sub_8122838 --- include/battle_party_menu.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index 11752296b..a7d46a462 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -3,19 +3,6 @@ #include "task.h" -// TODO: Unify all of the 0x0201B000 structs -struct Struct201B000 -{ - u8 filler0[0x259]; - u8 unk259; - u8 filler25A[6]; - u8 unk260; - u8 filler261[1]; - u8 unk262; - s16 unk264; - s16 unk266; -}; - struct PartyMenuItem { const u8 *text; @@ -34,6 +21,5 @@ extern u8 unk_2000000[]; void SetUpBattlePokemonMenu(u8); #define EWRAM_1609D unk_2000000[0x1609D] -#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000)) #endif -- cgit v1.2.3 From 14b1a94d7266cc24447d34145decf818e930e747 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 17 Jun 2017 21:38:01 -0500 Subject: finish decompiling choose_party --- include/battle_party_menu.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index a7d46a462..71bd2cf51 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -1,25 +1,9 @@ #ifndef GUARD_BATTLE_PARTY_MENU_H #define GUARD_BATTLE_PARTY_MENU_H -#include "task.h" - -struct PartyMenuItem -{ - const u8 *text; - TaskFunc func; -}; - -struct PartyPopupMenu -{ - u8 unk0; - u8 unk1; - const u8 *unk4; -}; - extern u8 unk_2000000[]; +#define EWRAM_1609D unk_2000000[0x1609D] void SetUpBattlePokemonMenu(u8); -#define EWRAM_1609D unk_2000000[0x1609D] - #endif -- cgit v1.2.3