chore: continue to use more MenuStruct around the code

This commit is contained in:
Seth Barberee
2023-02-25 10:21:10 -08:00
parent 08f7182576
commit 9aeb855d41
26 changed files with 99 additions and 124 deletions

View File

@@ -33,8 +33,7 @@ struct unkStruct_203B3F8
u16 unk6;
struct PokemonStruct *pokemon;
u32 unkC;
const char *unk10;
u8 fill14[0x60 - 0x14];
struct MenuStruct unk10;
u32 unk60;
u32 unk64;
u32 unk68;

View File

@@ -25,8 +25,7 @@ struct unkStruct_203B210
u32 unk30;
struct MenuItem unk34[8];
u16 unk74[8];
u32 unk84;
u8 fill88[0xD4 - 0x88];
struct MenuStruct unk84;
struct OpenedFile *faceFile;
u8 *unkD8;
u16 unkDC;

View File

@@ -19,8 +19,7 @@ struct unkStruct_203B304
u8 fill51[0x64 - 0x51];
u32 unk64;
u32 unk68;
u32 unk6C;
u8 fill70[0xBC - 0x70];
struct MenuStruct unk6C;
struct MenuItem unkBC[8];
u16 unkFC[8];
struct UnkTextStruct2 unk10C[4];

View File

@@ -11,7 +11,7 @@ struct MenuStruct
{
// size: 0x50
u8 *unk0;
/* 0x4 */ struct MenuItem *menuItems;
/* 0x4 */ const struct MenuItem *menuItems;
const u32 *menuTextColorArray;
u16 *unkC;
/* 0x10 */ s32 index;
@@ -23,9 +23,9 @@ struct MenuStruct
u16 unk38;
u8 fill3A[0x48 - 0x3A];
/* 0x48 */ s32 menuAction;
u8 unk4C;
u8 unk4D;
u8 unk4E;
bool8 unk4C;
bool8 unk4D;
bool8 unk4E;
};
#endif // GUARD_MENU_H

15
include/menu_input.h Normal file
View File

@@ -0,0 +1,15 @@
#include "menu.h"
void sub_8012BC4(u32 x, u32 y, s32 n, s32 len, u32 param_5, u32 param_6);
void sub_8012C60(u32 x,u32 y,u32 param_3,u32 param_4,u32 param_5);
void sub_8012CAC(struct UnkTextStruct2 *param_1, const struct MenuItem *param_2);
void sub_8012D08(struct UnkTextStruct2 *param_1, s32 param_2);
void sub_8012D34(struct UnkTextStruct2 *param_1, s32 param_2);
void sub_8012D60(struct MenuStruct *param_1,const struct MenuItem *menuItems,u32 *colorArray,u16 *param_4,s32 param_5, s32 index);
void sub_8012E04(struct MenuStruct *param_1,const struct MenuItem *menuItems,u32 *colorArray,u16 *param_4,s32 param_5, s32 index);
void sub_8012EA4(struct MenuStruct *param_1, bool8 r1);
void sub_8012EBC(struct MenuStruct *param_1);
u8 sub_8012FD8(struct MenuStruct *param_1);
u8 sub_80130A8(struct MenuStruct *param_1);
bool8 sub_8013114(struct MenuStruct *param_1, s32 *menuAction);

View File

@@ -1,3 +1,4 @@
#include "menu.h"
struct unkStruct_203B2F4
{
u8 fill0[0x1A];
@@ -50,9 +51,8 @@ struct unkStruct_203B2F8
u32 unk6C;
u32 unk70;
u32 unk74;
u8 unk78[0xC8 - 0x78];
u8 unkC8[4];
u8 fillCC[0x118 - 0xCC];
struct MenuStruct unk78;
struct MenuStruct unkC8;
struct MenuItem unk118[8];
struct MenuItem unk158[8];
u16 unk198[8];