diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 3 | ||||
| -rw-r--r-- | include/party_menu.h | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/ewram.h b/include/ewram.h index 6be4cd50a..e0beaa420 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -186,8 +186,7 @@ extern u8 gSharedMem[]; #define EWRAM_19348 ((u16 *)(gSharedMem + 0x19348)) #define eWRAM_19348Struct ((struct EWRAM_19348_Struct *)(gSharedMem + 0x19348)) #define ewram1A000 (&gSharedMem[0x1A000]) -#define ewram1B000 (*(struct Unk201B000 *)(gSharedMem + 0x1B000)) -#define EWRAM_1C000 (*(struct Struct201C000 *)(gSharedMem + 0x1C000)) +#define ePartyMenu2 (*(struct Unk201B000 *)(gSharedMem + 0x1B000)) #define gPartyMenu (*(struct PartyMenu *)(gSharedMem + 0x1C000)) #define sCreditsData (*(struct CreditsData *)(gSharedMem + 0x1C000)) diff --git a/include/party_menu.h b/include/party_menu.h index b991d8297..bfd2c6cae 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -81,6 +81,19 @@ struct Unk2001000 u16 array[53561]; }; +struct PartyMenu +{ + /*0x00*/ struct Pokemon *pokemon; + /*0x04*/ u8 unk4; + /*0x05*/ u8 primarySelectedMonIndex; + /*0x06*/ u16 secondarySelectedIndex; + /*0x08*/ u16 unk8; + /*0x0A*/ u8 pad_0A[2]; + /*0x0C*/ s32 unkC; + /*0x10*/ TaskFunc unk10; + /*0x14*/ TaskFunc unk14; +}; + void CB2_PartyMenuMain(void); void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed); void SetPartyMenuSettings(u8 menuType, u8 battleTypeFlags, TaskFunc menuHandlerFunc, u8 textId); |