diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index ab9c85e7a..5662b406b 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -5619,25 +5619,14 @@ glabel menuhandler0010ca1c
 /*  f10ca7c:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel menuhandler4MbAdvanceSetup
-/*  f10ca80:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f10ca84:	24010006 */ 	addiu	$at,$zero,0x6
-/*  f10ca88:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f10ca8c:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f10ca90:	14810005 */ 	bne	$a0,$at,.L0f10caa8
-/*  f10ca94:	afa60020 */ 	sw	$a2,0x20($sp)
-/*  f10ca98:	3c048007 */ 	lui	$a0,%hi(menudialog_mpgamesetup)
-/*  f10ca9c:	24845538 */ 	addiu	$a0,$a0,%lo(menudialog_mpgamesetup)
-/*  f10caa0:	0fc3e083 */ 	jal	func0f0f820c
-/*  f10caa4:	2405000b */ 	addiu	$a1,$zero,0xb
-.L0f10caa8:
-/*  f10caa8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f10caac:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f10cab0:	00001025 */ 	or	$v0,$zero,$zero
-/*  f10cab4:	03e00008 */ 	jr	$ra
-/*  f10cab8:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s32 menuhandler4MbAdvancedSetup(u32 operation, struct menu_item *item, s32 *value)
+{
+	if (operation == MENUOP_SET) {
+		func0f0f820c(&g_4MbAdvancedSetupMenuDialog, 11);
+	}
+
+	return 0;
+}
 
 GLOBAL_ASM(
 glabel menuhandler0010cabc
diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 73c370371..7797c3b62 100644
--- a/src/game/game_176d70.c
+++ b/src/game/game_176d70.c
@@ -9954,8 +9954,8 @@ glabel func0f17fcb0
 /*  f17fcf0:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f17fcf4:	15e10009 */ 	bne	$t7,$at,.L0f17fd1c
 /*  f17fcf8:	afa40028 */ 	sw	$a0,0x28($sp)
-/*  f17fcfc:	3c048007 */ 	lui	$a0,%hi(menudialog_mpgamesetup)
-/*  f17fd00:	24845538 */ 	addiu	$a0,$a0,%lo(menudialog_mpgamesetup)
+/*  f17fcfc:	3c048007 */ 	lui	$a0,%hi(g_4MbAdvancedSetupMenuDialog)
+/*  f17fd00:	24845538 */ 	addiu	$a0,$a0,%lo(g_4MbAdvancedSetupMenuDialog)
 /*  f17fd04:	0fc3e0cc */ 	jal	func0f0f8330
 /*  f17fd08:	2405000b */ 	addiu	$a1,$zero,0xb
 /*  f17fd0c:	0fc3e0c0 */ 	jal	func0f0f8300
diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h
index 405ce0922..e1d0c89f0 100644
--- a/src/include/game/game_107fb0.h
+++ b/src/include/game/game_107fb0.h
@@ -76,7 +76,7 @@ s32 menuhandler0010b974(u32, u32, u32 *);
 s32 menuhandler0010bc98(u32, u32, u32 *);
 s32 menuhandler0010ca1c(u32, u32, u32 *);
 s32 menuhandler0010cabc(u32, u32, u32 *);
-s32 menuhandler4MbAdvanceSetup(u32, u32, u32 *);
+s32 menuhandler4MbAdvancedSetup(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandlerDropOut(u32, u32, u32 *);
 s32 menuhandlerOpenCopyFile(u32, u32, u32 *);
 s32 menuhandlerOpenDeleteFile(u32, u32, u32 *);
diff --git a/src/include/setup/setup_0160b0.h b/src/include/setup/setup_0160b0.h
index b71b626c8..59672f340 100644
--- a/src/include/setup/setup_0160b0.h
+++ b/src/include/setup/setup_0160b0.h
@@ -241,7 +241,7 @@ extern struct menu_dialog menudialog_1b1bc;
 extern struct menu_dialog menudialog_smallbutperfectmenu;
 extern struct menu_dialog menudialog_mpdropout;
 extern struct menu_dialog menudialog_1b414;
-extern struct menu_dialog menudialog_mpgamesetup;
+extern struct menu_dialog g_4MbAdvancedSetupMenuDialog;
 extern struct menu_dialog menudialog_1b5c0;
 extern struct menu_dialog menudialog_promptnextmission;
 extern struct menu_dialog menudialog_1b7a4;
diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c
index ddc660067..c44569311 100644
--- a/src/setup/setup_0160b0.c
+++ b/src/setup/setup_0160b0.c
@@ -3798,7 +3798,7 @@ struct menu_item menuitems_smallbutperfectmenu[] = {
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400004, 0x000059b9, 0x00000000, &menudialog_mpcombatchallenges }, // "Challenges"
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400004, 0x000059ba, 0x00000001, &menudialog_mploadgamesettingstype1 }, // "Load/Preset Games"
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400004, 0x000059bb, 0x00000002, &menudialog_mpquickteam }, // "Quick Start"
-	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400000, 0x000059bc, 0x00000003, menuhandler4MbAdvanceSetup }, // "Advanced Setup"
+	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400000, 0x000059bc, 0x00000003, menuhandler4MbAdvancedSetup }, // "Advanced Setup"
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400004, 0x00005731, 0x00000000, &menudialog_1b00c }, // "Audio/Video"
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000082, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00400004, 0x00005732, 0x00000000, &menudialog_changeagent }, // "Change Agent"
@@ -3891,7 +3891,7 @@ struct menu_item menuitems_mpgamesetup[] = {
 };
 
 // 1b558
-struct menu_dialog menudialog_mpgamesetup = {
+struct menu_dialog g_4MbAdvancedSetupMenuDialog = {
 	MENUDIALOGTYPE_DEFAULT,
 	0x5011,
 	menuitems_mpgamesetup,