From 6f4c04afaaedb43dc9e463116fa7eb4e58ebce24 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 1 Jan 2020 15:16:50 +1000 Subject: [PATCH] Rename some control style dialog symbols --- src/game/game_102240.c | 4 ++-- src/game/pdoptions.c | 2 +- src/include/setup/setup_0160b0.h | 4 ++-- src/setup/setup_0160b0.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 67f319b32..7be5a58a9 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -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); } } diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index d088a6a43..1640f46f6 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -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; } diff --git a/src/include/setup/setup_0160b0.h b/src/include/setup/setup_0160b0.h index 894ab8549..04ed5cd60 100644 --- a/src/include/setup/setup_0160b0.h +++ b/src/include/setup/setup_0160b0.h @@ -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; diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 05a4c7f42..e561e03b8 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -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,