Rename some menu related symbols

This commit is contained in:
Ryan Dwyer
2020-07-10 23:00:52 +10:00
parent 917decce3e
commit 23091a58ec
50 changed files with 1651 additions and 1576 deletions
+53 -53
View File
@@ -2,8 +2,8 @@
#define IN_GAME_DATA_0160B0_H
#include <ultra64.h>
extern struct menu_dialog menudialog_18d78;
extern struct menu_dialog menudialog_18d90;
extern struct menudialog menudialog_18d78;
extern struct menudialog menudialog_18d90;
extern u32 var80070090;
extern u32 var80070098;
@@ -165,16 +165,16 @@ extern u32 var800714e0;
extern u32 var800714ec;
extern u32 var800714f0;
extern u32 var800714f4;
extern struct menu_dialog menudialog_pakremoved;
extern struct menu_dialog g_PakRepairSuccessMenuDialog;
extern struct menu_dialog g_PakRepairFailedMenuDialog;
extern struct menu_dialog g_PakAttemptRepairMenuDialog;
extern struct menudialog menudialog_pakremoved;
extern struct menudialog g_PakRepairSuccessMenuDialog;
extern struct menudialog g_PakRepairFailedMenuDialog;
extern struct menudialog g_PakAttemptRepairMenuDialog;
extern u16 savelocations[];
extern struct menu_dialog menudialog_damagedcontrollerpak;
extern struct menu_dialog menudialog_fullcontrollerpak;
extern struct menu_dialog menudialog_cannotreadgameboy;
extern struct menu_dialog menudialog_datalost;
extern struct menu_dialog menudialog_picktarget;
extern struct menudialog menudialog_damagedcontrollerpak;
extern struct menudialog menudialog_fullcontrollerpak;
extern struct menudialog menudialog_cannotreadgameboy;
extern struct menudialog menudialog_datalost;
extern struct menudialog menudialog_picktarget;
extern u32 var800719a0;
extern u32 var800719ac;
extern u32 var800719b0;
@@ -188,55 +188,55 @@ extern u16 g_SoundModeOptions[];
extern u16 g_ScreenSizeOptions[];
extern u16 g_ScreenRatioOptions[];
extern u16 g_ScreenSplitOptions[];
extern struct menu_dialog menudialog_briefing;
extern struct menu_dialog menudialog_changeagent;
extern struct menu_dialog g_ObjectivesMenuDialog;
extern struct menu_dialog g_PdModeSettingsDialog;
extern struct menu_dialog menudialog_selectdifficulty;
extern struct menu_dialog g_CoopOptionsMenuDialog;
extern struct menu_dialog g_AntiOptionsMenuDialog;
extern struct menu_dialog menudialog_selectdifficulty2;
extern struct menu_dialog menudialog_selectdifficulty3;
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_CoopOptionsMenuDialog;
extern struct menudialog g_AntiOptionsMenuDialog;
extern struct menudialog menudialog_selectdifficulty2;
extern struct menudialog menudialog_selectdifficulty3;
extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES];
extern struct mission missions[];
extern struct menu_dialog g_ControlStyleMultiMenuDialog;
extern struct menu_dialog g_ControlStyleSingleMenuDialog;
extern struct menu_dialog menudialog_control3;
extern struct menu_dialog menudialog_control4;
extern struct menudialog g_ControlStyleMultiMenuDialog;
extern struct menudialog g_ControlStyleSingleMenuDialog;
extern struct menudialog menudialog_control3;
extern struct menudialog menudialog_control4;
extern u32 var80072d8c;
extern u8 g_CassNecklaceUsername[10];
extern u8 g_CassNecklacePassword[14];
extern struct menu_dialog menudialog_weaponsavailable;
extern struct menu_dialog g_SoloAbortMenuDialog;
extern struct menu_dialog g_SoloPauseMenuDialog;
extern struct menu_dialog menudialog_audiooptions;
extern struct menu_dialog menudialog_audiooptionsshort;
extern struct menu_dialog menudialog_videooptions;
extern struct menu_dialog menudialog_videooptionsshort;
extern struct menu_dialog menudialog_controloptions;
extern struct menu_dialog menudialog_displayoptions;
extern struct menu_dialog menudialog_displayoptionsshort;
extern struct menu_dialog menudialog_displayoptions_2pplayer1;
extern struct menu_dialog menudialog_18028;
extern struct menu_dialog menudialog_18040;
extern struct menu_dialog menudialog_18058;
extern struct menu_dialog menudialog_18aa8;
extern struct menu_dialog menudialog_189dc;
extern struct menu_item menuitems_18c18[];
extern struct menu_dialog menudialog_18d30;
extern struct menu_dialog menudialog_19534;
extern struct menu_dialog menudialog_196c8;
extern struct menu_dialog menudialog_status;
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 cutscene g_Cutscenes[];
extern struct cutscenegroup cutscenegrouptable[];
extern struct menu_dialog g_CinemaMenuDialog;
extern struct menu_dialog g_SelectMissionMenuDialog;
extern struct menu_dialog menudialog_18d48;
extern struct menu_dialog menudialog_18d60;
extern struct menu_dialog g_CiMainMenuDialogViaPause;
extern struct menu_dialog g_MainMenuMenuDialog;
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 cheat g_Cheats[NUM_CHEATS];
extern struct menu_item g_CheatsBuddiesMenuItems[];
extern struct menu_dialog g_CheatsBuddiesMenuDialog;
extern struct menuitem g_CheatsBuddiesMenuItems[];
extern struct menudialog g_CheatsBuddiesMenuDialog;
#endif
+34 -34
View File
@@ -2,47 +2,47 @@
#define IN_GAME_DATA_01A3A0_H
#include <ultra64.h>
extern struct menu_dialog menudialog_1a410;
extern struct menudialog menudialog_1a410;
extern u16 savelocations2[];
extern u16 iomessages2[];
extern u16 filetypenames[];
extern struct menu_dialog menudialog_filesaved;
extern struct menu_dialog menudialog_saveerror;
extern struct menu_dialog menudialog_savelost;
extern struct menu_dialog g_SaveElsewhereMenuDialog;
extern struct menu_dialog menudialog_1a654;
extern struct menudialog menudialog_filesaved;
extern struct menudialog menudialog_saveerror;
extern struct menudialog menudialog_savelost;
extern struct menudialog g_SaveElsewhereMenuDialog;
extern struct menudialog menudialog_1a654;
extern u32 var8007464c;
extern struct menu_dialog menudialog_changefilename;
extern struct menu_dialog menudialog_duplicatefilename;
extern struct menudialog menudialog_changefilename;
extern struct menudialog menudialog_duplicatefilename;
extern u16 savelocations3[];
extern struct menu_dialog menudialog_selectlocation;
extern struct menu_dialog menudialog_confirmdelete;
extern struct menu_dialog menudialog_1a984;
extern struct menu_dialog menudialog_deletefile;
extern struct menu_dialog menudialog_copyfile;
extern struct menudialog menudialog_selectlocation;
extern struct menudialog menudialog_confirmdelete;
extern struct menudialog menudialog_1a984;
extern struct menudialog menudialog_deletefile;
extern struct menudialog menudialog_copyfile;
extern u32 var80074a4c;
extern struct menu_dialog menudialog_deletegamenote;
extern struct menu_dialog menudialog_gamenotes;
extern struct menu_dialog menudialog_controllerpakmenu;
extern struct menu_dialog menudialog_enteragentname;
extern struct menu_dialog menudialog_fileselect;
extern struct menu_dialog menudialog_fileselect2;
extern struct menu_dialog menudialog_mpquickgo2;
extern struct menu_dialog menudialog_1b1bc;
extern struct menu_dialog g_4MbMainMenu;
extern struct menu_dialog menudialog_mpdropout;
extern struct menu_dialog g_MpEditSimulant4MbMenuDialog;
extern struct menu_dialog g_4MbAdvancedSetupMenuDialog;
extern struct menu_dialog menudialog_1b5c0;
extern struct menu_dialog g_MenuDialogPromptNextMission;
extern struct menu_dialog menudialog_1b7a4;
extern struct menudialog menudialog_deletegamenote;
extern struct menudialog menudialog_gamenotes;
extern struct menudialog menudialog_controllerpakmenu;
extern struct menudialog menudialog_enteragentname;
extern struct menudialog menudialog_fileselect;
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_MpEditSimulant4MbMenuDialog;
extern struct menudialog g_4MbAdvancedSetupMenuDialog;
extern struct menudialog menudialog_1b5c0;
extern struct menudialog g_MenuDialogPromptNextMission;
extern struct menudialog menudialog_1b7a4;
extern u32 g_CheatColour;
extern struct menu_dialog g_MenuDialogSoloEndscreenCompleted;
extern struct menu_dialog g_MenuDialogSoloEndscreenFailed;
extern struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedWide;
extern struct menu_dialog g_MenuDialogSolo2PEndscreenFailedWide;
extern struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedNarrow;
extern struct menu_dialog g_MenuDialogSolo2PEndscreenFailedNarrow;
extern struct menudialog g_MenuDialogSoloEndscreenCompleted;
extern struct menudialog g_MenuDialogSoloEndscreenFailed;
extern struct menudialog g_MenuDialogSolo2PEndscreenCompletedWide;
extern struct menudialog g_MenuDialogSolo2PEndscreenFailedWide;
extern struct menudialog g_MenuDialogSolo2PEndscreenCompletedNarrow;
extern struct menudialog g_MenuDialogSolo2PEndscreenFailedNarrow;
extern struct savelocation *g_SaveLocations[];
extern u32 var80075bd0;
extern u32 var80075be0;
+19 -19
View File
@@ -2,25 +2,25 @@
#define IN_GAME_DATA_020DF0_H
#include <ultra64.h>
extern struct menu_dialog menudialog_2a800;
extern struct menu_dialog menudialog_2a818;
extern struct menu_dialog menudialog_mpweapons;
extern struct menu_dialog menudialog_mpoptions;
extern struct menu_dialog menudialog_mpcontrol;
extern struct menu_dialog menudialog_mpplayerstats;
extern struct menu_dialog menudialog_mpplayername;
extern struct menu_dialog menudialog_mploadgamesettingstype0;
extern struct menu_dialog menudialog_mploadgamesettingstype1;
extern struct menu_dialog menudialog_mploadplayer;
extern struct menu_dialog menudialog_mparena;
extern struct menu_dialog menudialog_mplimits;
extern struct menu_dialog menudialog_mpplayerhandicaps;
extern struct menu_dialog g_MpReadyMenuDialog;
extern struct menu_dialog menudialog_mpsimulants;
extern struct menu_dialog menudialog_mpteamcontrol;
extern struct menu_dialog menudialog_mpchallengedetails;
extern struct menu_dialog menudialog_mpscenario;
extern struct menu_dialog menudialog_mpquickteam;
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_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 s32 g_Difficulty;
+30 -30
View File
@@ -18,54 +18,54 @@ extern u32 var800844f0;
extern s32 var800845d8;
extern u32 var800845dc;
extern u32 var800845f4;
extern struct menu_dialog g_MpPausePlayerRankingMenuDialog;
extern struct menu_dialog g_MpPauseTeamRankingMenuDialog;
extern struct menudialog g_MpPausePlayerRankingMenuDialog;
extern struct menudialog g_MpPauseTeamRankingMenuDialog;
extern u16 g_OrdinalSuffixes[12];
extern struct menu_dialog g_MpEndscreenIndividualGameOverMenuDialog;
extern struct menu_dialog g_MpEndscreenTeamGameOverMenuDialog;
extern struct menu_dialog g_MpEndscreenChallengeCompletedMenuDialog;
extern struct menu_dialog g_MpEndscreenChallengeCheatedMenuDialog;
extern struct menu_dialog g_MpEndscreenChallengeFailedMenuDialog;
extern struct menu_dialog g_MpEndscreenSavePlayerMenuDialog;
extern struct menu_dialog menudialog_2aba0;
extern struct menudialog g_MpEndscreenIndividualGameOverMenuDialog;
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 mparena g_MpArenas[17];
extern u32 var80084bf8;
extern u32 var80084c00[];
extern u16 g_MpControlStyleLabels[4];
extern u16 g_MpAimModeLabels[2];
extern struct menu_dialog g_MpSaveChrMenuDialog;
extern struct menu_dialog menudialog_mpsavesetupname;
extern struct menu_dialog menudialog_mpsavesetup;
extern struct menudialog g_MpSaveChrMenuDialog;
extern struct menudialog menudialog_mpsavesetupname;
extern struct menudialog menudialog_mpsavesetup;
extern u32 var800851bc;
extern u32 var800851cc;
extern u32 var80085448;
extern struct menu_item menuitems_mpcharacter[];
extern struct menuitem menuitems_mpcharacter[];
extern u32 var800857d0;
extern struct menu_dialog g_MpAddSimulantMenuDialog;
extern struct menu_dialog g_MpChangeSimulantMenuDialog;
extern struct menu_dialog g_MpEditSimulantMenuDialog;
extern struct menudialog g_MpAddSimulantMenuDialog;
extern struct menudialog g_MpChangeSimulantMenuDialog;
extern struct menudialog g_MpEditSimulantMenuDialog;
extern u32 var80085a74;
extern u8 g_TeamIdsForPairing[4];
extern struct menu_dialog g_MpChangeTeamNameMenuDialog;
extern struct menu_dialog menudialog_2bfa8;
extern struct menu_dialog menudialog_mpchallengedetails2;
extern struct menu_dialog menudialog_2c0cc;
extern struct menudialog g_MpChangeTeamNameMenuDialog;
extern struct menudialog menudialog_2bfa8;
extern struct menudialog menudialog_mpchallengedetails2;
extern struct menudialog menudialog_2c0cc;
extern u16 mplockoptions[4];
extern struct menu_dialog menudialog_mpgamesetup3;
extern struct menu_dialog g_MpQuickGoMenuDialog;
extern struct menu_dialog g_MpQuickTeamGameSetupMenuDialog;
extern struct menu_dialog g_CombatSimulatorMenuDialog;
extern struct menudialog menudialog_mpgamesetup3;
extern struct menudialog g_MpQuickGoMenuDialog;
extern struct menudialog g_MpQuickTeamGameSetupMenuDialog;
extern struct menudialog g_CombatSimulatorMenuDialog;
extern u16 mpslowmotionoptions[];
extern struct menu_dialog menudialog_mpcombatoptions;
extern struct menu_dialog menudialog_mpbriefcaseoptions;
extern struct menudialog menudialog_mpcombatoptions;
extern struct menudialog menudialog_mpbriefcaseoptions;
extern struct defaultobj *var800869ec;
extern u32 var800869f0;
extern struct menu_dialog menudialog_mpcaptureoptions;
extern struct menudialog menudialog_mpcaptureoptions;
extern u32 var80086b60;
extern struct menu_dialog menudialog_mphilloptions;
extern struct menu_dialog menudialog_mphackeroptions;
extern struct menudialog menudialog_mphilloptions;
extern struct menudialog menudialog_mphackeroptions;
extern u32 var80086e14;
extern struct menu_dialog menudialog_mppopacapoptions;
extern struct menudialog menudialog_mppopacapoptions;
extern struct mpscenario g_MpScenarios[];
extern struct mpscenariooverview g_MpScenarioOverviews[];
extern u32 var8008716c;
+20 -20
View File
@@ -17,34 +17,34 @@ extern u32 var80088c9c;
extern u32 var80088ca0;
extern u32 var80088ca4;
extern u32 var80088ca8;
extern struct menu_dialog menudialog_frdifficulty;
extern struct menu_dialog g_FrWeaponListMenuDialog;
extern struct menu_dialog g_FrTrainingInfoMenuDialog;
extern struct menu_dialog menudialog_frtraininginfo2;
extern struct menu_dialog menudialog_frtrainingstats;
extern struct menu_dialog menudialog_frtrainingstats2;
extern struct menudialog menudialog_frdifficulty;
extern struct menudialog g_FrWeaponListMenuDialog;
extern struct menudialog g_FrTrainingInfoMenuDialog;
extern struct menudialog menudialog_frtraininginfo2;
extern struct menudialog menudialog_frtrainingstats;
extern struct menudialog menudialog_frtrainingstats2;
extern u32 var800891b0;
extern struct menu_dialog menudialog_information;
extern struct menudialog menudialog_information;
extern u32 var80089268;
extern u32 var80089280;
extern struct menu_dialog menudialog_characterprofile;
extern struct menu_dialog menudialog_2f3c0;
extern struct menu_dialog g_DeviceTrainingListMenuDialog;
extern struct menudialog menudialog_characterprofile;
extern struct menudialog menudialog_2f3c0;
extern struct menudialog g_DeviceTrainingListMenuDialog;
extern u32 var800893f8;
extern struct menu_dialog g_DeviceTrainingDetailsMenuDialog;
extern struct menu_dialog g_DeviceTrainingStatsFailedMenuDialog;
extern struct menu_dialog g_DeviceTrainingStatsCompletedMenuDialog;
extern struct menu_dialog g_HoloTrainingListMenuDialog;
extern struct menu_dialog g_HoloTrainingDetailsMenuDialog;
extern struct menu_dialog g_HoloTrainingStatsFailedMenuDialog;
extern struct menu_dialog g_HoloTrainingStatsCompletedMenuDialog;
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 u32 var800897a4;
extern u32 var800897b4;
extern u32 var800897c4;
extern struct hoverprop hoverprops[];
extern struct menu_dialog menudialog_2f938;
extern struct menu_dialog menudialog_2f950;
extern struct menu_dialog menudialog_hangarinformation;
extern struct menudialog menudialog_2f938;
extern struct menudialog menudialog_2f950;
extern struct menudialog menudialog_hangarinformation;
extern u32 var80089ad0;
extern u32 var8008a2d0;