From 8017dfaf1618258c2506bcbf3f0221eea56c1438 Mon Sep 17 00:00:00 2001 From: Cuyler36 Date: Fri, 23 Jun 2023 15:42:35 -0400 Subject: [PATCH] Predeclare Submenu type --- include/m_submenu.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/m_submenu.h b/include/m_submenu.h index 92b50576..65cfe100 100644 --- a/include/m_submenu.h +++ b/include/m_submenu.h @@ -12,6 +12,8 @@ extern "C" { #endif +typedef struct submenu_s Submenu; + enum { mSM_PROCESS_WAIT, mSM_PROCESS_PREWAIT, @@ -30,8 +32,8 @@ typedef struct submenu_item_s { typedef void (*SUBMENU_PROC)(Submenu*); typedef void (*SUBMENU_GAME_PROC)(Submenu*, GAME*); -/* sizeof (Submenu) == 0x1B8 */ -typedef struct submenu_s { +/* sizeof (struct submenu_s) == 0x1B8 */ +struct submenu_s { /* 0x000 */ int mode; /* 0x004 */ int menu_type; /* 0x008 */ int current_menu_type; @@ -62,7 +64,7 @@ typedef struct submenu_s { /* 0x178 */ s16 item_num; /* number of items in the item array */ /* 0x17A */ s16 selected_item_num; /* number of selected items in the item array */ /* 0x17C */ Submenu_Item_c items[mPr_POCKETS_SLOT_COUNT]; /* item buffer, entries are only set when an item is selected by the player */ -} Submenu; +}; #ifdef __cplusplus }