mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-25 22:18:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename menudialog to menudialogdef, menuframe to menudialog

Browse Source
This commit is contained in:
Ryan Dwyer
2022-01-23 10:59:02 +10:00
parent 65b1b19137
commit badc82ab12
36 changed files with 1118 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/activemenu/activemenu.c
+3 -3
View File
@@ -30,7 +30,7 @@ struct fontchar *g_AmFont1;
struct font *g_AmFont2;
s32 g_AmIndex;
struct menudialog g_AmPickTargetMenuDialog;
struct menudialogdef g_AmPickTargetMenuDialog;
/**
* This is a map of weapon numbers (as per the weapon set) to active menu slots.
@@ -199,7 +199,7 @@ s32 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata
return 0;
}
s32 amPickTargetMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -221,7 +221,7 @@ struct menuitem g_AmPickTargetMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AmPickTargetMenuDialog = {
struct menudialogdef g_AmPickTargetMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_492, // "Pick Target"
g_AmPickTargetMenuItems,
src/game/activemenu/tick.c
+1 -1
View File
@@ -240,7 +240,7 @@ void amTick(void)
}
if (!stayopen &&
(g_Vars.currentplayer->activemenumode != AMMODE_EDIT || g_Menus[g_MpPlayerNum].curframe == NULL)) {
(g_Vars.currentplayer->activemenumode != AMMODE_EDIT || g_Menus[g_MpPlayerNum].curdialog == NULL)) {
amClose();
break;
}
src/game/cheats.c
+18 -18
View File
@@ -19,7 +19,7 @@ u32 g_CheatsEnabledBank0;
u32 g_CheatsEnabledBank1;
struct menuitem g_CheatsBuddiesMenuItems[];
struct menudialog g_CheatsBuddiesMenuDialog;
struct menudialogdef g_CheatsBuddiesMenuDialog;
#define TIME(mins, secs) (mins * 60 + secs)
#define m
@@ -387,7 +387,7 @@ char *cheatGetNameIfUnlocked(struct menuitem *item)
return langGet(L_MPWEAPONS_074); // "----------"
}
s32 cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
func0f14a52c();
@@ -742,13 +742,13 @@ char *cheatGetMarquee(struct menuitem *arg0)
char difficultyname[256];
char cheatname[256];
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->focuseditem
&& g_Menus[g_MpPlayerNum].curframe->focuseditem->type == MENUITEMTYPE_CHECKBOX) {
cheat_id = g_Menus[g_MpPlayerNum].curframe->focuseditem->param;
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem->type == MENUITEMTYPE_CHECKBOX) {
cheat_id = g_Menus[g_MpPlayerNum].curdialog->focuseditem->param;
if (g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog
&& g_Menus[g_MpPlayerNum].curframe->focuseditem == &g_CheatsBuddiesMenuItems[0]) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem == &g_CheatsBuddiesMenuItems[0]) {
// Velvet
#if VERSION >= VERSION_NTSC_1_0
sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS_143), langGet(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark"
@@ -763,13 +763,13 @@ char *cheatGetMarquee(struct menuitem *arg0)
// Show cheat name
#if VERSION >= VERSION_NTSC_1_0
sprintf(g_CheatMarqueeString, "%s: %s\n",
g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available"
g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available"
langGet(g_Cheats[cheat_id].nametextid)
);
return g_CheatMarqueeString;
#else
sprintf(g_StringPointer, "%s: %s\n",
g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available"
g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available"
langGet(g_Cheats[cheat_id].nametextid)
);
return g_StringPointer;
@@ -932,7 +932,7 @@ struct menuitem g_CheatsWarningMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsWarningMenuDialog = {
struct menudialogdef g_CheatsWarningMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPMENU_478, // "Warning"
g_CheatsWarningMenuItems,
@@ -960,7 +960,7 @@ struct menuitem g_CheatsFunMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsFunMenuDialog = {
struct menudialogdef g_CheatsFunMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_118, // "Fun"
g_CheatsFunMenuItems,
@@ -985,7 +985,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsGameplayMenuDialog = {
struct menudialogdef g_CheatsGameplayMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_119, // "Gameplay"
g_CheatsGameplayMenuItems,
@@ -1010,7 +1010,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsSoloWeaponsMenuDialog = {
struct menudialogdef g_CheatsSoloWeaponsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_122, // "Weapons for Jo in Solo"
g_CheatsSoloWeaponsMenuItems,
@@ -1035,7 +1035,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsClassicWeaponsMenuDialog = {
struct menudialogdef g_CheatsClassicWeaponsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_123, // "Classic Weapons for Jo in Solo"
g_CheatsClassicWeaponsMenuItems,
@@ -1060,7 +1060,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsWeaponsMenuDialog = {
struct menudialogdef g_CheatsWeaponsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_120, // "Weapons"
g_CheatsWeaponsMenuItems,
@@ -1082,7 +1082,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsBuddiesMenuDialog = {
struct menudialogdef g_CheatsBuddiesMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_121, // "Buddies"
g_CheatsBuddiesMenuItems,
@@ -1105,7 +1105,7 @@ struct menuitem g_CheatsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CheatsMenuDialog = {
struct menudialogdef g_CheatsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_476, // "Cheats"
g_CheatsMenuItems,
src/game/endscreen.c
+35 -35
View File
@@ -38,7 +38,7 @@ s32 menuhandlerDeclineMission(s32 operation, struct menuitem *item, union handle
return 0;
}
s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_TICK:
@@ -50,9 +50,9 @@ s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handl
* when the dialog is not on screen?
*/
#if VERSION >= VERSION_NTSC_FINAL
if (g_Menus[g_MpPlayerNum].curframe) {
if (dialog == g_Menus[g_MpPlayerNum].curframe->dialog
|| (dialog->nextsibling && dialog->nextsibling == g_Menus[g_MpPlayerNum].curframe->dialog)) {
if (g_Menus[g_MpPlayerNum].curdialog) {
if (dialogdef == g_Menus[g_MpPlayerNum].curdialog->definition
|| (dialogdef->nextsibling && dialogdef->nextsibling == g_Menus[g_MpPlayerNum].curdialog->definition)) {
#endif
struct menuinputs *inputs = data->dialog2.inputs;
bool accept = false;
@@ -71,16 +71,16 @@ s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handl
inputs->start = false;
if (inputs->select
&& g_Menus[g_MpPlayerNum].curframe
&& dialog->nextsibling
&& dialog->nextsibling == g_Menus[g_MpPlayerNum].curframe->dialog) {
&& g_Menus[g_MpPlayerNum].curdialog
&& dialogdef->nextsibling
&& dialogdef->nextsibling == g_Menus[g_MpPlayerNum].curdialog->definition) {
accept = true;
inputs->select = false;
}
if (accept) {
union handlerdata data2;
menuhandlerAcceptMission(MENUOP_SET, &dialog->items[1], &data2);
menuhandlerAcceptMission(MENUOP_SET, &dialogdef->items[1], &data2);
}
#if VERSION >= VERSION_NTSC_FINAL
}
@@ -89,15 +89,15 @@ s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handl
}
}
menudialog00103608(operation, dialog, data);
menudialog00103608(operation, dialogdef, data);
}
char *menuDialogTitleRetryStageName(struct menudialog *dialog)
char *menuDialogTitleRetryStageName(struct menudialogdef *dialogdef)
{
char *name;
char *prefix;
if (g_Menus[g_MpPlayerNum].curframe->dialog != dialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition != dialogdef) {
return langGet(L_OPTIONS_300); // "Objectives"
}
@@ -109,12 +109,12 @@ char *menuDialogTitleRetryStageName(struct menudialog *dialog)
return g_StringPointer;
}
char *menuDialogTitleNextMissionStageName(struct menudialog *dialog)
char *menuDialogTitleNextMissionStageName(struct menudialogdef *dialogdef)
{
char *name;
char *prefix;
if (g_Menus[g_MpPlayerNum].curframe->dialog != dialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition != dialogdef) {
return langGet(L_OPTIONS_300); // "Objectives"
}
@@ -143,7 +143,7 @@ struct menuitem g_RetryMissionMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_RetryMissionMenuDialog = {
struct menudialogdef g_RetryMissionMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&menuDialogTitleRetryStageName,
g_RetryMissionMenuItems,
@@ -161,7 +161,7 @@ struct menuitem g_NextMissionMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_NextMissionMenuDialog = {
struct menudialogdef g_NextMissionMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&menuDialogTitleNextMissionStageName,
g_NextMissionMenuItems,
@@ -354,7 +354,7 @@ char *soloMenuTextMissionTime(struct menuitem *item)
}
#if VERSION >= VERSION_NTSC_1_0
struct menudialog *func0f10d730(void)
struct menudialogdef *func0f10d730(void)
{
g_MissionConfig.stageindex++;
g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum;
@@ -450,7 +450,7 @@ struct menuitem g_SoloEndscreenObjectivesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloEndscreenObjectivesFailedMenuDialog = {
struct menudialogdef g_SoloEndscreenObjectivesFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_300, // "Objectives"
g_SoloEndscreenObjectivesMenuItems,
@@ -459,7 +459,7 @@ struct menudialog g_SoloEndscreenObjectivesFailedMenuDialog = {
NULL,
};
struct menudialog g_SoloEndscreenObjectivesCompletedMenuDialog = {
struct menudialogdef g_SoloEndscreenObjectivesCompletedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_OPTIONS_300, // "Objectives"
g_SoloEndscreenObjectivesMenuItems,
@@ -468,7 +468,7 @@ struct menudialog g_SoloEndscreenObjectivesCompletedMenuDialog = {
NULL,
};
struct menudialog g_2PMissionEndscreenObjectivesFailedVMenuDialog = {
struct menudialogdef g_2PMissionEndscreenObjectivesFailedVMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_300, // "Objectives"
g_2PMissionEndscreenObjectivesVMenuItems,
@@ -477,7 +477,7 @@ struct menudialog g_2PMissionEndscreenObjectivesFailedVMenuDialog = {
NULL,
};
struct menudialog g_2PMissionEndscreenObjectivesCompletedVMenuDialog = {
struct menudialogdef g_2PMissionEndscreenObjectivesCompletedVMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_OPTIONS_300, // "Objectives"
g_2PMissionEndscreenObjectivesVMenuItems,
@@ -507,7 +507,7 @@ struct menuitem g_MissionContinueOrReplyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MissionContinueOrReplyMenuDialog = {
struct menudialogdef g_MissionContinueOrReplyMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&menuTextCurrentStageName3,
g_MissionContinueOrReplyMenuItems,
@@ -622,16 +622,16 @@ void endscreenHandleContinue(s32 context)
#endif
#if VERSION >= VERSION_NTSC_1_0
s32 menudialogSolo2PEndscreenCompleted(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogSolo2PEndscreenCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Menus[g_MpPlayerNum].endscreen.unke1c = 0;
}
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curframe->dialog == dialog
|| (dialog->nextsibling && dialog->nextsibling == g_Menus[g_MpPlayerNum].curframe->dialog)) {
if (g_Menus[g_MpPlayerNum].curdialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef
|| (dialogdef->nextsibling && dialogdef->nextsibling == g_Menus[g_MpPlayerNum].curdialog->definition)) {
struct menuinputs *inputs = data->dialog2.inputs;
if (inputs->select || inputs->back || inputs->start) {
@@ -908,16 +908,16 @@ glabel menudialogSolo2PEndscreenCompleted
);
#endif
s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Menus[g_MpPlayerNum].endscreen.unke1c = 0;
}
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curframe->dialog == dialog
|| (dialog->nextsibling && dialog->nextsibling == g_Menus[g_MpPlayerNum].curframe->dialog)) {
if (g_Menus[g_MpPlayerNum].curdialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef
|| (dialogdef->nextsibling && dialogdef->nextsibling == g_Menus[g_MpPlayerNum].curdialog->definition)) {
struct menuinputs *inputs = data->dialog2.inputs;
if (inputs->select || inputs->back || inputs->start) {
@@ -1153,7 +1153,7 @@ void endscreenSetCoopCompleted(void)
}
}
struct menudialog g_SoloMissionEndscreenCompletedMenuDialog = {
struct menudialogdef g_SoloMissionEndscreenCompletedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
(u32)&menuTitleStageCompleted,
g_MissionEndscreenMenuItems,
@@ -1162,7 +1162,7 @@ struct menudialog g_SoloMissionEndscreenCompletedMenuDialog = {
&g_SoloEndscreenObjectivesCompletedMenuDialog,
};
struct menudialog g_SoloMissionEndscreenFailedMenuDialog = {
struct menudialogdef g_SoloMissionEndscreenFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
(u32)&menuTitleStageFailed,
g_MissionEndscreenMenuItems,
@@ -1554,7 +1554,7 @@ glabel endscreenPrepare
);
#endif
struct menudialog g_2PMissionEndscreenCompletedHMenuDialog = {
struct menudialogdef g_2PMissionEndscreenCompletedHMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
(u32)&menuTitleStageCompleted,
g_MissionEndscreenMenuItems,
@@ -1563,7 +1563,7 @@ struct menudialog g_2PMissionEndscreenCompletedHMenuDialog = {
&g_SoloEndscreenObjectivesCompletedMenuDialog,
};
struct menudialog g_2PMissionEndscreenFailedHMenuDialog = {
struct menudialogdef g_2PMissionEndscreenFailedHMenuDialog = {
MENUDIALOGTYPE_DANGER,
(u32)&menuTitleStageFailed,
g_MissionEndscreenMenuItems,
@@ -1572,7 +1572,7 @@ struct menudialog g_2PMissionEndscreenFailedHMenuDialog = {
&g_SoloEndscreenObjectivesFailedMenuDialog,
};
struct menudialog g_2PMissionEndscreenCompletedVMenuDialog = {
struct menudialogdef g_2PMissionEndscreenCompletedVMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_OPTIONS_276, // "Completed"
g_2PMissionEndscreenVMenuItems,
@@ -1581,7 +1581,7 @@ struct menudialog g_2PMissionEndscreenCompletedVMenuDialog = {
&g_2PMissionEndscreenObjectivesCompletedVMenuDialog,
};
struct menudialog g_2PMissionEndscreenFailedVMenuDialog = {
struct menudialogdef g_2PMissionEndscreenFailedVMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_277, // "Failed"
g_2PMissionEndscreenVMenuItems,
src/game/filemgr.c
+46 -46
View File
@@ -29,26 +29,26 @@ u32 var800a22bc;
struct fileguid g_GameFileGuid;
// These might be able to be removed by relocating their symbols
struct menudialog g_FilemgrCopyMenuDialog;
struct menudialog g_FilemgrConfirmDeleteMenuDialog;
struct menudialog g_FilemgrDeleteMenuDialog;
struct menudialog g_FilemgrEnterNameMenuDialog;
struct menudialog g_FilemgrErrorMenuDialog;
struct menudialog g_FilemgrFileInUseMenuDialog;
struct menudialog g_FilemgrFileLostMenuDialog;
struct menudialog g_FilemgrFileSavedMenuDialog;
struct menudialog g_FilemgrFileSelectMenuDialog;
struct menudialog g_FilemgrSaveElsewhereMenuDialog;
struct menudialog g_FilemgrSaveErrorMenuDialog;
struct menudialog g_FilemgrSelectLocationMenuDialog;
struct menudialog g_PakDeleteNoteMenuDialog;
struct menudialog g_PakGameNotesMenuDialog;
struct menudialog g_PakNotOriginalMenuDialog;
struct menudialogdef g_FilemgrCopyMenuDialog;
struct menudialogdef g_FilemgrConfirmDeleteMenuDialog;
struct menudialogdef g_FilemgrDeleteMenuDialog;
struct menudialogdef g_FilemgrEnterNameMenuDialog;
struct menudialogdef g_FilemgrErrorMenuDialog;
struct menudialogdef g_FilemgrFileInUseMenuDialog;
struct menudialogdef g_FilemgrFileLostMenuDialog;
struct menudialogdef g_FilemgrFileSavedMenuDialog;
struct menudialogdef g_FilemgrFileSelectMenuDialog;
struct menudialogdef g_FilemgrSaveElsewhereMenuDialog;
struct menudialogdef g_FilemgrSaveErrorMenuDialog;
struct menudialogdef g_FilemgrSelectLocationMenuDialog;
struct menudialogdef g_PakDeleteNoteMenuDialog;
struct menudialogdef g_PakGameNotesMenuDialog;
struct menudialogdef g_PakNotOriginalMenuDialog;
struct pakdata *g_EditingPak;
#if VERSION >= VERSION_NTSC_1_0
struct menudialog g_FilemgrDuplicateNameMenuDialog;
struct menudialog g_FilemgrRenameMenuDialog;
struct menudialogdef g_FilemgrDuplicateNameMenuDialog;
struct menudialogdef g_FilemgrRenameMenuDialog;
#endif
#if VERSION >= VERSION_PAL_FINAL
@@ -88,7 +88,7 @@ struct menuitem g_ChooseLanguageMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
};
struct menudialog g_ChooseLanguageMenuDialog = {
struct menudialogdef g_ChooseLanguageMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_095,
g_ChooseLanguageMenuItems,
@@ -332,7 +332,7 @@ struct menuitem g_FilemgrErrorMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrErrorMenuDialog = {
struct menudialogdef g_FilemgrErrorMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_320, // "Error"
g_FilemgrErrorMenuItems,
@@ -613,11 +613,11 @@ void filemgrEraseCorruptFile(void)
}
#endif
s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe &&
g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog &&
g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
filemgrRetrySave(0);
}
}
@@ -1157,7 +1157,7 @@ struct menuitem g_FilemgrFileSavedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrFileSavedMenuDialog = {
struct menudialogdef g_FilemgrFileSavedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_OPTIONS_345, // "Cool!"
g_FilemgrFileSavedMenuItems,
@@ -1175,7 +1175,7 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrSaveErrorMenuDialog = {
struct menudialogdef g_FilemgrSaveErrorMenuDialog = {
MENUDIALOGTYPE_DANGER,
(u32)&filemgrMenuTextErrorTitle,
g_FilemgrSaveErrorMenuItems,
@@ -1196,7 +1196,7 @@ struct menuitem g_FilemgrFileLostMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrFileLostMenuDialog = {
struct menudialogdef g_FilemgrFileLostMenuDialog = {
MENUDIALOGTYPE_DANGER,
(u32)&filemgrMenuTextErrorTitle,
g_FilemgrFileLostMenuItems,
@@ -1212,7 +1212,7 @@ struct menuitem g_FilemgrSaveElsewhereMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrSaveElsewhereMenuDialog = {
struct menudialogdef g_FilemgrSaveElsewhereMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_359, // "Save"
g_FilemgrSaveElsewhereMenuItems,
@@ -1232,7 +1232,7 @@ struct menuitem g_PakNotOriginalMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakNotOriginalMenuDialog = {
struct menudialogdef g_PakNotOriginalMenuDialog = {
MENUDIALOGTYPE_DANGER,
(u32)&filemgrMenuTextErrorTitle,
g_PakNotOriginalMenuItems,
@@ -1586,7 +1586,7 @@ struct menuitem g_FilemgrRenameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrRenameMenuDialog = {
struct menudialogdef g_FilemgrRenameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_238, // "Change File Name"
g_FilemgrRenameMenuItems,
@@ -1608,7 +1608,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrDuplicateNameMenuDialog = {
struct menudialogdef g_FilemgrDuplicateNameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_232, // "Duplicate File Name"
g_FilemgrDuplicateMenuMenuItems,
@@ -2195,7 +2195,7 @@ s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union
return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, false);
}
s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_CLOSE) {
if (g_Menus[g_MpPlayerNum].fm.isdeletingforsave == true) {
@@ -2357,11 +2357,11 @@ const char var7f1b34e8[] = "Try to find last opened file...\n";
/**
* Controller pak note listing dialog.
*/
s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
s32 value = pak0f1168c4(g_Menus[g_MpPlayerNum].fm.device, &g_EditingPak);
if (value) {
@@ -2470,7 +2470,7 @@ s32 pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerd
*
* Lists the connected controller paks.
*/
s32 pakChoosePakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -2872,7 +2872,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
return 0;
}
s32 filemgrMainMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
s32 i;
@@ -2981,7 +2981,7 @@ struct menuitem g_FilemgrSelectLocationMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrSelectLocationMenuDialog = {
struct menudialogdef g_FilemgrSelectLocationMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_367, // "Select Location"
g_FilemgrSelectLocationMenuItems,
@@ -2999,7 +2999,7 @@ struct menuitem g_FilemgrConfirmDeleteMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrConfirmDeleteMenuDialog = {
struct menudialogdef g_FilemgrConfirmDeleteMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_379, // "Warning"
g_FilemgrConfirmDeleteMenuItems,
@@ -3020,7 +3020,7 @@ struct menuitem g_FilemgrFileInUseMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrFileInUseMenuDialog = {
struct menudialogdef g_FilemgrFileInUseMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_159, // "Error"
g_FilemgrFileInUseMenuItems,
@@ -3036,7 +3036,7 @@ struct menuitem g_FilemgrDeleteMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrDeleteMenuDialog = {
struct menudialogdef g_FilemgrDeleteMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_376, // "Delete File"
g_FilemgrDeleteMenuItems,
@@ -3052,7 +3052,7 @@ struct menuitem g_FilemgrCopyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrCopyMenuDialog = {
struct menudialogdef g_FilemgrCopyMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_373, // "Copy File"
g_FilemgrCopyMenuItems,
@@ -3070,7 +3070,7 @@ struct menuitem g_PakDeleteNoteMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakDeleteNoteMenuDialog = {
struct menudialogdef g_PakDeleteNoteMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_383, // "Delete Game Note"
g_PakDeleteNoteMenuItems,
@@ -3090,7 +3090,7 @@ struct menuitem g_PakGameNotesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakGameNotesMenuDialog = {
struct menudialogdef g_PakGameNotesMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_387, // "Game Notes"
g_PakGameNotesMenuItems,
@@ -3112,7 +3112,7 @@ struct menuitem g_PakChoosePakMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakChoosePakMenuDialog = {
struct menudialogdef g_PakChoosePakMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_107, // "Controller Pak Menu"
g_PakChoosePakMenuItems,
@@ -3136,7 +3136,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrOperationsMenuDialog = {
struct menudialogdef g_FilemgrOperationsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_099, // "Game Files"
g_FilemgrOperationsMenuItems,
@@ -3150,7 +3150,7 @@ struct menuitem g_FilemgrEnterNameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrEnterNameMenuDialog = {
struct menudialogdef g_FilemgrEnterNameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_401, // "Enter Agent Name"
g_FilemgrEnterNameMenuItems,
@@ -3165,7 +3165,7 @@ struct menuitem g_FilemgrFileSelectMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrFileSelectMenuDialog = {
struct menudialogdef g_FilemgrFileSelectMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_095, // "Perfect Dark"
g_FilemgrFileSelectMenuItems,
src/game/game_01bea0.c
+14 -14
View File
@@ -53,7 +53,7 @@ void menuCountDialogs(void)
g_MenuData.count = 0;
for (i = 0; i < 4; i++) {
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
g_MenuData.count++;
}
}
@@ -89,7 +89,7 @@ void menuTick(void)
g_Menus[i].unk83c--;
}
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
anyopen = true;
}
}
@@ -103,10 +103,10 @@ void menuTick(void)
s32 bVar11 = false;
for (j = 0; j < 4; j++) {
if (g_Menus[j].curframe) {
if (g_Menus[j].curframe->unk60 == 1
|| g_Menus[j].curframe->unk60 == 2
|| g_Menus[j].curframe->unk60 == 0) {
if (g_Menus[j].curdialog) {
if (g_Menus[j].curdialog->unk60 == 1
|| g_Menus[j].curdialog->unk60 == 2
|| g_Menus[j].curdialog->unk60 == 0) {
bVar11 = true;
}
}
@@ -297,7 +297,7 @@ void menuTick(void)
g_MpNumJoined = 0;
for (i = 0; i < 4; i++) {
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
g_Menus[i].playernum = g_MpNumJoined++;
if (g_MenuData.unk008 == -1) {
@@ -313,8 +313,8 @@ void menuTick(void)
for (i = 0; i < 4; i++) {
g_MpPlayerNum = i;
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curframe->dialog == &g_MpReadyMenuDialog) {
if (g_Menus[g_MpPlayerNum].curdialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_MpReadyMenuDialog) {
g_Vars.unk000498 = 1;
} else {
sp340 = false;
@@ -325,7 +325,7 @@ void menuTick(void)
for (i = 0; i < 4; i++) {
g_MpPlayerNum = i;
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curdialog) {
// Player has a dialog open - tick it
s32 prevplayernum = g_Vars.currentplayernum;
@@ -494,7 +494,7 @@ void menuTick(void)
sp344 = false;
for (i = 0; i < 4; i++) {
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
sp344 = true;
}
}
@@ -718,7 +718,7 @@ void menuTick(void)
|| g_MenuData.unk014
|| g_MenuData.unk5d5_05
|| g_MenuData.unk5d4
|| g_Menus[mpindex].curframe
|| g_Menus[mpindex].curdialog
|| g_MenuData.unk01b != -1) {
g_Vars.players[i]->menuisactive = true;
} else {
@@ -735,7 +735,7 @@ void menuTick(void)
case MENUROOT_4MBFILEMGR:
case MENUROOT_4MBMAINMENU:
case MENUROOT_TRAINING:
if (g_Menus[mpindex].curframe) {
if (g_Menus[mpindex].curdialog) {
g_Vars.paksconnected = 0x1f;
}
break;
@@ -745,7 +745,7 @@ void menuTick(void)
if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0)
&& PLAYERCOUNT() >= 2
&& g_Menus[mpindex].curframe) {
&& g_Menus[mpindex].curdialog) {
g_Vars.players[i]->devicesinhibit = 0
| DEVICE_NIGHTVISION
| DEVICE_XRAYSCANNER
src/game/game_0f09f0.c
+162 -161
View File
@@ -99,17 +99,17 @@ u32 var800a20c8;
u32 var800a20cc;
#if VERSION >= VERSION_NTSC_1_0
struct menudialog g_PakCannotReadGameBoyMenuDialog;
struct menudialog g_PakDamagedMenuDialog;
struct menudialog g_PakDataLostMenuDialog;
struct menudialogdef g_PakCannotReadGameBoyMenuDialog;
struct menudialogdef g_PakDamagedMenuDialog;
struct menudialogdef g_PakDataLostMenuDialog;
#else
struct menudialog g_PakDamagedMenuDialog;
struct menudialogdef g_PakDamagedMenuDialog;
#endif
struct menudialog g_PakFullMenuDialog;
struct menudialog g_PakRemovedMenuDialog;
struct menudialog g_PakRepairFailedMenuDialog;
struct menudialog g_PakRepairSuccessMenuDialog;
struct menudialogdef g_PakFullMenuDialog;
struct menudialogdef g_PakRemovedMenuDialog;
struct menudialogdef g_PakRepairFailedMenuDialog;
struct menudialogdef g_PakRepairSuccessMenuDialog;
const struct menucolourpalette g_MenuColourPalettes[] = {
{ 0x20202000, 0x20202000, 0x20202000, 0x4f4f4f00, 0x00000000, 0x00000000, 0x4f4f4f00, 0x4f4f4f00, 0x4f4f4f00, 0x4f4f4f00, 0x00000000, 0x00000000, 0x4f4f4f00, 0x00000000, 0x00000000 },
@@ -246,7 +246,7 @@ bool currentPlayerIsMenuOpenInSoloOrMp(void)
mpindex -= 4;
}
if (g_Menus[mpindex].curframe) {
if (g_Menus[mpindex].curdialog) {
return true;
}
}
@@ -1622,9 +1622,9 @@ char *menuResolveParam2Text(struct menuitem *item)
return menuResolveText(item->param2, item);
}
char *menuResolveDialogTitle(struct menudialog *dialog)
char *menuResolveDialogTitle(struct menudialogdef *dialogdef)
{
return menuResolveText(dialog->title, dialog);
return menuResolveText(dialogdef->title, dialogdef);
}
void func0f0f15a4(struct menuitem *item, s32 *arg1)
@@ -3588,7 +3588,7 @@ glabel func0f0f1d6c
// instruction. Removing the + 1 from the assign to frame->unk04 or
// menu->unk6d8 causes the below to use v0 only, which is a closer
// match but is functionally incorrect.
//void func0f0f1d6c(struct menudialog *dialog, struct menuframe *frame, struct menu *menu)
//void func0f0f1d6c(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu)
//{
// s32 index660 = menu->unk6d8 - 1; // 64
// s32 index4fc = menu->unk65c;
@@ -4552,7 +4552,7 @@ bool menuIsScrollableUnscrollable(struct menuitem *item)
return false;
}
bool menuIsItemDisabled(struct menuitem *item, struct menuframe *frame)
bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog)
{
union handlerdata sp30;
s16 sp2e;
@@ -4577,7 +4577,7 @@ bool menuIsItemDisabled(struct menuitem *item, struct menuframe *frame)
return true;
}
func0f0f1618(item, &sp2e, &sp2c, frame);
func0f0f1618(item, &sp2e, &sp2c, dialog);
if (sp2c == 0) {
return true;
@@ -4586,7 +4586,7 @@ bool menuIsItemDisabled(struct menuitem *item, struct menuframe *frame)
return false;
}
bool func0f0f2674(struct menuitem *item, struct menuframe *frame, u32 arg2)
bool func0f0f2674(struct menuitem *item, struct menudialog *dialog, u32 arg2)
{
u32 thing1;
u32 thing2;
@@ -4606,17 +4606,17 @@ bool func0f0f2674(struct menuitem *item, struct menuframe *frame, u32 arg2)
case MENUITEMTYPE_14:
case MENUITEMTYPE_16:
case MENUITEMTYPE_18:
func0f0f2354(frame, item, &thing1, &thing2);
func0f0f2354(dialog, item, &thing1, &thing2);
}
if (menuIsItemDisabled(item, frame)) {
if (menuIsItemDisabled(item, dialog)) {
return false;
}
return true;
}
struct menuitem *func0f0f26fc(s32 arg0, s32 arg1, struct menudialog *dialog, s32 *arg3, struct menuframe *frame)
struct menuitem *func0f0f26fc(s32 arg0, s32 arg1, struct menudialogdef *dialogdef, s32 *arg3, struct menudialog *dialog)
{
struct menuitem *result = NULL;
bool done = false;
@@ -4625,9 +4625,9 @@ struct menuitem *func0f0f26fc(s32 arg0, s32 arg1, struct menudialog *dialog, s32
s32 i;
for (i = 0, sum = 0; !done && i < g_Menus[g_MpPlayerNum].unk660[arg1].unk08; index++, i++) {
struct menuitem *item = &dialog->items[g_Menus[g_MpPlayerNum].unk4fc[index].itemindex];
struct menuitem *item = &dialogdef->items[g_Menus[g_MpPlayerNum].unk4fc[index].itemindex];
if (func0f0f2674(item, frame, 1)) {
if (func0f0f2674(item, dialog, 1)) {
result = item;
if (sum >= arg0) {
@@ -4643,14 +4643,14 @@ struct menuitem *func0f0f26fc(s32 arg0, s32 arg1, struct menudialog *dialog, s32
return result;
}
struct menuitem *func0f0f288c(struct menuframe *frame)
struct menuitem *func0f0f288c(struct menudialog *dialog)
{
s32 s0 = frame->unk04;
s32 s0 = dialog->unk04;
s32 i;
s32 sp34;
for (i = 0; i < frame->unk05; i++) {
struct menuitem *item = func0f0f26fc(0, s0, frame->dialog, &sp34, frame);
for (i = 0; i < dialog->unk05; i++) {
struct menuitem *item = func0f0f26fc(0, s0, dialog->definition, &sp34, dialog);
if (item != NULL) {
return item;
@@ -4659,9 +4659,9 @@ struct menuitem *func0f0f288c(struct menuframe *frame)
s0++;
}
menuResolveDialogTitle(frame->dialog);
menuResolveDialogTitle(dialog->definition);
return frame->dialog->items;
return dialog->definition->items;
}
GLOBAL_ASM(
@@ -5041,79 +5041,79 @@ glabel func0f0f2c44
/* f0f2cf0: 00000000 */ nop
);
void menuOpenDialog(struct menudialog *dialog, struct menuframe *frame, struct menu *menu)
void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu)
{
union handlerdata data3;
struct menuitem *item;
union handlerdata data1;
union handlerdata data2;
frame->dialog = dialog;
dialog->definition = dialogdef;
switch (g_MenuData.root) {
case MENUROOT_MPSETUP:
case MENUROOT_4MBMAINMENU:
frame->unk6e = 1;
dialog->unk6e = 1;
break;
case MENUROOT_MAINMENU:
case MENUROOT_TRAINING:
default:
frame->unk6e = 0;
dialog->unk6e = 0;
break;
}
func0f0f1d6c(dialog, frame, menu);
func0f0fa574(frame);
func0f0f1d6c(dialogdef, dialog, menu);
func0f0fa574(dialog);
frame->type = dialog->type;
frame->transitiontimer = -1;
frame->unk48 = 0;
frame->unk4c = random() * (1.0f / U32_MAX) * M_TAU;
dialog->type = dialogdef->type;
dialog->transitiontimer = -1;
dialog->unk48 = 0;
dialog->unk4c = random() * (1.0f / U32_MAX) * M_TAU;
g_Menus[g_MpPlayerNum].curframe->unk60 = 0;
g_Menus[g_MpPlayerNum].curframe->unk50 = 0;
g_Menus[g_MpPlayerNum].curdialog->unk60 = 0;
g_Menus[g_MpPlayerNum].curdialog->unk50 = 0;
frame->unk54 = 0;
frame->unk58 = 0;
frame->unk5c = 0;
dialog->unk54 = 0;
dialog->unk58 = 0;
dialog->unk5c = 0;
frame->focuseditem = func0f0f288c(frame);
dialog->focuseditem = func0f0f288c(dialog);
// Check if any items should be focused automatically
item = frame->dialog->items;
item = dialog->definition->items;
while (item->type != MENUITEMTYPE_END) {
if (item->handler
&& (item->flags & MENUITEMFLAG_00000004) == 0
&& item->handler(MENUOP_CHECKPREFOCUSED, item, &data1)) {
frame->focuseditem = item;
dialog->focuseditem = item;
}
item++;
}
// Run focus handler
if (frame->focuseditem
&& frame->focuseditem->handler
&& (frame->focuseditem->flags & MENUITEMFLAG_00000004) == 0) {
frame->focuseditem->handler(MENUOP_FOCUS, frame->focuseditem, &data2);
if (dialog->focuseditem
&& dialog->focuseditem->handler
&& (dialog->focuseditem->flags & MENUITEMFLAG_00000004) == 0) {
dialog->focuseditem->handler(MENUOP_FOCUS, dialog->focuseditem, &data2);
}
frame->dimmed = false;
frame->unk64 = 0;
frame->unk68 = 0;
dialog->dimmed = false;
dialog->unk64 = 0;
dialog->unk68 = 0;
if (dialog->handler) {
dialog->handler(MENUOP_OPEN, dialog, &data3);
if (dialogdef->handler) {
dialogdef->handler(MENUOP_OPEN, dialogdef, &data3);
}
func0f0f2134(dialog, frame, menu);
func0f0f7e98(frame);
func0f0f2134(dialogdef, dialog, menu);
func0f0f7e98(dialog);
frame->unk14 = frame->unk2c;
frame->y = frame->unk30;
frame->unk1c = frame->unk34;
frame->height = frame->unk38;
dialog->unk14 = dialog->unk2c;
dialog->y = dialog->unk30;
dialog->unk1c = dialog->unk34;
dialog->height = dialog->unk38;
}
#if VERSION >= VERSION_NTSC_1_0
@@ -5507,31 +5507,31 @@ glabel menuPushDialog
#endif
// regalloc: s1 (layer) and s2 (sibling) are swapped
//void menuPushDialog(struct menudialog *dialog)
//void menuPushDialog(struct menudialogdef *dialogdef)
//{
// if (dialog) {
// func0f0f37a4(&g_Menus[g_MpPlayerNum].unk840);
//
// if (g_Menus[g_MpPlayerNum].depth < 6 && g_Menus[g_MpPlayerNum].numframes < 10) {
// if (g_Menus[g_MpPlayerNum].depth < 6 && g_Menus[g_MpPlayerNum].numdialogs < 10) {
// struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[g_Menus[g_MpPlayerNum].depth];
// struct menudialog *sibling;
// struct menuframe *frame;
// struct menudialogdef *sibling;
// struct menudialog *dialog;
//
// g_Menus[g_MpPlayerNum].depth++;
//
// layer->numsiblings = 1;
// layer->cursibling = 0;
//
// frame = &g_Menus[g_MpPlayerNum].frames[g_Menus[g_MpPlayerNum].numframes];
// g_Menus[g_MpPlayerNum].numframes++;
// layer->siblings[0] = frame;
// g_Menus[g_MpPlayerNum].curframe = frame;
// frame->unk6d = 0;
// dialog = &g_Menus[g_MpPlayerNum].dialogs[g_Menus[g_MpPlayerNum].numdialogs];
// g_Menus[g_MpPlayerNum].numdialogs++;
// layer->siblings[0] = dialog;
// g_Menus[g_MpPlayerNum].curdialog = dialog;
// dialog->unk6d = 0;
//
// menuOpenDialog(dialog, frame, &g_Menus[g_MpPlayerNum]);
// menuOpenDialog(dialog, dialog, &g_Menus[g_MpPlayerNum]);
//
// frame->unk2c = (viGetWidth() - frame->unk1c) / 2;
// frame->unk30 = (viGetHeight() - frame->unk20) / 2;
// dialog->unk2c = (viGetWidth() - dialog->unk1c) / 2;
// dialog->unk30 = (viGetHeight() - dialog->unk20) / 2;
//
// g_Menus[g_MpPlayerNum].unke40 |= 0x80;
// sibling = dialog->nextsibling;
@@ -5539,22 +5539,22 @@ glabel menuPushDialog
// while (sibling && layer->numsiblings < 5) {
// // If this limit were to be reached, the game would soft lock
// // because sibling is incremented inside the if-statement block.
// if (g_Menus[g_MpPlayerNum].numframes < 10) {
// frame = &g_Menus[g_MpPlayerNum].frames[g_Menus[g_MpPlayerNum].numframes];
// g_Menus[g_MpPlayerNum].numframes++;
// if (g_Menus[g_MpPlayerNum].numdialogs < 10) {
// dialog = &g_Menus[g_MpPlayerNum].dialogs[g_Menus[g_MpPlayerNum].numdialogs];
// g_Menus[g_MpPlayerNum].numdialogs++;
//
// layer->siblings[layer->numsiblings] = frame;
// layer->siblings[layer->numsiblings] = dialog;
// layer->numsiblings++;
//
// frame->unk6d = -1;
// dialog->unk6d = -1;
//
// menuOpenDialog(sibling, frame, &g_Menus[g_MpPlayerNum]);
// menuOpenDialog(sibling, dialog, &g_Menus[g_MpPlayerNum]);
//
// frame->unk14 = -320;
// frame->unk2c = -320;
// frame->unk18 = (viGetHeight() - frame->unk20) / 2;
// frame->unk30 = frame->unk18;
// frame->unk3c = 0;
// dialog->unk14 = -320;
// dialog->unk2c = -320;
// dialog->unk18 = (viGetHeight() - dialog->unk20) / 2;
// dialog->unk30 = dialog->unk18;
// dialog->unk3c = 0;
//
// sibling = sibling->nextsibling;
// }
@@ -5583,7 +5583,7 @@ bool func0f0f3220(s32 arg0)
s32 prevplayernum = g_MpPlayerNum;
for (i = 3; i >= 0; i--) {
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
g_MpPlayerNum = i;
}
}
@@ -5592,11 +5592,12 @@ bool func0f0f3220(s32 arg0)
save = false;
}
if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog->type == 2) {
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition->type == MENUDIALOGTYPE_DANGER) {
save = false;
if (g_Menus[g_MpPlayerNum].curframe->dialog == &g_MpEndscreenChallengeCheatedMenuDialog
|| g_Menus[g_MpPlayerNum].curframe->dialog == &g_MpEndscreenChallengeFailedMenuDialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_MpEndscreenChallengeCheatedMenuDialog
|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_MpEndscreenChallengeFailedMenuDialog) {
save = true;
}
}
@@ -5629,7 +5630,7 @@ void func0f0f3220(s32 arg0)
s32 prevplayernum = g_MpPlayerNum;
for (i = 3; i >= 0; i--) {
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
g_MpPlayerNum = i;
}
}
@@ -5659,8 +5660,8 @@ void menuCloseDialog(void)
for (i = 0; i < layer->numsiblings; i++) {
data.dialog1.preventclose = false;
if (layer->siblings[i]->dialog->handler) {
layer->siblings[i]->dialog->handler(MENUOP_CLOSE, layer->siblings[i]->dialog, &data);
if (layer->siblings[i]->definition->handler) {
layer->siblings[i]->definition->handler(MENUOP_CLOSE, layer->siblings[i]->definition, &data);
}
if (value_prevent == data.dialog1.preventclose) {
@@ -5669,7 +5670,7 @@ void menuCloseDialog(void)
}
for (i = 0; i < layer->numsiblings; i++) {
g_Menus[g_MpPlayerNum].numframes--;
g_Menus[g_MpPlayerNum].numdialogs--;
}
g_Menus[g_MpPlayerNum].unk65c = g_Menus[g_MpPlayerNum].unk660[layer->siblings[0]->unk04].unk06;
@@ -5695,10 +5696,10 @@ void menuCloseDialog(void)
}
if (g_Menus[g_MpPlayerNum].depth == 0) {
g_Menus[g_MpPlayerNum].curframe = NULL;
g_Menus[g_MpPlayerNum].curdialog = NULL;
} else {
struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[g_Menus[g_MpPlayerNum].depth - 1];
g_Menus[g_MpPlayerNum].curframe = layer->siblings[layer->cursibling];
g_Menus[g_MpPlayerNum].curdialog = layer->siblings[layer->cursibling];
}
}
@@ -5710,11 +5711,11 @@ void menuUpdateCurFrame(void)
// No more parent menus - return control to the player
g_Vars.currentplayer->joybutinhibit = 0xffffffff;
menuClose();
g_Menus[g_MpPlayerNum].curframe = NULL;
g_Menus[g_MpPlayerNum].curdialog = NULL;
} else {
// Set up parent menu
struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[depth - 1];
g_Menus[g_MpPlayerNum].curframe = layer->siblings[layer->cursibling];
g_Menus[g_MpPlayerNum].curdialog = layer->siblings[layer->cursibling];
}
}
@@ -5724,10 +5725,10 @@ void menuPopDialog(void)
menuUpdateCurFrame();
}
void func0f0f3704(struct menudialog *dialog)
void func0f0f3704(struct menudialogdef *dialogdef)
{
menuCloseDialog();
menuPushDialog(dialog);
menuPushDialog(dialogdef);
}
GLOBAL_ASM(
@@ -12528,7 +12529,7 @@ glabel func0f0f5360
.L0f0f6bc4:
/* f0f6bc4: 8fa401e8 */ lw $a0,0x1e8($sp)
.L0f0f6bc8:
/* f0f6bc8: 0fc3c167 */ jal menuRenderItem
/* f0f6bc8: 0fc3c167 */ jal menuitemRender
/* f0f6bcc: 27a50198 */ addiu $a1,$sp,0x198
/* f0f6bd0: 8fab0118 */ lw $t3,0x118($sp)
/* f0f6bd4: afa201e8 */ sw $v0,0x1e8($sp)
@@ -12645,7 +12646,7 @@ glabel func0f0f5360
/* f0f6d74: afa90014 */ sw $t1,0x14($sp)
/* f0f6d78: 8fa401e8 */ lw $a0,0x1e8($sp)
/* f0f6d7c: afaf0018 */ sw $t7,0x18($sp)
/* f0f6d80: 0fc3c246 */ jal menuRenderOverlay
/* f0f6d80: 0fc3c246 */ jal menuitemOverlay
/* f0f6d84: afad0010 */ sw $t5,0x10($sp)
/* f0f6d88: 8fac01c0 */ lw $t4,0x1c0($sp)
/* f0f6d8c: 8fae007c */ lw $t6,0x7c($sp)
@@ -14725,7 +14726,7 @@ glabel func0f0f5360
.NB0f0f353c:
/* f0f353c: 8fa401e8 */ lw $a0,0x1e8($sp)
.NB0f0f3540:
/* f0f3540: 0fc3b4b3 */ jal menuRenderItem
/* f0f3540: 0fc3b4b3 */ jal menuitemRender
/* f0f3544: 27a50198 */ addiu $a1,$sp,0x198
/* f0f3548: 8fae0118 */ lw $t6,0x118($sp)
/* f0f354c: afa201e8 */ sw $v0,0x1e8($sp)
@@ -14842,7 +14843,7 @@ glabel func0f0f5360
/* f0f36ec: afa90014 */ sw $t1,0x14($sp)
/* f0f36f0: 8fa401e8 */ lw $a0,0x1e8($sp)
/* f0f36f4: afab0018 */ sw $t3,0x18($sp)
/* f0f36f8: 0fc3b592 */ jal menuRenderOverlay
/* f0f36f8: 0fc3b592 */ jal menuitemOverlay
/* f0f36fc: afae0010 */ sw $t6,0x10($sp)
/* f0f3700: 8fad01c0 */ lw $t5,0x1c0($sp)
/* f0f3704: 8faf007c */ lw $t7,0x7c($sp)
@@ -16884,11 +16885,11 @@ glabel func0f0f7e98
void menuClose(void)
{
g_Menus[g_MpPlayerNum].depth = 0;
g_Menus[g_MpPlayerNum].numframes = 0;
g_Menus[g_MpPlayerNum].numdialogs = 0;
g_Menus[g_MpPlayerNum].unk65c = 0;
g_Menus[g_MpPlayerNum].unk6d8 = 0;
g_Menus[g_MpPlayerNum].unk81c = 0;
g_Menus[g_MpPlayerNum].curframe = NULL;
g_Menus[g_MpPlayerNum].curdialog = NULL;
g_Menus[g_MpPlayerNum].unk83c = 10;
if (g_MenuData.root == MENUROOT_MPPAUSE) {
@@ -16908,7 +16909,7 @@ void menuClose(void)
void func0f0f8120(void)
{
struct menuframe *prev = g_Menus[g_MpPlayerNum].curframe;
struct menudialog *prev = g_Menus[g_MpPlayerNum].curdialog;
s32 i;
if (g_MenuData.unk66e > 0) {
@@ -16917,20 +16918,20 @@ void func0f0f8120(void)
}
}
if (g_Menus[g_MpPlayerNum].curframe == prev) {
if (g_Menus[g_MpPlayerNum].curdialog == prev) {
while (g_Menus[g_MpPlayerNum].depth > 0) {
menuPopDialog();
}
}
}
void func0f0f820c(struct menudialog *dialog, s32 root)
void func0f0f820c(struct menudialogdef *dialogdef, s32 root)
{
s32 i;
s32 prevplayernum = g_MpPlayerNum;
for (i = 0; i < 4; i++) {
if (g_Menus[i].curframe) {
if (g_Menus[i].curdialog) {
g_MpPlayerNum = i;
func0f0f8120();
}
@@ -16939,7 +16940,7 @@ void func0f0f820c(struct menudialog *dialog, s32 root)
g_MpPlayerNum = prevplayernum;
g_MenuData.unk008 = root;
g_MenuData.unk00c = dialog;
g_MenuData.unk00c = dialogdef;
}
bool func0f0f82a8(s32 arg0)
@@ -17450,13 +17451,13 @@ glabel var7f1b29f8
);
#endif
void func0f0f85e0(struct menudialog *dialog, s32 root)
void func0f0f85e0(struct menudialogdef *dialogdef, s32 root)
{
if (dialog == &g_CiMenuViaPcMenuDialog) {
if (dialogdef == &g_CiMenuViaPcMenuDialog) {
musicStartMenu();
}
menuPushRootDialog(dialog, root);
menuPushRootDialog(dialogdef, root);
lvSetPaused(true);
g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
}
@@ -20098,14 +20099,14 @@ glabel var7f1b3d5cpf
/* f0fa774: 03c02825 */ move $a1,$s8
/* f0fa778: 02203025 */ move $a2,$s1
/* f0fa77c: 36070004 */ ori $a3,$s0,0x4
/* f0fa780: 0fc3c389 */ jal menuTickItem
/* f0fa780: 0fc3c389 */ jal menuitemTick
/* f0fa784: afb30010 */ sw $s3,0x10($sp)
/* f0fa788: 1000000c */ b .PF0f0fa7bc
/* f0fa78c: afa2011c */ sw $v0,0x11c($sp)
.PF0f0fa790:
/* f0fa790: 02203025 */ move $a2,$s1
/* f0fa794: 02003825 */ move $a3,$s0
/* f0fa798: 0fc3c389 */ jal menuTickItem
/* f0fa798: 0fc3c389 */ jal menuitemTick
/* f0fa79c: afb30010 */ sw $s3,0x10($sp)
/* f0fa7a0: 10000006 */ b .PF0f0fa7bc
/* f0fa7a4: afa2011c */ sw $v0,0x11c($sp)
@@ -20114,7 +20115,7 @@ glabel var7f1b3d5cpf
.PF0f0fa7ac:
/* f0fa7ac: 02203025 */ move $a2,$s1
/* f0fa7b0: 02803825 */ move $a3,$s4
/* f0fa7b4: 0fc3c389 */ jal menuTickItem
/* f0fa7b4: 0fc3c389 */ jal menuitemTick
/* f0fa7b8: afb30010 */ sw $s3,0x10($sp)
.PF0f0fa7bc:
/* f0fa7bc: 92f80668 */ lbu $t8,0x668($s7)
@@ -21412,14 +21413,14 @@ glabel var7f1b2a64
/* f0fa044: 03c02825 */ or $a1,$s8,$zero
/* f0fa048: 02203025 */ or $a2,$s1,$zero
/* f0fa04c: 36070004 */ ori $a3,$s0,0x4
/* f0fa050: 0fc3c1c1 */ jal menuTickItem
/* f0fa050: 0fc3c1c1 */ jal menuitemTick
/* f0fa054: afb30010 */ sw $s3,0x10($sp)
/* f0fa058: 1000000c */ b .L0f0fa08c
/* f0fa05c: afa2011c */ sw $v0,0x11c($sp)
.L0f0fa060:
/* f0fa060: 02203025 */ or $a2,$s1,$zero
/* f0fa064: 02003825 */ or $a3,$s0,$zero
/* f0fa068: 0fc3c1c1 */ jal menuTickItem
/* f0fa068: 0fc3c1c1 */ jal menuitemTick
/* f0fa06c: afb30010 */ sw $s3,0x10($sp)
/* f0fa070: 10000006 */ b .L0f0fa08c
/* f0fa074: afa2011c */ sw $v0,0x11c($sp)
@@ -21428,7 +21429,7 @@ glabel var7f1b2a64
.L0f0fa07c:
/* f0fa07c: 02203025 */ or $a2,$s1,$zero
/* f0fa080: 02803825 */ or $a3,$s4,$zero
/* f0fa084: 0fc3c1c1 */ jal menuTickItem
/* f0fa084: 0fc3c1c1 */ jal menuitemTick
/* f0fa088: afb30010 */ sw $s3,0x10($sp)
.L0f0fa08c:
/* f0fa08c: 92e90668 */ lbu $t1,0x668($s7)
@@ -22644,14 +22645,14 @@ glabel var7f1b2a64
/* f0f6788: 03c02825 */ or $a1,$s8,$zero
/* f0f678c: 02203025 */ or $a2,$s1,$zero
/* f0f6790: 36070004 */ ori $a3,$s0,0x4
/* f0f6794: 0fc3b50d */ jal menuTickItem
/* f0f6794: 0fc3b50d */ jal menuitemTick
/* f0f6798: afb30010 */ sw $s3,0x10($sp)
/* f0f679c: 1000000c */ beqz $zero,.NB0f0f67d0
/* f0f67a0: afa2011c */ sw $v0,0x11c($sp)
.NB0f0f67a4:
/* f0f67a4: 02203025 */ or $a2,$s1,$zero
/* f0f67a8: 02003825 */ or $a3,$s0,$zero
/* f0f67ac: 0fc3b50d */ jal menuTickItem
/* f0f67ac: 0fc3b50d */ jal menuitemTick
/* f0f67b0: afb30010 */ sw $s3,0x10($sp)
/* f0f67b4: 10000006 */ beqz $zero,.NB0f0f67d0
/* f0f67b8: afa2011c */ sw $v0,0x11c($sp)
@@ -22660,7 +22661,7 @@ glabel var7f1b2a64
.NB0f0f67c0:
/* f0f67c0: 02203025 */ or $a2,$s1,$zero
/* f0f67c4: 02803825 */ or $a3,$s4,$zero
/* f0f67c8: 0fc3b50d */ jal menuTickItem
/* f0f67c8: 0fc3b50d */ jal menuitemTick
/* f0f67cc: afb30010 */ sw $s3,0x10($sp)
.NB0f0f67d0:
/* f0f67d0: 92eb05d8 */ lbu $t3,0x5d8($s7)
@@ -23012,25 +23013,25 @@ glabel var7f1b2a64
);
#endif
void func0f0fa574(struct menuframe *frame)
void func0f0fa574(struct menudialog *dialog)
{
struct menu *menu = &g_Menus[g_MpPlayerNum];
s32 i;
s32 j;
for (i = 0; i < frame->unk05; i++) {
s32 index1 = frame->unk04 + i;
for (i = 0; i < dialog->unk05; i++) {
s32 index1 = dialog->unk04 + i;
for (j = 0; j < menu->unk660[index1].unk08; j++) {
s32 index2 = menu->unk660[index1].unk06 + j;
struct menuitem *item = &frame->dialog->items[menu->unk4fc[index2].itemindex];
struct menuitem *item = &dialog->definition->items[menu->unk4fc[index2].itemindex];
union menuitemdata *data = NULL;
if (menu->unk4fc[index2].blockindex != -1) {
data = (union menuitemdata *)&menu->blocks[menu->unk4fc[index2].blockindex];
}
menuInitItem(item, data);
menuitemInit(item, data);
}
}
}
@@ -29709,7 +29710,7 @@ u32 menuGetRoot(void)
}
#if VERSION >= VERSION_NTSC_1_0
struct menudialog g_PakAttemptRepairMenuDialog;
struct menudialogdef g_PakAttemptRepairMenuDialog;
s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data)
{
@@ -29719,13 +29720,13 @@ s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata
while (!done) {
done = true;
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curframe->dialog == &g_PakRepairSuccessMenuDialog
|| g_Menus[g_MpPlayerNum].curframe->dialog == &g_PakRemovedMenuDialog
|| g_Menus[g_MpPlayerNum].curframe->dialog == &g_PakRepairFailedMenuDialog
|| g_Menus[g_MpPlayerNum].curframe->dialog == &g_PakAttemptRepairMenuDialog
|| g_Menus[g_MpPlayerNum].curframe->dialog == &g_PakDamagedMenuDialog
|| g_Menus[g_MpPlayerNum].curframe->dialog == &g_PakFullMenuDialog) {
if (g_Menus[g_MpPlayerNum].curdialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakRepairSuccessMenuDialog
|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakRemovedMenuDialog
|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakRepairFailedMenuDialog
|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakAttemptRepairMenuDialog
|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakDamagedMenuDialog
|| g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakFullMenuDialog) {
done = false;
menuPopDialog();
}
@@ -29737,11 +29738,11 @@ s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata
}
#endif
s32 menudialog000fcd48(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == dialog
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef
&& joy000155b4(g_Menus[g_MpPlayerNum].fm.device3) == 0) {
func0f0f3704(&g_PakRemovedMenuDialog);
}
@@ -29774,23 +29775,23 @@ s32 menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata
return 0;
}
void func0f0fce8c(struct menudialog *dialog, s32 playernum, s32 arg2)
void func0f0fce8c(struct menudialogdef *dialogdef, s32 playernum, s32 arg2)
{
s32 prevplayernum = g_MpPlayerNum;
g_MpPlayerNum = playernum;
g_Menus[g_MpPlayerNum].fm.device3 = arg2;
if (g_Menus[g_MpPlayerNum].curframe == NULL) {
if (g_Menus[g_MpPlayerNum].curdialog == NULL) {
if (PLAYERCOUNT() == 1) {
menuPushRootDialog(dialog, MENUROOT_MAINMENU);
menuPushRootDialog(dialogdef, MENUROOT_MAINMENU);
lvSetPaused(true);
g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
} else {
menuPushRootDialog(dialog, MENUROOT_MPPAUSE);
menuPushRootDialog(dialogdef, MENUROOT_MPPAUSE);
}
} else {
menuPushDialog(dialog);
menuPushDialog(dialogdef);
}
g_MpPlayerNum = prevplayernum;
@@ -29807,7 +29808,7 @@ struct menuitem g_PakRemovedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakRemovedMenuDialog = {
struct menudialogdef g_PakRemovedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_173, // "Error"
g_PakRemovedMenuItems,
@@ -29827,7 +29828,7 @@ struct menuitem g_PakRepairSuccessMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakRepairSuccessMenuDialog = {
struct menudialogdef g_PakRepairSuccessMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPWEAPONS_180, // "Repair Successful"
g_PakRepairSuccessMenuItems,
@@ -29843,7 +29844,7 @@ struct menuitem g_PakRepairFailedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakRepairFailedMenuDialog = {
struct menudialogdef g_PakRepairFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_182, // "Repair Failed"
g_PakRepairFailedMenuItems,
@@ -29861,7 +29862,7 @@ struct menuitem g_PakAttemptRepairMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakAttemptRepairMenuDialog = {
struct menudialogdef g_PakAttemptRepairMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_175, // "Attempt Repair"
g_PakAttemptRepairMenuItems,
@@ -29955,17 +29956,17 @@ bool func0f0fd1f4(s32 arg0, s32 arg1)
result = true;
}
if (g_Menus[playernum].curframe) {
if (g_Menus[playernum].curframe->dialog == &g_PakDamagedMenuDialog
if (g_Menus[playernum].curdialog) {
if (g_Menus[playernum].curdialog->definition == &g_PakDamagedMenuDialog
#if VERSION >= VERSION_NTSC_1_0
|| g_Menus[playernum].curframe->dialog == &g_PakCannotReadGameBoyMenuDialog
|| g_Menus[playernum].curframe->dialog == &g_PakDataLostMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakCannotReadGameBoyMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakDataLostMenuDialog
#endif
|| g_Menus[playernum].curframe->dialog == &g_PakFullMenuDialog
|| g_Menus[playernum].curframe->dialog == &g_PakAttemptRepairMenuDialog
|| g_Menus[playernum].curframe->dialog == &g_PakRemovedMenuDialog
|| g_Menus[playernum].curframe->dialog == &g_PakRepairSuccessMenuDialog
|| g_Menus[playernum].curframe->dialog == &g_PakRepairFailedMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakFullMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakAttemptRepairMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakRemovedMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakRepairSuccessMenuDialog
|| g_Menus[playernum].curdialog->definition == &g_PakRepairFailedMenuDialog
) {
result = false;
}
@@ -29995,7 +29996,7 @@ void func0f0fd320(s32 arg0, s32 arg1)
for (i = 0; i < g_Menus[g_MpPlayerNum].depth; i++) {
if (g_Menus[g_MpPlayerNum].layers[i].siblings[0]
&& g_Menus[g_MpPlayerNum].layers[i].siblings[0]->dialog == &g_PakChoosePakMenuDialog) {
&& g_Menus[g_MpPlayerNum].layers[i].siblings[0]->definition == &g_PakChoosePakMenuDialog) {
found = true;
}
}
@@ -30042,16 +30043,16 @@ void func0f0fd548(s32 arg0)
g_MenuData.unk66f = 0;
}
struct menuframe *menuIsDialogOpen(struct menudialog *dialog)
struct menudialog *menuIsDialogOpen(struct menudialogdef *dialogdef)
{
s32 i;
s32 j;
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curdialog) {
for (i = 0; i < g_Menus[g_MpPlayerNum].depth; i++) {
for (j = 0; j < g_Menus[g_MpPlayerNum].layers[i].numsiblings; j++) {
if (g_Menus[g_MpPlayerNum].layers[i].siblings[j]
&& g_Menus[g_MpPlayerNum].layers[i].siblings[j]->dialog == dialog) {
&& g_Menus[g_MpPlayerNum].layers[i].siblings[j]->definition == dialogdef) {
return g_Menus[g_MpPlayerNum].layers[i].siblings[j];
}
}
@@ -30072,7 +30073,7 @@ struct menuitem g_PakDamagedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakDamagedMenuDialog = {
struct menudialogdef g_PakDamagedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_064, // "Damaged Controller Pak"
g_PakDamagedMenuItems,
@@ -30095,7 +30096,7 @@ struct menuitem g_PakFullMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakFullMenuDialog = {
struct menudialogdef g_PakFullMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_070, // "Full Controller Pak"
g_PakFullMenuItems,
@@ -30116,7 +30117,7 @@ struct menuitem g_PakCannotReadGameBoyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakCannotReadGameBoyMenuDialog = {
struct menudialogdef g_PakCannotReadGameBoyMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_253, // "Error"
g_PakCannotReadGameBoyMenuItems,
@@ -30135,7 +30136,7 @@ struct menuitem g_PakDataLostMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PakDataLostMenuDialog = {
struct menudialogdef g_PakDataLostMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_256, // "Error"
g_PakDataLostMenuItems,
src/game/game_10c9c0.c
+17 -17
View File
@@ -160,7 +160,7 @@ void func0f10cb2c(void)
}
#endif
s32 menudialog4MbMainMenu(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog4MbMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Vars.waitingtojoin[0] = false;
@@ -169,9 +169,9 @@ s32 menudialog4MbMainMenu(s32 operation, struct menudialog *dialog, union handle
g_Vars.waitingtojoin[3] = false;
}
if (g_Menus[g_MpPlayerNum].curframe &&
g_Menus[g_MpPlayerNum].curframe->dialog == &g_MainMenu4MbMenuDialog &&
operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition == &g_MainMenu4MbMenuDialog
&& operation == MENUOP_TICK) {
g_Vars.mpsetupmenu = MPSETUPMENU_GENERAL;
g_Vars.mpquickteam = MPQUICKTEAM_NONE;
g_Vars.usingadvsetup = false;
@@ -197,7 +197,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_GameFiles4MbMenuDialog = {
struct menudialogdef g_GameFiles4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_099, // "Game Files"
g_GameFiles4MbMenuItems,
@@ -212,7 +212,7 @@ struct menuitem g_FilemgrFileSelect4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FilemgrFileSelect4MbMenuDialog = {
struct menudialogdef g_FilemgrFileSelect4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_095, // "Perfect Dark"
g_FilemgrFileSelect4MbMenuItems,
@@ -240,7 +240,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AudioVideo4MbMenuDialog = {
struct menudialogdef g_AudioVideo4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_307, // "Audio/Visual"
g_AudioVideo4MbMenuItems,
@@ -260,7 +260,7 @@ struct menuitem g_MpPlayerSetup4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPlayerSetup4MbMenuDialog = {
struct menudialogdef g_MpPlayerSetup4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_028, // "Player Setup"
g_MpPlayerSetup4MbMenuItems,
@@ -269,7 +269,7 @@ struct menudialog g_MpPlayerSetup4MbMenuDialog = {
&g_MpChallengeListOrDetailsMenuDialog,
};
struct menudialog g_MpDropOut4MbMenuDialog;
struct menudialogdef g_MpDropOut4MbMenuDialog;
struct menuitem g_MpQuickGo4MbMenuItems[] = {
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_456, 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game"
@@ -281,7 +281,7 @@ struct menuitem g_MpQuickGo4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpQuickGo4MbMenuDialog = {
struct menudialogdef g_MpQuickGo4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MISC_460, // "Quick Go"
g_MpQuickGo4MbMenuItems,
@@ -298,7 +298,7 @@ struct menuitem g_MpConfirmChallenge4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpConfirmChallenge4MbMenuDialog = {
struct menudialogdef g_MpConfirmChallenge4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&func0f17e318,
g_MpConfirmChallenge4MbMenuItems,
@@ -312,7 +312,7 @@ struct menuitem g_MpChallenges4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpChallenges4MbMenuDialog = {
struct menudialogdef g_MpChallenges4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_050, // "Combat Challenges"
g_MpChallenges4MbMenuItems,
@@ -332,7 +332,7 @@ struct menuitem g_MainMenu4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MainMenu4MbMenuDialog = {
struct menudialogdef g_MainMenu4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_302, // "Small but Perfect Menu"
g_MainMenu4MbMenuItems,
@@ -348,7 +348,7 @@ struct menuitem g_MpDropOut4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpDropOut4MbMenuDialog = {
struct menudialogdef g_MpDropOut4MbMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_195, // "Drop Out"
g_MpDropOut4MbMenuItems,
@@ -364,7 +364,7 @@ struct menuitem g_UnusedAbortMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_UnusedAbortMenuDialog = {
struct menudialogdef g_UnusedAbortMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_052, // "Abort"
g_UnusedAbortMenuItems,
@@ -382,7 +382,7 @@ struct menuitem g_MpEditSimulant4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpEditSimulant4MbMenuDialog = {
struct menudialogdef g_MpEditSimulant4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&mpMenuTitleEditSimulant,
g_MpEditSimulant4MbMenuItems,
@@ -409,7 +409,7 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AdvancedSetup4MbMenuDialog = {
struct menudialogdef g_AdvancedSetup4MbMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_017, // "Game Setup"
g_AdvancedSetup4MbMenuItems,
src/game/mainmenu.c
+66 -91
View File
@@ -32,9 +32,9 @@
u8 g_InventoryWeapon;
struct menudialog g_2PMissionControlStyleMenuDialog;
struct menudialog g_CiControlPlayer2MenuDialog;
struct menudialog g_CinemaMenuDialog;
struct menudialogdef g_2PMissionControlStyleMenuDialog;
struct menudialogdef g_CiControlPlayer2MenuDialog;
struct menudialogdef g_CinemaMenuDialog;
char *menuTextCurrentStageName(struct menuitem *item)
{
@@ -693,11 +693,11 @@ s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata
return 0;
}
s32 menudialogBriefing(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
struct menuinputs *inputs = data->dialog2.inputs;
if (inputs->start) {
@@ -716,7 +716,7 @@ struct menuitem g_PreAndPostMissionBriefingMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PreAndPostMissionBriefingMenuDialog = {
struct menudialogdef g_PreAndPostMissionBriefingMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_247, // "Briefing"
g_PreAndPostMissionBriefingMenuItems,
@@ -781,9 +781,9 @@ s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handler
return 0;
}
char *soloMenuTitleStageOverview(struct menudialog *dialog)
char *soloMenuTitleStageOverview(struct menudialogdef *dialogdef)
{
if (dialog != g_Menus[g_MpPlayerNum].curframe->dialog) {
if (dialogdef != g_Menus[g_MpPlayerNum].curdialog->definition) {
return langGet(L_OPTIONS_273); // "Overview"
}
@@ -794,7 +794,7 @@ char *soloMenuTitleStageOverview(struct menudialog *dialog)
return g_StringPointer;
}
s32 menudialog00103608(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -819,7 +819,7 @@ struct menuitem g_AcceptMissionMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AcceptMissionMenuDialog = {
struct menudialogdef g_AcceptMissionMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&soloMenuTitleStageOverview,
g_AcceptMissionMenuItems,
@@ -897,7 +897,7 @@ struct menuitem g_PdModeSettingsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PdModeSettingsMenuDialog = {
struct menudialogdef g_PdModeSettingsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_221, // "Perfect Dark"
g_PdModeSettingsMenuItems,
@@ -1576,7 +1576,7 @@ struct menuitem g_SoloMissionDifficultyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloMissionDifficultyMenuDialog = {
struct menudialogdef g_SoloMissionDifficultyMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_248, // "Select Difficulty"
g_SoloMissionDifficultyMenuItems,
@@ -1630,7 +1630,7 @@ s32 getMaxAiBuddies(void)
}
#endif
s32 menudialogCoopAntiOptions(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
#if VERSION >= VERSION_NTSC_1_0
if (operation == MENUOP_OPEN) {
@@ -1643,8 +1643,7 @@ s32 menudialogCoopAntiOptions(s32 operation, struct menudialog *dialog, union ha
#endif
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe &&
g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
struct menuinputs *inputs = data->dialog2.inputs;
if (inputs->start) {
@@ -1961,7 +1960,7 @@ struct menuitem g_CoopOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, // ""
};
struct menudialog g_CoopOptionsMenuDialog = {
struct menudialogdef g_CoopOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_255, // "Co-Operative Options"
g_CoopOptionsMenuItems,
@@ -2014,7 +2013,7 @@ struct menuitem g_AntiOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AntiOptionsMenuDialog = {
struct menudialogdef g_AntiOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_266, // "Counter-Operative Options"
g_AntiOptionsMenuItems,
@@ -2053,7 +2052,7 @@ struct menuitem g_CoopMissionDifficultyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CoopMissionDifficultyMenuDialog = {
struct menudialogdef g_CoopMissionDifficultyMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_248, // "Select Difficulty"
g_CoopMissionDifficultyMenuItems,
@@ -2085,7 +2084,7 @@ struct menuitem g_AntiMissionDifficultyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AntiMissionDifficultyMenuDialog = {
struct menudialogdef g_AntiMissionDifficultyMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_248, // "Select Difficulty"
g_AntiMissionDifficultyMenuItems,
@@ -4140,7 +4139,7 @@ glabel var7f1ad0fcnb
);
#endif
s32 menudialog0010559c(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -4174,7 +4173,7 @@ struct menuitem g_2PMissionBreifingVMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloMissionBriefingMenuDialog = {
struct menudialogdef g_SoloMissionBriefingMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_247, // "Briefing"
g_MissionBriefingMenuItems,
@@ -4183,7 +4182,7 @@ struct menudialog g_SoloMissionBriefingMenuDialog = {
NULL,
};
struct menudialog g_2PMissionBriefingHMenuDialog = {
struct menudialogdef g_2PMissionBriefingHMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_247, // "Briefing"
g_MissionBriefingMenuItems,
@@ -4192,7 +4191,7 @@ struct menudialog g_2PMissionBriefingHMenuDialog = {
NULL,
};
struct menudialog g_2PMissionBriefingVMenuDialog = {
struct menudialogdef g_2PMissionBriefingVMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_247, // "Briefing"
g_2PMissionBreifingVMenuItems,
@@ -4268,7 +4267,7 @@ struct menuitem g_2PMissionControlStyleMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_2PMissionControlStyleMenuDialog = {
struct menudialogdef g_2PMissionControlStyleMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_236, // "Control"
g_2PMissionControlStyleMenuItems,
@@ -4283,7 +4282,7 @@ struct menuitem g_SoloMissionControlStyleMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloMissionControlStyleMenuDialog = {
struct menudialogdef g_SoloMissionControlStyleMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_236, // "Control"
g_SoloMissionControlStyleMenuItems,
@@ -4298,7 +4297,7 @@ struct menuitem g_CiControlStyleMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiControlStyleMenuDialog = {
struct menudialogdef g_CiControlStyleMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_236, // "Control"
g_CiControlStyleMenuItems,
@@ -4313,7 +4312,7 @@ struct menuitem g_CiControlStylePlayer2MenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiControlStylePlayer2MenuDialog = {
struct menudialogdef g_CiControlStylePlayer2MenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_236, // "Control"
g_CiControlStylePlayer2MenuItems,
@@ -4337,7 +4336,7 @@ struct menuitem g_AudioOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_AudioOptionsMenuDialog = {
struct menudialogdef g_AudioOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_227, // "Audio Options"
g_AudioOptionsMenuItems,
@@ -4361,7 +4360,7 @@ struct menuitem g_2PMissionAudioOptionsVMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_2PMissionAudioOptionsVMenuDialog = {
struct menudialogdef g_2PMissionAudioOptionsVMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_227, // "Audio Options"
g_2PMissionAudioOptionsVMenuItems,
@@ -4396,7 +4395,7 @@ struct menuitem g_2PMissionVideoOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_VideoOptionsMenuDialog = {
struct menudialogdef g_VideoOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_214, // "Video Options"
g_VideoOptionsMenuItems,
@@ -4405,7 +4404,7 @@ struct menudialog g_VideoOptionsMenuDialog = {
NULL,
};
struct menudialog g_2PMissionVideoOptionsMenuDialog = {
struct menudialogdef g_2PMissionVideoOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_214, // "Video Options"
g_2PMissionVideoOptionsMenuItems,
@@ -4429,7 +4428,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MissionDisplayOptionsMenuDialog = {
struct menudialogdef g_MissionDisplayOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_203, // "Display Options"
g_MissionDisplayOptionsMenuItems,
@@ -4458,7 +4457,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_2PMissionDisplayOptionsVMenuDialog = {
struct menudialogdef g_2PMissionDisplayOptionsVMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_203, // "Display Options"
g_2PMissionDisplayOptionsVMenuItems,
@@ -4482,9 +4481,9 @@ struct menuitem g_CiDisplayMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiDisplayPlayer2MenuDialog;
struct menudialogdef g_CiDisplayPlayer2MenuDialog;
struct menudialog g_CiDisplayMenuDialog = {
struct menudialogdef g_CiDisplayMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_203, // "Display Options"
g_CiDisplayMenuItems,
@@ -4508,7 +4507,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiDisplayPlayer2MenuDialog = {
struct menudialogdef g_CiDisplayPlayer2MenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_204, // "Display Player 2"
g_CiDisplayPlayer2MenuItems,
@@ -4529,7 +4528,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MissionControlOptionsMenuDialog = {
struct menudialogdef g_MissionControlOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_192, // "Control Options"
g_MissionControlOptionsMenuItems,
@@ -4551,7 +4550,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiControlOptionsMenuDialog2 = {
struct menudialogdef g_CiControlOptionsMenuDialog2 = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_192, // "Control Options"
g_CiControlOptionsMenuItems2,
@@ -4573,7 +4572,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiControlOptionsMenuDialog = {
struct menudialogdef g_CiControlOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_192, // "Control Options"
g_CiControlOptionsMenuItems,
@@ -4594,7 +4593,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiControlPlayer2MenuDialog = {
struct menudialogdef g_CiControlPlayer2MenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_193, // "Control Player 2"
g_CiControlPlayer2MenuItems,
@@ -4610,7 +4609,7 @@ struct menuitem g_ChangeAgentMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_ChangeAgentMenuDialog = {
struct menudialogdef g_ChangeAgentMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_188, // "Warning"
g_ChangeAgentMenuItems,
@@ -4661,7 +4660,7 @@ struct menuitem g_CiOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloMissionOptionsMenuDialog = {
struct menudialogdef g_SoloMissionOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_180, // "Options"
g_SoloMissionOptionsMenuItems,
@@ -4670,7 +4669,7 @@ struct menudialog g_SoloMissionOptionsMenuDialog = {
&g_SoloMissionBriefingMenuDialog,
};
struct menudialog g_CiOptionsViaPcMenuDialog = {
struct menudialogdef g_CiOptionsViaPcMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_180, // "Options"
g_CiOptionsMenuItems,
@@ -4679,7 +4678,7 @@ struct menudialog g_CiOptionsViaPcMenuDialog = {
NULL,
};
struct menudialog g_CiOptionsViaPauseMenuDialog = {
struct menudialogdef g_CiOptionsViaPauseMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_180, // "Options"
g_CiOptionsMenuItems,
@@ -4688,7 +4687,7 @@ struct menudialog g_CiOptionsViaPauseMenuDialog = {
NULL,
};
struct menudialog g_2PMissionOptionsHMenuDialog = {
struct menudialogdef g_2PMissionOptionsHMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_180, // "Options"
g_2PMissionOptionsHMenuItems,
@@ -4697,7 +4696,7 @@ struct menudialog g_2PMissionOptionsHMenuDialog = {
&g_2PMissionBriefingHMenuDialog,
};
struct menudialog g_2PMissionOptionsVMenuDialog = {
struct menudialogdef g_2PMissionOptionsVMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_180, // "Options"
g_2PMissionOptionsVMenuItems,
@@ -4708,10 +4707,6 @@ struct menudialog g_2PMissionOptionsVMenuDialog = {
u8 var80072d88 = 255;
//-----------------------------------------------------------------------------\
// @dialog Inventory ----------------------------------------------------------/
//----------------------------------------------------------------------------/
char *invMenuTextPrimaryFunction(struct menuitem *item)
{
struct weaponfunc *primaryfunc = weaponGetFunctionById(g_InventoryWeapon, 0);
@@ -4890,10 +4885,10 @@ void func0f105948(s32 weaponnum)
}
}
s32 inventoryMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
g_Menus[g_MpPlayerNum].unkdb4 -= g_Vars.diffframe60;
g_Menus[g_MpPlayerNum].unkd8c = 18.849555969238f * var80061630;
g_Menus[g_MpPlayerNum].unkd64 = 18.849555969238f * var80061630;
@@ -5676,7 +5671,7 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloMissionInventoryMenuDialog = {
struct menudialogdef g_SoloMissionInventoryMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_178, // "Inventory"
g_SoloMissionInventoryMenuItems,
@@ -5685,7 +5680,7 @@ struct menudialog g_SoloMissionInventoryMenuDialog = {
&g_SoloMissionOptionsMenuDialog,
};
struct menudialog g_FrWeaponsAvailableMenuDialog = {
struct menudialogdef g_FrWeaponsAvailableMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_179, // "Weapons Available"
g_FrWeaponsAvailableMenuItems,
@@ -5696,10 +5691,6 @@ struct menudialog g_FrWeaponsAvailableMenuDialog = {
u32 var80073544 = 0;
//-----------------------------------------------------------------------------\
// @dialog SoloAbort ----------------------------------------------------------/
//----------------------------------------------------------------------------/
s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_SET) {
@@ -5710,7 +5701,7 @@ s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerd
return 0;
}
s32 menudialogAbortMission(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
// empty
@@ -5726,7 +5717,7 @@ struct menuitem g_MissionAbortMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MissionAbortMenuDialog = {
struct menudialogdef g_MissionAbortMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_174, // "Warning"
g_MissionAbortMenuItems,
@@ -5742,7 +5733,7 @@ struct menuitem g_2PMissionAbortVMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_2PMissionAbortVMenuDialog = {
struct menudialogdef g_2PMissionAbortVMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_OPTIONS_174, // "Warning"
g_2PMissionAbortVMenuItems,
@@ -5751,11 +5742,7 @@ struct menudialog g_2PMissionAbortVMenuDialog = {
NULL,
};
//-----------------------------------------------------------------------------\
// @dialog SoloPauseStatus ----------------------------------------------------/
//----------------------------------------------------------------------------/
s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
struct briefingobj *briefing = g_BriefingObjs;
@@ -5797,9 +5784,9 @@ s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union ha
return 0;
}
char *soloMenuTitlePauseStatus(struct menudialog *dialog)
char *soloMenuTitlePauseStatus(struct menudialogdef *dialogdef)
{
if (dialog != g_Menus[g_MpPlayerNum].curframe->dialog) {
if (dialogdef != g_Menus[g_MpPlayerNum].curdialog->definition) {
return langGet(L_OPTIONS_172); // "Status"
}
@@ -5822,7 +5809,7 @@ struct menuitem g_MissionPauseMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SoloMissionPauseMenuDialog = {
struct menudialogdef g_SoloMissionPauseMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&soloMenuTitlePauseStatus,
g_MissionPauseMenuItems,
@@ -5831,7 +5818,7 @@ struct menudialog g_SoloMissionPauseMenuDialog = {
&g_SoloMissionInventoryMenuDialog,
};
struct menudialog g_2PMissionPauseHMenuDialog = {
struct menudialogdef g_2PMissionPauseHMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&soloMenuTitlePauseStatus,
g_MissionPauseMenuItems,
@@ -5840,7 +5827,7 @@ struct menudialog g_2PMissionPauseHMenuDialog = {
&g_2PMissionInventoryHMenuDialog,
};
struct menudialog g_2PMissionPauseVMenuDialog = {
struct menudialogdef g_2PMissionPauseVMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_172, // "Status"
g_2PMissionPauseVMenuItems,
@@ -5849,10 +5836,6 @@ struct menudialog g_2PMissionPauseVMenuDialog = {
&g_2PMissionInventoryVMenuDialog,
};
//-----------------------------------------------------------------------------\
// @dialog Cinema -------------------------------------------------------------/
//----------------------------------------------------------------------------/
struct cutscene g_Cutscenes[] = {
// stage ID, mission, scene, name
{ /* 0*/ STAGE_DEFECTION, 0, 0, L_OPTIONS_450 },
@@ -6043,7 +6026,7 @@ struct menuitem g_CinemaMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CinemaMenuDialog = {
struct menudialogdef g_CinemaMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_490, // "Cinema"
g_CinemaMenuItems,
@@ -6052,16 +6035,12 @@ struct menudialog g_CinemaMenuDialog = {
NULL,
};
//-----------------------------------------------------------------------------\
// @dialog SelectMission ------------------------------------------------------/
//----------------------------------------------------------------------------/
struct menuitem g_SelectMissionMenuItems[] = {
{ MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000eb, 0x00000000, menuhandler0010476c },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_SelectMissionMenuDialog = {
struct menudialogdef g_SelectMissionMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_122, // "Mission Select"
g_SelectMissionMenuItems,
@@ -6070,10 +6049,6 @@ struct menudialog g_SelectMissionMenuDialog = {
NULL,
};
//-----------------------------------------------------------------------------\
// @dialog MainMenu -----------------------------------------------------------/
//----------------------------------------------------------------------------/
s32 menuhandlerMainMenuSoloMissions(s32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_SET) {
@@ -6134,15 +6109,15 @@ s32 menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, un
return 0;
}
s32 menudialogMainMenu(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
g_Menus[g_MpPlayerNum].main.unke2c = 0;
break;
case MENUOP_TICK:
if (g_Menus[g_MpPlayerNum].curframe &&
g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog &&
g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
g_MissionConfig.iscoop = false;
g_MissionConfig.isanti = false;
}
@@ -6185,7 +6160,7 @@ struct menuitem g_MainMenuMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CiMenuViaPcMenuDialog = {
struct menudialogdef g_CiMenuViaPcMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_116, // "Perfect Menu"
g_MainMenuMenuItems,
@@ -6194,7 +6169,7 @@ struct menudialog g_CiMenuViaPcMenuDialog = {
&g_CiOptionsViaPcMenuDialog,
};
struct menudialog g_CiMenuViaPauseMenuDialog = {
struct menudialogdef g_CiMenuViaPauseMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS_116, // "Perfect Menu"
g_MainMenuMenuItems,
src/game/menu/items.c
+373 -373
View File
File diff suppressed because it is too large Load Diff
src/game/mplayer/ingame.c
+23 -23
View File
@@ -20,12 +20,12 @@
#include "data.h"
#include "types.h"
struct menudialog g_MpEndscreenChallengeCompletedMenuDialog;
struct menudialog g_MpEndscreenIndGameOverMenuDialog;
struct menudialog g_MpEndscreenTeamGameOverMenuDialog;
struct menudialogdef g_MpEndscreenChallengeCompletedMenuDialog;
struct menudialogdef g_MpEndscreenIndGameOverMenuDialog;
struct menudialogdef g_MpEndscreenTeamGameOverMenuDialog;
#if VERSION >= VERSION_NTSC_1_0
struct menudialog g_MpEndscreenSavePlayerMenuDialog;
struct menudialogdef g_MpEndscreenSavePlayerMenuDialog;
#endif
s32 mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data)
@@ -210,7 +210,7 @@ char *mpMenuTextWeaponDescription(struct menuitem *item)
return "\n";
}
char *mpMenuTitleStatsFor(struct menudialog *dialog)
char *mpMenuTitleStatsFor(struct menudialogdef *dialogdef)
{
struct mpchrconfig *mpchr = MPCHR(g_MpSelectedPlayersForStats[g_MpPlayerNum]);
@@ -249,7 +249,7 @@ struct menuitem g_MpEndGameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpEndGameMenuDialog = {
struct menudialogdef g_MpEndGameMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_290, // "End Game"
g_MpEndGameMenuItems,
@@ -271,7 +271,7 @@ struct menuitem g_MpPauseControlMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPauseControlMenuDialog = {
struct menudialogdef g_MpPauseControlMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_285, // "Control"
g_MpPauseControlMenuItems,
@@ -286,7 +286,7 @@ struct menuitem g_Mp2PMissionInventoryMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPauseInventoryMenuDialog = {
struct menudialogdef g_MpPauseInventoryMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_284, // "Inventory"
g_Mp2PMissionInventoryMenuItems,
@@ -295,7 +295,7 @@ struct menudialog g_MpPauseInventoryMenuDialog = {
&g_MpPauseControlMenuDialog,
};
struct menudialog g_2PMissionInventoryHMenuDialog = {
struct menudialogdef g_2PMissionInventoryHMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_284, // "Inventory"
g_Mp2PMissionInventoryMenuItems,
@@ -304,7 +304,7 @@ struct menudialog g_2PMissionInventoryHMenuDialog = {
&g_2PMissionOptionsHMenuDialog,
};
struct menudialog g_2PMissionInventoryVMenuDialog = {
struct menudialogdef g_2PMissionInventoryVMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_284, // "Inventory"
g_Mp2PMissionInventoryMenuItems,
@@ -318,7 +318,7 @@ struct menuitem g_MpInGamePlayerStatsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPausePlayerStatsMenuDialog = {
struct menudialogdef g_MpPausePlayerStatsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&mpMenuTitleStatsFor,
g_MpInGamePlayerStatsMenuItems,
@@ -327,7 +327,7 @@ struct menudialog g_MpPausePlayerStatsMenuDialog = {
&g_MpPauseInventoryMenuDialog,
};
struct menudialog g_MpEndscreenPlayerStatsMenuDialog = {
struct menudialogdef g_MpEndscreenPlayerStatsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&mpMenuTitleStatsFor,
g_MpInGamePlayerStatsMenuItems,
@@ -341,7 +341,7 @@ struct menuitem g_MpPlayerRankingMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPausePlayerRankingMenuDialog = {
struct menudialogdef g_MpPausePlayerRankingMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_276, // "Player Ranking"
g_MpPlayerRankingMenuItems,
@@ -350,7 +350,7 @@ struct menudialog g_MpPausePlayerRankingMenuDialog = {
&g_MpPausePlayerStatsMenuDialog,
};
struct menudialog g_MpEndscreenPlayerRankingMenuDialog = {
struct menudialogdef g_MpEndscreenPlayerRankingMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_276, // "Player Ranking"
g_MpPlayerRankingMenuItems,
@@ -364,7 +364,7 @@ struct menuitem g_MpTeamRankingsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPauseTeamRankingsMenuDialog = {
struct menudialogdef g_MpPauseTeamRankingsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_279, // "Team Ranking"
g_MpTeamRankingsMenuItems,
@@ -373,7 +373,7 @@ struct menudialog g_MpPauseTeamRankingsMenuDialog = {
&g_MpPausePlayerRankingMenuDialog,
};
struct menudialog g_MpEndscreenTeamRankingMenuDialog = {
struct menudialogdef g_MpEndscreenTeamRankingMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_279, // "Team Ranking"
g_MpTeamRankingsMenuItems,
@@ -617,7 +617,7 @@ struct menuitem g_MpGameOverMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpEndscreenIndGameOverMenuDialog = {
struct menudialogdef g_MpEndscreenIndGameOverMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_260, // "Game Over"
g_MpGameOverMenuItems,
@@ -626,7 +626,7 @@ struct menudialog g_MpEndscreenIndGameOverMenuDialog = {
&g_MpEndscreenPlayerRankingMenuDialog,
};
struct menudialog g_MpEndscreenTeamGameOverMenuDialog = {
struct menudialogdef g_MpEndscreenTeamGameOverMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_260, // "Game Over"
g_MpGameOverMenuItems,
@@ -635,7 +635,7 @@ struct menudialog g_MpEndscreenTeamGameOverMenuDialog = {
&g_MpEndscreenTeamRankingMenuDialog,
};
struct menudialog g_MpEndscreenChallengeCompletedMenuDialog = {
struct menudialogdef g_MpEndscreenChallengeCompletedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPWEAPONS_165, // "Challenge Completed!"
g_MpTeamRankingsMenuItems,
@@ -644,7 +644,7 @@ struct menudialog g_MpEndscreenChallengeCompletedMenuDialog = {
&g_MpEndscreenIndGameOverMenuDialog,
};
struct menudialog g_MpEndscreenChallengeCheatedMenuDialog = {
struct menudialogdef g_MpEndscreenChallengeCheatedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_167, // "Challenge Cheated!"
g_MpTeamRankingsMenuItems,
@@ -653,7 +653,7 @@ struct menudialog g_MpEndscreenChallengeCheatedMenuDialog = {
&g_MpEndscreenIndGameOverMenuDialog,
};
struct menudialog g_MpEndscreenChallengeFailedMenuDialog = {
struct menudialogdef g_MpEndscreenChallengeFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPWEAPONS_166, // "Challenge Failed!"
g_MpTeamRankingsMenuItems,
@@ -669,7 +669,7 @@ struct menuitem g_MpEndscreenConfirmNameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpEndscreenConfirmNameMenuDialog = {
struct menudialogdef g_MpEndscreenConfirmNameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_142, // "Player Name"
g_MpEndscreenConfirmNameMenuItems,
@@ -685,7 +685,7 @@ struct menuitem g_MpEndscreenSavePlayerMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpEndscreenSavePlayerMenuDialog = {
struct menudialogdef g_MpEndscreenSavePlayerMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_246, // "Save Player"
g_MpEndscreenSavePlayerMenuItems,
src/game/mplayer/mplayer.c
+3 -3
View File
@@ -1168,7 +1168,7 @@ bool mpIsPaused(void)
{
if (PLAYERCOUNT() == 1
&& g_Vars.mplayerisrunning
&& g_Menus[g_Vars.currentplayerstats->mpindex].curframe) {
&& g_Menus[g_Vars.currentplayerstats->mpindex].curdialog) {
return true;
}
@@ -1213,9 +1213,9 @@ Gfx *mpRenderModalText(Gfx *gdl)
x = viGetViewLeft() + viGetViewWidth() / 2;
#if VERSION >= VERSION_NTSC_1_0
if (g_Menus[g_Vars.currentplayerstats->mpindex].curframe)
if (g_Menus[g_Vars.currentplayerstats->mpindex].curdialog)
#else
if (g_Menus[g_Vars.currentplayernum].curframe)
if (g_Menus[g_Vars.currentplayernum].curdialog)
#endif
{
y = viGetViewTop() + 10;
src/game/mplayer/scenarios.c
+6 -6
View File
@@ -52,7 +52,7 @@
*/
struct mpscenario {
struct menudialog *optionsdialog;
struct menudialogdef *optionsdialog;
void (*initfunc)(void);
s32 (*numpropsfunc)(void);
void (*initpropsfunc)(void);
@@ -243,15 +243,15 @@ struct mpscenariooverview g_MpScenarioOverviews[] = {
* While the options dialog is open, check if another player has changed the
* scenario to a different one. If so, replace this dialog with the new one.
*/
s32 mpOptionsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe->dialog != g_MpScenarios[g_MpSetup.scenario].optionsdialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition != g_MpScenarios[g_MpSetup.scenario].optionsdialog) {
s32 i;
s32 end = ARRAYCOUNT(g_MpScenarios);
for (i = 0; i < end; i++) {
if (g_Menus[g_MpPlayerNum].curframe->dialog == g_MpScenarios[i].optionsdialog) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == g_MpScenarios[i].optionsdialog) {
break;
}
}
@@ -910,7 +910,7 @@ struct menuitem g_MpScenarioMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpScenarioMenuDialog = {
struct menudialogdef g_MpScenarioMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_243, // "Scenario"
g_MpScenarioMenuItems,
@@ -924,7 +924,7 @@ struct menuitem g_MpQuickTeamScenarioMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpQuickTeamScenarioMenuDialog = {
struct menudialogdef g_MpQuickTeamScenarioMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_243, // "Scenario"
g_MpQuickTeamScenarioMenuItems,
src/game/mplayer/scenarios/capturethecase.inc
+1 -1
View File
@@ -26,7 +26,7 @@ struct menuitem g_CtcOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CtcOptionsMenuDialog = {
struct menudialogdef g_CtcOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_220, // "Capture Options"
g_CtcOptionsMenuItems,
src/game/mplayer/scenarios/combat.inc
+1 -1
View File
@@ -21,7 +21,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpCombatOptionsMenuDialog = {
struct menudialogdef g_MpCombatOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_215, // "Combat Options"
g_MpCombatOptionsMenuItems,
src/game/mplayer/scenarios/hackthatmac.inc
+1 -1
View File
@@ -25,7 +25,7 @@ struct menuitem g_HtmOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HtmOptionsMenuDialog = {
struct menudialogdef g_HtmOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_217, // "Hacker Options"
g_HtmOptionsMenuItems,
src/game/mplayer/scenarios/holdthebriefcase.inc
+1 -1
View File
@@ -25,7 +25,7 @@ struct menuitem g_HtbOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HtbOptionsMenuDialog = {
struct menudialogdef g_HtbOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_216, // "Briefcase Options"
g_HtbOptionsMenuItems,
src/game/mplayer/scenarios/kingofthehill.inc
+1 -1
View File
@@ -47,7 +47,7 @@ struct menuitem g_KohOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_KohOptionsMenuDialog = {
struct menudialogdef g_KohOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_219, // "Hill Options"
g_KohOptionsMenuItems,
src/game/mplayer/scenarios/popacap.inc
+1 -1
View File
@@ -23,7 +23,7 @@ struct menuitem g_PacOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_PacOptionsMenuDialog = {
struct menudialogdef g_PacOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_218, // "Pop a Cap Options"
g_PacOptionsMenuItems,
src/game/mplayer/setup.c
+94 -94
View File
@@ -23,11 +23,11 @@
#include "types.h"
struct menuitem g_MpCharacterMenuItems[];
struct menudialog g_MpAddSimulantMenuDialog;
struct menudialog g_MpChangeSimulantMenuDialog;
struct menudialog g_MpChangeTeamNameMenuDialog;
struct menudialog g_MpEditSimulantMenuDialog;
struct menudialog g_MpSaveSetupNameMenuDialog;
struct menudialogdef g_MpAddSimulantMenuDialog;
struct menudialogdef g_MpChangeSimulantMenuDialog;
struct menudialogdef g_MpChangeTeamNameMenuDialog;
struct menudialogdef g_MpEditSimulantMenuDialog;
struct menudialogdef g_MpSaveSetupNameMenuDialog;
s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data)
{
@@ -62,7 +62,7 @@ struct menuitem g_MpDropOutMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpDropOutMenuDialog = {
struct menudialogdef g_MpDropOutMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_195, // "Drop Out"
g_MpDropOutMenuItems,
@@ -630,7 +630,7 @@ s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handl
g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum, true);
}
s32 menudialog0017a174(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -638,11 +638,11 @@ s32 menudialog0017a174(s32 operation, struct menudialog *dialog, union handlerda
case MENUOP_CLOSE:
break;
case MENUOP_TICK:
if (g_Menus[g_MpPlayerNum].curframe->dialog == dialog
&& g_Menus[g_MpPlayerNum].curframe->focuseditem != &dialog->items[1]
&& g_Menus[g_MpPlayerNum].curframe->focuseditem != &dialog->items[2]) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[1]
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[2]) {
union handlerdata data;
menuhandlerMpCharacterBody(MENUOP_11, &dialog->items[2], &data);
menuhandlerMpCharacterBody(MENUOP_11, &dialogdef->items[2], &data);
}
}
@@ -972,7 +972,7 @@ s32 mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *
return 0;
}
char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog)
char *mpMenuTitleStatsForPlayerName(struct menudialogdef *dialogdef)
{
// "Stats for %s"
sprintf(g_StringPointer, langGet(L_MPMENU_145), g_PlayerConfigsArray[g_MpPlayerNum].base.name);
@@ -998,7 +998,7 @@ struct menuitem g_MpSavePlayerMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSavePlayerMenuDialog = {
struct menudialogdef g_MpSavePlayerMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_190, // "Confirm"
g_MpSavePlayerMenuItems,
@@ -1013,7 +1013,7 @@ struct menuitem g_MpSaveSetupNameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSaveSetupNameMenuDialog = {
struct menudialogdef g_MpSaveSetupNameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_188, // "Game File Name"
g_MpSaveSetupNameMenuItems,
@@ -1034,7 +1034,7 @@ struct menuitem g_MpSaveSetupExistsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSaveSetupExistsMenuDialog = {
struct menudialogdef g_MpSaveSetupExistsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_183, // "Save Game Setup"
g_MpSaveSetupExistsMenuItems,
@@ -1058,7 +1058,7 @@ struct menuitem g_MpWeaponsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpWeaponsMenuDialog = {
struct menudialogdef g_MpWeaponsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_173, // "Weapons"
g_MpWeaponsMenuItems,
@@ -1080,7 +1080,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpQuickTeamWeaponsMenuDialog = {
struct menudialogdef g_MpQuickTeamWeaponsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_173, // "Weapons"
g_MpQuickTeamWeaponsMenuItems,
@@ -1099,7 +1099,7 @@ struct menuitem g_MpPlayerOptionsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPlayerOptionsMenuDialog = {
struct menudialogdef g_MpPlayerOptionsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_167, // "Options"
g_MpPlayerOptionsMenuItems,
@@ -1127,7 +1127,7 @@ struct menuitem g_MpControlMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpControlMenuDialog = {
struct menudialogdef g_MpControlMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_199, // "Control"
g_MpControlMenuItems,
@@ -1141,7 +1141,7 @@ struct menuitem g_MpCompletedChallengesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpCompletedChallengesMenuDialog = {
struct menudialogdef g_MpCompletedChallengesMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_165, // "Completed Challenges"
g_MpCompletedChallengesMenuItems,
@@ -1245,7 +1245,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPlayerStatsMenuDialog = {
struct menudialogdef g_MpPlayerStatsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&mpMenuTitleStatsForPlayerName,
g_MpPlayerStatsMenuItems,
@@ -1699,7 +1699,7 @@ s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, u
return 0;
}
s32 menudialogMpReady(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
if (g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid && g_PlayerConfigsArray[g_MpPlayerNum].fileguid.deviceserial) {
@@ -1710,7 +1710,7 @@ s32 menudialogMpReady(s32 operation, struct menudialog *dialog, union handlerdat
return false;
}
s32 menudialogMpSimulant(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if ((u8)g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.name[0] == '\0') {
@@ -1728,7 +1728,7 @@ struct menuitem g_MpCharacterMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpCharacterMenuDialog = {
struct menudialogdef g_MpCharacterMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_143, // "Character"
g_MpCharacterMenuItems,
@@ -1742,7 +1742,7 @@ struct menuitem g_MpPlayerNameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPlayerNameMenuDialog = {
struct menudialogdef g_MpPlayerNameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_142, // "Player Name"
g_MpPlayerNameMenuItems,
@@ -1757,7 +1757,7 @@ struct menuitem g_MpLoadSettingsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpLoadSettingsMenuDialog = {
struct menudialogdef g_MpLoadSettingsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_139, // "Load Game Settings"
g_MpLoadSettingsMenuItems,
@@ -1772,7 +1772,7 @@ struct menuitem g_MpLoadPresetMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpLoadPresetMenuDialog = {
struct menudialogdef g_MpLoadPresetMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_139, // "Load Game Settings"
g_MpLoadPresetMenuItems,
@@ -1787,7 +1787,7 @@ struct menuitem g_MpLoadPlayerMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpLoadPlayerMenuDialog = {
struct menudialogdef g_MpLoadPlayerMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_137, // "Load Player"
g_MpLoadPlayerMenuItems,
@@ -1801,7 +1801,7 @@ struct menuitem g_MpArenaMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpArenaMenuDialog = {
struct menudialogdef g_MpArenaMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_115, // "Arena"
g_MpArenaMenuItems,
@@ -1820,7 +1820,7 @@ struct menuitem g_MpLimitsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpLimitsMenuDialog = {
struct menudialogdef g_MpLimitsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_107, // "Limits"
g_MpLimitsMenuItems,
@@ -1840,7 +1840,7 @@ struct menuitem g_MpHandicapsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpHandicapsMenuDialog = {
struct menudialogdef g_MpHandicapsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPWEAPONS_184, // "Player Handicaps"
g_MpHandicapsMenuItems,
@@ -1854,7 +1854,7 @@ struct menuitem g_MpReadyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpReadyMenuDialog = {
struct menudialogdef g_MpReadyMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPMENU_105, // "Ready!"
g_MpReadyMenuItems,
@@ -2011,19 +2011,19 @@ s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handle
false);
}
s32 menudialog0017ccfc(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_TICK:
if (g_Menus[g_MpPlayerNum].curframe->dialog == dialog
&& g_Menus[g_MpPlayerNum].curframe->focuseditem != &dialog->items[0]
&& g_Menus[g_MpPlayerNum].curframe->focuseditem != &dialog->items[1]) {
if (g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[0]
&& g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[1]) {
union handlerdata data;
menuhandlerMpCharacterBody(MENUOP_11, &dialog->items[1], &data);
menuhandlerMpCharacterBody(MENUOP_11, &dialogdef->items[1], &data);
}
}
return menudialogMpSimulant(operation, dialog, data);
return menudialogMpSimulant(operation, dialogdef, data);
}
s32 mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data)
@@ -2081,7 +2081,7 @@ s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union hand
return 0;
}
char *mpMenuTitleEditSimulant(struct menudialog *dialog)
char *mpMenuTitleEditSimulant(struct menudialogdef *dialogdef)
{
sprintf(g_StringPointer, "%s", &g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.name);
return g_StringPointer;
@@ -2190,7 +2190,7 @@ char *func0f17d3dc(struct menuitem *item)
return g_StringPointer;
}
s32 menudialogMpSimulants(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Menus[g_MpPlayerNum].mpsetup.slotcount = 0;
@@ -2205,7 +2205,7 @@ struct menuitem g_MpAddChangeSimulantMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpAddSimulantMenuDialog = {
struct menudialogdef g_MpAddSimulantMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_101, // "Add Simulant"
g_MpAddChangeSimulantMenuItems,
@@ -2214,7 +2214,7 @@ struct menudialog g_MpAddSimulantMenuDialog = {
NULL,
};
struct menudialog g_MpChangeSimulantMenuDialog = {
struct menudialogdef g_MpChangeSimulantMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_102, // "Change Simulant"
g_MpAddChangeSimulantMenuItems,
@@ -2229,7 +2229,7 @@ struct menuitem g_MpSimulantCharacterMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSimulantCharacterMenuDialog = {
struct menudialogdef g_MpSimulantCharacterMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_100, // "Simulant Character"
g_MpSimulantCharacterMenuItems,
@@ -2248,7 +2248,7 @@ struct menuitem g_MpEditSimulantMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpEditSimulantMenuDialog = {
struct menudialogdef g_MpEditSimulantMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&mpMenuTitleEditSimulant,
g_MpEditSimulantMenuItems,
@@ -2274,7 +2274,7 @@ struct menuitem g_MpSimulantsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSimulantsMenuDialog = {
struct menudialogdef g_MpSimulantsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_083, // "Simulants"
g_MpSimulantsMenuItems,
@@ -2722,7 +2722,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpAutoTeamMenuDialog = {
struct menudialogdef g_MpAutoTeamMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_075, // "Auto Team"
g_MpAutoTeamMenuItems,
@@ -2753,7 +2753,7 @@ struct menuitem g_MpTeamsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpTeamsMenuDialog = {
struct menudialogdef g_MpTeamsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_070, // "Team Control"
g_MpTeamsMenuItems,
@@ -2868,7 +2868,7 @@ s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerd
return 0;
}
s32 menudialogMpSelectTune(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
var800840e0 = 80;
@@ -2978,7 +2978,7 @@ s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handle
return 0;
}
char *func0f17e318(struct menudialog *dialog)
char *func0f17e318(struct menudialogdef *dialogdef)
{
sprintf(g_StringPointer, langGet(L_MPMENU_056), mpGetChallengeNameBySlot(g_Menus[g_MpPlayerNum].mpsetup.slotindex));
return g_StringPointer;
@@ -3001,7 +3001,7 @@ s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata
return 0;
}
s32 menudialog0017e3fc(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -3029,7 +3029,7 @@ struct menuitem g_MpSelectTunesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSelectTunesMenuDialog = {
struct menudialogdef g_MpSelectTunesMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&mpMenuTextSelectTuneOrTunes,
g_MpSelectTunesMenuItems,
@@ -3049,7 +3049,7 @@ struct menuitem g_MpSoundtrackMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpSoundtrackMenuDialog = {
struct menudialogdef g_MpSoundtrackMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_062, // "Soundtrack"
g_MpSoundtrackMenuItems,
@@ -3063,7 +3063,7 @@ struct menuitem g_MpChangeTeamNameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpChangeTeamNameMenuDialog = {
struct menudialogdef g_MpChangeTeamNameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_061, // "Change Team Name"
g_MpChangeTeamNameMenuItems,
@@ -3086,7 +3086,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpTeamNamesMenuDialog = {
struct menudialogdef g_MpTeamNamesMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_059, // "Team Names"
g_MpTeamNamesMenuItems,
@@ -3103,7 +3103,7 @@ struct menuitem g_MpConfirmChallengeViaListOrDetailsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpConfirmChallengeViaListOrDetailsMenuDialog = {
struct menudialogdef g_MpConfirmChallengeViaListOrDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&func0f17e318,
g_MpConfirmChallengeViaListOrDetailsMenuItems,
@@ -3124,7 +3124,7 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpChallengeListOrDetailsMenuDialog = {
struct menudialogdef g_MpChallengeListOrDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
#if VERSION >= VERSION_NTSC_1_0
(u32)&mpMenuTextChallengeName,
@@ -3141,9 +3141,9 @@ struct menudialog g_MpChallengeListOrDetailsMenuDialog = {
NULL,
};
struct menudialog g_MpAdvancedSetupViaAdvChallengeMenuDialog;
struct menudialogdef g_MpAdvancedSetupViaAdvChallengeMenuDialog;
struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = {
struct menudialogdef g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
#if VERSION >= VERSION_NTSC_1_0
(u32)&mpMenuTextChallengeName,
@@ -3169,7 +3169,7 @@ struct menuitem g_MpConfirmChallengeMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpConfirmChallengeMenuDialog = {
struct menudialogdef g_MpConfirmChallengeMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&func0f17e318,
g_MpConfirmChallengeMenuItems,
@@ -3344,12 +3344,12 @@ char *mpMenuTextChallengeName(struct menuitem *item)
return g_StringPointer;
}
s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_TICK) {
if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE
&& g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == dialog
&& g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef
&& !mpIsChallengeLoaded()) {
g_Menus[g_MpPlayerNum].unk850 = 0x4fac5ace;
@@ -3383,7 +3383,7 @@ struct menuitem g_MpChallengesMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpChallengesMenuDialog = {
struct menudialogdef g_MpChallengesMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_050, // "Combat Challenges"
g_MpChallengesMenuItems,
@@ -3504,7 +3504,7 @@ char *mpMenuTextWeaponSetName(struct menuitem *item)
return mpGetWeaponSetName(mpGetWeaponSet());
}
s32 menudialogMpGameSetup(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Vars.mpsetupmenu = MPSETUPMENU_ADVSETUP;
@@ -3514,7 +3514,7 @@ s32 menudialogMpGameSetup(s32 operation, struct menudialog *dialog, union handle
return false;
}
s32 menudialogMpQuickGo(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Vars.mpsetupmenu = MPSETUPMENU_QUICKGO;
@@ -3803,7 +3803,7 @@ s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union han
return 0;
}
s32 menudialogCombatSimulator(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_OPEN) {
g_Vars.waitingtojoin[0] = false;
@@ -3812,8 +3812,8 @@ s32 menudialogCombatSimulator(s32 operation, struct menudialog *dialog, union ha
g_Vars.waitingtojoin[3] = false;
}
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == &g_CombatSimulatorMenuDialog
if (g_Menus[g_MpPlayerNum].curdialog
&& g_Menus[g_MpPlayerNum].curdialog->definition == &g_CombatSimulatorMenuDialog
&& operation == MENUOP_TICK) {
g_Vars.mpsetupmenu = MPSETUPMENU_GENERAL;
g_Vars.mpquickteam = MPQUICKTEAM_NONE;
@@ -3850,7 +3850,7 @@ void mpCloseDialogsForNewSetup(void)
g_MpPlayerNum = i;
// If they have a menu open
if (g_Menus[g_MpPlayerNum].curframe) {
if (g_Menus[g_MpPlayerNum].curdialog) {
bool ok = false;
// Repeat the following steps until we've stopped finding dialogs
@@ -3863,19 +3863,19 @@ void mpCloseDialogsForNewSetup(void)
// Loop through the siblings (left/right) in this layer
for (k = 0; k < g_Menus[g_MpPlayerNum].layers[j].numsiblings; k++) {
if (g_Menus[g_MpPlayerNum].layers[j].siblings[k]) {
struct menudialog *dialog = g_Menus[g_MpPlayerNum].layers[j].siblings[k]->dialog;
struct menudialogdef *dialogdef = g_Menus[g_MpPlayerNum].layers[j].siblings[k]->definition;
if (dialog == &g_MpSaveSetupNameMenuDialog) ok = false;
if (dialog == &g_MpSaveSetupExistsMenuDialog) ok = false;
if (dialog == &g_MpAddSimulantMenuDialog) ok = false;
if (dialog == &g_MpChangeSimulantMenuDialog) ok = false;
if (dialog == &g_MpEditSimulantMenuDialog) ok = false;
if (dialog == &g_MpCombatOptionsMenuDialog) ok = false;
if (dialog == &g_HtbOptionsMenuDialog) ok = false;
if (dialog == &g_CtcOptionsMenuDialog) ok = false;
if (dialog == &g_KohOptionsMenuDialog) ok = false;
if (dialog == &g_HtmOptionsMenuDialog) ok = false;
if (dialog == &g_PacOptionsMenuDialog) ok = false;
if (dialogdef == &g_MpSaveSetupNameMenuDialog) ok = false;
if (dialogdef == &g_MpSaveSetupExistsMenuDialog) ok = false;
if (dialogdef == &g_MpAddSimulantMenuDialog) ok = false;
if (dialogdef == &g_MpChangeSimulantMenuDialog) ok = false;
if (dialogdef == &g_MpEditSimulantMenuDialog) ok = false;
if (dialogdef == &g_MpCombatOptionsMenuDialog) ok = false;
if (dialogdef == &g_HtbOptionsMenuDialog) ok = false;
if (dialogdef == &g_CtcOptionsMenuDialog) ok = false;
if (dialogdef == &g_KohOptionsMenuDialog) ok = false;
if (dialogdef == &g_HtmOptionsMenuDialog) ok = false;
if (dialogdef == &g_PacOptionsMenuDialog) ok = false;
}
}
}
@@ -3891,7 +3891,7 @@ void mpCloseDialogsForNewSetup(void)
g_MpPlayerNum = prevplayernum;
}
struct menudialog g_MpAbortMenuDialog;
struct menudialogdef g_MpAbortMenuDialog;
struct menuitem g_MpStuffMenuItems[] = {
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_041, 0x00000000, (void *)&g_MpSoundtrackMenuDialog }, // "Soundtrack"
@@ -3907,7 +3907,7 @@ struct menuitem g_MpStuffMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpStuffMenuDialog = {
struct menudialogdef g_MpStuffMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_040, // "Stuff"
g_MpStuffMenuItems,
@@ -3916,7 +3916,7 @@ struct menudialog g_MpStuffMenuDialog = {
&g_MpChallengeListOrDetailsMenuDialog,
};
struct menudialog g_MpStuffViaAdvChallengeMenuDialog = {
struct menudialogdef g_MpStuffViaAdvChallengeMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_040, // "Stuff"
g_MpStuffMenuItems,
@@ -3937,7 +3937,7 @@ struct menuitem g_MpPlayerSetup234MenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpPlayerSetupViaAdvMenuDialog = {
struct menudialogdef g_MpPlayerSetupViaAdvMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_028, // "Player Setup"
g_MpPlayerSetup234MenuItems,
@@ -3946,7 +3946,7 @@ struct menudialog g_MpPlayerSetupViaAdvMenuDialog = {
&g_MpStuffMenuDialog,
};
struct menudialog g_MpPlayerSetupViaAdvChallengeMenuDialog = {
struct menudialogdef g_MpPlayerSetupViaAdvChallengeMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_028, // "Player Setup"
g_MpPlayerSetup234MenuItems,
@@ -3955,7 +3955,7 @@ struct menudialog g_MpPlayerSetupViaAdvChallengeMenuDialog = {
&g_MpStuffViaAdvChallengeMenuDialog,
};
struct menudialog g_MpPlayerSetupViaQuickGoMenuDialog = {
struct menudialogdef g_MpPlayerSetupViaQuickGoMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_028, // "Player Setup"
g_MpPlayerSetup234MenuItems,
@@ -3971,7 +3971,7 @@ struct menuitem g_MpAbortMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpAbortMenuDialog = {
struct menudialogdef g_MpAbortMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_052, // "Abort"
g_MpAbortMenuItems,
@@ -3995,7 +3995,7 @@ struct menuitem g_MpAdvancedSetupMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpAdvancedSetupMenuDialog = {
struct menudialogdef g_MpAdvancedSetupMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_017, // "Game Setup"
g_MpAdvancedSetupMenuItems,
@@ -4004,7 +4004,7 @@ struct menudialog g_MpAdvancedSetupMenuDialog = {
&g_MpPlayerSetupViaAdvMenuDialog,
};
struct menudialog g_MpAdvancedSetupViaAdvChallengeMenuDialog = {
struct menudialogdef g_MpAdvancedSetupViaAdvChallengeMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_017, // "Game Setup"
g_MpAdvancedSetupMenuItems,
@@ -4023,7 +4023,7 @@ struct menuitem g_MpQuickGoMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpQuickGoMenuDialog = {
struct menudialogdef g_MpQuickGoMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MISC_460, // "Quick Go"
g_MpQuickGoMenuItems,
@@ -4053,7 +4053,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpQuickTeamGameSetupMenuDialog = {
struct menudialogdef g_MpQuickTeamGameSetupMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_017, // "Game Setup"
g_MpQuickTeamGameSetupMenuItems,
@@ -4072,7 +4072,7 @@ struct menuitem g_MpQuickTeamMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_MpQuickTeamMenuDialog = {
struct menudialogdef g_MpQuickTeamMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MISC_462, // "Quick Team"
g_MpQuickTeamMenuItems,
@@ -4089,7 +4089,7 @@ struct menuitem g_CombatSimulatorMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_CombatSimulatorMenuDialog = {
struct menudialogdef g_CombatSimulatorMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MISC_445, // "Combat Simulator"
g_CombatSimulatorMenuItems,
src/game/options.c
+5 -5
View File
@@ -240,15 +240,15 @@ s32 optionsGetEffectiveScreenSize(void)
if (g_MenuData.root == MENUROOT_TRAINING) {
g_MpPlayerNum = 0;
if (g_Menus[g_MpPlayerNum].curframe && var8009dfc0) {
if (g_Menus[g_MpPlayerNum].curdialog && var8009dfc0) {
return SCREENSIZE_FULL;
}
}
if (g_Menus[g_MpPlayerNum].curframe && (
g_Menus[g_MpPlayerNum].curframe->dialog == &g_CiControlStylePlayer2MenuDialog ||
g_Menus[g_MpPlayerNum].curframe->dialog == &g_CiControlStyleMenuDialog ||
g_Menus[g_MpPlayerNum].curframe->dialog == &g_SoloMissionControlStyleMenuDialog)) {
if (g_Menus[g_MpPlayerNum].curdialog && (
g_Menus[g_MpPlayerNum].curdialog->definition == &g_CiControlStylePlayer2MenuDialog ||
g_Menus[g_MpPlayerNum].curdialog->definition == &g_CiControlStyleMenuDialog ||
g_Menus[g_MpPlayerNum].curdialog->definition == &g_SoloMissionControlStyleMenuDialog)) {
return SCREENSIZE_FULL;
}
src/game/training/menus.c
+39 -39
View File
@@ -24,10 +24,10 @@
#include "data.h"
#include "types.h"
struct menudialog g_BioProfileMenuDialog;
struct menudialog g_BioTextMenuDialog;
struct menudialog g_HangarLocationDetailsMenuDialog;
struct menudialog g_HangarVehicleDetailsMenuDialog;
struct menudialogdef g_BioProfileMenuDialog;
struct menudialogdef g_BioTextMenuDialog;
struct menudialogdef g_HangarLocationDetailsMenuDialog;
struct menudialogdef g_HangarVehicleDetailsMenuDialog;
s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data)
{
@@ -82,7 +82,7 @@ s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *
return 0;
}
struct menudialog g_FrDifficultyMenuDialog;
struct menudialogdef g_FrDifficultyMenuDialog;
s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data)
{
@@ -207,7 +207,7 @@ s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerd
return 0;
}
s32 frTrainingInfoMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
u32 stack;
s32 weaponnum;
@@ -223,7 +223,7 @@ s32 frTrainingInfoMenuDialog(s32 operation, struct menudialog *dialog, union han
}
break;
case MENUOP_TICK:
if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
g_Menus[g_MpPlayerNum].unkdb4 -= g_Vars.diffframe60;
g_Menus[g_MpPlayerNum].unkd8c = 18.849555969238f * var80061630;
g_Menus[g_MpPlayerNum].unkd64 = 18.849555969238f * var80061630;
@@ -241,7 +241,7 @@ s32 frTrainingInfoMenuDialog(s32 operation, struct menudialog *dialog, union han
return 0;
}
s32 frTrainingStatsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_CLOSE) {
if (frIsInTraining() == false) {
@@ -869,7 +869,7 @@ struct menuitem g_FrDifficultyMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FrDifficultyMenuDialog = {
struct menudialogdef g_FrDifficultyMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_442, // "Difficulty"
g_FrDifficultyMenuItems,
@@ -883,7 +883,7 @@ struct menuitem g_FrWeaponListMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FrWeaponListMenuDialog = {
struct menudialogdef g_FrWeaponListMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_446, // "Weapon"
g_FrWeaponListMenuItems,
@@ -906,7 +906,7 @@ struct menuitem g_FrTrainingInfoInGameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FrTrainingInfoInGameMenuDialog = {
struct menudialogdef g_FrTrainingInfoInGameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_447, // "Training Info"
g_FrTrainingInfoInGameMenuItems,
@@ -929,7 +929,7 @@ struct menuitem g_FrTrainingInfoPreGameMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FrTrainingInfoPreGameMenuDialog = {
struct menudialogdef g_FrTrainingInfoPreGameMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_447, // "Training Info"
g_FrTrainingInfoPreGameMenuItems,
@@ -959,7 +959,7 @@ struct menuitem g_FrCompletedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FrCompletedMenuDialog = {
struct menudialogdef g_FrCompletedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPMENU_448, // "Training Stats"
g_FrCompletedMenuItems,
@@ -994,7 +994,7 @@ struct menuitem g_FrFailedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_FrFailedMenuDialog = {
struct menudialogdef g_FrFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_448, // "Training Stats"
g_FrFailedMenuItems,
@@ -1064,7 +1064,7 @@ struct menuitem g_BioListMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_BioListMenuDialog = {
struct menudialogdef g_BioListMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_418, // "Information"
g_BioListMenuItems,
@@ -1080,7 +1080,7 @@ struct menuitem g_NowSafeMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_NowSafeMenuDialog = {
struct menudialogdef g_NowSafeMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_436, // "Cheats"
g_NowSafeMenuItems,
@@ -1089,7 +1089,7 @@ struct menudialog g_NowSafeMenuDialog = {
NULL,
};
s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
u32 bodynum = ciGetChrBioBodynumBySlot(g_ChrBioSlot);
u32 mpbodynum = mpGetMpbodynumByBodynum(bodynum);
@@ -1308,7 +1308,7 @@ struct menuitem g_BioProfileMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_BioProfileMenuDialog = {
struct menudialogdef g_BioProfileMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_431, // "Character Profile"
g_BioProfileMenuItems,
@@ -1324,7 +1324,7 @@ struct menuitem g_BioTextMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_BioTextMenuDialog = {
struct menudialogdef g_BioTextMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&ciMenuTextMiscBioName,
g_BioTextMenuItems,
@@ -1338,7 +1338,7 @@ struct menuitem g_DtListMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_DtListMenuDialog = {
struct menudialogdef g_DtListMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_417, // "Device List"
g_DtListMenuItems,
@@ -1347,7 +1347,7 @@ struct menudialog g_DtListMenuDialog = {
NULL,
};
s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -1392,7 +1392,7 @@ s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialog *dialog, union
case MENUOP_CLOSE:
break;
case MENUOP_TICK:
if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
s32 weaponnum = dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot));
if (weaponnum == WEAPON_DISGUISE41) {
@@ -1456,7 +1456,7 @@ char *dtMenuTextTimeTakenValue(struct menuitem *item)
return g_StringPointer;
}
s32 menudialogDeviceTrainingResults(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_CLOSE) {
chrSetStageFlag(NULL, 0x08000000);
@@ -1517,7 +1517,7 @@ s32 menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata
return 0;
}
s32 menudialog001a6aa4(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
switch (operation) {
case MENUOP_OPEN:
@@ -1574,7 +1574,7 @@ char *htMenuTextTimeTakenValue(struct menuitem *item)
return g_StringPointer;
}
s32 menudialogFiringRangeResults(s32 operation, struct menudialog *dialog, union handlerdata *data)
s32 menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{
if (operation == MENUOP_CLOSE) {
chrSetStageFlag(NULL, 0x08000000);
@@ -1618,7 +1618,7 @@ struct menuitem g_DtDetailsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_DtDetailsMenuDialog = {
struct menudialogdef g_DtDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&dtMenuTextName,
g_DtDetailsMenuItems,
@@ -1636,7 +1636,7 @@ struct menuitem g_DtFailedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_DtFailedMenuDialog = {
struct menudialogdef g_DtFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_423, // "Training Stats"
g_DtFailedMenuItems,
@@ -1654,7 +1654,7 @@ struct menuitem g_DtCompletedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_DtCompletedMenuDialog = {
struct menudialogdef g_DtCompletedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPMENU_423, // "Training Stats"
g_DtCompletedMenuItems,
@@ -1668,7 +1668,7 @@ struct menuitem g_HtListMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HtListMenuDialog = {
struct menudialogdef g_HtListMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_416, // "Holotraining"
g_HtListMenuItems,
@@ -1686,7 +1686,7 @@ struct menuitem g_HtDetailsMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HtDetailsMenuDialog = {
struct menudialogdef g_HtDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&htMenuTextName,
g_HtDetailsMenuItems,
@@ -1704,7 +1704,7 @@ struct menuitem g_HtFailedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HtFailedMenuDialog = {
struct menudialogdef g_HtFailedMenuDialog = {
MENUDIALOGTYPE_DANGER,
L_MPMENU_423, // "Training Stats"
g_HtFailedMenuItems,
@@ -1722,7 +1722,7 @@ struct menuitem g_HtCompletedMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HtCompletedMenuDialog = {
struct menudialogdef g_HtCompletedMenuDialog = {
MENUDIALOGTYPE_SUCCESS,
L_MPMENU_423, // "Training Stats"
g_HtCompletedMenuItems,
@@ -2276,7 +2276,7 @@ struct hoverprop hoverprops[] = {
};
// Can't match the 4bc part
//s32 ciHangarHolographMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data)
//s32 ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
//{
// s32 index = ciGetHangarBioIndexBySlot(g_HangarBioSlot);
//
@@ -2299,7 +2299,7 @@ struct hoverprop hoverprops[] = {
// case MENUOP_CLOSE:
// break;
// case MENUOP_TICK:
// if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
// if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) {
// // 4bc
// index -= 14;
// g_Menus[g_MpPlayerNum].unkd54 = props[index].y_offset;
@@ -2317,7 +2317,7 @@ struct hoverprop hoverprops[] = {
// return 0;
//}
struct menudialog *ciGetFrWeaponListMenuDialog(void)
struct menudialogdef *ciGetFrWeaponListMenuDialog(void)
{
return &g_FrWeaponListMenuDialog;
}
@@ -2338,7 +2338,7 @@ struct menuitem g_HangarVehicleHolographMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HangarVehicleHolographMenuDialog = {
struct menudialogdef g_HangarVehicleHolographMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MISC_471, // "Holograph"
g_HangarVehicleHolographMenuItems,
@@ -2347,7 +2347,7 @@ struct menudialog g_HangarVehicleHolographMenuDialog = {
NULL,
};
struct menudialog g_HangarVehicleDetailsMenuDialog = {
struct menudialogdef g_HangarVehicleDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&bioMenuTextName,
g_HangarDetailsMenuItems,
@@ -2356,7 +2356,7 @@ struct menudialog g_HangarVehicleDetailsMenuDialog = {
&g_HangarVehicleHolographMenuDialog,
};
struct menudialog g_HangarLocationDetailsMenuDialog = {
struct menudialogdef g_HangarLocationDetailsMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
(u32)&bioMenuTextName,
g_HangarDetailsMenuItems,
@@ -2370,7 +2370,7 @@ struct menuitem g_HangarListMenuItems[] = {
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
struct menudialog g_HangarListMenuDialog = {
struct menudialogdef g_HangarListMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
L_MPMENU_415, // "Hangar Information"
g_HangarListMenuItems,
src/include/data.h
+70 -70
View File
@@ -285,30 +285,30 @@ extern char g_StringPointer2[];
extern s32 g_MpPlayerNum;
extern u32 g_MpNumJoined;
extern u16 g_ControlStyleOptions[];
extern struct menudialog g_PreAndPostMissionBriefingMenuDialog;
extern struct menudialogdef g_PreAndPostMissionBriefingMenuDialog;
extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES];
extern struct mission missions[];
extern struct menudialog g_SoloMissionControlStyleMenuDialog;
extern struct menudialog g_CiControlStyleMenuDialog;
extern struct menudialog g_CiControlStylePlayer2MenuDialog;
extern struct menudialog g_ChangeAgentMenuDialog;
extern struct menudialog g_2PMissionOptionsHMenuDialog;
extern struct menudialog g_2PMissionOptionsVMenuDialog;
extern struct menudialog g_FrWeaponsAvailableMenuDialog;
extern struct menudialog g_SoloMissionPauseMenuDialog;
extern struct menudialog g_2PMissionPauseHMenuDialog;
extern struct menudialog g_2PMissionPauseVMenuDialog;
extern struct menudialogdef g_SoloMissionControlStyleMenuDialog;
extern struct menudialogdef g_CiControlStyleMenuDialog;
extern struct menudialogdef g_CiControlStylePlayer2MenuDialog;
extern struct menudialogdef g_ChangeAgentMenuDialog;
extern struct menudialogdef g_2PMissionOptionsHMenuDialog;
extern struct menudialogdef g_2PMissionOptionsVMenuDialog;
extern struct menudialogdef g_FrWeaponsAvailableMenuDialog;
extern struct menudialogdef g_SoloMissionPauseMenuDialog;
extern struct menudialogdef g_2PMissionPauseHMenuDialog;
extern struct menudialogdef g_2PMissionPauseVMenuDialog;
extern struct cutscene g_Cutscenes[];
extern struct menudialog g_CiMenuViaPcMenuDialog;
extern struct menudialog g_CiMenuViaPauseMenuDialog;
extern struct menudialog g_CheatsMenuDialog;
extern struct menudialog g_PakChoosePakMenuDialog;
extern struct menudialog g_FilemgrFileSelect4MbMenuDialog;
extern struct menudialog g_MpQuickGo4MbMenuDialog;
extern struct menudialog g_MpConfirmChallenge4MbMenuDialog;
extern struct menudialog g_MainMenu4MbMenuDialog;
extern struct menudialog g_MpEditSimulant4MbMenuDialog;
extern struct menudialog g_AdvancedSetup4MbMenuDialog;
extern struct menudialogdef g_CiMenuViaPcMenuDialog;
extern struct menudialogdef g_CiMenuViaPauseMenuDialog;
extern struct menudialogdef g_CheatsMenuDialog;
extern struct menudialogdef g_PakChoosePakMenuDialog;
extern struct menudialogdef g_FilemgrFileSelect4MbMenuDialog;
extern struct menudialogdef g_MpQuickGo4MbMenuDialog;
extern struct menudialogdef g_MpConfirmChallenge4MbMenuDialog;
extern struct menudialogdef g_MainMenu4MbMenuDialog;
extern struct menudialogdef g_MpEditSimulant4MbMenuDialog;
extern struct menudialogdef g_AdvancedSetup4MbMenuDialog;
extern struct filelist *g_FileLists[];
extern bool var80075bd0[];
extern struct var80075c00 var80075c00[];
@@ -461,41 +461,41 @@ extern struct surfacetype *g_SurfaceTypes[15];
extern void *var800844f0;
extern f32 var800845d4;
extern u32 var800845dc;
extern struct menudialog g_2PMissionInventoryHMenuDialog;
extern struct menudialog g_2PMissionInventoryVMenuDialog;
extern struct menudialog g_MpEndscreenChallengeCheatedMenuDialog;
extern struct menudialog g_MpEndscreenChallengeFailedMenuDialog;
extern struct menudialog g_MpDropOutMenuDialog;
extern struct menudialogdef g_2PMissionInventoryHMenuDialog;
extern struct menudialogdef g_2PMissionInventoryVMenuDialog;
extern struct menudialogdef g_MpEndscreenChallengeCheatedMenuDialog;
extern struct menudialogdef g_MpEndscreenChallengeFailedMenuDialog;
extern struct menudialogdef g_MpDropOutMenuDialog;
extern struct mparena g_MpArenas[];
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 g_MpSimulantsMenuDialog;
extern struct menudialog g_MpTeamsMenuDialog;
extern struct menudialog g_MpChallengeListOrDetailsMenuDialog;
extern struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog;
extern struct menudialog g_MpAdvancedSetupMenuDialog;
extern struct menudialog g_MpQuickGoMenuDialog;
extern struct menudialog g_MpQuickTeamGameSetupMenuDialog;
extern struct menudialog g_MpQuickTeamMenuDialog;
extern struct menudialog g_CombatSimulatorMenuDialog;
extern struct menudialog g_MpCombatOptionsMenuDialog;
extern struct menudialog g_HtbOptionsMenuDialog;
extern struct menudialog g_CtcOptionsMenuDialog;
extern struct menudialog g_KohOptionsMenuDialog;
extern struct menudialog g_HtmOptionsMenuDialog;
extern struct menudialog g_PacOptionsMenuDialog;
extern struct menudialog g_MpScenarioMenuDialog;
extern struct menudialog g_MpQuickTeamScenarioMenuDialog;
extern struct menudialogdef g_MpWeaponsMenuDialog;
extern struct menudialogdef g_MpPlayerOptionsMenuDialog;
extern struct menudialogdef g_MpControlMenuDialog;
extern struct menudialogdef g_MpPlayerStatsMenuDialog;
extern struct menudialogdef g_MpPlayerNameMenuDialog;
extern struct menudialogdef g_MpLoadSettingsMenuDialog;
extern struct menudialogdef g_MpLoadPresetMenuDialog;
extern struct menudialogdef g_MpLoadPlayerMenuDialog;
extern struct menudialogdef g_MpArenaMenuDialog;
extern struct menudialogdef g_MpLimitsMenuDialog;
extern struct menudialogdef g_MpHandicapsMenuDialog;
extern struct menudialogdef g_MpReadyMenuDialog;
extern struct menudialogdef g_MpSimulantsMenuDialog;
extern struct menudialogdef g_MpTeamsMenuDialog;
extern struct menudialogdef g_MpChallengeListOrDetailsMenuDialog;
extern struct menudialogdef g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog;
extern struct menudialogdef g_MpAdvancedSetupMenuDialog;
extern struct menudialogdef g_MpQuickGoMenuDialog;
extern struct menudialogdef g_MpQuickTeamGameSetupMenuDialog;
extern struct menudialogdef g_MpQuickTeamMenuDialog;
extern struct menudialogdef g_CombatSimulatorMenuDialog;
extern struct menudialogdef g_MpCombatOptionsMenuDialog;
extern struct menudialogdef g_HtbOptionsMenuDialog;
extern struct menudialogdef g_CtcOptionsMenuDialog;
extern struct menudialogdef g_KohOptionsMenuDialog;
extern struct menudialogdef g_HtmOptionsMenuDialog;
extern struct menudialogdef g_PacOptionsMenuDialog;
extern struct menudialogdef g_MpScenarioMenuDialog;
extern struct menudialogdef g_MpQuickTeamScenarioMenuDialog;
extern s32 var80087260;
extern bool g_MpEnableMusicSwitching;
extern struct mpweapon g_MpWeapons[0x27];
@@ -515,20 +515,20 @@ extern u8 g_ChrBioSlot;
extern u8 g_HangarBioSlot;
extern u8 g_DtSlot;
extern u8 var80088bb4;
extern struct menudialog g_FrWeaponListMenuDialog;
extern struct menudialog g_FrTrainingInfoInGameMenuDialog;
extern struct menudialog g_FrTrainingInfoPreGameMenuDialog;
extern struct menudialog g_FrCompletedMenuDialog;
extern struct menudialog g_FrFailedMenuDialog;
extern struct menudialog g_BioListMenuDialog;
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 struct menudialog g_HangarListMenuDialog;
extern struct menudialogdef g_FrWeaponListMenuDialog;
extern struct menudialogdef g_FrTrainingInfoInGameMenuDialog;
extern struct menudialogdef g_FrTrainingInfoPreGameMenuDialog;
extern struct menudialogdef g_FrCompletedMenuDialog;
extern struct menudialogdef g_FrFailedMenuDialog;
extern struct menudialogdef g_BioListMenuDialog;
extern struct menudialogdef g_DtListMenuDialog;
extern struct menudialogdef g_DtDetailsMenuDialog;
extern struct menudialogdef g_DtFailedMenuDialog;
extern struct menudialogdef g_DtCompletedMenuDialog;
extern struct menudialogdef g_HtListMenuDialog;
extern struct menudialogdef g_HtDetailsMenuDialog;
extern struct menudialogdef g_HtFailedMenuDialog;
extern struct menudialogdef g_HtCompletedMenuDialog;
extern struct menudialogdef g_HangarListMenuDialog;
#endif
src/include/game/activemenu/activemenu.h
+2 -2
View File
@@ -5,8 +5,8 @@
#include "types.h"
void amOpenPickTarget(void);
s32 menudialog000fcd48(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 amPickTargetMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
void amSetAiBuddyTemperament(bool aggressive);
void amSetAiBuddyStealth(void);
s32 amGetFirstBuddyIndex(void);
src/include/game/cheats.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
extern struct menudialog g_CheatsMenuDialog;
extern struct menudialogdef g_CheatsMenuDialog;
u32 cheatIsUnlocked(s32 cheat_id);
bool cheatIsActive(s32 cheat_id);
@@ -18,7 +18,7 @@ s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty);
s32 cheatGetByCompletedStageIndex(s32 stage_index);
s32 cheatGetTime(s32 cheat_id);
char *cheatGetName(s32 cheat_id);
s32 cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data);
s32 cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data);
src/include/game/endscreen.h
+6 -6
View File
@@ -4,16 +4,16 @@
#include "data.h"
#include "types.h"
s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogSolo2PEndscreenCompleted(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogSolo2PEndscreenCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandlerDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerEndscreenCheats(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerContinueMission(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data);
char *menuDialogTitleRetryStageName(struct menudialog *dialog);
char *menuDialogTitleNextMissionStageName(struct menudialog *dialog);
char *menuDialogTitleRetryStageName(struct menudialogdef *dialogdef);
char *menuDialogTitleNextMissionStageName(struct menudialogdef *dialogdef);
char *soloMenuTextNumKills(struct menuitem *item);
char *soloMenuTextNumShots(struct menuitem *item);
char *soloMenuTextNumHeadShots(struct menuitem *item);
@@ -27,7 +27,7 @@ char *menuTitleStageCompleted(struct menuitem *item);
char *menuTextCurrentStageName3(struct menuitem *item);
char *menuTitleStageFailed(struct menuitem *item);
char *soloMenuTextMissionTime(struct menuitem *item);
struct menudialog *func0f10d730(void);
struct menudialogdef *func0f10d730(void);
void func0f10d770(void);
void endscreenHandleContinue(s32 context);
char *soloMenuTextTimedCheatName(struct menuitem *item);
src/include/game/filemgr.h
+5 -5
View File
@@ -52,11 +52,11 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 pakChoosePakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemgrMainMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
src/include/game/game_0f09f0.h
+19 -19
View File
@@ -21,24 +21,24 @@ void func0f0f1418(void);
void func0f0f1494(void);
char *menuResolveText(u32 thing, void *dialogoritem);
char *menuResolveParam2Text(struct menuitem *item);
char *menuResolveDialogTitle(struct menudialog *dialog);
char *menuResolveDialogTitle(struct menudialogdef *dialogdef);
void func0f0f15a4(struct menuitem *item, s32 *arg1);
void func0f0f1618(struct menuitem *item, void *arg1, void *arg2, struct menuframe *frame);
void func0f0f1d6c(struct menudialog *dialog, struct menuframe *frame, struct menu *menu);
void func0f0f1618(struct menuitem *item, void *arg1, void *arg2, struct menudialog *dialog);
void func0f0f1d6c(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu);
u32 func0f0f1ef4(void);
void func0f0f2134(struct menudialog *dialog, struct menuframe *frame, struct menu *menu);
u32 func0f0f2354(struct menuframe *frame, struct menuitem *item, u32 *arg2, u32 *arg3);
void func0f0f2134(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu);
u32 func0f0f2354(struct menudialog *dialog, struct menuitem *item, u32 *arg2, u32 *arg3);
bool menuIsScrollableUnscrollable(struct menuitem *item);
bool menuIsItemDisabled(struct menuitem *item, struct menuframe *frame);
bool func0f0f2674(struct menuitem *item, struct menuframe *frame, u32 arg2);
struct menuitem *func0f0f26fc(s32 arg0, s32 arg1, struct menudialog *dialog, s32 *arg3, struct menuframe *frame);
struct menuitem *func0f0f288c(struct menuframe *frame);
bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog);
bool func0f0f2674(struct menuitem *item, struct menudialog *dialog, u32 arg2);
struct menuitem *func0f0f26fc(s32 arg0, s32 arg1, struct menudialogdef *dialogdef, s32 *arg3, struct menudialog *dialog);
struct menuitem *func0f0f288c(struct menudialog *dialog);
u32 func0f0f2928(void);
u32 func0f0f29cc(void);
u32 func0f0f2b2c(void);
u32 func0f0f2c44(void);
void menuOpenDialog(struct menudialog *dialog, struct menuframe *arg1, struct menu *menu);
void menuPushDialog(struct menudialog *dialog);
void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *arg1, struct menu *menu);
void menuPushDialog(struct menudialogdef *dialogdef);
#if VERSION >= VERSION_NTSC_1_0
bool func0f0f3220(s32 arg0);
@@ -49,7 +49,7 @@ void func0f0f3220(s32 arg0);
void menuCloseDialog(void);
void menuUpdateCurFrame(void);
void menuPopDialog(void);
void func0f0f3704(struct menudialog *dialog);
void func0f0f3704(struct menudialogdef *dialogdef);
void func0f0f372c(u8 *arg0, f32 x, f32 y, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8);
void func0f0f37a4(u8 *arg0);
Gfx *func0f0f38b0(Gfx *gdl, u8 *arg1, u32 arg2);
@@ -59,21 +59,21 @@ u32 func0f0f5360(void);
u32 func0f0f74a8(void);
u32 func0f0f7594(void);
u32 func0f0f7728(void);
void func0f0f7e98(struct menuframe *frame);
void func0f0f7e98(struct menudialog *dialog);
void menuClose(void);
void func0f0f8120(void);
void func0f0f820c(struct menudialog *dialog, s32 root);
void func0f0f820c(struct menudialogdef *dialogdef, s32 root);
bool func0f0f82a8(s32 arg0);
void func0f0f8300(void);
void menuPushRootDialog(struct menudialog *dialog, s32 arg1);
void func0f0f85e0(struct menudialog *dialog, s32 root);
void menuPushRootDialog(struct menudialogdef *dialogdef, s32 arg1);
void func0f0f85e0(struct menudialogdef *dialogdef, s32 root);
u32 func0f0f8634(void);
u32 func0f0f86a8(void);
void func0f0f8bb4(u8 *arg0, u32 arg1, u32 arg2);
void menuInit(void);
u32 func0f0f9030(void);
u32 func0f0f935c(void);
void func0f0fa574(struct menuframe *frame);
void func0f0fa574(struct menudialog *dialog);
void func0f0fa6ac(void);
void menuDialogTick(void);
u32 func0f0fb488(void);
@@ -81,14 +81,14 @@ Gfx *func0f0fbba0(Gfx *gdl, u8 param_2, s32 arg2);
Gfx *func0f0fbc30(Gfx *gdl);
u32 menuChooseMusic(void);
u32 menuGetRoot(void);
void func0f0fce8c(struct menudialog *dialog, s32 playernum, s32 arg2);
void func0f0fce8c(struct menudialogdef *dialogdef, s32 playernum, s32 arg2);
char *menuTextSaveDeviceName(struct menuitem *item);
u32 func0f0fd118(u32 arg0);
bool func0f0fd1f4(s32 device, s32 arg1);
void func0f0fd320(s32 arg0, s32 arg1);
void func0f0fd494(struct coord *pos);
void func0f0fd548(s32 arg0);
struct menuframe *menuIsDialogOpen(struct menudialog *dialog);
struct menudialog *menuIsDialogOpen(struct menudialogdef *dialogdef);
struct chrdata *currentPlayerGetCommandingAibot(void);
s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data);
src/include/game/game_10c9c0.h
+1 -1
View File
@@ -9,6 +9,6 @@ s32 menuhandler4MbDropOut(s32 operation, struct menuitem *item, union handlerdat
s32 menuhandler0010ca1c(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler4MbAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler0010cabc(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialog4MbMainMenu(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog4MbMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
#endif
src/include/game/mainmenu.h
+8 -8
View File
@@ -9,7 +9,7 @@ extern u16 g_ControlStyleOptions[];
char *menuTextCurrentStageName(struct menuitem *item);
char *soloMenuTextDifficulty(struct menuitem *item);
s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex);
char *soloMenuTitleStageOverview(struct menudialog *dialog);
char *soloMenuTitleStageOverview(struct menudialogdef *dialogdef);
f32 func0f1036ac(u8 value, s32 prop);
bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty);
char *soloMenuTextBestTime(struct menuitem *item);
@@ -25,13 +25,13 @@ char *invMenuTextWeaponName(struct menuitem *item);
char *invMenuTextWeaponManufacturer(struct menuitem *item);
char *invMenuTextWeaponDescription(struct menuitem *item);
bool soloChoosePauseDialog(void);
s32 menudialogBriefing(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog00103608(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogCoopAntiOptions(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog0010559c(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 inventoryMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogAbortMission(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data);
src/include/game/menu/items.h
+56 -56
View File
@@ -4,79 +4,79 @@
#include "data.h"
#include "types.h"
u32 func0f0e5d2c(void);
s32 func0f0e5ef8(s16 arg0, struct menuitem *item);
u32 func0f0e6038(void);
Gfx *menuRenderOverlayList(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2);
Gfx *menuRenderItemList(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemList(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
u32 menuitem0f0e5d2c(void);
s32 menuitem0f0e5ef8(s16 arg0, struct menuitem *item);
u32 menuitem0f0e6038(void);
Gfx *menuitemListOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2);
Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuInitItemDropdown(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderItemDropdown(Gfx *gdl);
bool menuTickItemDropdown(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuitemDropdownInit(struct menuitem *item, union menuitemdata *data);
Gfx *menuitemDropdownRender(Gfx *gdl);
bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *menuRenderOverlayDropdown(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menuframe *frame, union menuitemdata *data);
bool menuIsStringEmptyOrSpaces(char *text);
Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *thing);
bool menuTickItemKeyboard(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuInitItemKeyboard(struct menuitem *item, union menuitemdata *data);
Gfx *menuitemDropdownOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data);
bool menuitemKeyboardIsStringEmptyOrSpaces(char *text);
Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *thing);
bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuitemKeyboardInit(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurendercontext *context);
Gfx *menuitemSeparatorRender(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderObjective(Gfx *gfx, struct menuframe *frame, s32 index, s32 position, s32 x, s32 y, s32 width, s32 height, s32 arg8, s32 arg9);
Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context);
Gfx *menuitemObjectiveRender(Gfx *gfx, struct menudialog *dialog, s32 index, s32 position, s32 x, s32 y, s32 width, s32 height, s32 arg8, s32 arg9);
Gfx *menuitemObjectivesRender(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemModel(Gfx *gdl, struct menurendercontext *context);
Gfx *menuitemModelRender(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemLabel(Gfx *gdl, struct menurendercontext *context);
Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemMeter(Gfx *gdl, struct menurendercontext *context);
Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemSelectable(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemSelectable(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemSelectableTick(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuRenderItemSlider(Gfx *gdl);
bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItemSlider(union menuitemdata *data);
Gfx *menuitemSliderRender(Gfx *gdl);
bool menuitemSliderTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuitemSliderInit(union menuitemdata *data);
Gfx *menuRenderItemCarousel(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemCarousel(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuitemCarouselRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemCarouselTick(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuRenderItemCheckbox(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemCheckbox(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemCheckboxTick(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
char *menuItemScrollableGetText(u32 type);
Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItemScrollable(union menuitemdata *data);
char *menuitemScrollableGetText(u32 type);
Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuitemScrollableInit(union menuitemdata *data);
Gfx *menuRenderItemMarquee(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemMarquee(struct menuitem *item, union menuitemdata *data);
void menuInitItemMarquee(union menuitemdata *data);
Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemMarqueeTick(struct menuitem *item, union menuitemdata *data);
void menuitemMarqueeInit(union menuitemdata *data);
Gfx *menuRenderItem07(Gfx *gdl);
Gfx *menuitem07Render(Gfx *gdl);
Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemdata *data);
void menuInitItemRanking(union menuitemdata *data);
Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemRankingTick(struct menuinputs *inputs, u32 arg1, union menuitemdata *data);
void menuitemRankingInit(union menuitemdata *data);
Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *menuRenderOverlayPlayerStats(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menuframe *frame, union menuitemdata *data);
void menuInitItemPlayerStats(struct menuitem *item, union menuitemdata *data);
Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemPlayerStatsTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *menuitemPlayerStatsOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data);
void menuitemPlayerStatsInit(struct menuitem *item, union menuitemdata *data);
u32 func0f0ef394(void);
Gfx *menuRenderControllerTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha);
Gfx *menuRenderControllerLines(Gfx *gdl, struct menurendercontext *context, s32 arg2, s32 arg3, s32 x, s32 y, u32 alpha);
u16 menuControllerGetButtonAction(s32 mode, s32 buttonnum);
Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 x, s32 y, u32 valuecolour, u32 labelcolour, s8 prevmode);
Gfx *menuRenderControllerInfo(Gfx *gdl, struct menurendercontext *context, s32 x, s32 y, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode);
Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context);
void menuInitItemController(union menuitemdata *data);
u32 menuitem0f0ef394(void);
Gfx *menuitemControllerRenderTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha);
Gfx *menuitemControllerRenderLines(Gfx *gdl, struct menurendercontext *context, s32 arg2, s32 arg3, s32 x, s32 y, u32 alpha);
u16 menuitemControllerGetButtonAction(s32 mode, s32 buttonnum);
Gfx *menuitemControllerTextRender(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 x, s32 y, u32 valuecolour, u32 labelcolour, s8 prevmode);
Gfx *menuitemControllerInfoRender(Gfx *gdl, struct menurendercontext *context, s32 x, s32 y, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode);
Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context);
void menuitemControllerInit(union menuitemdata *data);
Gfx *menuRenderItem(Gfx *gdl, struct menurendercontext *context);
bool menuTickItem(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItem(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menuframe *frame, union menuitemdata *data);
Gfx *menuitemRender(Gfx *gdl, struct menurendercontext *context);
bool menuitemTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuitemInit(struct menuitem *item, union menuitemdata *data);
Gfx *menuitemOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data);
#endif
src/include/game/mplayer/ingame.h
+1 -1
View File
@@ -9,7 +9,7 @@ char *mpMenuTextInGameLimit(struct menuitem *item);
char *menutextPauseOrUnpause(s32 arg0);
char *menutextMatchTime(s32 arg0);
char *mpMenuTextWeaponDescription(struct menuitem *item);
char *mpMenuTitleStatsFor(struct menudialog *dialog);
char *mpMenuTitleStatsFor(struct menudialogdef *dialogdef);
char *mpMenuTextWeaponOfChoiceName(struct menuitem *item);
char *mpMenuTextAward1(struct menuitem *item);
char *mpMenuTextAward2(struct menuitem *item);
src/include/game/mplayer/scenarios.h
+2 -2
View File
@@ -4,8 +4,8 @@
#include "data.h"
#include "types.h"
extern struct menudialog g_MpScenarioMenuDialog;
extern struct menudialog g_MpQuickTeamScenarioMenuDialog;
extern struct menudialogdef g_MpScenarioMenuDialog;
extern struct menudialogdef g_MpQuickTeamScenarioMenuDialog;
struct mpscenariooverview {
u16 name;
src/include/game/mplayer/setup.h
+15 -15
View File
@@ -10,7 +10,7 @@ s32 mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *
char *mpMenuTextWeaponNameForSlot(struct menuitem *item);
char *mpMenuTextSetupName(struct menuitem *item);
s32 mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, bool isplayer);
s32 menudialog0017a174(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTextKills(struct menuitem *item);
char *mpMenuTextDeaths(struct menuitem *item);
@@ -30,7 +30,7 @@ void mpFormatDamageValue(char *dst, f32 damage);
char *mpMenuTextPainReceived(struct menuitem *item);
char *mpMenuTextDamageDealt(struct menuitem *item);
s32 mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog);
char *mpMenuTitleStatsForPlayerName(struct menudialogdef *dialogdef);
char *mpMenuTextUsernamePassword(struct menuitem *item);
s32 mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4);
char *mpMenuTextBodyName(struct menuitem *item);
@@ -43,9 +43,9 @@ s32 menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union hand
char *mpMenuTextHandicapPlayerName(struct menuitem *item);
s32 mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTextSimulantDescription(struct menuitem *item);
s32 menudialog0017ccfc(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTitleEditSimulant(struct menudialog *dialog);
char *mpMenuTitleEditSimulant(struct menudialogdef *dialogdef);
char *mpMenuTextSimulantName(struct menuitem *item);
s32 menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams);
char *mpMenuTextChrNameForTeamSetup(struct menuitem *item);
@@ -55,11 +55,11 @@ s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerd
char *mpMenuTextCurrentTrack(struct menuitem *item);
s32 mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTextTeamName(struct menuitem *item);
char *func0f17e318(struct menudialog *dialog);
s32 menudialog0017e3fc(s32 operation, struct menudialog *dialog, union handlerdata *data);
char *func0f17e318(struct menudialogdef *dialogdef);
s32 menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTextChallengeName(struct menuitem *item);
s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
char *mpMenuTextSavePlayerOrCopy(struct menuitem *item);
char *mpMenuTextArenaName(struct menuitem *item);
char *mpMenuTextWeaponSetName(struct menuitem *item);
@@ -100,7 +100,7 @@ void pacHandleDeath(s32 cplayernum, s32 vplayernum);
void pacTick(void);
Gfx *pacRenderHud(Gfx *gdl);
bool pacRadarChr(Gfx **gdl, struct prop *prop);
s32 mpOptionsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
char *mpMenuTextScenarioShortName(struct menuitem *item);
char *mpMenuTextScenarioName(struct menuitem *item);
s32 scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
@@ -139,8 +139,8 @@ s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union ha
s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialogMpReady(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogMpSimulant(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data);
@@ -148,7 +148,7 @@ s32 menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union
s32 menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialogMpSimulants(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data);
@@ -156,7 +156,7 @@ s32 menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handle
s32 menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialogMpSelectTune(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data);
@@ -168,12 +168,12 @@ s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *d
s32 menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialogMpGameSetup(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogMpQuickGo(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialogCombatSimulator(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data);
src/include/game/training/menus.h
+9 -9
View File
@@ -33,15 +33,15 @@ char *htMenuTextCancelOrAbort(struct menuitem *item);
char *htMenuTextTimeTakenValue(struct menuitem *item);
char *bioMenuTextName(struct menuitem *item);
char *ciMenuTextHangarBioSubheading(struct menuitem *item);
struct menudialog *ciGetFrWeaponListMenuDialog(void);
s32 frTrainingInfoMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 frTrainingStatsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogDeviceTrainingResults(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog001a6aa4(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialogFiringRangeResults(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 ciHangarHolographMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
struct menudialogdef *ciGetFrWeaponListMenuDialog(void);
s32 frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
src/include/types.h
+11 -11
View File
@@ -3560,13 +3560,13 @@ struct menuitem {
};
};
struct menudialog {
struct menudialogdef {
u8 type;
u32 title;
struct menuitem *items;
s32 (*handler)(s32 operation, struct menudialog *dialog, union handlerdata *data);
s32 (*handler)(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
u32 unk10;
struct menudialog *nextsibling;
struct menudialogdef *nextsibling;
};
struct twowords {
@@ -3764,13 +3764,13 @@ struct fireslot {
};
struct menulayer {
struct menuframe *siblings[5];
struct menudialog *siblings[5];
s8 numsiblings;
s8 cursibling;
};
struct menuframe {
struct menudialog *dialog;
struct menudialog {
struct menudialogdef *definition;
u8 unk04;
u8 unk05;
u16 unk06;
@@ -3937,11 +3937,11 @@ struct menu660 {
};
struct menu {
struct menuframe frames[VERSION >= VERSION_NTSC_1_0 ? 10 : 9];
/*0x460*/ s16 numframes;
struct menudialog dialogs[VERSION >= VERSION_NTSC_1_0 ? 10 : 9];
/*0x460*/ s16 numdialogs;
/*0x464*/ struct menulayer layers[6];
/*0x4f4*/ s16 depth; // index into layers. 1-indexed?
/*0x4f8*/ struct menuframe *curframe;
/*0x4f8*/ struct menudialog *curdialog;
/*0x4fc*/ struct menu4fc unk4fc[VERSION >= VERSION_NTSC_1_0 ? 88 : 80];
/*0x65c*/ s32 unk65c;
/*0x660*/ struct menu660 unk660[VERSION >= VERSION_NTSC_1_0 ? 12 : 10];
@@ -5138,7 +5138,7 @@ struct menudata {
/*0x000*/ s32 count;
/*0x004*/ s32 root;
/*0x008*/ s32 unk008; // also a menuroot constant
/*0x00c*/ struct menudialog *unk00c;
/*0x00c*/ struct menudialogdef *unk00c;
/*0x010*/ f32 unk010;
/*0x014*/ u8 unk014;
/*0x015*/ u8 unk015;
@@ -6313,7 +6313,7 @@ struct menurendercontext {
s16 height;
struct menuitem *item;
bool focused;
struct menuframe *frame;
struct menudialog *dialog;
union menuitemdata *data;
};