chore: add more MenuStruct defs

This commit is contained in:
Seth Barberee 2023-02-26 08:36:23 -08:00
parent e9b94680da
commit 371316ae49
15 changed files with 28 additions and 47 deletions

View File

@ -3,6 +3,7 @@
#include "text.h"
#include "menu.h"
#include "menu_input.h"
enum DebugMenuOptions
{

View File

@ -1,6 +1,7 @@
#ifndef GUARD_FRIEND_AREA_ACTION_MENU_H
#define GUARD_FRIEND_AREA_ACTION_MENU_H
#include "menu.h"
struct unkStruct_203B2BC
{
// size: 0x1E0
@ -21,15 +22,15 @@ struct unkStruct_203B2BC
u32 unk70;
s32 unk74;
u32 unk78;
u32 unk7C;
u8 fill80[0xFD - 0x80];
struct MenuStruct unk7C;
u8 fill80[0xFD - 0xCC];
u32 unkFD;
u8 fill101[0x11C - 0x104];
struct MenuItem menuItems[4];
u8 fill120[0x16C - 0x13C];
// Structure of some sort
u32 unk16C;
u16 unk16C;
u8 fill170[0x180 - 0x170];
struct UnkTextStruct2 unk180[4];

View File

@ -18,8 +18,8 @@ struct unkStruct_203B26C
u32 unk24;
struct MenuItem unk28[8];
u16 unk68[8];
u32 unk78;
u8 fill7C[0x118 - 0x7C];
struct MenuStruct unk78;
u8 fillC8[0x118 - 0xC8];
/* 0x118 */ struct OpenedFile *faceFile;
/* 0x11C */ u8 *faceData;
/* 0x120 */ u16 unk120;

View File

@ -10,7 +10,7 @@ struct MenuItem
struct MenuStruct
{
// size: 0x50
u8 *unk0;
const u8 *unk0; // header text?
/* 0x4 */ const struct MenuItem *menuItems;
const u32 *menuTextColorArray;
u16 *unkC;

View File

@ -3,6 +3,7 @@
#include "menu.h"
#include "game_options.h"
#include "text.h"
#include "menu_input.h"
struct unkStruct_203B25C
{
@ -11,8 +12,7 @@ struct unkStruct_203B25C
u32 chosenHintIndex;
struct GameOptions newOptions;
u32 unk18;
const char *unk1C;
u8 fill20[0x6C - 0x20];
struct MenuStruct unk1C;
struct MenuItem menuItems[8];
u16 unkAC[8];
struct UnkTextStruct2 unkBC[4];
@ -28,15 +28,12 @@ extern void sub_801E0FC();
extern void HandleChangeSettingsMenu();
extern void sub_801DD84();
extern void sub_801DED0();
extern void sub_8012D60(const char **, struct MenuItem *, u32, u16 *, u32, u32);
extern u32 sub_801E198(struct GameOptions *);
extern void sub_8014248(const char *, u32, u32, struct MenuItem *, u32, u32, u32, u32, u32);
extern void CreateHintDisplayScreen(u32);
extern void sub_801E3F0(u32);
extern void CreateHintSelectionScreen(u32);
extern void CreateChangeSettingsConfirmMenu(void);
extern u8 sub_8012FD8(u32 *);
extern void sub_8013114(u32 *, u32 *);
extern u32 sub_801E474(u32);
extern u32 GetChosenHintIndex(void);
extern void sub_801E54C(void);
@ -47,7 +44,6 @@ extern void sub_801E2C4(void);
extern s32 sub_80144A4(s32 *);
extern void SetWindowBGColor(void);
extern void sub_8099690(u32);
extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *);
extern struct GameOptions *gGameOptionsRef;
extern struct unkStruct_203B25C *gUnknown_203B25C;
@ -350,7 +346,7 @@ void sub_801DED0(void)
switch(gUnknown_203B25C->state) {
case 0:
case 1:
gUnknown_203B25C->unk1C = gOthers_MenuOption;
gUnknown_203B25C->unk1C.unk0 = gOthers_MenuOption;
sub_8012D60(&gUnknown_203B25C->unk1C,gUnknown_203B25C->menuItems,0,gUnknown_203B25C->unkAC,gUnknown_203B25C->unk18,0);
break;
case 3:
@ -420,8 +416,8 @@ void HandleOthersMenu(void)
s32 menuAction;
menuAction = 0;
if (sub_8012FD8((u32 *)&gUnknown_203B25C->unk1C) == '\0') {
sub_8013114((u32 *)&gUnknown_203B25C->unk1C,&menuAction);
if (sub_8012FD8(&gUnknown_203B25C->unk1C) == '\0') {
sub_8013114(&gUnknown_203B25C->unk1C,&menuAction);
gUnknown_203B25C->unk18 = menuAction;
}
switch(menuAction)

View File

@ -4,12 +4,10 @@
extern struct unkStruct_203B3F8 *gUnknown_203B3F8;
extern u32 sub_8013BBC(u32 *);
extern u8 sub_8012FD8(void *);
extern void sub_803AE58(void);
extern u32 sub_8016080(void);
extern void sub_803ACD0(u32);
extern void sub_80160D8(void);
extern void sub_8013114(void *, s32 *);
extern u32 sub_8023A94(u32);
extern s16 sub_8023B44(void);

View File

@ -7,12 +7,12 @@
#include "pokemon.h"
#include "team_inventory.h"
#include "friend_area_action_menu.h"
#include "menu_input.h"
extern struct unkStruct_203B2BC *gUnknown_203B2BC;
extern void sub_80141B4(const char *r0, u32, u32 *r1, u32);
extern void sub_8014248(const char *r0, u32, u32, struct MenuItem *r4, u32, u32, u32, u32 *r5, u32);
extern void sub_8012D60(u32 *, struct MenuItem *, u32, u32 *, u32, u32);
extern void sub_8027D40(u32, struct BulkItem *);
extern void sub_8023868(u32, u32, u32, u32);
extern void sub_8023B7C(u32);
@ -30,7 +30,6 @@ extern void sub_801B3C0(struct Item *);
extern void unk_CopyMoves4To8(struct Move *, struct Move *);
extern void sub_801EE10(u32, s16, struct Move *, u32, u32, u32);
extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *);
extern void SetFriendAreaActionMenuState(u32);
extern void ResetSprites(u8 );
extern void sub_802719C();

View File

@ -6,6 +6,7 @@
#include "team_inventory.h"
#include "pokemon.h"
#include "friend_area_action_menu.h"
#include "menu_input.h"
extern struct unkStruct_203B2BC *gUnknown_203B2BC;
extern struct TeamInventory *gTeamInventory_203B460;
@ -16,8 +17,6 @@ extern u32 sub_801EF38(u8 r0);
extern void sub_801F214();
extern void SetFriendAreaActionMenuState(u32);
extern u8 sub_8012FD8(u32 *r0);
extern void sub_8013114(u32 *, s32 *);
extern void PlaySound(u32);
extern void nullsub_104();
extern void sub_801A928();

View File

@ -1,11 +1,13 @@
#include "global.h"
#include "constants/dungeon.h"
#include "item.h"
#include "menu.h"
#include "pokemon.h"
#include "text.h"
#include "team_inventory.h"
#include "constants/move.h"
#include "code_800D090.h"
#include "menu_input.h"
struct unkStruct_203B2B8
{
@ -26,9 +28,8 @@ struct unkStruct_203B2B8
u32 unk70;
u32 unk74;
u32 unk78;
u32 unk7C;
u8 fill80[0xCC - 0x80];
u32 unkCC;
struct MenuStruct unk7C;
struct MenuStruct unkCC;
};
extern struct unkStruct_203B2B8 *gUnknown_203B2B8;
extern u8 gAvailablePokemonNames[0x58];
@ -69,8 +70,6 @@ extern void nullsub_104(void);
extern void sub_801A928(void);
extern void sub_8099690(u32);
extern u32 sub_801A6E8(u32);
extern u8 sub_8012FD8(u32 *);
extern void sub_8013114(u32 *, s32 *);
extern u32 sub_801A8AC(void);
extern u32 sub_8022860(void);

View File

@ -6,6 +6,7 @@
#include "input.h"
#include "menu.h"
#include "gulpin_shop.h"
#include "menu_input.h"
extern struct unkStruct_203B26C *gUnknown_203B26C;
extern void UpdateGulpinShopState(u32);
@ -14,8 +15,6 @@ extern void sub_801F214(void);
extern s32 sub_80144A4(s32 *);
extern u32 sub_801F890(void);
extern void sub_801F8D0(void);
extern u8 sub_8012FD8(u32 *);
extern void sub_8013114(u32 *, u32 *);
extern u8 IsNextMoveLinked(u32, struct Move *);
extern void PlaySound(u32);
extern void sub_801EF38(u32);

View File

@ -9,6 +9,7 @@
#include "random.h"
#include "text.h"
#include "team_inventory.h"
#include "menu_input.h"
struct unkStruct_203B2B0
{
@ -32,8 +33,8 @@ struct unkStruct_203B2B0
u32 unk30;
struct MenuItem unk34[8];
u16 unk74[0x8];
u32 unk84;
u8 fill88[0x104 - 0x88];
struct MenuStruct unk84;
u8 fillD4[0x104 - 0xD4];
struct OpenedFile *unk104;
u8 *unk108;
u16 unk10C;
@ -111,7 +112,6 @@ extern void nullsub_104();
void sub_8024DBC(void);
void sub_8024E30(void);
void sub_801AEE4(u32, u32);
extern void sub_8012D60(u32 *, struct MenuItem *, u32, u16 *, u32, u32);
void sub_808F734(struct PokemonStruct *, s16);
void BoundedCopyStringtoBuffer(u8 *buffer, u8 *string, s32 size);
u32 sub_801602C(u32 r0, u8 *name);
@ -121,8 +121,6 @@ extern s32 sub_801A8AC(void);
extern void sub_8099690(u32);
extern void sub_801A928(void);
extern void PlayMenuSoundEffect(u32);
extern u8 sub_8012FD8(u32 *);
extern void sub_8013114(u32 *, u32 *);
extern u32 sub_801B410(void);
extern void sub_801B450(void);
extern u32 sub_8016080(void);

View File

@ -10,6 +10,7 @@
#include "rescue_password_menu.h"
#include "code_8094F88.h"
#include "wonder_mail.h"
#include "menu_input.h"
extern u8 gRescuePasswordBuffer[];
extern u32 gUnknown_202EC4C;
@ -34,8 +35,6 @@ extern u32 sub_8039068(u32, u8 *passwordBuffer, struct unkStruct_203B480 *r0);
extern void sub_80951BC(struct unkStruct_203B480 *r0);
extern bool8 sub_80951FC(struct unkStruct_203B480 *r0);
extern u8 sub_8012FD8(struct MenuStruct *r0);
extern void sub_8013114(struct MenuStruct *, s32 *);
extern u32 sub_80154F0(void);
extern void sub_8095274(u32);
extern u32 sub_8031DCC(void);

View File

@ -6,6 +6,7 @@
#include "memory.h"
#include "text.h"
#include "save.h"
#include "menu_input.h"
struct unkSprite
{
@ -136,12 +137,9 @@ extern void ResetSprites(u32);
extern void sub_8038440();
extern void sub_8035CF4(struct MenuStruct *, u32, u32);
extern void SetMenuItems(struct MenuStruct *, struct UnkTextStruct2 *, u32, const struct UnkTextStruct2 *, const struct MenuItem *, u32, u32, u32);
extern u8 sub_80130A8(struct MenuStruct *);
extern void sub_8013114(struct MenuStruct *, u32 *);
extern void sub_80384D0();
extern void sub_8038830();
extern void sub_80388C4(void);
extern u8 sub_8012FD8(struct MenuStruct *);
extern void sub_8014114();
extern void sub_80140F8(void);
extern void sub_8035CC0(struct UnkTextStruct2 *, u32);

View File

@ -4,6 +4,7 @@
#include "memory.h"
#include "menu.h"
#include "text.h"
#include "menu_input.h"
struct unkSprite
{
@ -33,8 +34,6 @@ extern void AddSprite(struct unkSprite *, u32, u32, u32);
extern void sub_8038440();
extern void sub_8035CF4(struct MenuStruct *, u32, u32);
extern void SetMenuItems(struct MenuStruct *, struct UnkTextStruct2 *, u32, struct UnkTextStruct2 *, struct MenuItem *, u32, u32, u32);
extern u8 sub_80130A8(struct MenuStruct *);
extern void sub_8013114(struct MenuStruct *, u32 *);
extern void sub_80384D0();
void sub_80382E4(s32 param_1)

View File

@ -9,6 +9,7 @@
#include "rescue_team_info.h"
#include "friend_area.h"
#include "item.h"
#include "menu_input.h"
struct unkStruct_803B344
{
@ -34,8 +35,7 @@ struct unkStruct_203B30C
u8 fill4D[0x58 - 0x4D];
u8 *unk58;
u32 unk5C;
u32 unk60;
u8 fill64[0xB0 - 0x64];
struct MenuStruct unk60;
struct MenuItem unkB0[8];
struct UnkTextStruct2 unkF0[4];
};
@ -101,7 +101,6 @@ extern struct unkStruct_203B314 *gUnknown_203B314;
extern u8 sub_802FCF0(u32);
extern void sub_802F9C0(void);
extern void sub_802FA50(void);
extern void sub_8012D08(struct UnkTextStruct2 *, u32);
extern void sub_8013818(u32 *, u32, u32, u32);
extern u32 sub_802FBF4(void);
extern void sub_8013878(u32 *, s32);
@ -119,18 +118,14 @@ extern void sub_801B72C(void);
extern u32 sub_801B6AC(void);
extern void sub_802F108(void);
extern s32 sub_80144A4(s32 *);
extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *);
extern void sub_803B35C(struct WonderMail*, u32 *);
extern void sub_802DE84(u32 *);
extern void sub_8012D60(u32 *, struct MenuItem *, u32, u16 *, u32, u32);
extern void sub_802CDD4(u32);
extern void sub_802CED8(u32);
extern void sub_802CFD0(void);
extern u8 sub_802CEBC(void);
extern u32 sub_802CE5C(u32);
extern void sub_802CF14(void);
extern u8 sub_8012FD8(u32 *r0);
extern void sub_8013114(u32 *, s32 *);
extern u32 sub_802DEE0(void);
extern void sub_802DF24(void);
extern void PrintPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon);