diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /include/battle_party_menu.h | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'include/battle_party_menu.h')
| -rw-r--r-- | include/battle_party_menu.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index b9c3ad707..5112c7b3c 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; @@ -15,24 +16,11 @@ 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)) +#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000)) #endif |