falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename some control style dialog symbols

This commit is contained in:
Ryan Dwyer 2020-01-01 15:16:50 +10:00
parent af8c4bbd36
commit 6f4c04afaa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/game_102240.c
View File

@ -3543,9 +3543,9 @@ s32 menuhandlerControlStyle(s32 operation, struct menu_item *item, u32 *value)
(g_Vars.players[1] ? 1 : 0) +
(g_Vars.players[2] ? 1 : 0) +
(g_Vars.players[3] ? 1 : 0) >= 2) {
menuPushDialog(&menudialog_control);
menuPushDialog(&g_ControlStyleMultiMenuDialog);
} else {
menuPushDialog(&menudialog_control2);
menuPushDialog(&g_ControlStyleSingleMenuDialog);
}
}

2
src/game/pdoptions.c
View File

@ -232,7 +232,7 @@ s32 optionsGetEffectiveScreenSize(void)
if (g_MenuStack[g_MenuStackDepth].unk00 && (
g_MenuStack[g_MenuStackDepth].unk00->dialog == &menudialog_control4 ||
g_MenuStack[g_MenuStackDepth].unk00->dialog == &menudialog_control3 ||
g_MenuStack[g_MenuStackDepth].unk00->dialog == &menudialog_control2)) {
g_MenuStack[g_MenuStackDepth].unk00->dialog == &g_ControlStyleSingleMenuDialog)) {
return SCREENSIZE_FULL;
}

4
src/include/setup/setup_0160b0.h
View File

@ -189,8 +189,8 @@ extern struct menu_dialog menudialog_selectdifficulty2;
extern struct menu_dialog menudialog_selectdifficulty3;
extern struct stageoverviewentry g_StageNames[];
extern struct mission missions[];
extern struct menu_dialog menudialog_control;
extern struct menu_dialog menudialog_control2;
extern struct menu_dialog g_ControlStyleMultiMenuDialog;
extern struct menu_dialog g_ControlStyleSingleMenuDialog;
extern struct menu_dialog menudialog_control3;
extern struct menu_dialog menudialog_control4;
extern u32 var80072d8c;

4
src/setup/setup_0160b0.c
View File

@ -1831,7 +1831,7 @@ struct menu_item menuitems_control[] = {
};
// 18098
struct menu_dialog menudialog_control = {
struct menu_dialog g_ControlStyleMultiMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
0x56ec, // "Control"
menuitems_control,
@ -1848,7 +1848,7 @@ struct menu_item menuitems_control2[] = {
};
// 180ec
struct menu_dialog menudialog_control2 = {
struct menu_dialog g_ControlStyleSingleMenuDialog = {
MENUDIALOGTYPE_DEFAULT,
0x56ec, // "Control"
menuitems_control2,