From 6d21084ba2e05e53ae36692c871ee7004eb7a1bc Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Mon, 2 Jun 2025 17:32:05 +0200
Subject: [PATCH] sync ListMenuTemplate

---
 include/list_menu.h | 39 ++++++++++++++++++++-------------------
 src/list_menu.c     | 10 ++++++++--
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/include/list_menu.h b/include/list_menu.h
index 6dd982801..c0dba9704 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -52,25 +52,26 @@ enum ListMenuFields
 
 struct ListMenuTemplate
 {
-    /*0x00*/ const struct ListMenuItem *items;
-    /*0x04*/ void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-    /*0x08*/ void (* itemPrintFunc)(u8 windowId, u32 itemId, u8 y);
-    /*0x0C*/ u16 totalItems;
-    /*0x0E*/ u16 maxShowed;
-    /*0x10*/ u8 windowId;
-    /*0x11*/ u8 header_X;
-    /*0x12*/ u8 item_X;
-    /*0x13*/ u8 cursor_X;
-    /*0x14*/ u8 upText_Y:4; // x1, x2, x4, x8 = xF
-             u8 cursorPal:4; // x10, x20, x40, x80 = xF0
-    /*0x15*/ u8 fillValue:4; // x1, x2, x4, x8 = xF
-             u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
-    /*0x16*/ u8 lettersSpacing:3;
-             u8 itemVerticalPadding:3;
-             u8 scrollMultiple:2; // x40, x80 = xC0
-    /*0x17*/ u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
-             u8 cursorKind:2; // x40, x80
-}; /* size = 0x18 */
+    const struct ListMenuItem *items;
+    void (*moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
+    void (*itemPrintFunc)(u8 windowId, u32 itemId, u8 y);
+    u32 totalItems:12;
+    u32 maxShowed:12;
+    u32 textNarrowWidth:8;
+    u8 windowId;
+    u8 header_X;
+    u8 item_X;
+    u8 cursor_X;
+    u8 upText_Y:4; // x1, x2, x4, x8 = xF
+    u8 cursorPal:4; // x10, x20, x40, x80 = xF0
+    u8 fillValue:4; // x1, x2, x4, x8 = xF
+    u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
+    u8 lettersSpacing:3;
+    u8 itemVerticalPadding:3;
+    u8 scrollMultiple:2; // x40, x80 = xC0
+    u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
+    u8 cursorKind:2; // x40, x80
+};
 
 struct ListMenu
 {
diff --git a/src/list_menu.c b/src/list_menu.c
index 2a7577c6e..a78825b54 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -269,18 +269,24 @@ static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y)
     u8 colors[3];
     if (gListMenuOverride.enabled)
     {
+        u32 fontId = gListMenuOverride.fontId;
+        if (list->template.textNarrowWidth)
+            fontId = GetFontIdToFit(str, fontId, gListMenuOverride.lettersSpacing, list->template.textNarrowWidth);
         colors[0] = gListMenuOverride.fillValue;
         colors[1] = gListMenuOverride.cursorPal;
         colors[2] = gListMenuOverride.cursorShadowPal;
-        AddTextPrinterParameterized4(list->template.windowId, gListMenuOverride.fontId, x, y, gListMenuOverride.lettersSpacing, 0, colors, TEXT_SKIP_DRAW, str);
+        AddTextPrinterParameterized4(list->template.windowId, fontId, x, y, gListMenuOverride.lettersSpacing, 0, colors, TEXT_SKIP_DRAW, str);
         gListMenuOverride.enabled = FALSE;
     }
     else
     {
+        u32 fontId = list->template.fontId;
+        if (list->template.textNarrowWidth)
+            fontId = GetFontIdToFit(str, fontId, list->template.lettersSpacing, list->template.textNarrowWidth);
         colors[0] = list->template.fillValue;
         colors[1] = list->template.cursorPal;
         colors[2] = list->template.cursorShadowPal;
-        AddTextPrinterParameterized4(list->template.windowId, list->template.fontId, x, y, list->template.lettersSpacing, 0, colors, TEXT_SKIP_DRAW, str);
+        AddTextPrinterParameterized4(list->template.windowId, fontId, x, y, list->template.lettersSpacing, 0, colors, TEXT_SKIP_DRAW, str);
     }
 }