diff --git a/src/game/cheats.c b/src/game/cheats.c index d2ece8035..01135e204 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -708,17 +708,17 @@ char *cheatGetName(s32 cheat_id) return langGet(g_Cheats[cheat_id].nametextid); } -struct menuitem g_CheatWarningMenuItems[] = { +struct menuitem g_CheatsWarningMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(479), 0x00000000, NULL }, // "If you activate any cheats, then you will be unable to progress further in the game while those cheats are active." { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(480), 0x00000000, NULL }, // "OK" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(481), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_CheatWarningMenuDialog = { +struct menudialog g_CheatsWarningMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(478), // "Warning" - g_CheatWarningMenuItems, + g_CheatsWarningMenuItems, NULL, 0x00000000, NULL, diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c index e135da98c..e0658b632 100644 --- a/src/game/data/data_01a3a0.c +++ b/src/game/data/data_01a3a0.c @@ -21,7 +21,7 @@ #include "types.h" // 1ae10 -struct menuitem menuitems_gamefiles2[] = { +struct menuitem g_GameFiles4MbMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Single Player Agent File" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Settings File" @@ -37,34 +37,34 @@ struct menuitem menuitems_gamefiles2[] = { }; // 1af00 -struct menudialog menudialog_gamefiles2 = { +struct menudialog g_GameFiles4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(99), // "Game Files" - menuitems_gamefiles2, + g_GameFiles4MbMenuItems, NULL, 0x00000020, NULL, }; // 1af18 -struct menuitem menuitems_fileselect2[] = { +struct menuitem g_FilemgrFileSelect4MbMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, filemgrChooseAgentListMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1af54 -struct menudialog menudialog_fileselect2 = { +struct menudialog g_FilemgrFileSelect4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(95), // "Perfect Dark" - menuitems_fileselect2, + g_FilemgrFileSelect4MbMenuItems, filemgrMainMenuDialog, 0x00000020, - &menudialog_gamefiles2, + &g_GameFiles4MbMenuDialog, }; // 1af6c -struct menuitem menuitems_audiovisual[] = { +struct menuitem g_AudioVideo4MbMenuItems[] = { { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(308), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(309), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(310), 0x00000000, menuhandlerSoundMode }, // "Sound Mode" @@ -76,60 +76,60 @@ struct menuitem menuitems_audiovisual[] = { }; // 1b00c -struct menudialog menudialog_1b00c = { +struct menudialog g_AudioVideo4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(307), // "Audio/Visual" - menuitems_audiovisual, + g_AudioVideo4MbMenuItems, menudialog0010559c, 0x00000000, NULL, }; // 1b024 -struct menuitem menuitems_mpplayersetup[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, (void *)&menudialog_mpplayername }, // "Name" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, (void *)&menudialog_mpcontrol }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, (void *)&menudialog_mpoptions }, // "Player Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(35), 0x00000000, (void *)&menudialog_mpplayerstats }, // "Statistics" +struct menuitem g_MpPlayerSetup4MbMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog }, // "Name" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, (void *)&g_MpControlMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, (void *)&g_MpPlayerOptionsMenuDialog }, // "Player Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(35), 0x00000000, (void *)&g_MpPlayerStatsMenuDialog }, // "Statistics" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&menudialog_mploadplayer }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&mpMenuTextSavePlayerOrCopy, 0x00000000, menuhandlerMpSavePlayer }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b0c4 -struct menudialog menudialog_mpplayersetup = { +struct menudialog g_MpPlayerSetup4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" - menuitems_mpplayersetup, + g_MpPlayerSetup4MbMenuItems, NULL, 0x00000800, - &menudialog_mpchallengedetails, + &g_MpChallengeListOrDetailsMenuDialog, }; -struct menudialog menudialog_mpdropout; +struct menudialog g_MpDropOut4MbMenuDialog; // 1b0dc -struct menuitem menuitems_mpquickgo2[] = { +struct menuitem g_MpQuickGo4MbMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(456), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&menudialog_mploadplayer }, // "Load Player" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, (void *)&menudialog_mpplayersetup }, // "Player Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(457), 0x00000000, (void *)&menudialog_mpdropout }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, (void *)&g_MpPlayerSetup4MbMenuDialog }, // "Player Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(457), 0x00000000, (void *)&g_MpDropOut4MbMenuDialog }, // "Drop Out" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b140 -struct menudialog menudialog_mpquickgo2 = { +struct menudialog g_MpQuickGo4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(460), // "Quick Go" - menuitems_mpquickgo2, + g_MpQuickGo4MbMenuItems, menudialogMpQuickGo, 0x00000000, NULL, }; // 1b158 -struct menuitem menuitems_1b158[] = { +struct menuitem g_MpConfirmChallenge4MbMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(57), 0x00000000, menuhandler0010cabc }, // "Accept" @@ -138,55 +138,55 @@ struct menuitem menuitems_1b158[] = { }; // 1b1bc -struct menudialog menudialog_1b1bc = { +struct menudialog g_MpConfirmChallenge4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17e318, - menuitems_1b158, + g_MpConfirmChallenge4MbMenuItems, menudialog0017e3fc, 0x00000000, NULL, }; // 1b1d4 -struct menuitem menuitems_mpcombatchallenges[] = { +struct menuitem g_MpChallenges4MbMenuItems[] = { { MENUITEMTYPE_LIST, 1, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b1fc -struct menudialog menudialog_mpcombatchallenges = { +struct menudialog g_MpChallenges4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(50), // "Combat Challenges" - menuitems_mpcombatchallenges, + g_MpChallenges4MbMenuItems, mpCombatChallengesMenuDialog, 0x00000000, NULL, }; // 1b214 -struct menuitem menuitems_smallbutperfectmenu[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, (void *)&menudialog_mpcombatchallenges }, // "Challenges" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, (void *)&menudialog_mploadgamesettingstype1 }, // "Load/Preset Games" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, (void *)&menudialog_mpquickteam }, // "Quick Start" +struct menuitem g_MainMenu4MbMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, (void *)&g_MpChallenges4MbMenuDialog }, // "Challenges" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, (void *)&g_MpLoadPresetMenuDialog }, // "Load/Preset Games" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, (void *)&g_MpQuickTeamMenuDialog }, // "Quick Start" { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(444), 0x00000003, menuhandler4MbAdvancedSetup }, // "Advanced Setup" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(305), 0x00000000, (void *)&menudialog_1b00c }, // "Audio/Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(305), 0x00000000, (void *)&g_AudioVideo4MbMenuDialog }, // "Audio/Video" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(306), 0x00000000, (void *)&menudialog_changeagent }, // "Change Agent" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(306), 0x00000000, (void *)&g_ChangeAgentMenuDialog }, // "Change Agent" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b2b4 -struct menudialog g_4MbMainMenu = { +struct menudialog g_MainMenu4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(302), // "Small but Perfect Menu" - menuitems_smallbutperfectmenu, + g_MainMenu4MbMenuItems, menudialog4MbMainMenu, 0x00000030, NULL, }; // 1b2cc -struct menuitem menuitems_mpdropout[] = { +struct menuitem g_MpDropOut4MbMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(196), 0x00000000, NULL }, // "Are you sure you want to drop out?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(197), 0x00000000, menuhandler4MbDropOut }, // "Drop Out" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(198), 0x00000000, NULL }, // "Cancel" @@ -194,17 +194,17 @@ struct menuitem menuitems_mpdropout[] = { }; // 1b31c -struct menudialog menudialog_mpdropout = { +struct menudialog g_MpDropOut4MbMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(195), // "Drop Out" - menuitems_mpdropout, + g_MpDropOut4MbMenuItems, NULL, 0x00000000, NULL, }; // 1b334 -struct menuitem menuitems_mpabort[] = { +struct menuitem g_UnusedAbortMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(53), 0x00000000, NULL }, // "Are you sure you want to abort the game?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(54), 0x00000000, menuhandler0010ca1c }, // "Abort" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(55), 0x00000000, NULL }, // "Cancel" @@ -212,17 +212,17 @@ struct menuitem menuitems_mpabort[] = { }; // 1b384 -struct menudialog menudialog_mpabort = { +struct menudialog g_UnusedAbortMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(52), // "Abort" - menuitems_mpabort, + g_UnusedAbortMenuItems, NULL, 0x00000000, NULL, }; // 1b39c -struct menuitem menuitems_1b39c[] = { +struct menuitem g_MpEditSimulant4MbMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(95), 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(96), 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -235,37 +235,37 @@ struct menuitem menuitems_1b39c[] = { struct menudialog g_MpEditSimulant4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17cfc0, - menuitems_1b39c, + g_MpEditSimulant4MbMenuItems, menudialogMpSimulant, 0x00000010, NULL, }; // 1b42c -struct menuitem menuitems_mpgamesetup[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&menudialog_mpscenario }, // "Scenario" +struct menuitem g_AdvancedSetup4MbMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog }, // "Scenario" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&menudialog_mparena }, // "Arena" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(44), 0x00000000, menuhandlerMpLock }, // "Lock" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), 0x00000000, (void *)&menudialog_mpweapons }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&menudialog_mplimits }, // "Limits" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(184), 0x00000000, (void *)&menudialog_mpplayerhandicaps }, // "Player Handicaps" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(25), 0x00000000, (void *)&menudialog_mpsimulants }, // "Simulants" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(22), 0x00000000, (void *)&menudialog_mpteamcontrol }, // "Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), 0x00000000, (void *)&g_MpWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(184), 0x00000000, (void *)&g_MpHandicapsMenuDialog }, // "Player Handicaps" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(25), 0x00000000, (void *)&g_MpSimulantsMenuDialog }, // "Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(22), 0x00000000, (void *)&g_MpTeamsMenuDialog }, // "Teams" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(36), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU(18), 0x00000000, (void *)&menudialog_mploadgamesettingstype0 }, // "Load Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU(18), 0x00000000, (void *)&g_MpLoadSettingsMenuDialog }, // "Load Settings" { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(26), 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b558 -struct menudialog g_4MbAdvancedSetupMenuDialog = { +struct menudialog g_AdvancedSetup4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" - menuitems_mpgamesetup, + g_AdvancedSetup4MbMenuItems, menudialogMpGameSetup, 0x00000810, - &menudialog_mpplayersetup, + &g_MpPlayerSetup4MbMenuDialog, }; diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c index cc2662737..2e59e375b 100644 --- a/src/game/data/data_02a0e0.c +++ b/src/game/data/data_02a0e0.c @@ -484,7 +484,7 @@ struct menudialog g_MpPauseControlMenuDialog = { }; // 2a7ac -struct menuitem g_MpInventoryMenuItems[] = { +struct menuitem g_Mp2PMissionInventoryMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x00000078, 0x00000042, menuhandler00106178 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&mpMenuTextWeaponDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -494,34 +494,34 @@ struct menuitem g_MpInventoryMenuItems[] = { struct menudialog g_MpPauseInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" - g_MpInventoryMenuItems, + g_Mp2PMissionInventoryMenuItems, NULL, 0x00000000, &g_MpPauseControlMenuDialog, }; // 2a800 -struct menudialog menudialog_2a800 = { +struct menudialog g_2PMissionInventoryHMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" - g_MpInventoryMenuItems, + g_Mp2PMissionInventoryMenuItems, NULL, 0x00000000, - &menudialog_18d78, + &g_2PMissionOptionsHMenuDialog, }; // 2a818 -struct menudialog menudialog_2a818 = { +struct menudialog g_2PMissionInventoryVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" - g_MpInventoryMenuItems, + g_Mp2PMissionInventoryMenuItems, NULL, 0x00000000, - &menudialog_18d90, + &g_2PMissionOptionsVMenuDialog, }; // 2a830 -struct menuitem g_MpPlayerStatsMenuItems[] = { +struct menuitem g_MpInGamePlayerStatsMenuItems[] = { { MENUITEMTYPE_PLAYERSTATS, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00177e00 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -530,7 +530,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { struct menudialog g_MpPausePlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1783a0, - g_MpPlayerStatsMenuItems, + g_MpInGamePlayerStatsMenuItems, NULL, 0x00000000, &g_MpPauseInventoryMenuDialog, @@ -540,7 +540,7 @@ struct menudialog g_MpPausePlayerStatsMenuDialog = { struct menudialog g_MpEndscreenPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1783a0, - g_MpPlayerStatsMenuItems, + g_MpInGamePlayerStatsMenuItems, NULL, 0x00000000, NULL, @@ -573,16 +573,16 @@ struct menudialog g_MpEndscreenPlayerRankingMenuDialog = { }; // 2a8e0 -struct menuitem g_MpTeamRankingMenuItems[] = { +struct menuitem g_MpTeamRankingsMenuItems[] = { { MENUITEMTYPE_RANKING, 0, 0x00000000, 0x00000001, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a908 -struct menudialog g_MpPauseTeamRankingMenuDialog = { +struct menudialog g_MpPauseTeamRankingsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(279), // "Team Ranking" - g_MpTeamRankingMenuItems, + g_MpTeamRankingsMenuItems, NULL, 0x00000000, &g_MpPausePlayerRankingMenuDialog, @@ -592,7 +592,7 @@ struct menudialog g_MpPauseTeamRankingMenuDialog = { struct menudialog g_MpEndscreenTeamRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(279), // "Team Ranking" - g_MpTeamRankingMenuItems, + g_MpTeamRankingsMenuItems, NULL, 0x00000000, &g_MpEndscreenPlayerRankingMenuDialog, @@ -629,7 +629,7 @@ struct menuitem g_MpGameOverMenuItems[] = { }; // 2aa18 -struct menudialog g_MpEndscreenIndividualGameOverMenuDialog = { +struct menudialog g_MpEndscreenIndGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(260), // "Game Over" g_MpGameOverMenuItems, @@ -652,44 +652,44 @@ struct menudialog g_MpEndscreenTeamGameOverMenuDialog = { struct menudialog g_MpEndscreenChallengeCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPWEAPONS(165), // "Challenge Completed!" - g_MpTeamRankingMenuItems, + g_MpTeamRankingsMenuItems, NULL, 0x00000000, - &g_MpEndscreenIndividualGameOverMenuDialog, + &g_MpEndscreenIndGameOverMenuDialog, }; // 2aa60 struct menudialog g_MpEndscreenChallengeCheatedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(167), // "Challenge Cheated!" - g_MpTeamRankingMenuItems, + g_MpTeamRankingsMenuItems, NULL, 0x00000000, - &g_MpEndscreenIndividualGameOverMenuDialog, + &g_MpEndscreenIndGameOverMenuDialog, }; // 2aa78 struct menudialog g_MpEndscreenChallengeFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(166), // "Challenge Failed!" - g_MpTeamRankingMenuItems, + g_MpTeamRankingsMenuItems, NULL, 0x00000000, - &g_MpEndscreenIndividualGameOverMenuDialog, + &g_MpEndscreenIndGameOverMenuDialog, }; // 2aa90 -struct menuitem g_MpEndscreenConfirmPlayerNameMenuItems[] = { +struct menuitem g_MpEndscreenConfirmNameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(250), 0x00000000, NULL }, // "Confirm player name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00178bf4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2aacc -struct menudialog g_MpEndscreenConfirmPlayerNameMenuDialog = { +struct menudialog g_MpEndscreenConfirmNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(142), // "Player Name" - g_MpEndscreenConfirmPlayerNameMenuItems, + g_MpEndscreenConfirmNameMenuItems, NULL, 0x00000000, NULL, @@ -698,7 +698,7 @@ struct menudialog g_MpEndscreenConfirmPlayerNameMenuDialog = { // 2aae4 struct menuitem g_MpEndscreenSavePlayerMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(247), 0x00000000, NULL }, // "Save new player and statistics?" - { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS(248), 0x00000000, (void *)&g_MpEndscreenConfirmPlayerNameMenuDialog }, // "Save Now" + { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS(248), 0x00000000, (void *)&g_MpEndscreenConfirmNameMenuDialog }, // "Save Now" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(249), 0x00000000, NULL }, // "No Thanks!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -716,7 +716,7 @@ struct menudialog g_MpEndscreenSavePlayerMenuDialog = { u32 var80084b2c = 0x00000000; // 2ab50 -struct menuitem menuitems_2ab50[] = { +struct menuitem g_MpDropOutMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(196), 0x00000000, NULL }, // "Are you sure you want to drop out?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(197), 0x00000000, menuhandlerMpDropOut }, // "Drop Out" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(198), 0x00000000, NULL }, // "Cancel" @@ -724,10 +724,10 @@ struct menuitem menuitems_2ab50[] = { }; // 2aba0 -struct menudialog menudialog_2aba0 = { +struct menudialog g_MpDropOutMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(195), // "Drop Out" - menuitems_2ab50, + g_MpDropOutMenuItems, NULL, 0x00000000, NULL, @@ -777,7 +777,7 @@ u16 g_MpAimModeLabels[] = { }; // 2ac44 -struct menuitem menuitems_mpsavechr[] = { +struct menuitem g_MpSavePlayerMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(191), 0x00000000, NULL }, // "Your player file is always saved automatically." { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(192), 0x00000000, NULL }, // "Save a copy now?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(193), 0x00000000, NULL }, // "No" @@ -786,34 +786,34 @@ struct menuitem menuitems_mpsavechr[] = { }; // 2aca8 -struct menudialog g_MpSaveChrMenuDialog = { +struct menudialog g_MpSavePlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(190), // "Confirm" - menuitems_mpsavechr, + g_MpSavePlayerMenuItems, NULL, 0x00000000, NULL, }; // 2acc0 -struct menuitem menuitems_mpsavesetupname[] = { +struct menuitem g_MpSaveSetupNameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(189), 0x00000000, NULL }, // "Enter a name for your game setup file:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandlerMpPlayerName }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2acfc -struct menudialog menudialog_mpsavesetupname = { +struct menudialog g_MpSaveSetupNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(188), // "Game File Name" - menuitems_mpsavesetupname, + g_MpSaveSetupNameMenuItems, NULL, 0x00000000, NULL, }; // 2ad14 -struct menuitem menuitems_mpsavesetup[] = { +struct menuitem g_MpSaveSetupExistsMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS(230), (u32)&mpMenuTextSetupName, NULL }, // "Name:" { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemgrMenuTextDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(184), 0x00000000, NULL }, // "Do you want to save over your original game file?" @@ -824,17 +824,17 @@ struct menuitem menuitems_mpsavesetup[] = { }; // 2ada0 -struct menudialog menudialog_mpsavesetup = { +struct menudialog g_MpSaveSetupExistsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(183), // "Save Game Setup" - menuitems_mpsavesetup, + g_MpSaveSetupExistsMenuItems, NULL, 0x00000000, NULL, }; // 2adb8 -struct menuitem menuitems_mpweapons[] = { +struct menuitem g_MpWeaponsMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 1, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000212, L_MPMENU(175), 0x00000000, NULL }, // "Current Weapon Setup:" @@ -850,17 +850,17 @@ struct menuitem menuitems_mpweapons[] = { }; // 2aea8 -struct menudialog menudialog_mpweapons = { +struct menudialog g_MpWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(173), // "Weapons" - menuitems_mpweapons, + g_MpWeaponsMenuItems, NULL, 0x00000010, NULL, }; // 2aec0 -struct menuitem menuitems_mpweapons2[] = { +struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(176), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "1:" @@ -874,17 +874,17 @@ struct menuitem menuitems_mpweapons2[] = { }; // 2af88 -struct menudialog menudialog_mpweapons2 = { +struct menudialog g_MpQuickTeamWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(173), // "Weapons" - menuitems_mpweapons2, + g_MpQuickTeamWeaponsMenuItems, NULL, 0x00000010, NULL, }; // 2afa0 -struct menuitem menuitems_mpoptions[] = { +struct menuitem g_MpPlayerOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(168), 0x00000002, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Pickups" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(169), 0x00000001, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Players" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(170), 0x00000008, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Teams" @@ -895,17 +895,17 @@ struct menuitem menuitems_mpoptions[] = { }; // 2b02c -struct menudialog menudialog_mpoptions = { +struct menudialog g_MpPlayerOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(167), // "Options" - menuitems_mpoptions, + g_MpPlayerOptionsMenuItems, NULL, 0x00000000, NULL, }; // 2b044 -struct menuitem menuitems_mpcontrol[] = { +struct menuitem g_MpControlMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPMENU(200), 0x00000000, menuhandlerMpControlStyle }, // "Control Style" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(201), 0x00000001, menuhandlerMpControlCheckbox }, // "Reverse Pitch" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(202), 0x00000002, menuhandlerMpControlCheckbox }, // "Look Ahead" @@ -925,26 +925,26 @@ struct menuitem menuitems_mpcontrol[] = { }; // 2b184 -struct menudialog menudialog_mpcontrol = { +struct menudialog g_MpControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(199), // "Control" - menuitems_mpcontrol, + g_MpControlMenuItems, NULL, 0x00000000, NULL, }; // 2b19c -struct menuitem menuitems_mpcompletedchallenges[] = { +struct menuitem g_MpCompletedChallengesMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017a20c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b1c4 -struct menudialog menudialog_mpcompletedchallenges = { +struct menudialog g_MpCompletedChallengesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(165), // "Completed Challenges" - menuitems_mpcompletedchallenges, + g_MpCompletedChallengesMenuItems, NULL, 0x00000048, NULL, @@ -959,7 +959,7 @@ u32 var800851d0 = 0x416c7d95; u32 var800851d4 = 0x2e280000; // 2b1f8 -struct menuitem menuitems_mpplayerstats[] = { +struct menuitem g_MpPlayerStatsMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(146), (u32)&mpMenuTextKills, NULL }, // "Kills:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(147), (u32)&mpMenuTextDeaths, NULL }, // "Deaths:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(148), (u32)&mpMenuTextAccuracy, NULL }, // "Accuracy:" @@ -993,20 +993,20 @@ struct menuitem menuitems_mpplayerstats[] = { }; // 2b450 -struct menudialog menudialog_mpplayerstats = { +struct menudialog g_MpPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTitleStatsForPlayerName, - menuitems_mpplayerstats, + g_MpPlayerStatsMenuItems, NULL, 0x00000048, - &menudialog_mpcompletedchallenges, + &g_MpCompletedChallengesMenuDialog, }; u32 var80085448 = 0x00000300; u32 var8008544c = 0x0400ff00; // 2b470 -struct menuitem menuitems_mpcharacter[] = { +struct menuitem g_MpCharacterMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00004230, (u32)&mpMenuTextBodyName, 0x00000000, NULL }, { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x00000022, menuhandlerMpCharacterHead }, { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x0000001b, menuhandlerMpCharacterBody }, @@ -1014,100 +1014,100 @@ struct menuitem menuitems_mpcharacter[] = { }; // 2b4c0 -struct menudialog menudialog_mpcharacter = { +struct menudialog g_MpCharacterMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(143), // "Character" - menuitems_mpcharacter, + g_MpCharacterMenuItems, menudialog0017a174, 0x00000002, NULL, }; // 2b4d8 -struct menuitem menuitems_mpplayername[] = { +struct menuitem g_MpPlayerNameMenuItems[] = { { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017b91c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b500 -struct menudialog menudialog_mpplayername = { +struct menudialog g_MpPlayerNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(142), // "Player Name" - menuitems_mpplayername, + g_MpPlayerNameMenuItems, NULL, 0x00000000, NULL, }; // 2b518 -struct menuitem menuitems_mploadgamesettingstype0[] = { +struct menuitem g_MpLoadSettingsMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x00000078, 0x00000042, menuhandler0017bab4 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&func0f17be2c, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b554 -struct menudialog menudialog_mploadgamesettingstype0 = { +struct menudialog g_MpLoadSettingsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(139), // "Load Game Settings" - menuitems_mploadgamesettingstype0, + g_MpLoadSettingsMenuItems, NULL, 0x00000001, NULL, }; // 2b56c -struct menuitem menuitems_mploadgamesettingstype1[] = { +struct menuitem g_MpLoadPresetMenuItems[] = { { MENUITEMTYPE_LIST, 1, 0x00000000, 0x00000078, 0x00000042, menuhandler0017bab4 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&func0f17be2c, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b5a8 -struct menudialog menudialog_mploadgamesettingstype1 = { +struct menudialog g_MpLoadPresetMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(139), // "Load Game Settings" - menuitems_mploadgamesettingstype1, + g_MpLoadPresetMenuItems, NULL, 0x00000000, NULL, }; // 2b5c0 -struct menuitem menuitems_mploadplayer[] = { +struct menuitem g_MpLoadPlayerMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x0000007e, 0x00000042, menuhandler0017bfc0 }, { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPMENU(138), 0x00000000, NULL }, // "B Button to cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b5fc -struct menudialog menudialog_mploadplayer = { +struct menudialog g_MpLoadPlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(137), // "Load Player" - menuitems_mploadplayer, + g_MpLoadPlayerMenuItems, NULL, 0x00000000, NULL, }; // 2b614 -struct menuitem menuitems_mparena[] = { +struct menuitem g_MpArenaMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00020000, 0x00000078, 0x0000004d, menuhandler001791c8 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b63c -struct menudialog menudialog_mparena = { +struct menudialog g_MpArenaMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(115), // "Arena" - menuitems_mparena, + g_MpArenaMenuItems, NULL, 0x00000011, NULL, }; // 2b654 -struct menuitem menuitems_mplimits[] = { +struct menuitem g_MpLimitsMenuItems[] = { { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU(108), 0x0000003c, menuhandlerMpTimeLimitSlider }, // "Time" { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU(109), 0x00000064, menuhandlerMpScoreLimitSlider }, // "Score" { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MISC(447), 0x00000190, menuhandlerMpTeamScoreLimitSlider }, // "Team Score" @@ -1118,17 +1118,17 @@ struct menuitem menuitems_mplimits[] = { }; // 2b6e0 -struct menudialog menudialog_mplimits = { +struct menudialog g_MpLimitsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(107), // "Limits" - menuitems_mplimits, + g_MpLimitsMenuItems, NULL, 0x00000010, NULL, }; // 2b6f8 -struct menuitem menuitems_mpplayerhandicaps[] = { +struct menuitem g_MpHandicapsMenuItems[] = { { MENUITEMTYPE_SLIDER, 0, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SLIDER, 1, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SLIDER, 2, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer }, @@ -1140,17 +1140,17 @@ struct menuitem menuitems_mpplayerhandicaps[] = { }; // 2b798 -struct menudialog menudialog_mpplayerhandicaps = { +struct menudialog g_MpHandicapsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(184), // "Player Handicaps" - menuitems_mpplayerhandicaps, + g_MpHandicapsMenuItems, NULL, 0x00000010, NULL, }; // 2b7b0 -struct menuitem menuitems_mpready[] = { +struct menuitem g_MpReadyMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(106), 0x00000000, NULL }, // "...and waiting" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1159,7 +1159,7 @@ struct menuitem menuitems_mpready[] = { struct menudialog g_MpReadyMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(105), // "Ready!" - menuitems_mpready, + g_MpReadyMenuItems, menudialogMpReady, 0x00000001, NULL, @@ -1171,7 +1171,7 @@ u32 var800857d8 = 0x00000006; u32 var800857dc = 0x50680000; // "Special Simulants" // 2b800 -struct menuitem menuitems_mpaddchangesimulant[] = { +struct menuitem g_MpAddChangeSimulantMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00020000, 0x00000078, 0x00000042, menuhandler0017c6a4 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&mpMenuTextSimulantDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1181,7 +1181,7 @@ struct menuitem menuitems_mpaddchangesimulant[] = { struct menudialog g_MpAddSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(101), // "Add Simulant" - menuitems_mpaddchangesimulant, + g_MpAddChangeSimulantMenuItems, NULL, 0x00000011, NULL, @@ -1191,34 +1191,34 @@ struct menudialog g_MpAddSimulantMenuDialog = { struct menudialog g_MpChangeSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(102), // "Change Simulant" - menuitems_mpaddchangesimulant, + g_MpAddChangeSimulantMenuItems, menudialogMpSimulant, 0x00000011, NULL, }; // 2b86c -struct menuitem menuitems_mpsimulantcharacter[] = { +struct menuitem g_MpSimulantCharacterMenuItems[] = { { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x00000025, menuhandlerMpSimulantHead }, { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x0000001b, menuhandlerMpSimulantBody }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b8a8 -struct menudialog menudialog_mpsimulantcharacter = { +struct menudialog g_MpSimulantCharacterMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(100), // "Simulant Character" - menuitems_mpsimulantcharacter, + g_MpSimulantCharacterMenuItems, menudialog0017ccfc, 0x00000012, NULL, }; // 2b8c0 -struct menuitem menuitems_mpeditsimulant[] = { +struct menuitem g_MpEditSimulantMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(95), 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(96), 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(97), 0x00000000, (void *)&menudialog_mpsimulantcharacter }, // "Character..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(97), 0x00000000, (void *)&g_MpSimulantCharacterMenuDialog }, // "Character..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(98), 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(99), 0x00000000, NULL }, // "Back" @@ -1229,14 +1229,14 @@ struct menuitem menuitems_mpeditsimulant[] = { struct menudialog g_MpEditSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17cfc0, - menuitems_mpeditsimulant, + g_MpEditSimulantMenuItems, menudialogMpSimulant, 0x00000010, NULL, }; // 2b964 -struct menuitem menuitems_mpsimulants[] = { +struct menuitem g_MpSimulantsMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(84), 0x00000000, menuhandlerMpAddSimulant }, // "Add Simulant..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(85), (u32)&func0f17d378, menuhandlerMpSimulantSlot }, // "1:" @@ -1254,10 +1254,10 @@ struct menuitem menuitems_mpsimulants[] = { }; // 2ba7c -struct menudialog menudialog_mpsimulants = { +struct menudialog g_MpSimulantsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(83), // "Simulants" - menuitems_mpsimulants, + g_MpSimulantsMenuItems, menudialogMpSimulants, 0x00000010, NULL, @@ -1270,7 +1270,7 @@ u32 var80085a80 = 0x00000000; u8 g_TeamIdsForPairing[] = {0, 1, 2, 3}; // 2baa8 -struct menuitem menuitems_mpautoteam[] = { +struct menuitem g_MpAutoTeamMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(76), 0x00000000, menuhandlerMpTwoTeams }, // "Two Teams" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(77), 0x00000000, menuhandlerMpThreeTeams }, // "Three Teams" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(78), 0x00000000, menuhandlerMpFourTeams }, // "Four Teams" @@ -1283,17 +1283,17 @@ struct menuitem menuitems_mpautoteam[] = { }; // 2bb5c -struct menudialog menudialog_mpautoteam = { +struct menudialog g_MpAutoTeamMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(75), // "Auto Team" - menuitems_mpautoteam, + g_MpAutoTeamMenuItems, NULL, 0x00000010, NULL, }; // 2bb74 -struct menuitem menuitems_mpteamcontrol[] = { +struct menuitem g_MpTeamsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(71), 0x00000002, menuhandlerMpTeamsEnabled }, // "Teams Enabled" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(72), 0x00000000, menuhandlerMpTeamsLabel }, // "Teams:" @@ -1310,16 +1310,16 @@ struct menuitem menuitems_mpteamcontrol[] = { { MENUITEMTYPE_DROPDOWN, 10, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_DROPDOWN, 11, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(73), 0x00000000, (void *)&menudialog_mpautoteam }, // "Auto Team..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(73), 0x00000000, (void *)&g_MpAutoTeamMenuDialog }, // "Auto Team..." { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(74), 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2bcf0 -struct menudialog menudialog_mpteamcontrol = { +struct menudialog g_MpTeamsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(70), // "Team Control" - menuitems_mpteamcontrol, + g_MpTeamsMenuItems, NULL, 0x00000010, NULL, @@ -1331,27 +1331,27 @@ u32 var80085cf0 = L_MISC(168); // "Select None" u32 var80085cf4 = L_MISC(169); // "Randomize" // 2bd18 -struct menuitem menuitems_2bd18[] = { +struct menuitem g_MpSelectTunesMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00020000, 0x00000078, 0x0000004d, menuhandler0017dc84 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2bd40 -struct menudialog menudialog_2bd40 = { +struct menudialog g_MpSelectTunesMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTextSelectTuneOrTunes, - menuitems_2bd18, + g_MpSelectTunesMenuItems, menudialogMpSelectTune, 0x00000010, NULL, }; // 2bd58 -struct menuitem menuitems_mpsoundtrack[] = { +struct menuitem g_MpSoundtrackMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(63), 0x00000000, NULL }, // "Current:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(3), (u32)&mpMenuTextCurrentTrack, NULL }, // "" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, (u32)&mpMenuTextSelectTuneOrTunes, 0x00000000, (void *)&menudialog_2bd40 }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, (u32)&mpMenuTextSelectTuneOrTunes, 0x00000000, (void *)&g_MpSelectTunesMenuDialog }, { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(64), 0x00000000, menuhandlerMpMultipleTunes }, // "Multiple Tunes" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(65), 0x00000000, NULL }, // "Back" @@ -1359,17 +1359,17 @@ struct menuitem menuitems_mpsoundtrack[] = { }; // 2bdf8 -struct menudialog menudialog_mpsoundtrack = { +struct menudialog g_MpSoundtrackMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(62), // "Soundtrack" - menuitems_mpsoundtrack, + g_MpSoundtrackMenuItems, NULL, 0x00000010, NULL, }; // 2be10 -struct menuitem menuitems_mpchangeteamname[] = { +struct menuitem g_MpChangeTeamNameMenuItems[] = { { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017e06c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1378,14 +1378,14 @@ struct menuitem menuitems_mpchangeteamname[] = { struct menudialog g_MpChangeTeamNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(61), // "Change Team Name" - menuitems_mpchangeteamname, + g_MpChangeTeamNameMenuItems, NULL, 0x00000000, NULL, }; // 2be50 -struct menuitem menuitems_mpteamnames[] = { +struct menuitem g_MpTeamNamesMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(8), (u32)&func0f17e288, menuhandlerMpTeamNameSlot }, // "Red" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(9), (u32)&func0f17e288, menuhandlerMpTeamNameSlot }, // "Yellow" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(10), (u32)&func0f17e288, menuhandlerMpTeamNameSlot }, // "Blue" @@ -1400,17 +1400,17 @@ struct menuitem menuitems_mpteamnames[] = { }; // 2bf2c -struct menudialog menudialog_mpteamnames = { +struct menudialog g_MpTeamNamesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(59), // "Team Names" - menuitems_mpteamnames, + g_MpTeamNamesMenuItems, NULL, 0x00000010, NULL, }; // 2bf44 -struct menuitem menuitems_2bf44[] = { +struct menuitem g_MpConfirmChallengeViaListOrDetailsMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(57), 0x00000000, menuhandler0017e38c }, // "Accept" @@ -1419,17 +1419,17 @@ struct menuitem menuitems_2bf44[] = { }; // 2bfa8 -struct menudialog menudialog_2bfa8 = { +struct menudialog g_MpConfirmChallengeViaListOrDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17e318, - menuitems_2bf44, + g_MpConfirmChallengeViaListOrDetailsMenuItems, menudialog0017e3fc, 0x00000014, NULL, }; // 2bfc0 -struct menuitem menuitems_mpchallengedetails[] = { +struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCHALLENGE, 0x00000000, 0x0000007c, 0x00000037, menuhandler0017e9d8 }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017e9d8 }, @@ -1439,29 +1439,29 @@ struct menuitem menuitems_mpchallengedetails[] = { }; // 2c038 -struct menudialog menudialog_mpchallengedetails = { +struct menudialog g_MpChallengeListOrDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTextChallengeName, - menuitems_mpchallengedetails, + g_MpChallengesListOrDetailsMenuItems, mpCombatChallengesMenuDialog, 0x00000808, NULL, }; -struct menudialog menudialog_mpgamesetup2; +struct menudialog g_MpAdvancedSetupViaAdvChallengeMenuDialog; // 2c050 -struct menudialog menudialog_mpchallengedetails2 = { +struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTextChallengeName, - menuitems_mpchallengedetails, + g_MpChallengesListOrDetailsMenuItems, mpCombatChallengesMenuDialog, 0x00000808, - &menudialog_mpgamesetup2, + &g_MpAdvancedSetupViaAdvChallengeMenuDialog, }; // 2c068 -struct menuitem menuitems_2c068[] = { +struct menuitem g_MpConfirmChallengeMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(57), 0x00000000, menuhandler0017ec64 }, // "Accept" @@ -1470,26 +1470,26 @@ struct menuitem menuitems_2c068[] = { }; // 2c0cc -struct menudialog menudialog_2c0cc = { +struct menudialog g_MpConfirmChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17e318, - menuitems_2c068, + g_MpConfirmChallengeMenuItems, menudialog0017e3fc, 0x00000004, NULL, }; // 2c0e4 -struct menuitem menuitems_mpcombatchallenges2[] = { +struct menuitem g_MpChallengesMenuItems[] = { { MENUITEMTYPE_LIST, 1, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2c10c -struct menudialog menudialog_mpcombatchallenges2 = { +struct menudialog g_MpChallengesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(50), // "Combat Challenges" - menuitems_mpcombatchallenges2, + g_MpChallengesMenuItems, mpCombatChallengesMenuDialog, 0x00000000, NULL, @@ -1503,88 +1503,88 @@ u16 mplockoptions[4] = { L_MPMENU(48), // "Random" }; -struct menudialog menudialog_mpabort2; +struct menudialog g_MpAbortMenuDialog; // 2c12c -struct menuitem menuitems_mpstuff[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(41), 0x00000000, (void *)&menudialog_mpsoundtrack }, // "Soundtrack" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(42), 0x00000000, (void *)&menudialog_mpteamnames }, // "Team Names" +struct menuitem g_MpStuffMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(41), 0x00000000, (void *)&g_MpSoundtrackMenuDialog }, // "Soundtrack" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(42), 0x00000000, (void *)&g_MpTeamNamesMenuDialog }, // "Team Names" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(44), 0x00000000, menuhandlerMpLock }, // "Lock" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(154), 0x00000000, menuhandlerScreenSplit }, // "Split" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(36), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(37), 0x00000000, (void *)&menudialog_2aba0 }, // "Drop Out" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(27), 0x00000000, (void *)&menudialog_mpabort2 }, // "Abort Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(37), 0x00000000, (void *)&g_MpDropOutMenuDialog }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(27), 0x00000000, (void *)&g_MpAbortMenuDialog }, // "Abort Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2c208 -struct menudialog menudialog_mpstuff = { +struct menudialog g_MpStuffMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(40), // "Stuff" - menuitems_mpstuff, + g_MpStuffMenuItems, NULL, 0x00000810, - &menudialog_mpchallengedetails, + &g_MpChallengeListOrDetailsMenuDialog, }; // 2c220 -struct menudialog menudialog_mpstuff2 = { +struct menudialog g_MpStuffViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(40), // "Stuff" - menuitems_mpstuff, + g_MpStuffMenuItems, NULL, 0x00000810, NULL, }; // 2c238 -struct menuitem menuitems_mpplayersetup4[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, (void *)&menudialog_mpplayername }, // "Name" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(31), 0x00000000, (void *)&menudialog_mpcharacter }, // "Character" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, (void *)&menudialog_mpcontrol }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, (void *)&menudialog_mpoptions }, // "Player Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(35), 0x00000000, (void *)&menudialog_mpplayerstats }, // "Statistics" +struct menuitem g_MpPlayerSetup234MenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog }, // "Name" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(31), 0x00000000, (void *)&g_MpCharacterMenuDialog }, // "Character" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, (void *)&g_MpControlMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, (void *)&g_MpPlayerOptionsMenuDialog }, // "Player Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(35), 0x00000000, (void *)&g_MpPlayerStatsMenuDialog }, // "Statistics" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&menudialog_mploadplayer }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&mpMenuTextSavePlayerOrCopy, 0x00000000, menuhandlerMpSavePlayer }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2c2ec -struct menudialog menudialog_mpplayersetup4 = { +struct menudialog g_MpPlayerSetupViaAdvMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" - menuitems_mpplayersetup4, + g_MpPlayerSetup234MenuItems, NULL, 0x00000800, - &menudialog_mpstuff, + &g_MpStuffMenuDialog, }; // 2c304 -struct menudialog menudialog_mpplayersetup2 = { +struct menudialog g_MpPlayerSetupViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" - menuitems_mpplayersetup4, + g_MpPlayerSetup234MenuItems, NULL, 0x00000800, - &menudialog_mpstuff2, + &g_MpStuffViaAdvChallengeMenuDialog, }; // 2c31c -struct menudialog menudialog_mpplayersetup3 = { +struct menudialog g_MpPlayerSetupViaQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" - menuitems_mpplayersetup4, + g_MpPlayerSetup234MenuItems, NULL, 0x00000000, NULL, }; // 2c334 -struct menuitem menuitems_mpabort2[] = { +struct menuitem g_MpAbortMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(53), 0x00000000, NULL }, // "Are you sure you want to abort the game?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(54), 0x00000000, menuhandler0017ef30 }, // "Abort" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(55), 0x00000000, NULL }, // "Cancel" @@ -1592,59 +1592,59 @@ struct menuitem menuitems_mpabort2[] = { }; // 2c384 -struct menudialog menudialog_mpabort2 = { +struct menudialog g_MpAbortMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(52), // "Abort" - menuitems_mpabort2, + g_MpAbortMenuItems, NULL, 0x00000000, NULL, }; -struct menudialog menudialog_mpscenario; +struct menudialog g_MpScenarioMenuDialog; // 2c39c -struct menuitem menuitems_mpgamesetup3[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&menudialog_mpscenario }, // "Scenario" +struct menuitem g_MpAdvancedSetupMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog }, // "Scenario" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&menudialog_mparena }, // "Arena" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), 0x00000000, (void *)&menudialog_mpweapons }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&menudialog_mplimits }, // "Limits" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(184), 0x00000000, (void *)&menudialog_mpplayerhandicaps }, // "Player Handicaps" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(25), 0x00000000, (void *)&menudialog_mpsimulants }, // "Simulants" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(22), 0x00000000, (void *)&menudialog_mpteamcontrol }, // "Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), 0x00000000, (void *)&g_MpWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(184), 0x00000000, (void *)&g_MpHandicapsMenuDialog }, // "Player Handicaps" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(25), 0x00000000, (void *)&g_MpSimulantsMenuDialog }, // "Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(22), 0x00000000, (void *)&g_MpTeamsMenuDialog }, // "Teams" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU(18), 0x00000000, (void *)&menudialog_mploadgamesettingstype0 }, // "Load Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU(18), 0x00000000, (void *)&g_MpLoadSettingsMenuDialog }, // "Load Settings" { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(26), 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2c48c -struct menudialog menudialog_mpgamesetup3 = { +struct menudialog g_MpAdvancedSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" - menuitems_mpgamesetup3, + g_MpAdvancedSetupMenuItems, menudialogMpGameSetup, 0x00000810, - &menudialog_mpplayersetup4, + &g_MpPlayerSetupViaAdvMenuDialog, }; // 2c4a4 -struct menudialog menudialog_mpgamesetup2 = { +struct menudialog g_MpAdvancedSetupViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" - menuitems_mpgamesetup3, + g_MpAdvancedSetupMenuItems, menudialogMpGameSetup, 0x00000810, - &menudialog_mpplayersetup2, + &g_MpPlayerSetupViaAdvChallengeMenuDialog, }; // 2c4bc -struct menuitem menuitems_mpquickgo[] = { +struct menuitem g_MpQuickGoMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(456), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&menudialog_mploadplayer }, // "Load Player" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, (void *)&menudialog_mpplayersetup3 }, // "Player Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(457), 0x00000000, (void *)&menudialog_2aba0 }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, (void *)&g_MpPlayerSetupViaQuickGoMenuDialog }, // "Player Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(457), 0x00000000, (void *)&g_MpDropOutMenuDialog }, // "Drop Out" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1652,21 +1652,21 @@ struct menuitem menuitems_mpquickgo[] = { struct menudialog g_MpQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(460), // "Quick Go" - menuitems_mpquickgo, + g_MpQuickGoMenuItems, menudialogMpQuickGo, 0x00000000, NULL, }; -struct menudialog menudialog_mpscenario2; +struct menudialog g_MpQuickTeamScenarioMenuDialog; // 2c538 -struct menuitem menuitems_mpquickteamgamesetup[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&menudialog_mpscenario2 }, // "Scenario" +struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&g_MpQuickTeamScenarioMenuDialog }, // "Scenario" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&menudialog_mparena }, // "Arena" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), (u32)&mpMenuTextWeaponSetName, (void *)&menudialog_mpweapons2 }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&menudialog_mplimits }, // "Limits" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), (u32)&mpMenuTextWeaponSetName, (void *)&g_MpQuickTeamWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, menuhandlerQuickTeamSeparator }, { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC(449), 0x00000000, menuhandlerPlayerTeam }, // "Player 1 Team" { MENUITEMTYPE_DROPDOWN, 1, 0x00000000, L_MISC(450), 0x00000000, menuhandlerPlayerTeam }, // "Player 2 Team" @@ -1686,14 +1686,14 @@ struct menuitem menuitems_mpquickteamgamesetup[] = { struct menudialog g_MpQuickTeamGameSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" - menuitems_mpquickteamgamesetup, + g_MpQuickTeamGameSetupMenuItems, NULL, 0x00000000, NULL, }; // 2c6b8 -struct menuitem menuitems_mpquickteam[] = { +struct menuitem g_MpQuickTeamMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(463), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players Only" { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, L_MISC(464), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players and Simulants" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, @@ -1704,20 +1704,20 @@ struct menuitem menuitems_mpquickteam[] = { }; // 2c744 -struct menudialog menudialog_mpquickteam = { +struct menudialog g_MpQuickTeamMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(462), // "Quick Team" - menuitems_mpquickteam, + g_MpQuickTeamMenuItems, NULL, 0x00000004, NULL, }; // 2c75c -struct menuitem menuitems_mpcombatsimulator[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, (void *)&menudialog_mpcombatchallenges2 }, // "Challenges" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, (void *)&menudialog_mploadgamesettingstype1 }, // "Load/Preset Games" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, (void *)&menudialog_mpquickteam }, // "Quick Start" +struct menuitem g_CombatSimulatorMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, (void *)&g_MpChallengesMenuDialog }, // "Challenges" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, (void *)&g_MpLoadPresetMenuDialog }, // "Load/Preset Games" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, (void *)&g_MpQuickTeamMenuDialog }, // "Quick Start" { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(444), 0x00000003, menuhandlerMpAdvancedSetup }, // "Advanced Setup" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1726,7 +1726,7 @@ struct menuitem menuitems_mpcombatsimulator[] = { struct menudialog g_CombatSimulatorMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(445), // "Combat Simulator" - menuitems_mpcombatsimulator, + g_CombatSimulatorMenuItems, menudialogCombatSimulator, 0x00000004, NULL, @@ -1744,7 +1744,7 @@ u16 mpslowmotionoptions[] = { }; // 2c7e8 -struct menuitem menuitems_mpcombatoptions[] = { +struct menuitem g_MpCombatOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1760,17 +1760,17 @@ struct menuitem menuitems_mpcombatoptions[] = { }; // 2c8d8 -struct menudialog menudialog_mpcombatoptions = { +struct menudialog g_MpCombatOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(215), // "Combat Options" - menuitems_mpcombatoptions, + g_MpCombatOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, NULL, }; // 2c8f0 -struct menuitem menuitems_mpbriefcaseoptions[] = { +struct menuitem g_MpBriefcaseOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1787,10 +1787,10 @@ struct menuitem menuitems_mpbriefcaseoptions[] = { }; // 2c9f4 -struct menudialog menudialog_mpbriefcaseoptions = { +struct menudialog g_MpBriefcaseOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(216), // "Briefcase Options" - menuitems_mpbriefcaseoptions, + g_MpBriefcaseOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, NULL, @@ -1825,7 +1825,7 @@ u32 var80086a50 = 0x00ffffff; u32 var80086a54 = 0x00000000; // 2ca78 -struct menuitem menuitems_mpcaptureoptions[] = { +struct menuitem g_MpCaptureOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1841,10 +1841,10 @@ struct menuitem menuitems_mpcaptureoptions[] = { }; // 2cb68 -struct menudialog menudialog_mpcaptureoptions = { +struct menudialog g_MpCaptureOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(220), // "Capture Options" - menuitems_mpcaptureoptions, + g_MpCaptureOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, NULL, @@ -1878,7 +1878,7 @@ u32 var80086bc0 = 0x00ffffff; u32 var80086bc4 = 0x00000000; // 2cbe8 -struct menuitem menuitems_mphilloptions[] = { +struct menuitem g_MpHillOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1896,17 +1896,17 @@ struct menuitem menuitems_mphilloptions[] = { }; // 2cd00 -struct menudialog menudialog_mphilloptions = { +struct menudialog g_MpHillOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(219), // "Hill Options" - menuitems_mphilloptions, + g_MpHillOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, NULL, }; // 2cd18 -struct menuitem menuitems_mphackeroptions[] = { +struct menuitem g_MpHackerOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1923,10 +1923,10 @@ struct menuitem menuitems_mphackeroptions[] = { }; // 2ce1c -struct menudialog menudialog_mphackeroptions = { +struct menudialog g_MpHackerOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(217), // "Hacker Options" - menuitems_mphackeroptions, + g_MpHackerOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, NULL, @@ -1960,7 +1960,7 @@ u32 var80086e74 = 0x00ffffff; u32 var80086e78 = 0x00000000; // 2ce9c -struct menuitem menuitems_mppopacapoptions[] = { +struct menuitem g_MpPopacapOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1977,10 +1977,10 @@ struct menuitem menuitems_mppopacapoptions[] = { }; // 2cfa0 -struct menudialog menudialog_mppopacapoptions = { +struct menudialog g_MpPopacapOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(218), // "Pop a Cap Options" - menuitems_mppopacapoptions, + g_MpPopacapOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, NULL, @@ -1988,12 +1988,12 @@ struct menudialog menudialog_mppopacapoptions = { // 2cfb8 struct mpscenario g_MpScenarios[] = { - { &menudialog_mpcombatoptions, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mpbriefcaseoptions, scenarioHtbInit, scenarioHtbCallback08, scenarioHtbReset, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbKill, scenarioHtbRadar, scenarioHtbRadar2, scenarioHtbHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mphackeroptions, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmReset, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmKill, scenarioHtmRadar, scenarioHtmRadar2, scenarioHtmHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mppopacapoptions, scenarioPacInit, NULL, scenarioPacReset, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacKill, scenarioPacRadar, scenarioPacRadar2, scenarioPacHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mphilloptions, scenarioKohInit, NULL, scenarioKohReset, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohKill, scenarioKohRadar, NULL, NULL, NULL, NULL, scenarioKohIsRoomHighlighted, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 }, - { &menudialog_mpcaptureoptions, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcReset, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcKill, scenarioCtcRadar, scenarioCtcRadar2, scenarioCtcHighlight, scenarioCtcCallback2c, scenarioCtcGetMaxTeams, scenarioCtcIsRoomHighlighted, scenarioCtcCallback38, NULL, NULL, NULL }, + { &g_MpCombatOptionsMenuDialog, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &g_MpBriefcaseOptionsMenuDialog, scenarioHtbInit, scenarioHtbCallback08, scenarioHtbReset, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbKill, scenarioHtbRadar, scenarioHtbRadar2, scenarioHtbHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &g_MpHackerOptionsMenuDialog, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmReset, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmKill, scenarioHtmRadar, scenarioHtmRadar2, scenarioHtmHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &g_MpPopacapOptionsMenuDialog, scenarioPacInit, NULL, scenarioPacReset, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacKill, scenarioPacRadar, scenarioPacRadar2, scenarioPacHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &g_MpHillOptionsMenuDialog, scenarioKohInit, NULL, scenarioKohReset, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohKill, scenarioKohRadar, NULL, NULL, NULL, NULL, scenarioKohIsRoomHighlighted, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 }, + { &g_MpCaptureOptionsMenuDialog, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcReset, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcKill, scenarioCtcRadar, scenarioCtcRadar2, scenarioCtcHighlight, scenarioCtcCallback2c, scenarioCtcGetMaxTeams, scenarioCtcIsRoomHighlighted, scenarioCtcCallback38, NULL, NULL, NULL }, }; // 2d168 @@ -2013,32 +2013,32 @@ u32 var80087174 = 0x00000004; u32 var80087178 = 0x50f50000; // "-Teamwork-" // 2d19c -struct menuitem menuitems_mpscenario[] = { +struct menuitem g_MpScenarioMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00020040, 0x00000078, 0x0000004d, menuhandler00185068 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2d1c4 -struct menudialog menudialog_mpscenario = { +struct menudialog g_MpScenarioMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(243), // "Scenario" - menuitems_mpscenario, + g_MpScenarioMenuItems, NULL, 0x00000011, NULL, }; // 2d1dc -struct menuitem menuitems_mpscenario2[] = { +struct menuitem g_MpQuickTeamScenarioMenuItems[] = { { MENUITEMTYPE_LIST, 1, 0x00020040, 0x00000078, 0x0000004d, menuhandler00185068 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2d204 -struct menudialog menudialog_mpscenario2 = { +struct menudialog g_MpQuickTeamScenarioMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(243), // "Scenario" - menuitems_mpscenario2, + g_MpQuickTeamScenarioMenuItems, NULL, 0x00000011, NULL, diff --git a/src/game/data/data_02e820.c b/src/game/data/data_02e820.c index bfa6c6499..2a8d4b6d5 100644 --- a/src/game/data/data_02e820.c +++ b/src/game/data/data_02e820.c @@ -38,7 +38,7 @@ struct hoverprop hoverprops[] = { }; // 2f858 -struct menuitem menuitems_2f858[] = { +struct menuitem g_HangarDetailsMenuItems[] = { { MENUITEMTYPE_MODEL, 0, 0x00200002, 0x00000104, 0x0000002c, menuhandler001a6ea4 }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HANGARBIO, 0x00000000, 0x00000104, 0x0000005a, NULL }, @@ -48,7 +48,7 @@ struct menuitem menuitems_2f858[] = { }; // 2f8d0 -struct menuitem menuitems_holograph[] = { +struct menuitem g_HangarVehicleHolographMenuItems[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000104, 0x0000006e, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." @@ -56,46 +56,46 @@ struct menuitem menuitems_holograph[] = { }; // 2f920 -struct menudialog menudialog_holograph = { +struct menudialog g_HangarVehicleHolographMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(471), // "Holograph" - menuitems_holograph, + g_HangarVehicleHolographMenuItems, ciHangarHolographMenuDialog, 0x00000202, NULL, }; // 2f938 -struct menudialog menudialog_2f938 = { +struct menudialog g_HangarVehicleDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&bioMenuTextName, - menuitems_2f858, + g_HangarDetailsMenuItems, NULL, 0x00000202, - &menudialog_holograph, + &g_HangarVehicleHolographMenuDialog, }; // 2f950 -struct menudialog menudialog_2f950 = { +struct menudialog g_HangarLocationDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&bioMenuTextName, - menuitems_2f858, + g_HangarDetailsMenuItems, NULL, 0x00000202, NULL, }; // 2f968 -struct menuitem menuitems_hangarinformation[] = { +struct menuitem g_HangarListMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000008, 0x000000a0, 0x00000000, ciHangarInformationMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2f990 -struct menudialog menudialog_hangarinformation = { +struct menudialog g_HangarListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(415), // "Hangar Information" - menuitems_hangarinformation, + g_HangarListMenuItems, NULL, 0x00000000, NULL, diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 2f9eb72f2..a29eda60f 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -142,23 +142,23 @@ s32 menuhandlerReplayPreviousMission(u32 operation, struct menuitem *item, union return menuhandlerAcceptMission(operation, NULL, data); } -struct menuitem g_MenuItemsRetryMission[] = { +struct menuitem g_RetryMissionMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(298), 0x00000000, menuhandlerAcceptMission }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(299), 0x00000000, menuhandlerDeclineMission }, // "Decline" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MenuDialogRetryMission = { +struct menudialog g_RetryMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&menuDialogTitleRetryStageName, - g_MenuItemsRetryMission, + g_RetryMissionMenuItems, menudialogRetryMission, 0x0000000c, - &menudialog_briefing, + &g_PreAndPostMissionBriefingMenuDialog, }; -struct menuitem g_MenuItemsPromptNextMission[] = { +struct menuitem g_NextMissionMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(298), 0x00000000, menuhandlerAcceptMission }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(299), 0x00000000, menuhandlerDeclineMission }, // "Decline" @@ -167,13 +167,13 @@ struct menuitem g_MenuItemsPromptNextMission[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MenuDialogPromptNextMission = { +struct menudialog g_NextMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&menuDialogTitleNextMissionStageName, - g_MenuItemsPromptNextMission, + g_NextMissionMenuItems, menudialogRetryMission, 0x0000000c, - &menudialog_briefing, + &g_PreAndPostMissionBriefingMenuDialog, }; char *soloMenuTextNumKills(struct menuitem *item) @@ -356,7 +356,7 @@ struct menudialog *func0f10d730(void) g_MissionConfig.stageindex++; g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum; - return &g_MenuDialogPromptNextMission; + return &g_NextMissionMenuDialog; } void func0f10d770(void) @@ -384,51 +384,51 @@ s32 menuhandlerReplayLastLevel(u32 operation, struct menuitem *item, union handl return 0; } -struct menuitem g_MenuItemsSolo2PObjectivesNarrow[] = { +struct menuitem g_2PMissionEndscreenObjectivesVMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 2, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(301), 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem g_MenuItemsSolo2PObjectivesWide[] = { +struct menuitem g_SoloEndscreenObjectivesMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(301), 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MenuDialogObjectivesFailedWide = { +struct menudialog g_SoloEndscreenObjectivesFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(300), // "Objectives" - g_MenuItemsSolo2PObjectivesWide, + g_SoloEndscreenObjectivesMenuItems, soloMenuDialogPauseStatus, 0x00000048, NULL, }; -struct menudialog g_MenuDialogObjectivesCompletedWide = { +struct menudialog g_SoloEndscreenObjectivesCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(300), // "Objectives" - g_MenuItemsSolo2PObjectivesWide, + g_SoloEndscreenObjectivesMenuItems, soloMenuDialogPauseStatus, 0x00000048, NULL, }; -struct menudialog g_MenuDialogObjectivesFailedNarrow = { +struct menudialog g_2PMissionEndscreenObjectivesFailedVMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(300), // "Objectives" - g_MenuItemsSolo2PObjectivesNarrow, + g_2PMissionEndscreenObjectivesVMenuItems, soloMenuDialogPauseStatus, 0x00000048, NULL, }; -struct menudialog g_MenuDialogObjectivesCompletedNarrow = { +struct menudialog g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(300), // "Objectives" - g_MenuItemsSolo2PObjectivesNarrow, + g_2PMissionEndscreenObjectivesVMenuItems, soloMenuDialogPauseStatus, 0x00000048, NULL, @@ -447,16 +447,16 @@ s32 menuhandlerContinueMission(u32 operation, struct menuitem *item, union handl return 0; } -struct menuitem g_MenuItemsContinueOrReplay[] = { +struct menuitem g_MissionContinueOrReplyMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(244), 0x00000000, menuhandlerContinueMission }, // "Continue" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(245), 0x00000000, menuhandlerReplayLastLevel }, // "Replay Last Level" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MenuDialogContinueOrReplay = { +struct menudialog g_MissionContinueOrReplyMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&menuTextCurrentStageName3, - g_MenuItemsContinueOrReplay, + g_MissionContinueOrReplyMenuItems, NULL, 0x00000004, NULL, @@ -525,9 +525,9 @@ void endscreenHandleContinue(s32 context) } } else { if (context == 1) { - menuPushRootDialog(&g_MenuDialogContinueOrReplay, MENUROOT_COOPCONTINUE); + menuPushRootDialog(&g_MissionContinueOrReplyMenuDialog, MENUROOT_COOPCONTINUE); } else { - menuPushDialog(&g_MenuDialogContinueOrReplay); + menuPushDialog(&g_MissionContinueOrReplyMenuDialog); } } } else { @@ -540,7 +540,7 @@ void endscreenHandleContinue(s32 context) menuPopDialog(); menuPopDialog(); } else { - menuPushDialog(&g_MenuDialogContinueOrReplay); + menuPushDialog(&g_MissionContinueOrReplyMenuDialog); } } else if (stageGetIndex(g_MissionConfig.stagenum) < 0 || g_Vars.stagenum == STAGE_CITRAINING @@ -549,7 +549,7 @@ void endscreenHandleContinue(s32 context) menuPopDialog(); menuPopDialog(); } else { - menuPushDialog(&g_MenuDialogContinueOrReplay); + menuPushDialog(&g_MissionContinueOrReplyMenuDialog); } } else { func0f10d770(); @@ -627,7 +627,7 @@ s32 menudialogSolo2PEndscreenFailed(u32 operation, struct menudialog *dialog, un menuPopDialog(); } else { func0f10d770(); - menuPushDialog(&g_MenuDialogRetryMission); + menuPushDialog(&g_RetryMissionMenuDialog); } } } @@ -640,7 +640,7 @@ s32 menudialogSolo2PEndscreenFailed(u32 operation, struct menudialog *dialog, un return 0; } -struct menuitem g_MenuItemsSoloEndscreenNarrow[] = { +struct menuitem g_2PMissionEndscreenVMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(278), 0x00000000, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&soloMenuTextMissionStatus, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(279), 0x00000000, NULL }, // "Agent Status:" @@ -668,7 +668,7 @@ struct menuitem g_MenuItemsSoloEndscreenNarrow[] = { u32 g_CheatColour = 0xff7f7fff; -struct menuitem g_MenuItemsSoloEndscreenWide[] = { +struct menuitem g_MissionEndscreenMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(278), (u32)&soloMenuTextMissionStatus, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(279), (u32)&soloMenuTextAgentStatus, NULL }, // "Agent Status:" { MENUITEMTYPE_LABEL, 0, 0x01000000, L_OPTIONS(280), (u32)&soloMenuTextMissionTime, menuhandlerEndscreenCheats }, // "Mission Time:" @@ -869,22 +869,22 @@ void endscreenSetCoopCompleted(void) } } -struct menudialog g_MenuDialogSoloEndscreenCompleted = { +struct menudialog g_SoloMissionEndscreenCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, (u32)&menuTitleStageCompleted, - g_MenuItemsSoloEndscreenWide, + g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenCompleted, 0x00000048, - &g_MenuDialogObjectivesCompletedWide, + &g_SoloEndscreenObjectivesCompletedMenuDialog, }; -struct menudialog g_MenuDialogSoloEndscreenFailed = { +struct menudialog g_SoloMissionEndscreenFailedMenuDialog = { MENUDIALOGTYPE_DANGER, (u32)&menuTitleStageFailed, - g_MenuItemsSoloEndscreenWide, + g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenFailed, 0x00000048, - &g_MenuDialogObjectivesFailedWide, + &g_SoloEndscreenObjectivesFailedMenuDialog, }; GLOBAL_ASM( @@ -983,10 +983,10 @@ glabel endscreenPrepare /* f10e784: 0fc256d9 */ jal objectiveIsAllComplete /* f10e788: 00000000 */ nop /* f10e78c: 1440000a */ bnez $v0,.L0f10e7b8 -/* f10e790: 3c048007 */ lui $a0,%hi(g_MenuDialogSoloEndscreenCompleted) +/* f10e790: 3c048007 */ lui $a0,%hi(g_SoloMissionEndscreenCompletedMenuDialog) .L0f10e794: -/* f10e794: 3c048007 */ lui $a0,%hi(g_MenuDialogSoloEndscreenFailed) -/* f10e798: 24845b3c */ addiu $a0,$a0,%lo(g_MenuDialogSoloEndscreenFailed) +/* f10e794: 3c048007 */ lui $a0,%hi(g_SoloMissionEndscreenFailedMenuDialog) +/* f10e798: 24845b3c */ addiu $a0,$a0,%lo(g_SoloMissionEndscreenFailedMenuDialog) /* f10e79c: 0fc3e0cc */ jal menuPushRootDialog /* f10e7a0: 24050001 */ addiu $a1,$zero,0x1 /* f10e7a4: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x3) @@ -995,7 +995,7 @@ glabel endscreenPrepare /* f10e7b0: 1000000f */ b .L0f10e7f0 /* f10e7b4: 01201025 */ or $v0,$t1,$zero .L0f10e7b8: -/* f10e7b8: 24845b24 */ addiu $a0,$a0,%lo(g_MenuDialogSoloEndscreenCompleted) +/* f10e7b8: 24845b24 */ addiu $a0,$a0,%lo(g_SoloMissionEndscreenCompletedMenuDialog) /* f10e7bc: 0fc3e0cc */ jal menuPushRootDialog /* f10e7c0: 24050001 */ addiu $a1,$zero,0x1 /* f10e7c4: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x3) @@ -1378,9 +1378,9 @@ glabel endscreenPrepare // if (g_Vars.currentplayer->isdead // || g_Vars.currentplayer->aborted // || !objectiveIsAllComplete()) { -// menuPushRootDialog(&g_MenuDialogSoloEndscreenFailed, MENUROOT_ENDSCREEN); +// menuPushRootDialog(&g_SoloMissionEndscreenFailedMenuDialog, MENUROOT_ENDSCREEN); // } else { -// menuPushRootDialog(&g_MenuDialogSoloEndscreenCompleted, MENUROOT_ENDSCREEN); +// menuPushRootDialog(&g_SoloMissionEndscreenCompletedMenuDialog, MENUROOT_ENDSCREEN); // // if (g_MissionConfig.iscoop) { // endscreenSetCoopCompleted(); @@ -1503,40 +1503,40 @@ glabel endscreenPrepare // } //} -struct menudialog g_MenuDialogSolo2PEndscreenCompletedWide = { +struct menudialog g_2PMissionEndscreenCompletedHMenuDialog = { MENUDIALOGTYPE_SUCCESS, (u32)&menuTitleStageCompleted, - g_MenuItemsSoloEndscreenWide, + g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenCompleted, 0x00000048, - &g_MenuDialogObjectivesCompletedWide, + &g_SoloEndscreenObjectivesCompletedMenuDialog, }; -struct menudialog g_MenuDialogSolo2PEndscreenFailedWide = { +struct menudialog g_2PMissionEndscreenFailedHMenuDialog = { MENUDIALOGTYPE_DANGER, (u32)&menuTitleStageFailed, - g_MenuItemsSoloEndscreenWide, + g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenFailed, 0x00000048, - &g_MenuDialogObjectivesFailedWide, + &g_SoloEndscreenObjectivesFailedMenuDialog, }; -struct menudialog g_MenuDialogSolo2PEndscreenCompletedNarrow = { +struct menudialog g_2PMissionEndscreenCompletedVMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(276), // "Completed" - g_MenuItemsSoloEndscreenNarrow, + g_2PMissionEndscreenVMenuItems, menudialogSolo2PEndscreenCompleted, 0x00000048, - &g_MenuDialogObjectivesCompletedNarrow, + &g_2PMissionEndscreenObjectivesCompletedVMenuDialog, }; -struct menudialog g_MenuDialogSolo2PEndscreenFailedNarrow = { +struct menudialog g_2PMissionEndscreenFailedVMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(277), // "Failed" - g_MenuItemsSoloEndscreenNarrow, + g_2PMissionEndscreenVMenuItems, menudialogSolo2PEndscreenFailed, 0x00000048, - &g_MenuDialogObjectivesFailedNarrow, + &g_2PMissionEndscreenObjectivesFailedVMenuDialog, }; void soloPushCoopModeEndscreen(void) @@ -1558,16 +1558,16 @@ void soloPushCoopModeEndscreen(void) || !objectiveIsAllComplete()) { // Failed or aborted if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenFailedNarrow, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenFailedWide, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); } } else { // Completed if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenCompletedNarrow, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenCompletedWide, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); } endscreenSetCoopCompleted(); @@ -1600,7 +1600,7 @@ void soloPushSoloModeEndscreen(void) || !objectiveIsAllComplete()) { // Failed or aborted func0f10d770(); - menuPushRootDialog(&g_MenuDialogRetryMission, MENUROOT_COOPCONTINUE); + menuPushRootDialog(&g_RetryMissionMenuDialog, MENUROOT_COOPCONTINUE); } else { // Completed endscreenHandleContinue(1); @@ -1627,16 +1627,16 @@ void soloPushAntiModeEndscreen(void) (g_Vars.bond->isdead || g_Vars.bond->aborted || objectiveIsAllComplete() == false)) { // Bond - failed or aborted if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenFailedNarrow, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenFailedWide, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); } } else { // Bond - completed if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenCompletedNarrow, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenCompletedWide, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); } } @@ -1646,16 +1646,16 @@ void soloPushAntiModeEndscreen(void) (g_Vars.bond->isdead || g_Vars.bond->aborted || objectiveIsAllComplete() == false)) { // Anti - completed if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenCompletedNarrow, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenCompletedWide, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); } } else { // Anti - failed or aborted if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenFailedNarrow, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MenuDialogSolo2PEndscreenFailedWide, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); } } } diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 0516523f2..2f88b7f4f 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -419,8 +419,8 @@ glabel var7f1a863c /* f01c388: 248467a0 */ addiu $a0,$a0,%lo(g_CombatSimulatorMenuDialog) /* f01c38c: 16d80008 */ bne $s6,$t8,.L0f01c3b0 /* f01c390: 24050003 */ addiu $a1,$zero,0x3 -/* f01c394: 3c048007 */ lui $a0,%hi(g_4MbMainMenu) -/* f01c398: 24845294 */ addiu $a0,$a0,%lo(g_4MbMainMenu) +/* f01c394: 3c048007 */ lui $a0,%hi(g_MainMenu4MbMenuDialog) +/* f01c398: 24845294 */ addiu $a0,$a0,%lo(g_MainMenu4MbMenuDialog) /* f01c39c: 2405000b */ addiu $a1,$zero,0xb /* f01c3a0: 0fc3e0cc */ jal menuPushRootDialog /* f01c3a4: afa80058 */ sw $t0,0x58($sp) @@ -756,9 +756,9 @@ glabel var7f1a863c /* f01c840: 2405000b */ addiu $a1,$zero,0xb /* f01c844: 16ce0006 */ bne $s6,$t6,.L0f01c860 /* f01c848: 24846500 */ addiu $a0,$a0,%lo(g_MpQuickGoMenuDialog) -/* f01c84c: 3c048007 */ lui $a0,%hi(menudialog_mpquickgo2) +/* f01c84c: 3c048007 */ lui $a0,%hi(g_MpQuickGo4MbMenuDialog) /* f01c850: 0fc3e0cc */ jal menuPushRootDialog -/* f01c854: 24845120 */ addiu $a0,$a0,%lo(menudialog_mpquickgo2) +/* f01c854: 24845120 */ addiu $a0,$a0,%lo(g_MpQuickGo4MbMenuDialog) /* f01c858: 1000000a */ b .L0f01c884 /* f01c85c: 32191000 */ andi $t9,$s0,0x1000 .L0f01c860: @@ -803,9 +803,9 @@ glabel var7f1a863c /* f01c8e8: 2405000b */ addiu $a1,$zero,0xb /* f01c8ec: 16cf0006 */ bne $s6,$t7,.L0f01c908 /* f01c8f0: 24846500 */ addiu $a0,$a0,%lo(g_MpQuickGoMenuDialog) -/* f01c8f4: 3c048007 */ lui $a0,%hi(menudialog_mpquickgo2) +/* f01c8f4: 3c048007 */ lui $a0,%hi(g_MpQuickGo4MbMenuDialog) /* f01c8f8: 0fc3e0cc */ jal menuPushRootDialog -/* f01c8fc: 24845120 */ addiu $a0,$a0,%lo(menudialog_mpquickgo2) +/* f01c8fc: 24845120 */ addiu $a0,$a0,%lo(g_MpQuickGo4MbMenuDialog) /* f01c900: 1000000d */ b .L0f01c938 /* f01c904: 00000000 */ nop .L0f01c908: @@ -1055,11 +1055,11 @@ glabel var7f1a863c /* f01cc5c: 3c0e8009 */ lui $t6,%hi(g_Is4Mb) /* f01cc60: aeaf0008 */ sw $t7,0x8($s5) /* f01cc64: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) -/* f01cc68: 3c198007 */ lui $t9,%hi(g_MainMenuMenuDialog) -/* f01cc6c: 27393a5c */ addiu $t9,$t9,%lo(g_MainMenuMenuDialog) +/* f01cc68: 3c198007 */ lui $t9,%hi(g_CiMenuViaPcMenuDialog) +/* f01cc6c: 27393a5c */ addiu $t9,$t9,%lo(g_CiMenuViaPcMenuDialog) /* f01cc70: 16ce0004 */ bne $s6,$t6,.L0f01cc84 -/* f01cc74: 3c188007 */ lui $t8,%hi(g_CiMainMenuDialogViaPause) -/* f01cc78: 27183a74 */ addiu $t8,$t8,%lo(g_CiMainMenuDialogViaPause) +/* f01cc74: 3c188007 */ lui $t8,%hi(g_CiMenuViaPauseMenuDialog) +/* f01cc78: 27183a74 */ addiu $t8,$t8,%lo(g_CiMenuViaPauseMenuDialog) /* f01cc7c: 10000002 */ b .L0f01cc88 /* f01cc80: aeb8000c */ sw $t8,0xc($s5) .L0f01cc84: @@ -1074,9 +1074,9 @@ glabel var7f1a863c /* f01cc9c: 271867a0 */ addiu $t8,$t8,%lo(g_CombatSimulatorMenuDialog) /* f01cca0: 16cd0007 */ bne $s6,$t5,.L0f01ccc0 /* f01cca4: 00402825 */ or $a1,$v0,$zero -/* f01cca8: 3c0e8007 */ lui $t6,%hi(g_4MbMainMenu) +/* f01cca8: 3c0e8007 */ lui $t6,%hi(g_MainMenu4MbMenuDialog) /* f01ccac: 2405000b */ addiu $a1,$zero,0xb -/* f01ccb0: 25ce5294 */ addiu $t6,$t6,%lo(g_4MbMainMenu) +/* f01ccb0: 25ce5294 */ addiu $t6,$t6,%lo(g_MainMenu4MbMenuDialog) /* f01ccb4: aea50008 */ sw $a1,0x8($s5) /* f01ccb8: 10000003 */ b .L0f01ccc8 /* f01ccbc: aeae000c */ sw $t6,0xc($s5) @@ -2044,7 +2044,7 @@ glabel var7f1a863c // // // c38c // if (IS4MB()) { -// menuPushRootDialog(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); +// menuPushRootDialog(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); // } else { // menuPushRootDialog(&g_CombatSimulatorMenuDialog, MENUROOT_MPSETUP); // } @@ -2189,7 +2189,7 @@ glabel var7f1a863c // var800714d8++; // // if (IS4MB()) { -// menuPushRootDialog(&menudialog_mpquickgo2, MENUROOT_4MBMAINMENU); +// menuPushRootDialog(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); // } else { // menuPushRootDialog(&g_MpQuickGoMenuDialog, MENUROOT_MPSETUP); // } @@ -2211,7 +2211,7 @@ glabel var7f1a863c // var800714d8++; // // if (IS4MB()) { -// menuPushRootDialog(&menudialog_mpquickgo2, MENUROOT_4MBMAINMENU); +// menuPushRootDialog(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); // } else { // menuPushRootDialog(&g_MpQuickGoMenuDialog, MENUROOT_MPSETUP); // } @@ -2308,12 +2308,12 @@ glabel var7f1a863c // // cc4c // if (g_Vars.unk000490 == 2) { // g_MenuData.unk008 = MENUROOT_MAINMENU; -// g_MenuData.unk00c = IS4MB() ? &g_CiMainMenuDialogViaPause : &g_MainMenuMenuDialog; +// g_MenuData.unk00c = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog; // } else { // // cc90 // if (IS4MB()) { // g_MenuData.unk008 = MENUROOT_4MBMAINMENU; -// g_MenuData.unk00c = &g_4MbMainMenu; +// g_MenuData.unk00c = &g_MainMenu4MbMenuDialog; // } else { // // ccc0 // g_MenuData.unk008 = MENUROOT_MPSETUP; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 26d241eb4..d3956d1bc 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -8469,7 +8469,7 @@ glabel var7f1b29f8 void func0f0f85e0(struct menudialog *dialog, s32 root) { - if (dialog == &g_MainMenuMenuDialog) { + if (dialog == &g_CiMenuViaPcMenuDialog) { musicStartForMenu(); } @@ -10486,17 +10486,17 @@ glabel var7f1b2a64 /* f0fa220: 00000000 */ nop /* f0fa224: 91ad0af0 */ lbu $t5,%lo(g_Is4Mb)($t5) /* f0fa228: 24010001 */ addiu $at,$zero,0x1 -/* f0fa22c: 3c048008 */ lui $a0,%hi(menudialog_2aba0) +/* f0fa22c: 3c048008 */ lui $a0,%hi(g_MpDropOutMenuDialog) /* f0fa230: 15a10006 */ bne $t5,$at,.L0f0fa24c /* f0fa234: 00000000 */ nop -/* f0fa238: 3c048007 */ lui $a0,%hi(menudialog_mpdropout) +/* f0fa238: 3c048007 */ lui $a0,%hi(g_MpDropOut4MbMenuDialog) /* f0fa23c: 0fc3cbd3 */ jal menuPushDialog -/* f0fa240: 248452fc */ addiu $a0,$a0,%lo(menudialog_mpdropout) +/* f0fa240: 248452fc */ addiu $a0,$a0,%lo(g_MpDropOut4MbMenuDialog) /* f0fa244: 1000001f */ b .L0f0fa2c4 /* f0fa248: 8fd00008 */ lw $s0,0x8($s8) .L0f0fa24c: /* f0fa24c: 0fc3cbd3 */ jal menuPushDialog -/* f0fa250: 24844b80 */ addiu $a0,$a0,%lo(menudialog_2aba0) +/* f0fa250: 24844b80 */ addiu $a0,$a0,%lo(g_MpDropOutMenuDialog) /* f0fa254: 1000001b */ b .L0f0fa2c4 /* f0fa258: 8fd00008 */ lw $s0,0x8($s8) .L0f0fa25c: @@ -13453,20 +13453,20 @@ glabel menuhandler000fcc34 /* f0fcc64: afa50044 */ sw $a1,0x44($sp) /* f0fcc68: 1481002a */ bne $a0,$at,.L0f0fcd14 /* f0fcc6c: afa60048 */ sw $a2,0x48($sp) -/* f0fcc70: 3c1e8007 */ lui $s8,%hi(menudialog_damagedcontrollerpak) +/* f0fcc70: 3c1e8007 */ lui $s8,%hi(g_PakDamagedMenuDialog) /* f0fcc74: 3c178007 */ lui $s7,%hi(g_PakAttemptRepairMenuDialog) /* f0fcc78: 3c168007 */ lui $s6,%hi(g_PakRepairFailedMenuDialog) -/* f0fcc7c: 3c158007 */ lui $s5,%hi(menudialog_pakremoved) +/* f0fcc7c: 3c158007 */ lui $s5,%hi(g_PakRemovedMenuDialog) /* f0fcc80: 3c148007 */ lui $s4,%hi(g_PakRepairSuccessMenuDialog) /* f0fcc84: 3c128007 */ lui $s2,%hi(g_MpPlayerNum) /* f0fcc88: 3c11800a */ lui $s1,%hi(g_Menus) /* f0fcc8c: 2631e000 */ addiu $s1,$s1,%lo(g_Menus) /* f0fcc90: 26521448 */ addiu $s2,$s2,%lo(g_MpPlayerNum) /* f0fcc94: 269415b0 */ addiu $s4,$s4,%lo(g_PakRepairSuccessMenuDialog) -/* f0fcc98: 26b51548 */ addiu $s5,$s5,%lo(menudialog_pakremoved) +/* f0fcc98: 26b51548 */ addiu $s5,$s5,%lo(g_PakRemovedMenuDialog) /* f0fcc9c: 26d61618 */ addiu $s6,$s6,%lo(g_PakRepairFailedMenuDialog) /* f0fcca0: 26f716a8 */ addiu $s7,$s7,%lo(g_PakAttemptRepairMenuDialog) -/* f0fcca4: 27de176c */ addiu $s8,$s8,%lo(menudialog_damagedcontrollerpak) +/* f0fcca4: 27de176c */ addiu $s8,$s8,%lo(g_PakDamagedMenuDialog) /* f0fcca8: 24130e70 */ addiu $s3,$zero,0xe70 /* f0fccac: 8e4e0000 */ lw $t6,0x0($s2) .L0f0fccb0: @@ -13487,8 +13487,8 @@ glabel menuhandler000fcc34 /* f0fcce8: 12e20006 */ beq $s7,$v0,.L0f0fcd04 /* f0fccec: 00000000 */ nop /* f0fccf0: 13c20004 */ beq $s8,$v0,.L0f0fcd04 -/* f0fccf4: 3c198007 */ lui $t9,%hi(menudialog_fullcontrollerpak) -/* f0fccf8: 27391810 */ addiu $t9,$t9,%lo(menudialog_fullcontrollerpak) +/* f0fccf4: 3c198007 */ lui $t9,%hi(g_PakFullMenuDialog) +/* f0fccf8: 27391810 */ addiu $t9,$t9,%lo(g_PakFullMenuDialog) /* f0fccfc: 17220003 */ bne $t9,$v0,.L0f0fcd0c /* f0fcd00: 00000000 */ nop .L0f0fcd04: @@ -13519,7 +13519,7 @@ s32 menudialog000fcd48(u32 operation, struct menudialog *dialog, union handlerda if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog && func000155b4(g_Menus[g_MpPlayerNum].savedevice) == 0) { - func0f0f3704(&menudialog_pakremoved); + func0f0f3704(&g_PakRemovedMenuDialog); } } @@ -13534,9 +13534,9 @@ glabel func0f0fcdd0 /* f0fcddc: afa5001c */ sw $a1,0x1c($sp) /* f0fcde0: 14810004 */ bne $a0,$at,.L0f0fcdf4 /* f0fcde4: afa60020 */ sw $a2,0x20($sp) -/* f0fcde8: 3c048007 */ lui $a0,%hi(menudialog_damagedcontrollerpak) +/* f0fcde8: 3c048007 */ lui $a0,%hi(g_PakDamagedMenuDialog) /* f0fcdec: 0fc3cdc1 */ jal func0f0f3704 -/* f0fcdf0: 2484176c */ addiu $a0,$a0,%lo(menudialog_damagedcontrollerpak) +/* f0fcdf0: 2484176c */ addiu $a0,$a0,%lo(g_PakDamagedMenuDialog) .L0f0fcdf4: /* f0fcdf4: 8fbf0014 */ lw $ra,0x14($sp) /* f0fcdf8: 27bd0018 */ addiu $sp,$sp,0x18 @@ -13645,23 +13645,23 @@ glabel func0f0fce8c /* f0fcfb4: ac2a1448 */ sw $t2,%lo(g_MpPlayerNum)($at) ); -struct menuitem menuitems_pakremoved[] = { +struct menuitem g_PakRemovedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(174), 0x00000000, NULL }, // "The Controller Pak has been removed." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(73), 0x00000000, menuhandler000fcc34 }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_pakremoved = { +struct menudialog g_PakRemovedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(173), // "Error" - menuitems_pakremoved, + g_PakRemovedMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_pakrepaired[] = { +struct menuitem g_PakRepairSuccessMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000054b5, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005449, 0x00000000, menuhandler000fcc34 }, @@ -13671,13 +13671,13 @@ struct menuitem menuitems_pakrepaired[] = { struct menudialog g_PakRepairSuccessMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPWEAPONS(180), // "Repair Successful" - menuitems_pakrepaired, + g_PakRepairSuccessMenuItems, menudialog000fcd48, 0x00000000, NULL, }; -struct menuitem menuitems_pakrepairfailed[] = { +struct menuitem g_PakRepairFailedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(183), 0x00000000, NULL }, // "The Controller Pak cannot be repaired. You will not be able to load from or save to this Controller Pak." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(73), 0x00000000, NULL }, // "OK" @@ -13687,13 +13687,13 @@ struct menuitem menuitems_pakrepairfailed[] = { struct menudialog g_PakRepairFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(182), // "Repair Failed" - menuitems_pakrepairfailed, + g_PakRepairFailedMenuItems, menudialog000fcd48, 0x00000000, NULL, }; -struct menuitem menuitems_pakattemptrepair[] = { +struct menuitem g_PakAttemptRepairMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(176), 0x00000000, NULL }, // "Are you sure you want to attempt repair of this Controller Pak?" { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(177), 0x00000000, NULL }, // "Data may be lost!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -13705,7 +13705,7 @@ struct menuitem menuitems_pakattemptrepair[] = { struct menudialog g_PakAttemptRepairMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(175), // "Attempt Repair" - menuitems_pakattemptrepair, + g_PakAttemptRepairMenuItems, menudialog000fcd48, 0x00000000, NULL, @@ -13786,12 +13786,12 @@ bool func0f0fd1f4(u32 arg0, u32 arg1) } if (g_Menus[playernum].curframe) { - if (g_Menus[playernum].curframe->dialog == &menudialog_damagedcontrollerpak - || g_Menus[playernum].curframe->dialog == &menudialog_cannotreadgameboy - || g_Menus[playernum].curframe->dialog == &menudialog_datalost - || g_Menus[playernum].curframe->dialog == &menudialog_fullcontrollerpak + if (g_Menus[playernum].curframe->dialog == &g_PakDamagedMenuDialog + || g_Menus[playernum].curframe->dialog == &g_PakCannotReadGameBoyMenuDialog + || g_Menus[playernum].curframe->dialog == &g_PakDataLostMenuDialog + || g_Menus[playernum].curframe->dialog == &g_PakFullMenuDialog || g_Menus[playernum].curframe->dialog == &g_PakAttemptRepairMenuDialog - || g_Menus[playernum].curframe->dialog == &menudialog_pakremoved + || g_Menus[playernum].curframe->dialog == &g_PakRemovedMenuDialog || g_Menus[playernum].curframe->dialog == &g_PakRepairSuccessMenuDialog || g_Menus[playernum].curframe->dialog == &g_PakRepairFailedMenuDialog) { result = false; @@ -13837,8 +13837,8 @@ glabel var7f1b2b10 /* f0fd364: 8c2f2b00 */ lw $t7,%lo(var7f1b2b00)($at) /* f0fd368: 01e00008 */ jr $t7 /* f0fd36c: 00000000 */ nop -/* f0fd370: 3c048007 */ lui $a0,%hi(menudialog_damagedcontrollerpak) -/* f0fd374: 2484176c */ addiu $a0,$a0,%lo(menudialog_damagedcontrollerpak) +/* f0fd370: 3c048007 */ lui $a0,%hi(g_PakDamagedMenuDialog) +/* f0fd374: 2484176c */ addiu $a0,$a0,%lo(g_PakDamagedMenuDialog) /* f0fd378: 8fa50018 */ lw $a1,0x18($sp) /* f0fd37c: 0fc3f3a3 */ jal func0f0fce8c /* f0fd380: 8fa60020 */ lw $a2,0x20($sp) @@ -13888,22 +13888,22 @@ glabel var7f1b2b10 /* f0fd428: 24630018 */ addiu $v1,$v1,0x18 .L0f0fd42c: /* f0fd42c: 14e00013 */ bnez $a3,.L0f0fd47c -/* f0fd430: 3c048007 */ lui $a0,%hi(menudialog_fullcontrollerpak) -/* f0fd434: 24841810 */ addiu $a0,$a0,%lo(menudialog_fullcontrollerpak) +/* f0fd430: 3c048007 */ lui $a0,%hi(g_PakFullMenuDialog) +/* f0fd434: 24841810 */ addiu $a0,$a0,%lo(g_PakFullMenuDialog) /* f0fd438: 8fa50018 */ lw $a1,0x18($sp) /* f0fd43c: 0fc3f3a3 */ jal func0f0fce8c /* f0fd440: 8fa60020 */ lw $a2,0x20($sp) /* f0fd444: 1000000e */ b .L0f0fd480 /* f0fd448: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fd44c: 3c048007 */ lui $a0,%hi(menudialog_cannotreadgameboy) -/* f0fd450: 24841878 */ addiu $a0,$a0,%lo(menudialog_cannotreadgameboy) +/* f0fd44c: 3c048007 */ lui $a0,%hi(g_PakCannotReadGameBoyMenuDialog) +/* f0fd450: 24841878 */ addiu $a0,$a0,%lo(g_PakCannotReadGameBoyMenuDialog) /* f0fd454: 8fa50018 */ lw $a1,0x18($sp) /* f0fd458: 0fc3f3a3 */ jal func0f0fce8c /* f0fd45c: 8fa60020 */ lw $a2,0x20($sp) /* f0fd460: 10000007 */ b .L0f0fd480 /* f0fd464: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fd468: 3c048007 */ lui $a0,%hi(menudialog_datalost) -/* f0fd46c: 2484191c */ addiu $a0,$a0,%lo(menudialog_datalost) +/* f0fd468: 3c048007 */ lui $a0,%hi(g_PakDataLostMenuDialog) +/* f0fd46c: 2484191c */ addiu $a0,$a0,%lo(g_PakDataLostMenuDialog) /* f0fd470: 8fa50018 */ lw $a1,0x18($sp) /* f0fd474: 0fc3f3a3 */ jal func0f0fce8c /* f0fd478: 8fa60020 */ lw $a2,0x20($sp) @@ -14013,7 +14013,7 @@ struct chrdata *currentPlayerGetCommandingAibot(void) return g_Vars.currentplayer->commandingaibot; } -struct menuitem menuitems_damagedcontrollerpak[] = { +struct menuitem g_PakDamagedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(65), 0x00000000, NULL }, // "is damaged or" { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(66), 0x00000000, NULL }, // "inserted incorrectly" @@ -14024,16 +14024,16 @@ struct menuitem menuitems_damagedcontrollerpak[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_damagedcontrollerpak = { +struct menudialog g_PakDamagedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(64), // "Damaged Controller Pak" - menuitems_damagedcontrollerpak, + g_PakDamagedMenuItems, menudialog000fcd48, 0x00000020, NULL, }; -struct menuitem menuitems_fullcontrollerpak[] = { +struct menuitem g_PakFullMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000210, L_MPWEAPONS(71), 0x00000000, NULL }, // "is too full to save note - 1 note and 28 pages required to save" { MENUITEMTYPE_LABEL, 0, 0x02000220, L_OPTIONS(3), 0x00000000, NULL }, // "" @@ -14043,32 +14043,32 @@ struct menuitem menuitems_fullcontrollerpak[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_fullcontrollerpak = { +struct menudialog g_PakFullMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(70), // "Full Controller Pak" - menuitems_fullcontrollerpak, + g_PakFullMenuItems, menudialog000fcd48, 0x00000020, NULL, }; -struct menuitem menuitems_cannotreadgameboy[] = { +struct menuitem g_PakCannotReadGameBoyMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(254), 0x00000000, NULL }, // "Cannot read Game Boy Game Pak. Check connections and make sure correct Game Boy Game Pak is being used." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(255), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_cannotreadgameboy = { +struct menudialog g_PakCannotReadGameBoyMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(253), // "Error" - menuitems_cannotreadgameboy, + g_PakCannotReadGameBoyMenuItems, NULL, 0x00000020, NULL, }; -struct menuitem menuitems_datalost[] = { +struct menuitem g_PakDataLostMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(257), 0x00000000, NULL }, // "The saved data has" { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(258), 0x00000000, NULL }, // "been erased due to" @@ -14078,10 +14078,10 @@ struct menuitem menuitems_datalost[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_datalost = { +struct menudialog g_PakDataLostMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(256), // "Error" - menuitems_datalost, + g_PakDataLostMenuItems, NULL, 0x00000020, NULL, diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 3869db9d7..006f377d1 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -629,15 +629,15 @@ s32 menudialogBriefing(u32 operation, struct menudialog *dialog, union handlerda return 0; } -struct menuitem menuitems_briefing[] = { +struct menuitem g_PreAndPostMissionBriefingMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_BRIEFING, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_briefing = { +struct menudialog g_PreAndPostMissionBriefingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" - menuitems_briefing, + g_PreAndPostMissionBriefingMenuItems, menudialogBriefing, 0x00000008, NULL, @@ -727,20 +727,20 @@ s32 menudialog00103608(u32 operation, struct menudialog *dialog, union handlerda return 0; } -struct menuitem menuitems_objectives[] = { +struct menuitem g_AcceptMissionMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(274), 0x00000000, menuhandlerAcceptMission }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(275), 0x00000000, NULL }, // "Decline" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_ObjectivesMenuDialog = { +struct menudialog g_AcceptMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&soloMenuTitleStageOverview, - menuitems_objectives, + g_AcceptMissionMenuItems, menudialog00103608, 0x0000000c, - &menudialog_briefing, + &g_PreAndPostMissionBriefingMenuDialog, }; f32 func0f1036ac(u8 value, s32 prop) @@ -795,13 +795,13 @@ s32 menuhandlerAcceptPdModeSettings(u32 operation, struct menuitem *item, union coreSetDifficulty(g_MissionConfig.difficulty); menuPopDialog(); menuPopDialog(); - menuPushDialog(&g_ObjectivesMenuDialog); + menuPushDialog(&g_AcceptMissionMenuDialog); } return 0; } -struct menuitem menuitems_perfectdarkmodesettings[] = { +struct menuitem g_PdModeSettingsMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS(222), 0x00000000, NULL }, // "Choose Settings:" { MENUITEMTYPE_SLIDER, 1, 0x00100000, L_MPWEAPONS(224), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Health" { MENUITEMTYPE_SLIDER, 2, 0x00100000, L_MPWEAPONS(225), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Damage" @@ -812,10 +812,10 @@ struct menuitem menuitems_perfectdarkmodesettings[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_PdModeSettingsDialog = { +struct menudialog g_PdModeSettingsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(221), // "Perfect Dark" - menuitems_perfectdarkmodesettings, + g_PdModeSettingsMenuItems, NULL, 0x00000004, NULL, @@ -1139,7 +1139,7 @@ s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, union handle g_MissionConfig.difficulty = item->param; coreSetDifficulty(g_MissionConfig.difficulty); menuPopDialog(); - menuPushDialog(&g_ObjectivesMenuDialog); + menuPushDialog(&g_AcceptMissionMenuDialog); break; case MENUOP_CHECKDISABLED: if (!isStageDifficultyUnlocked(g_MissionConfig.stageindex, item->param)) { @@ -1154,7 +1154,7 @@ s32 menuhandlerPdMode(u32 operation, struct menuitem *item, union handlerdata *d { switch (operation) { case MENUOP_SET: - menuPushDialog(&g_PdModeSettingsDialog); + menuPushDialog(&g_PdModeSettingsMenuDialog); break; case MENUOP_CHECKHIDDEN: if (g_SoloSaveFile.besttimes[SOLOSTAGEINDEX_SKEDARRUINS][DIFF_PA] == 0) { @@ -1189,7 +1189,7 @@ char *soloMenuTextBestTime(struct menuitem *item) return g_StringPointer; } -struct menuitem menuitems_selectdifficulty[] = { +struct menuitem g_SoloMissionDifficultyMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(249), L_OPTIONS(250), NULL }, // "Difficulty" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Agent" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Special Agent" @@ -1200,10 +1200,10 @@ struct menuitem menuitems_selectdifficulty[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_selectdifficulty = { +struct menudialog g_SoloMissionDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(248), // "Select Difficulty" - menuitems_selectdifficulty, + g_SoloMissionDifficultyMenuItems, NULL, 0x00000004, NULL, @@ -1217,7 +1217,7 @@ s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menuitem *item, union { if (operation == MENUOP_SET) { menuPopDialog(); - menuPushDialog(&g_ObjectivesMenuDialog); + menuPushDialog(&g_AcceptMissionMenuDialog); } if (operation == MENUOP_CHECKPREFOCUSED) { @@ -1417,7 +1417,7 @@ glabel menuhandlerCoopBuddy /* f10441c: 00000000 */ nop ); -struct menuitem menuitems_cooperativeoptions[] = { +struct menuitem g_CoopOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(256), 0x00000000, menuhandlerCoopRadar }, // "Radar On" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(257), 0x00000000, menuhandlerCoopFriendlyFire }, // "Friendly Fire" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(258), 0x00000000, menuhandlerCoopBuddy }, // "Perfect Buddy" @@ -1430,7 +1430,7 @@ struct menuitem menuitems_cooperativeoptions[] = { struct menudialog g_CoopOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(255), // "Co-Operative Options" - menuitems_cooperativeoptions, + g_CoopOptionsMenuItems, menudialogCoopAntiOptions, 0x00000004, NULL, @@ -1471,7 +1471,7 @@ s32 menuhandlerAntiPlayer(u32 operation, struct menuitem *item, union handlerdat return 0; } -struct menuitem menuitems_counteroperativeoptions[] = { +struct menuitem g_AntiOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(267), 0x00000000, menuhandlerAntiRadar }, // "Radar On" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(268), 0x00000000, menuhandlerAntiPlayer }, // "Counter-Operative" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1483,7 +1483,7 @@ struct menuitem menuitems_counteroperativeoptions[] = { struct menudialog g_AntiOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(266), // "Counter-Operative Options" - menuitems_counteroperativeoptions, + g_AntiOptionsMenuItems, menudialogCoopAntiOptions, 0x00000004, NULL, @@ -1510,7 +1510,7 @@ s32 menuhandlerCoopDifficulty(u32 operation, struct menuitem *item, union handle return 0; } -struct menuitem menuitems_selectdifficulty2[] = { +struct menuitem g_CoopMissionDifficultyMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), 0x00000000, menuhandlerCoopDifficulty }, // "Agent" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), 0x00000000, menuhandlerCoopDifficulty }, // "Special Agent" { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), 0x00000000, menuhandlerCoopDifficulty }, // "Perfect Agent" @@ -1519,10 +1519,10 @@ struct menuitem menuitems_selectdifficulty2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_selectdifficulty2 = { +struct menudialog g_CoopMissionDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(248), // "Select Difficulty" - menuitems_selectdifficulty2, + g_CoopMissionDifficultyMenuItems, NULL, 0x00000004, NULL, @@ -1542,7 +1542,7 @@ s32 menuhandlerAntiDifficulty(u32 operation, struct menuitem *item, union handle return 0; } -struct menuitem menuitems_selectdifficulty3[] = { +struct menuitem g_AntiMissionDifficultyMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), 0x00000000, menuhandlerAntiDifficulty }, // "Agent" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), 0x00000000, menuhandlerAntiDifficulty }, // "Special Agent" { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), 0x00000000, menuhandlerAntiDifficulty }, // "Perfect Agent" @@ -1551,10 +1551,10 @@ struct menuitem menuitems_selectdifficulty3[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_selectdifficulty3 = { +struct menudialog g_AntiMissionDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(248), // "Select Difficulty" - menuitems_selectdifficulty3, + g_AntiMissionDifficultyMenuItems, NULL, 0x00000004, NULL, @@ -1858,25 +1858,25 @@ glabel var7f1b2dfc /* f1049bc: a1070002 */ sb $a3,0x2($t0) /* f1049c0: 05e10006 */ bgez $t7,.L0f1049dc /* f1049c4: a1180001 */ sb $t8,0x1($t0) -/* f1049c8: 3c048007 */ lui $a0,%hi(menudialog_selectdifficulty2) +/* f1049c8: 3c048007 */ lui $a0,%hi(g_CoopMissionDifficultyMenuDialog) /* f1049cc: 0fc3cbd3 */ jal menuPushDialog -/* f1049d0: 24841dc4 */ addiu $a0,$a0,%lo(menudialog_selectdifficulty2) +/* f1049d0: 24841dc4 */ addiu $a0,$a0,%lo(g_CoopMissionDifficultyMenuDialog) /* f1049d4: 100002ec */ b .L0f105588 /* f1049d8: 00001025 */ or $v0,$zero,$zero .L0f1049dc: /* f1049dc: 8d0e0000 */ lw $t6,0x0($t0) -/* f1049e0: 3c048007 */ lui $a0,%hi(menudialog_selectdifficulty) +/* f1049e0: 3c048007 */ lui $a0,%hi(g_SoloMissionDifficultyMenuDialog) /* f1049e4: 000ece40 */ sll $t9,$t6,0x19 /* f1049e8: 07210006 */ bgez $t9,.L0f104a04 /* f1049ec: 00000000 */ nop -/* f1049f0: 3c048007 */ lui $a0,%hi(menudialog_selectdifficulty3) +/* f1049f0: 3c048007 */ lui $a0,%hi(g_AntiMissionDifficultyMenuDialog) /* f1049f4: 0fc3cbd3 */ jal menuPushDialog -/* f1049f8: 24841e54 */ addiu $a0,$a0,%lo(menudialog_selectdifficulty3) +/* f1049f8: 24841e54 */ addiu $a0,$a0,%lo(g_AntiMissionDifficultyMenuDialog) /* f1049fc: 100002e2 */ b .L0f105588 /* f104a00: 00001025 */ or $v0,$zero,$zero .L0f104a04: /* f104a04: 0fc3cbd3 */ jal menuPushDialog -/* f104a08: 24841c00 */ addiu $a0,$a0,%lo(menudialog_selectdifficulty) +/* f104a08: 24841c00 */ addiu $a0,$a0,%lo(g_SoloMissionDifficultyMenuDialog) /* f104a0c: 100002de */ b .L0f105588 /* f104a10: 00001025 */ or $v0,$zero,$zero /* f104a14: 3c0f000f */ lui $t7,0xf @@ -2669,38 +2669,38 @@ s32 menudialog0010559c(u32 operation, struct menudialog *dialog, union handlerda return 0; } -struct menuitem menuitems_17fd8[] = { +struct menuitem g_MissionBriefingMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_BRIEFING, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_18000[] = { +struct menuitem g_2PMissionBreifingVMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_BRIEFING, 0x00000000, 0x00000078, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_18028 = { +struct menudialog g_SoloMissionBriefingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" - menuitems_17fd8, + g_MissionBriefingMenuItems, NULL, 0x00000008, NULL, }; -struct menudialog menudialog_18040 = { +struct menudialog g_2PMissionBriefingHMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" - menuitems_17fd8, + g_MissionBriefingMenuItems, NULL, 0x00000008, NULL, }; -struct menudialog menudialog_18058 = { +struct menudialog g_2PMissionBriefingVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" - menuitems_18000, + g_2PMissionBreifingVMenuItems, NULL, 0x00000008, NULL, @@ -2741,9 +2741,9 @@ s32 menuhandlerControlStyle(u32 operation, struct menuitem *item, union handlerd { if (operation == MENUOP_SET) { if (PLAYERCOUNT() >= 2) { - menuPushDialog(&g_ControlStyleMultiMenuDialog); + menuPushDialog(&g_2PMissionControlStyleMenuDialog); } else { - menuPushDialog(&g_ControlStyleSingleMenuDialog); + menuPushDialog(&g_SoloMissionControlStyleMenuDialog); } } @@ -2768,66 +2768,66 @@ s32 menuhandlerChangeAgent(u32 operation, struct menuitem *item, union handlerda return 0; } -struct menuitem menuitems_control[] = { +struct menuitem g_2PMissionControlStyleMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00800000, 0x00000050, 0x00000000, menuhandler001024dc }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_ControlStyleMultiMenuDialog = { +struct menudialog g_2PMissionControlStyleMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" - menuitems_control, + g_2PMissionControlStyleMenuItems, NULL, 0x00000400, NULL, }; -struct menuitem menuitems_control2[] = { +struct menuitem g_SoloMissionControlStyleMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00800000, 0x00000028, 0x00000096, menuhandler001024dc }, { MENUITEMTYPE_CONTROLLER, 0, 0x00000001, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_ControlStyleSingleMenuDialog = { +struct menudialog g_SoloMissionControlStyleMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" - menuitems_control2, + g_SoloMissionControlStyleMenuItems, NULL, 0x00000400, NULL, }; -struct menuitem menuitems_control3[] = { +struct menuitem g_CiControlStyleMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00800000, 0x00000028, 0x00000096, menuhandler001024dc }, { MENUITEMTYPE_CONTROLLER, 0, 0x00000001, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_control3 = { +struct menudialog g_CiControlStyleMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" - menuitems_control3, + g_CiControlStyleMenuItems, NULL, 0x00000400, NULL, }; -struct menuitem menuitems_control4[] = { +struct menuitem g_CiControlStylePlayer2MenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00800000, 0x00000028, 0x00000096, menuhandler001024fc }, { MENUITEMTYPE_CONTROLLER, 0, 0x00000001, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_control4 = { +struct menudialog g_CiControlStylePlayer2MenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" - menuitems_control4, + g_CiControlStylePlayer2MenuItems, NULL, 0x00000400, NULL, }; -struct menuitem menuitems_audiooptions[] = { +struct menuitem g_AudioOptionsMenuItems[] = { { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(228), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(229), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(230), 0x00000000, menuhandlerSoundMode }, // "Sound Mode" @@ -2837,16 +2837,16 @@ struct menuitem menuitems_audiooptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_audiooptions = { +struct menudialog g_AudioOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(227), // "Audio Options" - menuitems_audiooptions, + g_AudioOptionsMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_audiooptions2[] = { +struct menuitem g_2PMissionAudioOptionsVMenuItems[] = { { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS(228), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS(229), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(153), 0x00000000, menuhandlerSoundMode }, // "Mode" @@ -2856,16 +2856,16 @@ struct menuitem menuitems_audiooptions2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_audiooptionsshort = { +struct menudialog g_2PMissionAudioOptionsVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(227), // "Audio Options" - menuitems_audiooptions2, + g_2PMissionAudioOptionsVMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_videooptions[] = { +struct menuitem g_VideoOptionsMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(215), 0x00000000, menuhandlerScreenSize }, // "Screen Size" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(217), 0x00000000, menuhandlerHiRes }, // "Hi-Res" @@ -2876,7 +2876,7 @@ struct menuitem menuitems_videooptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_videooptionsshort[] = { +struct menuitem g_2PMissionVideoOptionsMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(217), 0x00000000, menuhandlerHiRes }, // "Hi-Res" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(154), 0x00000000, menuhandlerScreenSplit }, // "Split" @@ -2885,25 +2885,25 @@ struct menuitem menuitems_videooptionsshort[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_videooptions = { +struct menudialog g_VideoOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(214), // "Video Options" - menuitems_videooptions, + g_VideoOptionsMenuItems, NULL, 0x00000000, NULL, }; -struct menudialog menudialog_videooptionsshort = { +struct menudialog g_2PMissionVideoOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(214), // "Video Options" - menuitems_videooptionsshort, + g_2PMissionVideoOptionsMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_displayoptions[] = { +struct menuitem g_MissionDisplayOptionsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(205), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(206), 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(207), 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" @@ -2918,16 +2918,16 @@ struct menuitem menuitems_displayoptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_displayoptions = { +struct menudialog g_MissionDisplayOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(203), // "Display Options" - menuitems_displayoptions, + g_MissionDisplayOptionsMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_displayoptionsshort[] = { +struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(145), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(146), 0x00000004, menuhandlerAlwaysShowTarget }, // "Target" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(147), 0x00000004, menuhandlerShowZoomRange }, // "Zoom Range" @@ -2942,16 +2942,16 @@ struct menuitem menuitems_displayoptionsshort[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_displayoptionsshort = { +struct menudialog g_2PMissionDisplayOptionsVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(203), // "Display Options" - menuitems_displayoptionsshort, + g_2PMissionDisplayOptionsVMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_displayoptions_2pplayer1[] = { +struct menuitem g_CiDisplayMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(205), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(206), 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(207), 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" @@ -2966,18 +2966,18 @@ struct menuitem menuitems_displayoptions_2pplayer1[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_displayplayer2; +struct menudialog g_CiDisplayPlayer2MenuDialog; -struct menudialog menudialog_displayoptions_2pplayer1 = { +struct menudialog g_CiDisplayMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(203), // "Display Options" - menuitems_displayoptions_2pplayer1, + g_CiDisplayMenuItems, NULL, 0x00000000, - &menudialog_displayplayer2, + &g_CiDisplayPlayer2MenuDialog, }; -struct menuitem menuitems_displayplayer2[] = { +struct menuitem g_CiDisplayPlayer2MenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000005, menuhandlerSightOnScreen }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000005, menuhandlerAlwaysShowTarget }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000005, menuhandlerShowZoomRange }, @@ -2992,16 +2992,16 @@ struct menuitem menuitems_displayplayer2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_displayplayer2 = { +struct menudialog g_CiDisplayPlayer2MenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(204), // "Display Player 2" - menuitems_displayplayer2, + g_CiDisplayPlayer2MenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_controloptions[] = { +struct menuitem g_MissionControlOptionsMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(194), (u32)&func0f105664, menuhandlerControlStyle }, // "Control Style" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(195), 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(196), 0x00000004, menuhandlerLookAhead }, // "Look Ahead" @@ -3013,17 +3013,17 @@ struct menuitem menuitems_controloptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_controloptions = { +struct menudialog g_MissionControlOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(192), // "Control Options" - menuitems_controloptions, + g_MissionControlOptionsMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_18928[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(194), (u32)&func0f105664, (void *)&menudialog_control3 }, // "Control Style" +struct menuitem g_CiControlOptionsMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(194), (u32)&func0f105664, (void *)&g_CiControlStyleMenuDialog }, // "Control Style" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(195), 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(196), 0x00000004, menuhandlerLookAhead }, // "Look Ahead" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(197), 0x00000004, menuhandlerHeadRoll }, // "Head Roll" @@ -3034,17 +3034,17 @@ struct menuitem menuitems_18928[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_189dc = { +struct menudialog g_CiControlOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(192), // "Control Options" - menuitems_18928, + g_CiControlOptionsMenuItems, NULL, 0x00000000, - &menudialog_18aa8, + &g_CiControlPlayer2MenuDialog, }; -struct menuitem menuitems_189f4[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056c2, (u32)&func0f1056a0, (void *)&menudialog_control4 }, +struct menuitem g_CiControlPlayer2MenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056c2, (u32)&func0f1056a0, (void *)&g_CiControlStylePlayer2MenuDialog }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000005, menuhandlerReversePitch }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000005, menuhandlerLookAhead }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000005, menuhandlerHeadRoll }, @@ -3055,112 +3055,112 @@ struct menuitem menuitems_189f4[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_18aa8 = { +struct menudialog g_CiControlPlayer2MenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(193), // "Control Player 2" - menuitems_189f4, + g_CiControlPlayer2MenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_changeagent[] = { +struct menuitem g_ChangeAgentMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(189), 0x00000000, NULL }, // "Do you want to load another agent?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(190), 0x00000000, menuhandlerChangeAgent }, // "Yes" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(191), 0x00000000, NULL }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_changeagent = { +struct menudialog g_ChangeAgentMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(188), // "Warning" - menuitems_changeagent, + g_ChangeAgentMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_18b28[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(181), 0x00000000, (void *)&menudialog_audiooptions }, // "Audio" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(182), 0x00000000, (void *)&menudialog_videooptions }, // "Video" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(183), 0x00000000, (void *)&menudialog_controloptions }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(184), 0x00000000, (void *)&menudialog_displayoptions }, // "Display" +struct menuitem g_SoloMissionOptionsMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(181), 0x00000000, (void *)&g_AudioOptionsMenuDialog }, // "Audio" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(182), 0x00000000, (void *)&g_VideoOptionsMenuDialog }, // "Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(183), 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(184), 0x00000000, (void *)&g_MissionDisplayOptionsMenuDialog }, // "Display" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_18b8c[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, (void *)&menudialog_audiooptions }, // "Audio" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, (void *)&menudialog_videooptionsshort }, // "Video" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, (void *)&menudialog_controloptions }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(184), 0x00000000, (void *)&menudialog_displayoptions }, // "Display" +struct menuitem g_2PMissionOptionsHMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, (void *)&g_AudioOptionsMenuDialog }, // "Audio" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(184), 0x00000000, (void *)&g_MissionDisplayOptionsMenuDialog }, // "Display" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000064, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_18c18[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, (void *)&menudialog_audiooptionsshort }, // "Audio" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, (void *)&menudialog_videooptionsshort }, // "Video" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, (void *)&menudialog_controloptions }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(184), 0x00000000, (void *)&menudialog_displayoptionsshort }, // "Display" +struct menuitem g_2PMissionOptionsVMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, (void *)&g_2PMissionAudioOptionsVMenuDialog }, // "Audio" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(184), 0x00000000, (void *)&g_2PMissionDisplayOptionsVMenuDialog }, // "Display" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000064, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_18ca4[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b5, 0x00000001, (void *)&menudialog_audiooptions }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b6, 0x00000002, (void *)&menudialog_videooptions }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b7, 0x00000003, (void *)&menudialog_189dc }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b8, 0x00000004, (void *)&menudialog_displayoptions_2pplayer1 }, +struct menuitem g_CiOptionsMenuItems[] = { + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b5, 0x00000001, (void *)&g_AudioOptionsMenuDialog }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b6, 0x00000002, (void *)&g_VideoOptionsMenuDialog }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b7, 0x00000003, (void *)&g_CiControlOptionsMenuDialog }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b8, 0x00000004, (void *)&g_CiDisplayMenuDialog }, { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b9, 0x00000005, (void *)&g_CheatsMenuDialog }, { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x00005679, 0x00000006, (void *)&g_CinemaMenuDialog }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_18d30 = { +struct menudialog g_SoloMissionOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" - menuitems_18b28, + g_SoloMissionOptionsMenuItems, menudialog0010559c, 0x00000000, - &menudialog_18028, + &g_SoloMissionBriefingMenuDialog, }; -struct menudialog menudialog_18d48 = { +struct menudialog g_CiOptionsViaPcMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" - menuitems_18ca4, + g_CiOptionsMenuItems, menudialog0010559c, 0x00000000, NULL, }; -struct menudialog menudialog_18d60 = { +struct menudialog g_CiOptionsViaPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" - menuitems_18ca4, + g_CiOptionsMenuItems, menudialog0010559c, 0x00000000, NULL, }; -struct menudialog menudialog_18d78 = { +struct menudialog g_2PMissionOptionsHMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" - menuitems_18b8c, + g_2PMissionOptionsHMenuItems, menudialog0010559c, 0x00000000, - &menudialog_18040, + &g_2PMissionBriefingHMenuDialog, }; -struct menudialog menudialog_18d90 = { +struct menudialog g_2PMissionOptionsVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" - menuitems_18c18, + g_2PMissionOptionsVMenuItems, menudialog0010559c, 0x00000000, - &menudialog_18058, + &g_2PMissionBriefingVMenuDialog, }; u8 var80072d88 = 255; @@ -3584,21 +3584,21 @@ glabel var7f1b2e44 /* f106114: ac39ee28 */ sw $t9,%lo(g_Menus+0xe28)($at) /* f106118: 8cca0000 */ lw $t2,0x0($a2) /* f10611c: 3c018007 */ lui $at,%hi(var80073544) -/* f106120: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x14) -/* f106124: 248433e8 */ addiu $a0,$a0,%lo(menuitems_inventory+0x14) +/* f106120: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x14) +/* f106124: 248433e8 */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x14) /* f106128: 3c05bf80 */ lui $a1,0xbf80 /* f10612c: 0fc3c4e7 */ jal func0f0f139c /* f106130: a02a3544 */ sb $t2,%lo(var80073544)($at) -/* f106134: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x28) -/* f106138: 248433fc */ addiu $a0,$a0,%lo(menuitems_inventory+0x28) +/* f106134: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x28) +/* f106138: 248433fc */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x28) /* f10613c: 0fc3c4e7 */ jal func0f0f139c /* f106140: 3c05bf80 */ lui $a1,0xbf80 -/* f106144: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x50) -/* f106148: 24843424 */ addiu $a0,$a0,%lo(menuitems_inventory+0x50) +/* f106144: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x50) +/* f106148: 24843424 */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x50) /* f10614c: 0fc3c4e7 */ jal func0f0f139c /* f106150: 3c05bf80 */ lui $a1,0xbf80 -/* f106154: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x64) -/* f106158: 24843438 */ addiu $a0,$a0,%lo(menuitems_inventory+0x64) +/* f106154: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x64) +/* f106158: 24843438 */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x64) /* f10615c: 0fc3c4e7 */ jal func0f0f139c /* f106160: 3c05bf80 */ lui $a1,0xbf80 .L0f106164: @@ -3765,21 +3765,21 @@ glabel var7f1b2e84 /* f106330: 016a5823 */ subu $t3,$t3,$t2 /* f106334: 000b5900 */ sll $t3,$t3,0x4 /* f106338: 002b0821 */ addu $at,$at,$t3 -/* f10633c: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x14) +/* f10633c: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x14) /* f106340: ac29ee28 */ sw $t1,%lo(g_Menus+0xe28)($at) -/* f106344: 248433e8 */ addiu $a0,$a0,%lo(menuitems_inventory+0x14) +/* f106344: 248433e8 */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x14) /* f106348: 0fc3c4e7 */ jal func0f0f139c /* f10634c: 3c05bf80 */ lui $a1,0xbf80 -/* f106350: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x28) -/* f106354: 248433fc */ addiu $a0,$a0,%lo(menuitems_inventory+0x28) +/* f106350: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x28) +/* f106354: 248433fc */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x28) /* f106358: 0fc3c4e7 */ jal func0f0f139c /* f10635c: 3c05bf80 */ lui $a1,0xbf80 -/* f106360: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x50) -/* f106364: 24843424 */ addiu $a0,$a0,%lo(menuitems_inventory+0x50) +/* f106360: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x50) +/* f106364: 24843424 */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x50) /* f106368: 0fc3c4e7 */ jal func0f0f139c /* f10636c: 3c05bf80 */ lui $a1,0xbf80 -/* f106370: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x64) -/* f106374: 24843438 */ addiu $a0,$a0,%lo(menuitems_inventory+0x64) +/* f106370: 3c048007 */ lui $a0,%hi(g_SoloMissionInventoryMenuItems+0x64) +/* f106374: 24843438 */ addiu $a0,$a0,%lo(g_SoloMissionInventoryMenuItems+0x64) /* f106378: 0fc3c4e7 */ jal func0f0f139c /* f10637c: 3c05bf80 */ lui $a1,0xbf80 .L0f106380: @@ -3791,7 +3791,7 @@ glabel var7f1b2e84 /* f106390: 00000000 */ nop ); -struct menuitem menuitems_inventory[] = { +struct menuitem g_SoloMissionInventoryMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x0000006e, 0x00000063, menuhandler00106178 }, { MENUITEMTYPE_LABEL, 0, 0x00000203, L_OPTIONS(3), (u32)&invMenuTextWeaponManufacturer, NULL }, // "" { MENUITEMTYPE_LABEL, 0, 0x00000302, L_OPTIONS(3), (u32)&invMenuTextWeaponName, NULL }, // "" @@ -3802,7 +3802,7 @@ struct menuitem menuitems_inventory[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_weaponsavailable[] = { +struct menuitem g_FrWeaponsAvailableMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x0000006e, 0x00000063, menuhandler00106028 }, { MENUITEMTYPE_LABEL, 0, 0x0213, L_OPTIONS(3), (u32)&invMenuTextWeaponManufacturer, NULL }, // "" { MENUITEMTYPE_LABEL, 0, 0x0312, L_OPTIONS(3), (u32)&invMenuTextWeaponName, NULL }, // "" @@ -3813,19 +3813,19 @@ struct menuitem menuitems_weaponsavailable[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_19534 = { +struct menudialog g_SoloMissionInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(178), // "Inventory" - menuitems_inventory, + g_SoloMissionInventoryMenuItems, inventoryMenuDialog, 0x00000602, - &menudialog_18d30, + &g_SoloMissionOptionsMenuDialog, }; -struct menudialog menudialog_weaponsavailable = { +struct menudialog g_FrWeaponsAvailableMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(179), // "Weapons Available" - menuitems_weaponsavailable, + g_FrWeaponsAvailableMenuItems, inventoryMenuDialog, 0x00000602, NULL, @@ -3856,33 +3856,33 @@ s32 menudialogAbortMission(u32 operation, struct menudialog *dialog, union handl return 0; } -struct menuitem g_SoloAbortMenuItems[] = { +struct menuitem g_MissionAbortMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(175), 0x00000000, NULL }, // "Do you want to abort the mission?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(176), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(177), 0x00000000, menuhandlerAbortMission }, // "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_SoloAbortMenuDialog = { +struct menudialog g_MissionAbortMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(174), // "Warning" - g_SoloAbortMenuItems, + g_MissionAbortMenuItems, menudialogAbortMission, 0x00000000, NULL, }; -struct menuitem g_SoloAbortShortMenuItems[] = { +struct menuitem g_2PMissionAbortVMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS(155), 0x00000000, NULL }, // "Do you want to abort the mission" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(176), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(177), 0x00000000, menuhandlerAbortMission }, // "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_SoloAbortShortMenuDialog = { +struct menudialog g_2PMissionAbortVMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(174), // "Warning" - g_SoloAbortShortMenuItems, + g_2PMissionAbortVMenuItems, menudialogAbortMission, 0x00000000, NULL, @@ -3947,43 +3947,43 @@ char *soloMenuTitlePauseStatus(struct menudialog *dialog) return g_StringPointer; } -struct menuitem menuitems_status[] = { +struct menuitem g_2PMissionPauseVMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 2, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, (void *)&g_SoloAbortShortMenuDialog }, // "Abort!" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, (void *)&g_2PMissionAbortVMenuDialog }, // "Abort!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menuitem menuitems_19674[] = { +struct menuitem g_MissionPauseMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, (void *)&g_SoloAbortMenuDialog }, // "Abort!" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, (void *)&g_MissionAbortMenuDialog }, // "Abort!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_SoloPauseMenuDialog = { +struct menudialog g_SoloMissionPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&soloMenuTitlePauseStatus, - menuitems_19674, + g_MissionPauseMenuItems, soloMenuDialogPauseStatus, 0x00000048, - &menudialog_19534, + &g_SoloMissionInventoryMenuDialog, }; -struct menudialog menudialog_196c8 = { +struct menudialog g_2PMissionPauseHMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&soloMenuTitlePauseStatus, - menuitems_19674, + g_MissionPauseMenuItems, soloMenuDialogPauseStatus, 0x00000048, - &menudialog_2a800, + &g_2PMissionInventoryHMenuDialog, }; -struct menudialog menudialog_status = { +struct menudialog g_2PMissionPauseVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(172), // "Status" - menuitems_status, + g_2PMissionPauseVMenuItems, soloMenuDialogPauseStatus, 0x00000048, - &menudialog_2a818, + &g_2PMissionInventoryVMenuDialog, }; //-----------------------------------------------------------------------------\ @@ -4276,32 +4276,32 @@ char *mainMenuTextLabel(struct menuitem *item) return langGet(nocheats[item->param]); } -struct menuitem menuitems_mainmenu[] = { +struct menuitem g_MainMenuMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400008, L_MISC(446), 0x00000001, NULL }, // "Carrington Institute" { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, (u32)&mainMenuTextLabel, 0x00000002, menuhandlerMainMenuSoloMissions }, { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, (u32)&mainMenuTextLabel, 0x00000003, menuhandlerMainMenuCombatSimulator }, { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, (u32)&mainMenuTextLabel, 0x00000004, menuhandlerMainMenuCooperative }, { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, (u32)&mainMenuTextLabel, 0x00000005, menuhandlerMainMenuCounterOperative }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(187), 0x00000006, (void *)&menudialog_changeagent }, // "Change Agent..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(187), 0x00000006, (void *)&g_ChangeAgentMenuDialog }, // "Change Agent..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MainMenuMenuDialog = { +struct menudialog g_CiMenuViaPcMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(116), // "Perfect Menu" - menuitems_mainmenu, + g_MainMenuMenuItems, menudialogMainMenu, 0x00000004, - &menudialog_18d48, + &g_CiOptionsViaPcMenuDialog, }; -struct menudialog g_CiMainMenuDialogViaPause = { +struct menudialog g_CiMenuViaPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(116), // "Perfect Menu" - menuitems_mainmenu, + g_MainMenuMenuItems, menudialogMainMenu, 0x00000004, - &menudialog_18d60, + &g_CiOptionsViaPauseMenuDialog, }; bool soloChoosePauseDialog(void) @@ -4320,35 +4320,35 @@ bool soloChoosePauseDialog(void) struct trainingdata *htdata = getHoloTrainingData(); if (htdata->intraining) { - menuPushRootDialog(&g_HoloTrainingDetailsMenuDialog, MENUROOT_TRAINING); + menuPushRootDialog(&g_HtDetailsMenuDialog, MENUROOT_TRAINING); } else if (htdata->finished) { htPushEndscreen(); } else { - menuPushRootDialog(&g_HoloTrainingListMenuDialog, MENUROOT_TRAINING); + menuPushRootDialog(&g_HtListMenuDialog, MENUROOT_TRAINING); } handled = true; } else { if (room == CIROOM_DEVICEROOM) { if (dtdata->intraining) { - menuPushRootDialog(&g_DeviceTrainingDetailsMenuDialog, MENUROOT_TRAINING); + menuPushRootDialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); } else if (dtdata->finished) { dtPushEndscreen(); } else { - menuPushRootDialog(&g_DeviceTrainingListMenuDialog, MENUROOT_TRAINING); + menuPushRootDialog(&g_DtListMenuDialog, MENUROOT_TRAINING); } handled = true; } else { if (dtdata->intraining) { - menuPushRootDialog(&g_DeviceTrainingDetailsMenuDialog, MENUROOT_TRAINING); + menuPushRootDialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); handled = true; } else if (dtdata->finished) { dtPushEndscreen(); handled = true; } else if (room == CIROOM_FIRINGRANGE) { if (frIsInTraining()) { - menuPushRootDialog(&g_FrTrainingInfoMenuDialog, MENUROOT_TRAINING); + menuPushRootDialog(&g_FrTrainingInfoInGameMenuDialog, MENUROOT_TRAINING); } else { menuPushRootDialog(&g_FrWeaponListMenuDialog, MENUROOT_TRAINING); } @@ -4360,11 +4360,11 @@ bool soloChoosePauseDialog(void) } if (!handled) { - menuPushRootDialog(&g_CiMainMenuDialogViaPause, MENUROOT_MAINMENU); + menuPushRootDialog(&g_CiMenuViaPauseMenuDialog, MENUROOT_MAINMENU); return true; } } else { - menuPushRootDialog(&g_SoloPauseMenuDialog, MENUROOT_MAINMENU); + menuPushRootDialog(&g_SoloMissionPauseMenuDialog, MENUROOT_MAINMENU); } return true; diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index b37b8c661..16bed31a7 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -402,9 +402,9 @@ void func0f108a80(void) func0f1109c0(); if (IS4MB()) { - func0f0f820c(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); + func0f0f820c(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } else { - func0f0f820c(&g_MainMenuMenuDialog, MENUROOT_MAINMENU); + func0f0f820c(&g_CiMenuViaPcMenuDialog, MENUROOT_MAINMENU); } break; case 104: @@ -598,7 +598,7 @@ void filemgrRetrySave(s32 context) } if (context == 2) { - func0f0f3704(&g_FilemgrInsertOriginalPakMenuDialog); + func0f0f3704(&g_PakNotOriginalMenuDialog); } } else if (fileSave(index, true)) { if (context == 2) { @@ -746,7 +746,7 @@ bool func0f1094e4(struct savelocation_2d8 *arg0, s32 arg1, void *arg2) if (value == -1) { g_Menus[g_MpPlayerNum].isretryingsave |= 1; - menuPushDialog(&g_FilemgrInsertOriginalPakMenuDialog); + menuPushDialog(&g_PakNotOriginalMenuDialog); return false; } @@ -828,7 +828,7 @@ struct menudialog g_FilemgrSaveErrorMenuDialog = { NULL, }; -struct menuitem g_FilemgrFileLostMenuItems[] = { +struct menuitem g_FilemgrFileLoadMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextDeviceName, 0x00000000, filemgrDeviceNameMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(251), 0x00000000, NULL }, // "The saved file has been erased due to corruption or damage." { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(354), 0x00000000, filemgrAcknowledgeFileLostMenuHandler }, // "Cancel" @@ -838,7 +838,7 @@ struct menuitem g_FilemgrFileLostMenuItems[] = { struct menudialog g_FilemgrFileLostMenuDialog = { MENUDIALOGTYPE_DANGER, (u32)&filemgrMenuTextErrorTitle, - g_FilemgrFileLostMenuItems, + g_FilemgrFileLoadMenuItems, NULL, 0x000000a0, NULL, @@ -860,17 +860,17 @@ struct menudialog g_FilemgrSaveElsewhereMenuDialog = { NULL, }; -struct menuitem g_FilemgrInsertOriginalPakMenuItems[] = { +struct menuitem g_PakNotOriginalMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextInsertOriginalPak, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(365), 0x00000000, filemgrReinsertedOkMenuHandler }, // "OK" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(366), 0x00000000, filemgrReinsertedCancelMenuHandler }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrInsertOriginalPakMenuDialog = { +struct menudialog g_PakNotOriginalMenuDialog = { MENUDIALOGTYPE_DANGER, (u32)&filemgrMenuTextErrorTitle, - g_FilemgrInsertOriginalPakMenuItems, + g_PakNotOriginalMenuItems, filemgrInsertOriginalPakMenuDialog, 0x000000a0, NULL, @@ -1187,7 +1187,7 @@ void func0f109ec4(void) { if (g_FileLists[g_Menus[g_MpPlayerNum].listnum]->spacesfree[g_Menus[g_MpPlayerNum].device] > 0) { if (!filemgrIsNameAvailable(g_Menus[g_MpPlayerNum].device)) { - menuPushDialog(&g_FilemgrDuplicateFileNameMenuDialog); + menuPushDialog(&g_FilemgrDuplicateNameMenuDialog); } else { menuPopDialog(); @@ -1240,7 +1240,7 @@ s32 filemgrDuplicateRenameMenuHandler(u32 operation, struct menuitem *item, unio { if (operation == MENUOP_SET) { menuPopDialog(); - menuPushDialog(&g_FilemgrChangeFileNameMenuDialog); + menuPushDialog(&g_FilemgrRenameMenuDialog); } return 0; @@ -1271,22 +1271,22 @@ char *filemgrMenuTextDuplicateFileName(struct menuitem *item) return g_StringPointer; } -struct menuitem g_FilemgrChangeFileNameMenuItems[] = { +struct menuitem g_FilemgrRenameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(239), 0x00000000, NULL }, // "Enter new file name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, filemgrConfirmRenameMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrChangeFileNameMenuDialog = { +struct menudialog g_FilemgrRenameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(238), // "Change File Name" - g_FilemgrChangeFileNameMenuItems, + g_FilemgrRenameMenuItems, NULL, 0x00000080, NULL, }; -struct menuitem g_FilemgrDuplicateFileNameMenuItems[] = { +struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&filemgrMenuTextDeviceNameContainingDuplicateFile, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(233), 0x00000000, NULL }, // "already contains" { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(234), 0x00000000, NULL }, // "a file named" @@ -1297,10 +1297,10 @@ struct menuitem g_FilemgrDuplicateFileNameMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrDuplicateFileNameMenuDialog = { +struct menudialog g_FilemgrDuplicateNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(232), // "Duplicate File Name" - g_FilemgrDuplicateFileNameMenuItems, + g_FilemgrDuplicateMenuMenuItems, NULL, 0x00000080, NULL, @@ -1424,7 +1424,7 @@ s32 filemgrConfirmDeleteMenuHandler(u32 operation, struct menuitem *item, union char *filemgrMenuTextFileInUseDescription(struct menuitem *item) { - if (menuIsDialogOpen(&g_FilemgrCopyListMenuDialog)) { + if (menuIsDialogOpen(&g_FilemgrCopyMenuDialog)) { return langGet(L_MPWEAPONS(240)); // "The file you are copying cannot be deleted." } @@ -1481,13 +1481,13 @@ bool filemgrIsFileInUse(struct savelocation000 *arg0) { s32 i; - if (menuIsDialogOpen(&g_FilemgrCopyListMenuDialog) + if (menuIsDialogOpen(&g_FilemgrCopyMenuDialog) && arg0->unk00 == g_FilemgrFileToCopy.unk00 && arg0->unk04 == g_FilemgrFileToCopy.unk04) { return true; } - if (menuIsDialogOpen(&menudialog_fileselect2)) { + if (menuIsDialogOpen(&g_FilemgrFileSelect4MbMenuDialog)) { return false; } @@ -1666,7 +1666,7 @@ void filemgrPushDeleteFileDialog(s32 listnum) g_Menus[g_MpPlayerNum].data.filemgr.filetypeplusone = list->filetype + 1; } - menuPushDialog(&g_FilemgrDeleteFileMenuDialog); + menuPushDialog(&g_FilemgrDeleteMenuDialog); } s32 pakDeleteGameNoteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) @@ -1773,7 +1773,7 @@ s32 pakGameNoteListMenuHandler(u32 operation, struct menuitem *item, union handl case MENUOP_SET: if (g_EditingPak->notesinuse[data->list.value] == true) { g_Menus[g_MpPlayerNum].data.pak.noteindex = data->list.value; - menuPushDialog(&g_PakDeleteGameNoteMenuDialog); + menuPushDialog(&g_PakDeleteNoteMenuDialog); } break; } @@ -1919,7 +1919,7 @@ s32 filemgrOpenCopyFileMenuHandler(u32 operation, struct menuitem *item, union h func0f110c5c(0, item->param); g_Menus[g_MpPlayerNum].listnum = 0; g_Menus[g_MpPlayerNum].data.filemgr.isdeletingforsave = false; - menuPushDialog(&g_FilemgrCopyListMenuDialog); + menuPushDialog(&g_FilemgrCopyMenuDialog); } return 0; @@ -2155,7 +2155,7 @@ s32 filemgrChooseAgentListMenuHandler(u32 operation, struct menuitem *item, unio case MENUOP_SET: if (data->list.value == g_FileLists[0]->numfiles) { savefileLoadDefaults(&g_SoloSaveFile); - menuPushDialog(&g_FilemgrEnterAgentNameMenuDialog); + menuPushDialog(&g_FilemgrEnterNameMenuDialog); } else { struct savelocation000 *file = &g_FileLists[0]->unk000[data->list.value]; @@ -2216,7 +2216,7 @@ bool filemgrConsiderPushingFileSelectDialog(void) { if (g_Menus[g_MpPlayerNum].unk83c == 0) { g_Menus[g_MpPlayerNum].playernum = 0; - menuPushRootDialog(&g_FilemgrMainMenuDialog, MENUROOT_FILEMGR); + menuPushRootDialog(&g_FilemgrFileSelectMenuDialog, MENUROOT_FILEMGR); return true; } @@ -2289,33 +2289,33 @@ struct menudialog g_FilemgrFileInUseMenuDialog = { NULL, }; -struct menuitem g_FilemgrDeleteFileMenuItems[] = { +struct menuitem g_FilemgrDeleteMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(377), 0x00000000, NULL }, // "Select a file to delete:" { MENUITEMTYPE_LIST, 1, 0x00200000, 0x00000000, 0x00000000, filemgrFileToDeleteListMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS(378), 0x00000000, NULL }, // "Press B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrDeleteFileMenuDialog = { +struct menudialog g_FilemgrDeleteMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(376), // "Delete File" - g_FilemgrDeleteFileMenuItems, + g_FilemgrDeleteMenuItems, filemgrCopyOrDeleteListMenuDialog, 0x00000000, NULL, }; -struct menuitem g_FilemgrCopyListMenuItems[] = { +struct menuitem g_FilemgrCopyMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(374), 0x00000000, NULL }, // "Select a file to copy:" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000000, 0x00000000, filemgrFileToCopyListMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS(375), 0x00000000, NULL }, // "Press B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrCopyListMenuDialog = { +struct menudialog g_FilemgrCopyMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(373), // "Copy File" - g_FilemgrCopyListMenuItems, + g_FilemgrCopyMenuItems, filemgrCopyOrDeleteListMenuDialog, 0x00000000, NULL, @@ -2323,17 +2323,17 @@ struct menudialog g_FilemgrCopyListMenuDialog = { struct pakdata *g_EditingPak = NULL; -struct menuitem g_PakDeleteGameNoteMenuItems[] = { +struct menuitem g_PakDeleteNoteMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(384), 0x00000000, NULL }, // "Are you sure you want to delete this game note?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(385), 0x00000000, NULL }, // "No" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(386), 0x00000000, pakDeleteGameNoteMenuHandler }, // "Yes" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_PakDeleteGameNoteMenuDialog = { +struct menudialog g_PakDeleteNoteMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(383), // "Delete Game Note" - g_PakDeleteGameNoteMenuItems, + g_PakDeleteNoteMenuItems, NULL, 0x00000000, NULL, @@ -2405,30 +2405,30 @@ struct menudialog g_FilemgrOperationsMenuDialog = { NULL, }; -struct menuitem g_FilemgrEnterAgentNameMenuItems[] = { +struct menuitem g_FilemgrEnterNameMenuItems[] = { { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000001, filemgrAgentNameKeyboardMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrEnterAgentNameMenuDialog = { +struct menudialog g_FilemgrEnterNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(401), // "Enter Agent Name" - g_FilemgrEnterAgentNameMenuItems, + g_FilemgrEnterNameMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem g_FilemgrMainMenuItems[] = { +struct menuitem g_FilemgrFileSelectMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, filemgrChooseAgentListMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FilemgrMainMenuDialog = { +struct menudialog g_FilemgrFileSelectMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(95), // "Perfect Dark" - g_FilemgrMainMenuItems, + g_FilemgrFileSelectMenuItems, filemgrMainMenuDialog, 0x00000020, &g_FilemgrOperationsMenuDialog, diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 9df32ca22..123cba141 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -21,7 +21,7 @@ s32 menuhandler4MbDropOut(u32 operation, struct menuitem *item, union handlerdat menuPopDialog(); if (mpGetNumChrs() == 1) { - func0f0f820c(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); + func0f0f820c(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } } @@ -32,9 +32,9 @@ s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, union handlerdata { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_4MBMENU) { - func0f0f820c(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); + func0f0f820c(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } else { - func0f0f820c(&g_SoloPauseMenuDialog, MENUROOT_MAINMENU); + func0f0f820c(&g_SoloMissionPauseMenuDialog, MENUROOT_MAINMENU); } } @@ -44,7 +44,7 @@ s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, union handlerdata s32 menuhandler4MbAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - func0f0f820c(&g_4MbAdvancedSetupMenuDialog, MENUROOT_4MBMAINMENU); + func0f0f820c(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); } return 0; @@ -54,7 +54,7 @@ s32 menuhandler0010cabc(u32 operation, struct menuitem *item, union handlerdata { if (operation == MENUOP_SET) { mpSetCurrentChallenge(g_Menus[g_MpPlayerNum].data.main4mb.slotindex); - func0f0f820c(&menudialog_mpquickgo2, MENUROOT_4MBMAINMENU); + func0f0f820c(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); } return 0; @@ -69,7 +69,7 @@ void func0f10cb2c(void) if (g_FileState != FILESTATE_UNSELECTED) { if (var80087260 == 0) { g_Vars.unk000490 = 2; - menuPushRootDialog(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); + menuPushRootDialog(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } } else { g_FileState = FILESTATE_SELECTED; @@ -84,7 +84,7 @@ void func0f10cb2c(void) mpDetermineUnlockedFeatures(); - menuPushRootDialog(&menudialog_fileselect2, MENUROOT_4MBFILEMGR); + menuPushRootDialog(&g_FilemgrFileSelect4MbMenuDialog, MENUROOT_4MBFILEMGR); } g_MpPlayerNum = prevplayernum; @@ -100,7 +100,7 @@ s32 menudialog4MbMainMenu(u32 operation, struct menudialog *dialog, union handle } if (g_Menus[g_MpPlayerNum].curframe && - g_Menus[g_MpPlayerNum].curframe->dialog == &g_4MbMainMenu && + g_Menus[g_MpPlayerNum].curframe->dialog == &g_MainMenu4MbMenuDialog && operation == MENUOP_TICK) { g_Vars.unk000490 = 2; g_Vars.mpquickteam = MPQUICKTEAM_5; diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index a89e44e76..dccb85fc1 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -905,15 +905,15 @@ void mpPushPauseDialog(void) if (g_Vars.normmplayerisrunning) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - menuPushRootDialog(&g_MpPauseTeamRankingMenuDialog, MENUROOT_MPPAUSE); + menuPushRootDialog(&g_MpPauseTeamRankingsMenuDialog, MENUROOT_MPPAUSE); } else { menuPushRootDialog(&g_MpPausePlayerRankingMenuDialog, MENUROOT_MPPAUSE); } } else { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&menudialog_status, MENUROOT_MPPAUSE); + menuPushRootDialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE); } else { - menuPushRootDialog(&menudialog_196c8, MENUROOT_MPPAUSE); + menuPushRootDialog(&g_2PMissionPauseHMenuDialog, MENUROOT_MPPAUSE); } } } @@ -942,7 +942,7 @@ void mpPushEndscreenDialog(u32 arg0, u32 playernum) menuPushRootDialog(&g_MpEndscreenTeamGameOverMenuDialog, MENUROOT_MPENDSCREEN); } } else { - menuPushRootDialog(&g_MpEndscreenIndividualGameOverMenuDialog, MENUROOT_MPENDSCREEN); + menuPushRootDialog(&g_MpEndscreenIndGameOverMenuDialog, MENUROOT_MPENDSCREEN); } if ((g_MpPlayers[g_MpPlayerNum].options & OPTION_ASKEDSAVEPLAYER) == 0 diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 7e37ad554..958b93f4b 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -78,13 +78,13 @@ void func0f17fcb0(s32 silent) g_Menus[g_MpPlayerNum].playernum = g_MpPlayerNum; if (IS4MB()) { - menuPushRootDialog(&g_4MbAdvancedSetupMenuDialog, MENUROOT_4MBMAINMENU); + menuPushRootDialog(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); func0f0f8300(); } else { if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) { - menuPushRootDialog(&menudialog_mpchallengedetails2, MENUROOT_MPSETUP); + menuPushRootDialog(&g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog, MENUROOT_MPSETUP); } else { - menuPushRootDialog(&menudialog_mpgamesetup3, MENUROOT_MPSETUP); + menuPushRootDialog(&g_MpAdvancedSetupMenuDialog, MENUROOT_MPSETUP); } func0f0f8300(); diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 510a9cb60..c195f7aad 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -536,7 +536,7 @@ s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menuitem *item, union handl { if (operation == MENUOP_SET) { menuPopDialog(); - menuPushDialog(&menudialog_mpsavesetupname); + menuPushDialog(&g_MpSaveSetupNameMenuDialog); } return 0; @@ -2426,7 +2426,7 @@ char *mpMenuTextBodyName(struct menuitem *item) void func0f17b8f0(void) { - func0f0f139c(menuitems_mpcharacter, -0.4f); + func0f0f139c(g_MpCharacterMenuItems, -0.4f); } GLOBAL_ASM( @@ -2699,9 +2699,9 @@ glabel var7f1b818c /* f17bc74: 2405000b */ addiu $a1,$zero,0xb /* f17bc78: 14480006 */ bne $v0,$t0,.L0f17bc94 /* f17bc7c: 24846500 */ addiu $a0,$a0,%lo(g_MpQuickGoMenuDialog) -/* f17bc80: 3c048007 */ lui $a0,%hi(menudialog_mpquickgo2) +/* f17bc80: 3c048007 */ lui $a0,%hi(g_MpQuickGo4MbMenuDialog) /* f17bc84: 0fc3e083 */ jal func0f0f820c -/* f17bc88: 24845120 */ addiu $a0,$a0,%lo(menudialog_mpquickgo2) +/* f17bc88: 24845120 */ addiu $a0,$a0,%lo(g_MpQuickGo4MbMenuDialog) /* f17bc8c: 10000063 */ b .L0f17be1c /* f17bc90: 00001025 */ or $v0,$zero,$zero .L0f17bc94: @@ -4952,27 +4952,27 @@ glabel var7f1b8288 /* f17e590: 002d0821 */ addu $at,$at,$t5 /* f17e594: ac2bee1c */ sw $t3,%lo(g_Menus+0xe1c)($at) /* f17e598: 90ae0001 */ lbu $t6,0x1($a1) -/* f17e59c: 3c048008 */ lui $a0,%hi(menudialog_2bfa8) +/* f17e59c: 3c048008 */ lui $a0,%hi(g_MpConfirmChallengeViaListOrDetailsMenuDialog) /* f17e5a0: 15c00005 */ bnez $t6,.L0f17e5b8 /* f17e5a4: 00000000 */ nop /* f17e5a8: 0fc3cbd3 */ jal menuPushDialog -/* f17e5ac: 24845f88 */ addiu $a0,$a0,%lo(menudialog_2bfa8) +/* f17e5ac: 24845f88 */ addiu $a0,$a0,%lo(g_MpConfirmChallengeViaListOrDetailsMenuDialog) /* f17e5b0: 100000fe */ b .L0f17e9ac /* f17e5b4: 00001025 */ or $v0,$zero,$zero .L0f17e5b8: /* f17e5b8: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* f17e5bc: 24010001 */ addiu $at,$zero,0x1 -/* f17e5c0: 3c048008 */ lui $a0,%hi(menudialog_2c0cc) +/* f17e5c0: 3c048008 */ lui $a0,%hi(g_MpConfirmChallengeMenuDialog) /* f17e5c4: 15e10006 */ bne $t7,$at,.L0f17e5e0 /* f17e5c8: 00000000 */ nop -/* f17e5cc: 3c048007 */ lui $a0,%hi(menudialog_1b1bc) +/* f17e5cc: 3c048007 */ lui $a0,%hi(g_MpConfirmChallenge4MbMenuDialog) /* f17e5d0: 0fc3cbd3 */ jal menuPushDialog -/* f17e5d4: 2484519c */ addiu $a0,$a0,%lo(menudialog_1b1bc) +/* f17e5d4: 2484519c */ addiu $a0,$a0,%lo(g_MpConfirmChallenge4MbMenuDialog) /* f17e5d8: 100000f4 */ b .L0f17e9ac /* f17e5dc: 00001025 */ or $v0,$zero,$zero .L0f17e5e0: /* f17e5e0: 0fc3cbd3 */ jal menuPushDialog -/* f17e5e4: 248460ac */ addiu $a0,$a0,%lo(menudialog_2c0cc) +/* f17e5e4: 248460ac */ addiu $a0,$a0,%lo(g_MpConfirmChallengeMenuDialog) /* f17e5e8: 100000f0 */ b .L0f17e9ac /* f17e5ec: 00001025 */ or $v0,$zero,$zero /* f17e5f0: 3c18000f */ lui $t8,0xf @@ -5363,7 +5363,7 @@ s32 menuhandlerMpSavePlayer(u32 operation, struct menuitem *item, union handlerd if (g_MpPlayers[g_MpPlayerNum].unk4c.unk00 == false) { filemgrPushSelectLocationDialog(6, 2); } else { - menuPushDialog(&g_MpSaveChrMenuDialog); + menuPushDialog(&g_MpSavePlayerMenuDialog); } } @@ -5384,12 +5384,12 @@ s32 menuhandler0017ef30(u32 operation, struct menuitem *item, union handlerdata if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_CITRAINING) { if (IS4MB()) { - func0f0f820c(&g_CiMainMenuDialogViaPause, 2); + func0f0f820c(&g_CiMenuViaPauseMenuDialog, 2); } else { - func0f0f820c(&g_MainMenuMenuDialog, 2); + func0f0f820c(&g_CiMenuViaPcMenuDialog, 2); } } else { - func0f0f820c(&g_SoloPauseMenuDialog, 2); + func0f0f820c(&g_SoloMissionPauseMenuDialog, 2); } } @@ -5400,10 +5400,10 @@ s32 menuhandlerMpSaveSettings(u32 operation, struct menuitem *item, union handle { if (operation == MENUOP_SET) { if (g_MpSetup.unk20.unk00 == false) { - menuPushDialog(&menudialog_mpsavesetupname); + menuPushDialog(&g_MpSaveSetupNameMenuDialog); } else { func0f108324(g_MpSetup.unk20.unk04); - menuPushDialog(&menudialog_mpsavesetup); + menuPushDialog(&g_MpSaveSetupExistsMenuDialog); } } @@ -5736,8 +5736,8 @@ glabel func0f17f428 /* f17f444: 3c048008 */ lui $a0,%hi(g_MpQuickGoMenuDialog) /* f17f448: 15c10007 */ bne $t6,$at,.L0f17f468 /* f17f44c: 24846500 */ addiu $a0,$a0,%lo(g_MpQuickGoMenuDialog) -/* f17f450: 3c048007 */ lui $a0,%hi(menudialog_mpquickgo2) -/* f17f454: 24845120 */ addiu $a0,$a0,%lo(menudialog_mpquickgo2) +/* f17f450: 3c048007 */ lui $a0,%hi(g_MpQuickGo4MbMenuDialog) +/* f17f454: 24845120 */ addiu $a0,$a0,%lo(g_MpQuickGo4MbMenuDialog) /* f17f458: 0fc3e083 */ jal func0f0f820c /* f17f45c: 2405000b */ addiu $a1,$zero,0xb /* f17f460: 10000004 */ b .L0f17f474 @@ -6120,7 +6120,7 @@ s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union ha s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - func0f0f820c(&menudialog_mpgamesetup3, 3); + func0f0f820c(&g_MpAdvancedSetupMenuDialog, 3); } return 0; @@ -6141,29 +6141,29 @@ glabel func0f17fa28 /* f17fa50: afb30024 */ sw $s3,0x24($sp) /* f17fa54: afb20020 */ sw $s2,0x20($sp) /* f17fa58: afb1001c */ sw $s1,0x1c($sp) -/* f17fa5c: 3c118008 */ lui $s1,%hi(menudialog_mpsavesetupname) -/* f17fa60: 3c128008 */ lui $s2,%hi(menudialog_mpsavesetup) +/* f17fa5c: 3c118008 */ lui $s1,%hi(g_MpSaveSetupNameMenuDialog) +/* f17fa60: 3c128008 */ lui $s2,%hi(g_MpSaveSetupExistsMenuDialog) /* f17fa64: 3c138008 */ lui $s3,%hi(g_MpAddSimulantMenuDialog) /* f17fa68: 3c148008 */ lui $s4,%hi(g_MpChangeSimulantMenuDialog) /* f17fa6c: 3c158008 */ lui $s5,%hi(g_MpEditSimulantMenuDialog) -/* f17fa70: 3c168008 */ lui $s6,%hi(menudialog_mpcombatoptions) -/* f17fa74: 3c178008 */ lui $s7,%hi(menudialog_mpbriefcaseoptions) -/* f17fa78: 3c1e8008 */ lui $s8,%hi(menudialog_mpcaptureoptions) -/* f17fa7c: 3c098008 */ lui $t1,%hi(menudialog_mppopacapoptions) -/* f17fa80: 3c088008 */ lui $t0,%hi(menudialog_mphackeroptions) -/* f17fa84: 3c078008 */ lui $a3,%hi(menudialog_mphilloptions) +/* f17fa70: 3c168008 */ lui $s6,%hi(g_MpCombatOptionsMenuDialog) +/* f17fa74: 3c178008 */ lui $s7,%hi(g_MpBriefcaseOptionsMenuDialog) +/* f17fa78: 3c1e8008 */ lui $s8,%hi(g_MpCaptureOptionsMenuDialog) +/* f17fa7c: 3c098008 */ lui $t1,%hi(g_MpPopacapOptionsMenuDialog) +/* f17fa80: 3c088008 */ lui $t0,%hi(g_MpHackerOptionsMenuDialog) +/* f17fa84: 3c078008 */ lui $a3,%hi(g_MpHillOptionsMenuDialog) /* f17fa88: afb00018 */ sw $s0,0x18($sp) -/* f17fa8c: 24e76ce0 */ addiu $a3,$a3,%lo(menudialog_mphilloptions) -/* f17fa90: 25086dfc */ addiu $t0,$t0,%lo(menudialog_mphackeroptions) -/* f17fa94: 25296f80 */ addiu $t1,$t1,%lo(menudialog_mppopacapoptions) -/* f17fa98: 27de6b48 */ addiu $s8,$s8,%lo(menudialog_mpcaptureoptions) -/* f17fa9c: 26f769d4 */ addiu $s7,$s7,%lo(menudialog_mpbriefcaseoptions) -/* f17faa0: 26d668b8 */ addiu $s6,$s6,%lo(menudialog_mpcombatoptions) +/* f17fa8c: 24e76ce0 */ addiu $a3,$a3,%lo(g_MpHillOptionsMenuDialog) +/* f17fa90: 25086dfc */ addiu $t0,$t0,%lo(g_MpHackerOptionsMenuDialog) +/* f17fa94: 25296f80 */ addiu $t1,$t1,%lo(g_MpPopacapOptionsMenuDialog) +/* f17fa98: 27de6b48 */ addiu $s8,$s8,%lo(g_MpCaptureOptionsMenuDialog) +/* f17fa9c: 26f769d4 */ addiu $s7,$s7,%lo(g_MpBriefcaseOptionsMenuDialog) +/* f17faa0: 26d668b8 */ addiu $s6,$s6,%lo(g_MpCombatOptionsMenuDialog) /* f17faa4: 26b5592c */ addiu $s5,$s5,%lo(g_MpEditSimulantMenuDialog) /* f17faa8: 26945834 */ addiu $s4,$s4,%lo(g_MpChangeSimulantMenuDialog) /* f17faac: 2673581c */ addiu $s3,$s3,%lo(g_MpAddSimulantMenuDialog) -/* f17fab0: 26524d80 */ addiu $s2,$s2,%lo(menudialog_mpsavesetup) -/* f17fab4: 26314cdc */ addiu $s1,$s1,%lo(menudialog_mpsavesetupname) +/* f17fab0: 26524d80 */ addiu $s2,$s2,%lo(g_MpSaveSetupExistsMenuDialog) +/* f17fab4: 26314cdc */ addiu $s1,$s1,%lo(g_MpSaveSetupNameMenuDialog) /* f17fab8: 00001025 */ or $v0,$zero,$zero /* f17fabc: afae0040 */ sw $t6,0x40($sp) /* f17fac0: 0002c0c0 */ sll $t8,$v0,0x3 @@ -6278,14 +6278,14 @@ glabel func0f17fa28 /* f17fc30: 00000000 */ nop /* f17fc34: 0fc3cdb7 */ jal menuPopDialog /* f17fc38: 00000000 */ nop -/* f17fc3c: 3c078008 */ lui $a3,%hi(menudialog_mphilloptions) -/* f17fc40: 3c088008 */ lui $t0,%hi(menudialog_mphackeroptions) -/* f17fc44: 3c098008 */ lui $t1,%hi(menudialog_mppopacapoptions) +/* f17fc3c: 3c078008 */ lui $a3,%hi(g_MpHillOptionsMenuDialog) +/* f17fc40: 3c088008 */ lui $t0,%hi(g_MpHackerOptionsMenuDialog) +/* f17fc44: 3c098008 */ lui $t1,%hi(g_MpPopacapOptionsMenuDialog) /* f17fc48: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum) /* f17fc4c: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) -/* f17fc50: 25296f80 */ addiu $t1,$t1,%lo(menudialog_mppopacapoptions) -/* f17fc54: 25086dfc */ addiu $t0,$t0,%lo(menudialog_mphackeroptions) -/* f17fc58: 24e76ce0 */ addiu $a3,$a3,%lo(menudialog_mphilloptions) +/* f17fc50: 25296f80 */ addiu $t1,$t1,%lo(g_MpPopacapOptionsMenuDialog) +/* f17fc54: 25086dfc */ addiu $t0,$t0,%lo(g_MpHackerOptionsMenuDialog) +/* f17fc58: 24e76ce0 */ addiu $a3,$a3,%lo(g_MpHillOptionsMenuDialog) .L0f17fc5c: /* f17fc5c: 5200ffa7 */ beqzl $s0,.L0f17fafc /* f17fc60: 8fe20000 */ lw $v0,0x0($ra) diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index 374f56acc..d55d8146d 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -235,9 +235,9 @@ s32 optionsGetEffectiveScreenSize(void) } if (g_Menus[g_MpPlayerNum].curframe && ( - g_Menus[g_MpPlayerNum].curframe->dialog == &menudialog_control4 || - g_Menus[g_MpPlayerNum].curframe->dialog == &menudialog_control3 || - g_Menus[g_MpPlayerNum].curframe->dialog == &g_ControlStyleSingleMenuDialog)) { + g_Menus[g_MpPlayerNum].curframe->dialog == &g_CiControlStylePlayer2MenuDialog || + g_Menus[g_MpPlayerNum].curframe->dialog == &g_CiControlStyleMenuDialog || + g_Menus[g_MpPlayerNum].curframe->dialog == &g_SoloMissionControlStyleMenuDialog)) { return SCREENSIZE_FULL; } diff --git a/src/game/propobj.c b/src/game/propobj.c index 1a34a55dd..78ab9d18d 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -37186,24 +37186,24 @@ bool propobjInteract(struct prop *prop) handled = true; if (data->intraining) { - func0f0f85e0(&g_DeviceTrainingDetailsMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); } else { - func0f0f85e0(&g_DeviceTrainingListMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_DtListMenuDialog, MENUROOT_TRAINING); } } else if (tag_id == 0x45) { struct trainingdata *data = getHoloTrainingData(); handled = true; if (data->intraining) { - func0f0f85e0(&g_HoloTrainingDetailsMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_HtDetailsMenuDialog, MENUROOT_TRAINING); } else { - func0f0f85e0(&g_HoloTrainingListMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_HtListMenuDialog, MENUROOT_TRAINING); } } else if (tag_id == 0x7f) { handled = true; if (frIsInTraining()) { - func0f0f85e0(&g_FrTrainingInfoMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_FrTrainingInfoInGameMenuDialog, MENUROOT_TRAINING); } else { func0f0f85e0(&g_FrWeaponListMenuDialog, MENUROOT_TRAINING); } @@ -37213,19 +37213,19 @@ bool propobjInteract(struct prop *prop) if (!handled) { if (tag_id == 0x0e) { handled = true; - func0f0f85e0(&menudialog_information, MENUROOT_TRAINING); + func0f0f85e0(&g_BioListMenuDialog, MENUROOT_TRAINING); } else if (tag_id == 0x0f) { handled = true; func0f0f85e0(&g_CheatsMenuDialog, MENUROOT_TRAINING); } else if (tag_id == 0x1b) { handled = true; - func0f0f85e0(&menudialog_weaponsavailable, MENUROOT_TRAINING); + func0f0f85e0(&g_FrWeaponsAvailableMenuDialog, MENUROOT_TRAINING); } else if (tag_id == 0x47) { handled = true; - func0f0f85e0(&g_MainMenuMenuDialog, MENUROOT_MAINMENU); + func0f0f85e0(&g_CiMenuViaPcMenuDialog, MENUROOT_MAINMENU); } else if (tag_id == 0x46) { handled = true; - func0f0f85e0(&menudialog_hangarinformation, MENUROOT_TRAINING); + func0f0f85e0(&g_HangarListMenuDialog, MENUROOT_TRAINING); } } diff --git a/src/game/training/menus.c b/src/game/training/menus.c index a23d823dd..03435f62c 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -180,17 +180,17 @@ glabel var7f1b9940 /* f1a3548: 00402025 */ or $a0,$v0,$zero /* f1a354c: 0fc67570 */ jal frSetDifficulty /* f1a3550: 00402025 */ or $a0,$v0,$zero -/* f1a3554: 3c048009 */ lui $a0,%hi(menudialog_frdifficulty) +/* f1a3554: 3c048009 */ lui $a0,%hi(g_FrDifficultyMenuDialog) /* f1a3558: 0fc3cbd3 */ jal menuPushDialog -/* f1a355c: 24848d38 */ addiu $a0,$a0,%lo(menudialog_frdifficulty) +/* f1a355c: 24848d38 */ addiu $a0,$a0,%lo(g_FrDifficultyMenuDialog) /* f1a3560: 1000010d */ b .L0f1a3998 /* f1a3564: 00001025 */ or $v0,$zero,$zero .L0f1a3568: /* f1a3568: 0fc67570 */ jal frSetDifficulty /* f1a356c: 00002025 */ or $a0,$zero,$zero -/* f1a3570: 3c048009 */ lui $a0,%hi(menudialog_frtraininginfo2) +/* f1a3570: 3c048009 */ lui $a0,%hi(g_FrTrainingInfoPreGameMenuDialog) /* f1a3574: 0fc3cbd3 */ jal menuPushDialog -/* f1a3578: 24848f60 */ addiu $a0,$a0,%lo(menudialog_frtraininginfo2) +/* f1a3578: 24848f60 */ addiu $a0,$a0,%lo(g_FrTrainingInfoPreGameMenuDialog) /* f1a357c: 10000106 */ b .L0f1a3998 /* f1a3580: 00001025 */ or $v0,$zero,$zero /* f1a3584: 0fc67494 */ jal frGetSlot @@ -540,7 +540,7 @@ s32 frDifficultyDropdownMenuHandler(u32 operation, struct menuitem *item, union return (s32) langGet(names[data->dropdown.value]); case MENUOP_SET: frSetDifficulty(data->dropdown.value); - menuPushDialog(&menudialog_frtraininginfo2); + menuPushDialog(&g_FrTrainingInfoPreGameMenuDialog); break; case MENUOP_GETOPTIONVALUE: data->dropdown.value = frGetDifficulty(); @@ -560,7 +560,7 @@ s32 frDifficultyMenuHandler(u32 operation, struct menuitem *item, union handlerd break; case MENUOP_SET: frSetDifficulty(item->param); - menuPushDialog(&menudialog_frtraininginfo2); + menuPushDialog(&g_FrTrainingInfoPreGameMenuDialog); break; case MENUOP_CHECKPREFOCUSED: if (ciGetFiringRangeScore(frGetWeaponIndexByWeapon(frGetWeaponBySlot(frGetSlot()))) >= item->param) { @@ -2451,7 +2451,7 @@ s32 menuhandlerFrFailedContinue(u32 operation, struct menuitem *item, union hand return 0; } -struct menuitem menuitems_frdifficulty[] = { +struct menuitem g_FrDifficultyMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPMENU(444), L_MPMENU(445), NULL }, // "Select Difficulty:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPMENU(439), L_OPTIONS(3), frDifficultyMenuHandler }, // "Bronze" { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, L_MPMENU(440), L_OPTIONS(3), frDifficultyMenuHandler }, // "Silver" @@ -2461,16 +2461,16 @@ struct menuitem menuitems_frdifficulty[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_frdifficulty = { +struct menudialog g_FrDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(442), // "Difficulty" - menuitems_frdifficulty, + g_FrDifficultyMenuItems, NULL, 0x00000200, NULL, }; -struct menuitem menuitems_frweapon[] = { +struct menuitem g_FrWeaponListMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00200008, 0x000000aa, 0x00000000, menuhandler001a348c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -2478,13 +2478,13 @@ struct menuitem menuitems_frweapon[] = { struct menudialog g_FrWeaponListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(446), // "Weapon" - menuitems_frweapon, + g_FrWeaponListMenuItems, NULL, 0x00000200, NULL, }; -struct menuitem menuitems_frtraininginfo[] = { +struct menuitem g_FrTrainingInfoInGameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(443), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty" { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextGoalScoreLabel, (u32)&frMenuTextGoalScoreValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextMinAccuracyOrTargetsLabel, (u32)&frMenuTextMinAccuracyOrTargetsValue, NULL }, @@ -2498,16 +2498,16 @@ struct menuitem menuitems_frtraininginfo[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_FrTrainingInfoMenuDialog = { +struct menudialog g_FrTrainingInfoInGameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(447), // "Training Info" - menuitems_frtraininginfo, + g_FrTrainingInfoInGameMenuItems, frTrainingInfoMenuDialog, 0x00000602, NULL, }; -struct menuitem menuitems_frtraininginfo2[] = { +struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(443), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextGoalScoreLabel, (u32)&frMenuTextGoalScoreValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextMinAccuracyOrTargetsLabel, (u32)&frMenuTextMinAccuracyOrTargetsValue, NULL }, @@ -2521,16 +2521,16 @@ struct menuitem menuitems_frtraininginfo2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_frtraininginfo2 = { +struct menudialog g_FrTrainingInfoPreGameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(447), // "Training Info" - menuitems_frtraininginfo2, + g_FrTrainingInfoPreGameMenuItems, frTrainingInfoMenuDialog, 0x00000602, NULL, }; -struct menuitem g_MenuItemsFrTrainingStatsCompleted[] = { +struct menuitem g_FrCompletedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(449), 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" @@ -2546,16 +2546,16 @@ struct menuitem g_MenuItemsFrTrainingStatsCompleted[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MenuDialogFrTrainingStatsCompleted = { +struct menudialog g_FrCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(448), // "Training Stats" - g_MenuItemsFrTrainingStatsCompleted, + g_FrCompletedMenuItems, frTrainingStatsMenuDialog, 0x00000004, NULL, }; -struct menuitem g_MenuItemsFrTrainingStatsFailed[] = { +struct menuitem g_FrFailedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&frMenuTextFailReason, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" @@ -2571,10 +2571,10 @@ struct menuitem g_MenuItemsFrTrainingStatsFailed[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_MenuDialogFrTrainingStatsFailed = { +struct menudialog g_FrFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(448), // "Training Stats" - g_MenuItemsFrTrainingStatsFailed, + g_FrFailedMenuItems, frTrainingStatsMenuDialog, 0x00000004, NULL, @@ -2610,9 +2610,9 @@ s32 ciOfficeInformationMenuHandler(u32 operation, struct menuitem *item, union h case MENUOP_SET: g_ChrBioSlot = data->list.value; if (g_ChrBioSlot < numunlockedchrbios) { - menuPushDialog(&menudialog_characterprofile); + menuPushDialog(&g_BioProfileMenuDialog); } else { - menuPushDialog(&menudialog_2f3c0); + menuPushDialog(&g_BioTextMenuDialog); } break; case MENUOP_GETOPTIONVALUE: @@ -2631,31 +2631,31 @@ s32 ciOfficeInformationMenuHandler(u32 operation, struct menuitem *item, union h return 0; } -struct menuitem menuitems_information[] = { +struct menuitem g_BioListMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000008, 0x000000c8, 0x00000000, ciOfficeInformationMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_information = { +struct menudialog g_BioListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(418), // "Information" - menuitems_information, + g_BioListMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_nowsafe[] = { +struct menuitem g_NowSafeMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(437), 0x00000000, NULL }, // "It is now safe to turn off your computer" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(438), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_nowsafe = { +struct menudialog g_NowSafeMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(436), // "Cheats" - menuitems_nowsafe, + g_NowSafeMenuItems, NULL, 0x00000200, NULL, @@ -2819,7 +2819,7 @@ s32 dtDeviceListMenuHandler(u32 operation, struct menuitem *item, union handlerd return (s32) weaponGetName(dtGetWeaponByDeviceIndex(dtGetIndexBySlot(data->list.value))); case MENUOP_SET: g_DtSlot = data->list.value; - menuPushDialog(&g_DeviceTrainingDetailsMenuDialog); + menuPushDialog(&g_DtDetailsMenuDialog); break; case MENUOP_GETOPTIONVALUE: data->list.value = g_DtSlot; @@ -2865,7 +2865,7 @@ s32 menuhandler001a6514(u32 operation, struct menuitem *item, union handlerdata return 0; } -struct menuitem menuitems_characterprofile[] = { +struct menuitem g_BioProfileMenuItems[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000046, 0x00000096, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000003, L_MPMENU(432), (u32)&ciMenuTextChrBioName, NULL }, // "Name:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(433), (u32)&ciMenuTextChrBioAge, NULL }, // "Age:" @@ -2877,40 +2877,40 @@ struct menuitem menuitems_characterprofile[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_characterprofile = { +struct menudialog g_BioProfileMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(431), // "Character Profile" - menuitems_characterprofile, + g_BioProfileMenuItems, ciCharacterProfileMenuDialog, 0x00000002, NULL, }; -struct menuitem menuitems_2f370[] = { +struct menuitem g_BioTextMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MISCBIO, 0x00000000, 0x000000c8, 0x00000096, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog menudialog_2f3c0 = { +struct menudialog g_BioTextMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&ciMenuTextMiscBioName, - menuitems_2f370, + g_BioTextMenuItems, NULL, 0x00000200, NULL, }; -struct menuitem menuitems_devicelist[] = { +struct menuitem g_DtListMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000008, 0x000000a0, 0x00000000, dtDeviceListMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_DeviceTrainingListMenuDialog = { +struct menudialog g_DtListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(417), // "Device List" - menuitems_devicelist, + g_DtListMenuItems, NULL, 0x00000000, NULL, @@ -3024,7 +3024,7 @@ s32 htHoloListMenuHandler(u32 operation, struct menuitem *item, union handlerdat return (s32) htGetName(htGetIndexBySlot(data->list.value)); case MENUOP_SET: var80088bb4 = data->list.value; - menuPushDialog(&g_HoloTrainingDetailsMenuDialog); + menuPushDialog(&g_HtDetailsMenuDialog); break; case MENUOP_GETOPTIONVALUE: data->list.value = var80088bb4; @@ -3158,7 +3158,7 @@ char *ciMenuTextHangarBioSubheading(struct menuitem *item) return g_StringPointer; } -struct menuitem menuitems_2f424[] = { +struct menuitem g_DtDetailsMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_DEVICETRAINING, 0x00000000, 0x000000aa, 0x000000be, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, @@ -3167,16 +3167,16 @@ struct menuitem menuitems_2f424[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_DeviceTrainingDetailsMenuDialog = { +struct menudialog g_DtDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&dtMenuTextName, - menuitems_2f424, + g_DtDetailsMenuItems, dtTrainingDetailsMenuDialog, 0x00000206, NULL, }; -struct menuitem menuitems_trainingstats_failed[] = { +struct menuitem g_DtFailedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(426), 0x00000000, NULL }, // "Failed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -3185,16 +3185,16 @@ struct menuitem menuitems_trainingstats_failed[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_DeviceTrainingStatsFailedMenuDialog = { +struct menudialog g_DtFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(423), // "Training Stats" - menuitems_trainingstats_failed, + g_DtFailedMenuItems, menudialogDeviceTrainingResults, 0x00000200, - &g_DeviceTrainingListMenuDialog, + &g_DtListMenuDialog, }; -struct menuitem menuitems_trainingstats_completed[] = { +struct menuitem g_DtCompletedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(425), 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -3203,30 +3203,30 @@ struct menuitem menuitems_trainingstats_completed[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_DeviceTrainingStatsCompletedMenuDialog = { +struct menudialog g_DtCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(423), // "Training Stats" - menuitems_trainingstats_completed, + g_DtCompletedMenuItems, menudialogDeviceTrainingResults, 0x00000200, - &g_DeviceTrainingListMenuDialog, + &g_DtListMenuDialog, }; -struct menuitem menuitems_holotraining[] = { +struct menuitem g_HtListMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000008, 0x000000a0, 0x00000000, htHoloListMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_HoloTrainingListMenuDialog = { +struct menudialog g_HtListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(416), // "Holotraining" - menuitems_holotraining, + g_HtListMenuItems, NULL, 0x00000000, NULL, }; -struct menuitem menuitems_2f614[] = { +struct menuitem g_HtDetailsMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HOLOTRAINING, 0x00000000, 0x000000aa, 0x000000be, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, @@ -3235,16 +3235,16 @@ struct menuitem menuitems_2f614[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_HoloTrainingDetailsMenuDialog = { +struct menudialog g_HtDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&htMenuTextName, - menuitems_2f614, + g_HtDetailsMenuItems, menudialog001a6aa4, 0x00000206, NULL, }; -struct menuitem menuitems_trainingstats_failed2[] = { +struct menuitem g_HtFailedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(426), 0x00000000, NULL }, // "Failed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -3253,16 +3253,16 @@ struct menuitem menuitems_trainingstats_failed2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_HoloTrainingStatsFailedMenuDialog = { +struct menudialog g_HtFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(423), // "Training Stats" - menuitems_trainingstats_failed2, + g_HtFailedMenuItems, menudialogFiringRangeResults, 0x00000200, - &g_HoloTrainingListMenuDialog, + &g_HtListMenuDialog, }; -struct menuitem menuitems_trainingstats_completed2[] = { +struct menuitem g_HtCompletedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(425), 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -3271,13 +3271,13 @@ struct menuitem menuitems_trainingstats_completed2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menudialog g_HoloTrainingStatsCompletedMenuDialog = { +struct menudialog g_HtCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(423), // "Training Stats" - menuitems_trainingstats_completed2, + g_HtCompletedMenuItems, menudialogFiringRangeResults, 0x00000200, - &g_HoloTrainingListMenuDialog, + &g_HtListMenuDialog, }; s32 ciHangarInformationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) @@ -3304,9 +3304,9 @@ s32 ciHangarInformationMenuHandler(u32 operation, struct menuitem *item, union h bioindex = ciGetHangarBioIndexBySlot(g_HangarBioSlot); if (bioindex <= HANGARBIO_SKEDARRUINS) { - menuPushDialog(&menudialog_2f950); + menuPushDialog(&g_HangarLocationDetailsMenuDialog); } else { - menuPushDialog(&menudialog_2f938); + menuPushDialog(&g_HangarVehicleDetailsMenuDialog); } break; case MENUOP_GETOPTIONVALUE: diff --git a/src/game/training/training.c b/src/game/training/training.c index fcd5487f6..ad2176351 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -2506,7 +2506,7 @@ glabel var7f1b94e4 /* f19faec: 3c048009 */ lui $a0,%hi(var80095200) /* f19faf0: 24010003 */ addiu $at,$zero,0x3 /* f19faf4: 11e10023 */ beq $t7,$at,.L0f19fb84 -/* f19faf8: 3c048009 */ lui $a0,%hi(menudialog_frtraininginfo2) +/* f19faf8: 3c048009 */ lui $a0,%hi(g_FrTrainingInfoPreGameMenuDialog) /* f19fafc: 1000037d */ b .L0f1a08f4 /* f19fb00: 8fbf007c */ lw $ra,0x7c($sp) .L0f19fb04: @@ -2518,7 +2518,7 @@ glabel var7f1b94e4 /* f19fb18: 10000376 */ b .L0f1a08f4 /* f19fb1c: 8fbf007c */ lw $ra,0x7c($sp) .L0f19fb20: -/* f19fb20: 24848f60 */ addiu $a0,$a0,%lo(menudialog_frtraininginfo2) +/* f19fb20: 24848f60 */ addiu $a0,$a0,%lo(g_FrTrainingInfoPreGameMenuDialog) /* f19fb24: 0fc3e178 */ jal func0f0f85e0 /* f19fb28: 2405000d */ addiu $a1,$zero,0xd /* f19fb2c: 10000371 */ b .L0f1a08f4 @@ -2538,8 +2538,8 @@ glabel var7f1b94e4 /* f19fb60: 2407ffff */ addiu $a3,$zero,-1 /* f19fb64: 0c004241 */ jal audioStart /* f19fb68: e7b80014 */ swc1 $f24,0x14($sp) -/* f19fb6c: 3c048009 */ lui $a0,%hi(g_MenuDialogFrTrainingStatsFailed) -/* f19fb70: 24849198 */ addiu $a0,$a0,%lo(g_MenuDialogFrTrainingStatsFailed) +/* f19fb6c: 3c048009 */ lui $a0,%hi(g_FrFailedMenuDialog) +/* f19fb70: 24849198 */ addiu $a0,$a0,%lo(g_FrFailedMenuDialog) /* f19fb74: 0fc3e178 */ jal func0f0f85e0 /* f19fb78: 2405000d */ addiu $a1,$zero,0xd /* f19fb7c: 1000035d */ b .L0f1a08f4 @@ -2559,8 +2559,8 @@ glabel var7f1b94e4 /* f19fbb0: 2407ffff */ addiu $a3,$zero,-1 /* f19fbb4: 0c004241 */ jal audioStart /* f19fbb8: e7b80014 */ swc1 $f24,0x14($sp) -/* f19fbbc: 3c048009 */ lui $a0,%hi(g_MenuDialogFrTrainingStatsCompleted) -/* f19fbc0: 2484907c */ addiu $a0,$a0,%lo(g_MenuDialogFrTrainingStatsCompleted) +/* f19fbbc: 3c048009 */ lui $a0,%hi(g_FrCompletedMenuDialog) +/* f19fbc0: 2484907c */ addiu $a0,$a0,%lo(g_FrCompletedMenuDialog) /* f19fbc4: 0fc3e178 */ jal func0f0f85e0 /* f19fbc8: 2405000d */ addiu $a1,$zero,0xd /* f19fbcc: 3c04800a */ lui $a0,%hi(g_FilemgrLoadedMainFile) @@ -3563,15 +3563,15 @@ glabel var7f1b94e4 // func0f0f85e0(ciGetFrWeaponListMenuDialog(), MENUROOT_TRAINING); // break; // case FRMENUTYPE_DETAILS: -// func0f0f85e0(&menudialog_frtraininginfo2, MENUROOT_TRAINING); +// func0f0f85e0(&g_FrTrainingInfoPreGameMenuDialog, MENUROOT_TRAINING); // break; // case FRMENUTYPE_FAILED: // audioStart(var80095200, 0x5db, NULL, -1, -1, -1, -1, -1); -// func0f0f85e0(&g_MenuDialogFrTrainingStatsFailed, MENUROOT_TRAINING); +// func0f0f85e0(&g_FrFailedMenuDialog, MENUROOT_TRAINING); // break; // case FRMENUTYPE_COMPLETED: // audioStart(var80095200, 0x5dc, NULL, -1, -1, -1, -1, -1); -// func0f0f85e0(&g_MenuDialogFrTrainingStatsCompleted, MENUROOT_TRAINING); +// func0f0f85e0(&g_FrCompletedMenuDialog, MENUROOT_TRAINING); // func0f1094e4(&g_FilemgrLoadedMainFile, 0, 0); // break; // } @@ -4699,9 +4699,9 @@ void dtRestorePlayer(void) void dtPushEndscreen(void) { if (g_DtData.completed) { - func0f0f85e0(&g_DeviceTrainingStatsCompletedMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_DtCompletedMenuDialog, MENUROOT_TRAINING); } else if (g_DtData.failed) { - func0f0f85e0(&g_DeviceTrainingStatsFailedMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_DtFailedMenuDialog, MENUROOT_TRAINING); } g_DtData.timeleft = 0; @@ -4945,9 +4945,9 @@ struct trainingdata *getHoloTrainingData(void) void htPushEndscreen(void) { if (g_HoloTrainingData.completed) { - func0f0f85e0(&g_HoloTrainingStatsCompletedMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_HtCompletedMenuDialog, MENUROOT_TRAINING); } else if (g_HoloTrainingData.failed) { - func0f0f85e0(&g_HoloTrainingStatsFailedMenuDialog, MENUROOT_TRAINING); + func0f0f85e0(&g_HtFailedMenuDialog, MENUROOT_TRAINING); } g_HoloTrainingData.timeleft = 0; diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h index 9b8f8359b..23a19dfa3 100644 --- a/src/include/game/data/data_0160b0.h +++ b/src/include/game/data/data_0160b0.h @@ -2,8 +2,8 @@ #define IN_GAME_DATA_0160B0_H #include -extern struct menudialog menudialog_18d78; -extern struct menudialog menudialog_18d90; +extern struct menudialog g_2PMissionOptionsHMenuDialog; +extern struct menudialog g_2PMissionOptionsVMenuDialog; extern u32 var80070090; extern u32 var80070098; @@ -164,15 +164,15 @@ extern u32 var800714e0; extern u32 var800714ec; extern u32 var800714f0; extern u32 var800714f4; -extern struct menudialog menudialog_pakremoved; +extern struct menudialog g_PakRemovedMenuDialog; extern struct menudialog g_PakRepairSuccessMenuDialog; extern struct menudialog g_PakRepairFailedMenuDialog; extern struct menudialog g_PakAttemptRepairMenuDialog; extern u16 savelocations[]; -extern struct menudialog menudialog_damagedcontrollerpak; -extern struct menudialog menudialog_fullcontrollerpak; -extern struct menudialog menudialog_cannotreadgameboy; -extern struct menudialog menudialog_datalost; +extern struct menudialog g_PakDamagedMenuDialog; +extern struct menudialog g_PakFullMenuDialog; +extern struct menudialog g_PakCannotReadGameBoyMenuDialog; +extern struct menudialog g_PakDataLostMenuDialog; extern struct menudialog g_AmPickTargetMenuDialog; extern u8 var800719a0[3][3]; extern u16 options_controlmode[]; @@ -181,53 +181,53 @@ extern u16 g_SoundModeOptions[]; extern u16 g_ScreenSizeOptions[]; extern u16 g_ScreenRatioOptions[]; extern u16 g_ScreenSplitOptions[]; -extern struct menudialog menudialog_briefing; -extern struct menudialog menudialog_changeagent; -extern struct menudialog g_ObjectivesMenuDialog; -extern struct menudialog g_PdModeSettingsDialog; -extern struct menudialog menudialog_selectdifficulty; +extern struct menudialog g_PreAndPostMissionBriefingMenuDialog; +extern struct menudialog g_ChangeAgentMenuDialog; +extern struct menudialog g_AcceptMissionMenuDialog; +extern struct menudialog g_PdModeSettingsMenuDialog; +extern struct menudialog g_SoloMissionDifficultyMenuDialog; extern struct menudialog g_CoopOptionsMenuDialog; extern struct menudialog g_AntiOptionsMenuDialog; -extern struct menudialog menudialog_selectdifficulty2; -extern struct menudialog menudialog_selectdifficulty3; +extern struct menudialog g_CoopMissionDifficultyMenuDialog; +extern struct menudialog g_AntiMissionDifficultyMenuDialog; extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES]; extern struct mission missions[]; -extern struct menudialog g_ControlStyleMultiMenuDialog; -extern struct menudialog g_ControlStyleSingleMenuDialog; -extern struct menudialog menudialog_control3; -extern struct menudialog menudialog_control4; +extern struct menudialog g_2PMissionControlStyleMenuDialog; +extern struct menudialog g_SoloMissionControlStyleMenuDialog; +extern struct menudialog g_CiControlStyleMenuDialog; +extern struct menudialog g_CiControlStylePlayer2MenuDialog; extern u32 var80072d8c; extern u8 g_CassNecklaceUsername[10]; extern u8 g_CassNecklacePassword[14]; -extern struct menudialog menudialog_weaponsavailable; -extern struct menudialog g_SoloAbortMenuDialog; -extern struct menudialog g_SoloPauseMenuDialog; -extern struct menudialog menudialog_audiooptions; -extern struct menudialog menudialog_audiooptionsshort; -extern struct menudialog menudialog_videooptions; -extern struct menudialog menudialog_videooptionsshort; -extern struct menudialog menudialog_controloptions; -extern struct menudialog menudialog_displayoptions; -extern struct menudialog menudialog_displayoptionsshort; -extern struct menudialog menudialog_displayoptions_2pplayer1; -extern struct menudialog menudialog_18028; -extern struct menudialog menudialog_18040; -extern struct menudialog menudialog_18058; -extern struct menudialog menudialog_18aa8; -extern struct menudialog menudialog_189dc; -extern struct menuitem menuitems_18c18[]; -extern struct menudialog menudialog_18d30; -extern struct menudialog menudialog_19534; -extern struct menudialog menudialog_196c8; -extern struct menudialog menudialog_status; +extern struct menudialog g_FrWeaponsAvailableMenuDialog; +extern struct menudialog g_MissionAbortMenuDialog; +extern struct menudialog g_SoloMissionPauseMenuDialog; +extern struct menudialog g_AudioOptionsMenuDialog; +extern struct menudialog g_2PMissionAudioOptionsVMenuDialog; +extern struct menudialog g_VideoOptionsMenuDialog; +extern struct menudialog g_2PMissionVideoOptionsMenuDialog; +extern struct menudialog g_MissionControlOptionsMenuDialog; +extern struct menudialog g_MissionDisplayOptionsMenuDialog; +extern struct menudialog g_2PMissionDisplayOptionsVMenuDialog; +extern struct menudialog g_CiDisplayMenuDialog; +extern struct menudialog g_SoloMissionBriefingMenuDialog; +extern struct menudialog g_2PMissionBriefingHMenuDialog; +extern struct menudialog g_2PMissionBriefingVMenuDialog; +extern struct menudialog g_CiControlPlayer2MenuDialog; +extern struct menudialog g_CiControlOptionsMenuDialog; +extern struct menuitem g_2PMissionOptionsVMenuItems[]; +extern struct menudialog g_SoloMissionOptionsMenuDialog; +extern struct menudialog g_SoloMissionInventoryMenuDialog; +extern struct menudialog g_2PMissionPauseHMenuDialog; +extern struct menudialog g_2PMissionPauseVMenuDialog; extern struct cutscene g_Cutscenes[]; extern struct cutscenegroup cutscenegrouptable[]; extern struct menudialog g_CinemaMenuDialog; extern struct menudialog g_SelectMissionMenuDialog; -extern struct menudialog menudialog_18d48; -extern struct menudialog menudialog_18d60; -extern struct menudialog g_CiMainMenuDialogViaPause; -extern struct menudialog g_MainMenuMenuDialog; +extern struct menudialog g_CiOptionsViaPcMenuDialog; +extern struct menudialog g_CiOptionsViaPauseMenuDialog; +extern struct menudialog g_CiMenuViaPauseMenuDialog; +extern struct menudialog g_CiMenuViaPcMenuDialog; extern struct cheat g_Cheats[NUM_CHEATS]; extern struct menuitem g_CheatsBuddiesMenuItems[]; extern struct menudialog g_CheatsBuddiesMenuDialog; diff --git a/src/include/game/data/data_01a3a0.h b/src/include/game/data/data_01a3a0.h index e4a12ecf7..a96d26bca 100644 --- a/src/include/game/data/data_01a3a0.h +++ b/src/include/game/data/data_01a3a0.h @@ -10,29 +10,29 @@ extern struct menudialog g_FilemgrFileSavedMenuDialog; extern struct menudialog g_FilemgrSaveErrorMenuDialog; extern struct menudialog g_FilemgrFileLostMenuDialog; extern struct menudialog g_FilemgrSaveElsewhereMenuDialog; -extern struct menudialog g_FilemgrInsertOriginalPakMenuDialog; +extern struct menudialog g_PakNotOriginalMenuDialog; extern u32 var8007464c; -extern struct menudialog g_FilemgrChangeFileNameMenuDialog; -extern struct menudialog g_FilemgrDuplicateFileNameMenuDialog; +extern struct menudialog g_FilemgrRenameMenuDialog; +extern struct menudialog g_FilemgrDuplicateNameMenuDialog; extern u16 savelocations3[]; extern struct menudialog g_FilemgrSelectLocationMenuDialog; extern struct menudialog g_FilemgrConfirmDeleteMenuDialog; extern struct menudialog g_FilemgrFileInUseMenuDialog; -extern struct menudialog g_FilemgrDeleteFileMenuDialog; -extern struct menudialog g_FilemgrCopyListMenuDialog; +extern struct menudialog g_FilemgrDeleteMenuDialog; +extern struct menudialog g_FilemgrCopyMenuDialog; extern struct pakdata *g_EditingPak; -extern struct menudialog g_PakDeleteGameNoteMenuDialog; +extern struct menudialog g_PakDeleteNoteMenuDialog; extern struct menudialog g_PakGameNotesMenuDialog; extern struct menudialog g_PakChoosePakMenuDialog; -extern struct menudialog g_FilemgrEnterAgentNameMenuDialog; -extern struct menudialog g_FilemgrMainMenuDialog; -extern struct menudialog menudialog_fileselect2; -extern struct menudialog menudialog_mpquickgo2; -extern struct menudialog menudialog_1b1bc; -extern struct menudialog g_4MbMainMenu; -extern struct menudialog menudialog_mpdropout; +extern struct menudialog g_FilemgrEnterNameMenuDialog; +extern struct menudialog g_FilemgrFileSelectMenuDialog; +extern struct menudialog g_FilemgrFileSelect4MbMenuDialog; +extern struct menudialog g_MpQuickGo4MbMenuDialog; +extern struct menudialog g_MpConfirmChallenge4MbMenuDialog; +extern struct menudialog g_MainMenu4MbMenuDialog; +extern struct menudialog g_MpDropOut4MbMenuDialog; extern struct menudialog g_MpEditSimulant4MbMenuDialog; -extern struct menudialog g_4MbAdvancedSetupMenuDialog; +extern struct menudialog g_AdvancedSetup4MbMenuDialog; extern struct filelist *g_FileLists[4]; extern bool var80075bd0[4]; extern u32 var80075be0; diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index a24763777..5c6e9e5cf 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -2,25 +2,25 @@ #define IN_GAME_DATA_020DF0_H #include -extern struct menudialog menudialog_2a800; -extern struct menudialog menudialog_2a818; -extern struct menudialog menudialog_mpweapons; -extern struct menudialog menudialog_mpoptions; -extern struct menudialog menudialog_mpcontrol; -extern struct menudialog menudialog_mpplayerstats; -extern struct menudialog menudialog_mpplayername; -extern struct menudialog menudialog_mploadgamesettingstype0; -extern struct menudialog menudialog_mploadgamesettingstype1; -extern struct menudialog menudialog_mploadplayer; -extern struct menudialog menudialog_mparena; -extern struct menudialog menudialog_mplimits; -extern struct menudialog menudialog_mpplayerhandicaps; +extern struct menudialog g_2PMissionInventoryHMenuDialog; +extern struct menudialog g_2PMissionInventoryVMenuDialog; +extern struct menudialog g_MpWeaponsMenuDialog; +extern struct menudialog g_MpPlayerOptionsMenuDialog; +extern struct menudialog g_MpControlMenuDialog; +extern struct menudialog g_MpPlayerStatsMenuDialog; +extern struct menudialog g_MpPlayerNameMenuDialog; +extern struct menudialog g_MpLoadSettingsMenuDialog; +extern struct menudialog g_MpLoadPresetMenuDialog; +extern struct menudialog g_MpLoadPlayerMenuDialog; +extern struct menudialog g_MpArenaMenuDialog; +extern struct menudialog g_MpLimitsMenuDialog; +extern struct menudialog g_MpHandicapsMenuDialog; extern struct menudialog g_MpReadyMenuDialog; -extern struct menudialog menudialog_mpsimulants; -extern struct menudialog menudialog_mpteamcontrol; -extern struct menudialog menudialog_mpchallengedetails; -extern struct menudialog menudialog_mpscenario; -extern struct menudialog menudialog_mpquickteam; +extern struct menudialog g_MpSimulantsMenuDialog; +extern struct menudialog g_MpTeamsMenuDialog; +extern struct menudialog g_MpChallengeListOrDetailsMenuDialog; +extern struct menudialog g_MpScenarioMenuDialog; +extern struct menudialog g_MpQuickTeamMenuDialog; extern s32 g_Difficulty; diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h index 25f13c07f..f0a870708 100644 --- a/src/include/game/data/data_02a0e0.h +++ b/src/include/game/data/data_02a0e0.h @@ -30,27 +30,27 @@ extern s32 var800845d8; extern u32 var800845dc; extern u32 var800845f4; extern struct menudialog g_MpPausePlayerRankingMenuDialog; -extern struct menudialog g_MpPauseTeamRankingMenuDialog; +extern struct menudialog g_MpPauseTeamRankingsMenuDialog; extern u16 g_OrdinalSuffixes[12]; -extern struct menudialog g_MpEndscreenIndividualGameOverMenuDialog; +extern struct menudialog g_MpEndscreenIndGameOverMenuDialog; extern struct menudialog g_MpEndscreenTeamGameOverMenuDialog; extern struct menudialog g_MpEndscreenChallengeCompletedMenuDialog; extern struct menudialog g_MpEndscreenChallengeCheatedMenuDialog; extern struct menudialog g_MpEndscreenChallengeFailedMenuDialog; extern struct menudialog g_MpEndscreenSavePlayerMenuDialog; -extern struct menudialog menudialog_2aba0; +extern struct menudialog g_MpDropOutMenuDialog; extern struct mparena g_MpArenas[17]; extern u32 var80084bf8; extern u32 var80084c00[]; extern u16 g_MpControlStyleLabels[4]; extern u16 g_MpAimModeLabels[2]; -extern struct menudialog g_MpSaveChrMenuDialog; -extern struct menudialog menudialog_mpsavesetupname; -extern struct menudialog menudialog_mpsavesetup; +extern struct menudialog g_MpSavePlayerMenuDialog; +extern struct menudialog g_MpSaveSetupNameMenuDialog; +extern struct menudialog g_MpSaveSetupExistsMenuDialog; extern u32 var800851bc; extern u32 var800851cc; extern u32 var80085448; -extern struct menuitem menuitems_mpcharacter[]; +extern struct menuitem g_MpCharacterMenuItems[]; extern u32 var800857d0; extern struct menudialog g_MpAddSimulantMenuDialog; extern struct menudialog g_MpChangeSimulantMenuDialog; @@ -58,25 +58,25 @@ extern struct menudialog g_MpEditSimulantMenuDialog; extern u32 var80085a74; extern u8 g_TeamIdsForPairing[4]; extern struct menudialog g_MpChangeTeamNameMenuDialog; -extern struct menudialog menudialog_2bfa8; -extern struct menudialog menudialog_mpchallengedetails2; -extern struct menudialog menudialog_2c0cc; +extern struct menudialog g_MpConfirmChallengeViaListOrDetailsMenuDialog; +extern struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog; +extern struct menudialog g_MpConfirmChallengeMenuDialog; extern u16 mplockoptions[4]; -extern struct menudialog menudialog_mpgamesetup3; +extern struct menudialog g_MpAdvancedSetupMenuDialog; extern struct menudialog g_MpQuickGoMenuDialog; extern struct menudialog g_MpQuickTeamGameSetupMenuDialog; extern struct menudialog g_CombatSimulatorMenuDialog; extern u16 mpslowmotionoptions[]; -extern struct menudialog menudialog_mpcombatoptions; -extern struct menudialog menudialog_mpbriefcaseoptions; +extern struct menudialog g_MpCombatOptionsMenuDialog; +extern struct menudialog g_MpBriefcaseOptionsMenuDialog; extern struct defaultobj *var800869ec; extern u32 var800869f0; -extern struct menudialog menudialog_mpcaptureoptions; +extern struct menudialog g_MpCaptureOptionsMenuDialog; extern u32 var80086b60; -extern struct menudialog menudialog_mphilloptions; -extern struct menudialog menudialog_mphackeroptions; +extern struct menudialog g_MpHillOptionsMenuDialog; +extern struct menudialog g_MpHackerOptionsMenuDialog; extern u32 var80086e14; -extern struct menudialog menudialog_mppopacapoptions; +extern struct menudialog g_MpPopacapOptionsMenuDialog; extern struct mpscenario g_MpScenarios[6]; extern struct mpscenariooverview g_MpScenarioOverviews[]; extern u32 var8008716c; diff --git a/src/include/game/data/data_02e820.h b/src/include/game/data/data_02e820.h index 32024e6aa..1bfaf220b 100644 --- a/src/include/game/data/data_02e820.h +++ b/src/include/game/data/data_02e820.h @@ -16,33 +16,33 @@ extern u32 var80088c9c; extern u32 var80088ca0; extern u32 var80088ca4; extern u32 var80088ca8; -extern struct menudialog menudialog_frdifficulty; +extern struct menudialog g_FrDifficultyMenuDialog; extern struct menudialog g_FrWeaponListMenuDialog; -extern struct menudialog g_FrTrainingInfoMenuDialog; -extern struct menudialog menudialog_frtraininginfo2; -extern struct menudialog g_MenuDialogFrTrainingStatsCompleted; -extern struct menudialog g_MenuDialogFrTrainingStatsFailed; +extern struct menudialog g_FrTrainingInfoInGameMenuDialog; +extern struct menudialog g_FrTrainingInfoPreGameMenuDialog; +extern struct menudialog g_FrCompletedMenuDialog; +extern struct menudialog g_FrFailedMenuDialog; extern u32 var800891b0; -extern struct menudialog menudialog_information; +extern struct menudialog g_BioListMenuDialog; extern u32 var80089268; extern u32 var80089280; -extern struct menudialog menudialog_characterprofile; -extern struct menudialog menudialog_2f3c0; -extern struct menudialog g_DeviceTrainingListMenuDialog; -extern struct menudialog g_DeviceTrainingDetailsMenuDialog; -extern struct menudialog g_DeviceTrainingStatsFailedMenuDialog; -extern struct menudialog g_DeviceTrainingStatsCompletedMenuDialog; -extern struct menudialog g_HoloTrainingListMenuDialog; -extern struct menudialog g_HoloTrainingDetailsMenuDialog; -extern struct menudialog g_HoloTrainingStatsFailedMenuDialog; -extern struct menudialog g_HoloTrainingStatsCompletedMenuDialog; +extern struct menudialog g_BioProfileMenuDialog; +extern struct menudialog g_BioTextMenuDialog; +extern struct menudialog g_DtListMenuDialog; +extern struct menudialog g_DtDetailsMenuDialog; +extern struct menudialog g_DtFailedMenuDialog; +extern struct menudialog g_DtCompletedMenuDialog; +extern struct menudialog g_HtListMenuDialog; +extern struct menudialog g_HtDetailsMenuDialog; +extern struct menudialog g_HtFailedMenuDialog; +extern struct menudialog g_HtCompletedMenuDialog; extern u32 var800897a4; extern u32 var800897b4; extern s8 var800897c4[]; extern struct hoverprop hoverprops[]; -extern struct menudialog menudialog_2f938; -extern struct menudialog menudialog_2f950; -extern struct menudialog menudialog_hangarinformation; +extern struct menudialog g_HangarVehicleDetailsMenuDialog; +extern struct menudialog g_HangarLocationDetailsMenuDialog; +extern struct menudialog g_HangarListMenuDialog; extern u32 var80089ad0; extern u32 var8008a2d0;