From 3efb581e7e8e8091d1d8f6ff3c588fc44f754b40 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 15 May 2025 04:37:57 -0300 Subject: [PATCH] Linked STARTMENU labels to the entries of sStartMenuActionTable This makes it easier to remove options from the start menu at will. Looking for a STARTMENU label and removing it from enum StartMenuOption and the SetUpStartMenu functions isn't good enough by itself. --- src/start_menu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/start_menu.c b/src/start_menu.c index f39176ccc..8a372e5af 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -113,15 +113,15 @@ static void CloseSaveStatsWindow(void); static void CloseStartMenu(void); static const struct MenuAction sStartMenuActionTable[] = { - { gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback} }, - { gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback} }, - { gText_MenuBag, {.u8_void = StartMenuBagCallback} }, - { gText_MenuPlayer, {.u8_void = StartMenuPlayerCallback} }, - { gText_MenuSave, {.u8_void = StartMenuSaveCallback} }, - { gText_MenuOption, {.u8_void = StartMenuOptionCallback} }, - { gText_MenuExit, {.u8_void = StartMenuExitCallback} }, - { gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback} }, - { gText_MenuPlayer, {.u8_void = StartMenuLinkPlayerCallback} } + [STARTMENU_POKEDEX] = { gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback} }, + [STARTMENU_POKEMON] = { gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback} }, + [STARTMENU_BAG] = { gText_MenuBag, {.u8_void = StartMenuBagCallback} }, + [STARTMENU_PLAYER] = { gText_MenuPlayer, {.u8_void = StartMenuPlayerCallback} }, + [STARTMENU_SAVE] = { gText_MenuSave, {.u8_void = StartMenuSaveCallback} }, + [STARTMENU_OPTION] = { gText_MenuOption, {.u8_void = StartMenuOptionCallback} }, + [STARTMENU_EXIT] = { gText_MenuExit, {.u8_void = StartMenuExitCallback} }, + [STARTMENU_RETIRE] = { gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback} }, + [STARTMENU_PLAYER2] = { gText_MenuPlayer, {.u8_void = StartMenuLinkPlayerCallback} } }; static const struct WindowTemplate sSafariZoneStatsWindowTemplate = {