Merge pull request #1708 from LOuroboros/sStartMenuItems

Linked MENU_ACTION constants to the items in sStartMenuItems
This commit is contained in:
GriffinR
2022-07-15 09:22:35 -04:00
committed by GitHub
+13 -13
View File
@@ -156,19 +156,19 @@ static const struct WindowTemplate sPyramidFloorWindowTemplate_1 = {0, 1, 1, 0xC
static const struct MenuAction sStartMenuItems[] = static const struct MenuAction sStartMenuItems[] =
{ {
{gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback}}, [MENU_ACTION_POKEDEX] = {gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback}},
{gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback}}, [MENU_ACTION_POKEMON] = {gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback}},
{gText_MenuBag, {.u8_void = StartMenuBagCallback}}, [MENU_ACTION_BAG] = {gText_MenuBag, {.u8_void = StartMenuBagCallback}},
{gText_MenuPokenav, {.u8_void = StartMenuPokeNavCallback}}, [MENU_ACTION_POKENAV] = {gText_MenuPokenav, {.u8_void = StartMenuPokeNavCallback}},
{gText_MenuPlayer, {.u8_void = StartMenuPlayerNameCallback}}, [MENU_ACTION_PLAYER] = {gText_MenuPlayer, {.u8_void = StartMenuPlayerNameCallback}},
{gText_MenuSave, {.u8_void = StartMenuSaveCallback}}, [MENU_ACTION_SAVE] = {gText_MenuSave, {.u8_void = StartMenuSaveCallback}},
{gText_MenuOption, {.u8_void = StartMenuOptionCallback}}, [MENU_ACTION_OPTION] = {gText_MenuOption, {.u8_void = StartMenuOptionCallback}},
{gText_MenuExit, {.u8_void = StartMenuExitCallback}}, [MENU_ACTION_EXIT] = {gText_MenuExit, {.u8_void = StartMenuExitCallback}},
{gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback}}, [MENU_ACTION_RETIRE_SAFARI] = {gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback}},
{gText_MenuPlayer, {.u8_void = StartMenuLinkModePlayerNameCallback}}, [MENU_ACTION_PLAYER_LINK] = {gText_MenuPlayer, {.u8_void = StartMenuLinkModePlayerNameCallback}},
{gText_MenuRest, {.u8_void = StartMenuSaveCallback}}, [MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
{gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
{gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}} [MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}
}; };
static const struct BgTemplate sBgTemplates_LinkBattleSave[] = static const struct BgTemplate sBgTemplates_LinkBattleSave[] =