fixed more header issue

4 files changed, 5 insertions, 9 deletions

diff --git a/include/menu.h b/include/menu.h
index 3cd7b140a..cc685d682 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -55,6 +55,8 @@ s8 Menu_ProcessInput_other(void);
 s8 Menu_ProcessInputNoWrapAround(void);
 s8 Menu_ProcessInput(void);
 u8 Menu_GetCursorPos(void);
+u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta);
+u8 Menu_MoveCursor(s8 cursorDelta);
 u8 Menu_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos);
 u8 Menu_InitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos, bool8 APressMuted);
 void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 notUsed, bool8 copyToVram);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 72e014653..7fe8c19b2 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -4,7 +4,8 @@
 #include "global.h"
 #include "task.h"
 
-struct YesNoFuncTable {
+struct YesNoFuncTable
+{
     TaskFunc yesFunc;
     TaskFunc noFunc;
 };
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index c52741d92..d68957e62 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -48,7 +48,5 @@ void sub_80F7974(const u8 * text);
 void sub_80F7998(void);
 void sub_80F79A4(void);
 void SetDefaultFontsPointer(void);
-u8 GetFontAttribute(u8 fontId, u8 attributeId);
-u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/src/menu.c b/src/menu.c
index ac2e0160b..844878017 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -47,8 +47,6 @@ static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLef
 static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
 static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
 static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY);
-u8 Menu_MoveCursor(s8 cursorDelta);
-void DestroyYesNoMenu(void);
 
 void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
 {
@@ -213,7 +211,6 @@ void TopBarWindowPrintString(const u8 *string, u8 unUsed, bool8 copyToVram)
     }
 }
 
-
 void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 notUsed, bool8 copyToVram)
 {
     struct TextColor color;
@@ -308,7 +305,7 @@ static u8 sub_810F818(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8
     return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos);
 }
 
-void RedrawMenuCursor(u8 oldPos, u8 newPos)
+static void RedrawMenuCursor(u8 oldPos, u8 newPos)
 {
     u8 width, height;
 
@@ -480,9 +477,7 @@ void PrintMultichoiceListItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineH
     u8 i;
 
     for (i = 0; i < itemCount; i++)
-    {
         AddTextPrinterParameterized5(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL, letterSpacing, lineSpacing);
-    }
     CopyWindowToVram(windowId, 2);
 }