Pass struct array to PrintMenuItems

5 files changed, 14 insertions, 20 deletions

diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 7e00223ce..8865eeb57 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -11,7 +11,7 @@
 
 extern u8 gSystemText_ClearAllSaveDataPrompt[];
 extern u8 gSystemText_ClearingData[];
-extern u8 *gUnknown_08376D74[][2];
+extern const struct MenuAction gUnknown_08376D74[];
 
 static void VBlankCB_ClearSaveDataScreen(void);
 static void Task_InitMenu(u8);
diff --git a/src/main_menu.c b/src/main_menu.c
index 02aabbb64..274386b03 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -57,9 +57,9 @@ extern const struct SpritePalette gMonPaletteTable[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern void * const gUnknown_081FAF4C[];
 extern u16 gUnknown_081E795C[];
-extern u8 * const gUnknown_081E79B0[][2];
-extern u8 * const gMalePresetNames[][2];
-extern u8 * const gFemalePresetNames[][2];
+extern const struct MenuAction gUnknown_081E79B0[];
+extern const struct MenuAction gMalePresetNames[];
+extern const struct MenuAction gFemalePresetNames[];
 
 extern const u8 gUnknown_081E764C[];
 extern const u8 gUnknown_081E768C[];
@@ -1645,9 +1645,9 @@ static void SetPresetPlayerName(u8 index)
     u8 *name;
 
     if (gSaveBlock2.playerGender == MALE)
-        name = gMalePresetNames[index][0];
+        name = gMalePresetNames[index].text;
     else
-        name = gFemalePresetNames[index][0];
+        name = gFemalePresetNames[index].text;
 
     for (i = 0; i < 7; i++)
         gSaveBlock2.playerName[i] = name[i];
diff --git a/src/menu.c b/src/menu.c
index 3b0440afb..62237794b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -39,7 +39,7 @@ EWRAM_DATA u16 gMenuTextWindowTileOffset = 0;
 EWRAM_DATA u16 gMenuTextWindowContentTileOffset = 0;
 EWRAM_DATA u16 gMenuMessageBoxContentTileOffset = 0;
 
-extern const u8 *gUnknown_08376D74[][2];
+extern const struct MenuAction gUnknown_08376D74[];
 
 void InitMenuWindow(const struct WindowConfig *winConfig)
 {
@@ -540,25 +540,25 @@ u8 sub_807288C(u8 column)
     return gMenu.columnXCoords[column];
 }
 
-void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, u8 * const menuItems[][2])
+void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[])
 {
     u8 i;
 
     for (i = 0; i < menuItemCount; i++)
-        MenuPrint(menuItems[i][0], left, top + 2 * i);
+        MenuPrint(menuItems[i].text, left, top + 2 * i);
 }
 
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, u8 * const menuItems[][2], u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], u8 *order)
 {
     u8 i;
 
     for (i = 0; i < menuItemCount; i++)
-        MenuPrint(menuItems[order[i]][0], left, top + 2 * i);
+        MenuPrint(menuItems[order[i]].text, left, top + 2 * i);
 }
 
 void InitYesNoMenu(u8 left, u8 top, u8 a3)
 {
-    PrintMenuItems(left + 1, top + 1, 2, (void *)gUnknown_08376D74);
+    PrintMenuItems(left + 1, top + 1, 2, gUnknown_08376D74);
     InitMenu(0, left + 1, top + 1, 2, 0, a3);
 }
 
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index b8fe92b9a..4e6708037 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -8,17 +8,11 @@
 
 extern u8 (*gCallback_03004AE8)(void);
 
-struct DebugMenuAction
-{
-   u8 *text;
-   u8 (*func)(void);
-};
-
 extern u8 gUnknown_0839B24D[];
 extern u8 gUnknown_0839B255[];
 extern u8 gUnknown_0839B257[];
 
-extern struct DebugMenuAction gMoriDebugMenuActions[];
+extern const struct MenuAction gMoriDebugMenuActions[];
 
 extern u8 gSpeciesNames[][11];
 
diff --git a/src/wallclock.c b/src/wallclock.c
index b6d648d33..e3b79efea 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -20,7 +20,7 @@ extern struct SpritePalette gUnknown_083F7AA0;
 extern u8 gUnknown_08E95774[];
 extern u8 gUnknown_08E954B0[];
 extern u8 gOtherText_CorrectTimePrompt[];
-extern u8 * const gUnknown_08376D74[][2];
+extern const struct MenuAction gUnknown_08376D74[];
 extern s8 gClockHandCoords[][2];
 
 extern struct SpriteTemplate gSpriteTemplate_83F7AD8;