diff --git a/src/game/game_015470.c b/src/game/game_015470.c
index 7fbd4661e..74d48b516 100644
--- a/src/game/game_015470.c
+++ b/src/game/game_015470.c
@@ -8291,10 +8291,10 @@ glabel func0f01bf28
 /*  f01c830:	ae8f0000 */ 	sw	$t7,0x0($s4)
 /*  f01c834:	3c0e8009 */ 	lui	$t6,%hi(var8009000c)
 /*  f01c838:	91ce0af0 */ 	lbu	$t6,0xaf0($t6)
-/*  f01c83c:	3c048008 */ 	lui	$a0,%hi(menudialog_mpquickgo)
+/*  f01c83c:	3c048008 */ 	lui	$a0,%hi(g_MpQuickGoMenuDialog)
 /*  f01c840:	2405000b */ 	addiu	$a1,$zero,0xb
 /*  f01c844:	16ce0006 */ 	bne	$s6,$t6,.L0f01c860
-/*  f01c848:	24846500 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo)
+/*  f01c848:	24846500 */ 	addiu	$a0,$a0,%lo(g_MpQuickGoMenuDialog)
 /*  f01c84c:	3c048007 */ 	lui	$a0,%hi(menudialog_mpquickgo2)
 /*  f01c850:	0fc3e0cc */ 	jal	func0f0f8330
 /*  f01c854:	24845120 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo2)
@@ -8338,10 +8338,10 @@ glabel func0f01bf28
 /*  f01c8d8:	272d0001 */ 	addiu	$t5,$t9,0x1
 /*  f01c8dc:	ae8d0000 */ 	sw	$t5,0x0($s4)
 /*  f01c8e0:	91ef0af0 */ 	lbu	$t7,0xaf0($t7)
-/*  f01c8e4:	3c048008 */ 	lui	$a0,%hi(menudialog_mpquickgo)
+/*  f01c8e4:	3c048008 */ 	lui	$a0,%hi(g_MpQuickGoMenuDialog)
 /*  f01c8e8:	2405000b */ 	addiu	$a1,$zero,0xb
 /*  f01c8ec:	16cf0006 */ 	bne	$s6,$t7,.L0f01c908
-/*  f01c8f0:	24846500 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo)
+/*  f01c8f0:	24846500 */ 	addiu	$a0,$a0,%lo(g_MpQuickGoMenuDialog)
 /*  f01c8f4:	3c048007 */ 	lui	$a0,%hi(menudialog_mpquickgo2)
 /*  f01c8f8:	0fc3e0cc */ 	jal	func0f0f8330
 /*  f01c8fc:	24845120 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo2)
diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 55de1ead9..9b1d4a4ce 100644
--- a/src/game/game_176d70.c
+++ b/src/game/game_176d70.c
@@ -5933,10 +5933,10 @@ glabel menuhandler0017bab4
 /*  f17bc64:	5458006d */ 	bnel	$v0,$t8,.L0f17be1c
 /*  f17bc68:	00001025 */ 	or	$v0,$zero,$zero
 /*  f17bc6c:	91080af0 */ 	lbu	$t0,0xaf0($t0)
-/*  f17bc70:	3c048008 */ 	lui	$a0,%hi(menudialog_mpquickgo)
+/*  f17bc70:	3c048008 */ 	lui	$a0,%hi(g_MpQuickGoMenuDialog)
 /*  f17bc74:	2405000b */ 	addiu	$a1,$zero,0xb
 /*  f17bc78:	14480006 */ 	bne	$v0,$t0,.L0f17bc94
-/*  f17bc7c:	24846500 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo)
+/*  f17bc7c:	24846500 */ 	addiu	$a0,$a0,%lo(g_MpQuickGoMenuDialog)
 /*  f17bc80:	3c048007 */ 	lui	$a0,%hi(menudialog_mpquickgo2)
 /*  f17bc84:	0fc3e083 */ 	jal	func0f0f820c
 /*  f17bc88:	24845120 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo2)
@@ -8956,38 +8956,15 @@ glabel menudialog0017eb34
 /*  f17ec60:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel menuhandler0017ec64
-/*  f17ec64:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f17ec68:	24010006 */ 	addiu	$at,$zero,0x6
-/*  f17ec6c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f17ec70:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f17ec74:	14810012 */ 	bne	$a0,$at,.L0f17ecc0
-/*  f17ec78:	afa60020 */ 	sw	$a2,0x20($sp)
-/*  f17ec7c:	3c0e8007 */ 	lui	$t6,0x8007
-/*  f17ec80:	8dce1448 */ 	lw	$t6,0x1448($t6)
-/*  f17ec84:	3c04800a */ 	lui	$a0,0x800a
-/*  f17ec88:	000e78c0 */ 	sll	$t7,$t6,0x3
-/*  f17ec8c:	01ee7823 */ 	subu	$t7,$t7,$t6
-/*  f17ec90:	000f7880 */ 	sll	$t7,$t7,0x2
-/*  f17ec94:	01ee7821 */ 	addu	$t7,$t7,$t6
-/*  f17ec98:	000f78c0 */ 	sll	$t7,$t7,0x3
-/*  f17ec9c:	01ee7823 */ 	subu	$t7,$t7,$t6
-/*  f17eca0:	000f7900 */ 	sll	$t7,$t7,0x4
-/*  f17eca4:	008f2021 */ 	addu	$a0,$a0,$t7
-/*  f17eca8:	0fc66ddf */ 	jal	func0f19b77c
-/*  f17ecac:	8c84ee1c */ 	lw	$a0,-0x11e4($a0)
-/*  f17ecb0:	3c048008 */ 	lui	$a0,%hi(menudialog_mpquickgo)
-/*  f17ecb4:	24846500 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo)
-/*  f17ecb8:	0fc3e083 */ 	jal	func0f0f820c
-/*  f17ecbc:	24050003 */ 	addiu	$a1,$zero,0x3
-.L0f17ecc0:
-/*  f17ecc0:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f17ecc4:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f17ecc8:	00001025 */ 	or	$v0,$zero,$zero
-/*  f17eccc:	03e00008 */ 	jr	$ra
-/*  f17ecd0:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s32 menuhandler0017ec64(u32 operation, struct menu_item *item, s32 *value)
+{
+	if (operation == MENUOP_SET) {
+		func0f19b77c(g_MenuStack[g_MpPlayerNum].slotindex);
+		func0f0f820c(&g_MpQuickGoMenuDialog, 3);
+	}
+
+	return 0;
+}
 
 GLOBAL_ASM(
 glabel menuhandlerMpLock
@@ -9542,9 +9519,9 @@ glabel func0f17f428
 /*  f17f438:	3c0e8009 */ 	lui	$t6,0x8009
 /*  f17f43c:	91ce0af0 */ 	lbu	$t6,0xaf0($t6)
 /*  f17f440:	24010001 */ 	addiu	$at,$zero,0x1
-/*  f17f444:	3c048008 */ 	lui	$a0,%hi(menudialog_mpquickgo)
+/*  f17f444:	3c048008 */ 	lui	$a0,%hi(g_MpQuickGoMenuDialog)
 /*  f17f448:	15c10007 */ 	bne	$t6,$at,.L0f17f468
-/*  f17f44c:	24846500 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo)
+/*  f17f44c:	24846500 */ 	addiu	$a0,$a0,%lo(g_MpQuickGoMenuDialog)
 /*  f17f450:	3c048007 */ 	lui	$a0,%hi(menudialog_mpquickgo2)
 /*  f17f454:	24845120 */ 	addiu	$a0,$a0,%lo(menudialog_mpquickgo2)
 /*  f17f458:	0fc3e083 */ 	jal	func0f0f820c
diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h
index d56cd1063..daa2ca9f3 100644
--- a/src/include/game/game_176d70.h
+++ b/src/include/game/game_176d70.h
@@ -208,7 +208,7 @@ s32 menuhandler0017e06c(u32, u32, u32 *);
 s32 menuhandler0017e38c(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandler0017e4d4(u32, u32, u32 *);
 s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value);
-s32 menuhandler0017ec64(u32, u32, u32 *);
+s32 menuhandler0017ec64(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandler0017ee60(u32, u32, u32 *);
 s32 menuhandler0017ef30(u32, u32, u32 *);
 s32 menuhandlerQuickTeamSeparator(u32 operation, struct menu_item *item, s32 *value);
diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h
index f84b9449d..71a30cde9 100644
--- a/src/include/setup/setup_020df0.h
+++ b/src/include/setup/setup_020df0.h
@@ -273,7 +273,7 @@ extern struct menu_dialog menudialog_mpchallengedetails2;
 extern struct menu_dialog menudialog_2c0cc;
 extern u16 mplockoptions[];
 extern struct menu_dialog menudialog_mpgamesetup3;
-extern struct menu_dialog menudialog_mpquickgo;
+extern struct menu_dialog g_MpQuickGoMenuDialog;
 extern struct menu_dialog g_MpQuickTeamGameSetupMenuDialog;
 extern struct menu_dialog g_CombatSimulatorMenuDialog;
 extern u16 mpslowmotionoptions[];
diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c
index 79d4b95cb..c214de065 100644
--- a/src/setup/setup_020df0.c
+++ b/src/setup/setup_020df0.c
@@ -11208,7 +11208,7 @@ struct menu_item menuitems_mpquickgo[] = {
 };
 
 // 2c520
-struct menu_dialog menudialog_mpquickgo = {
+struct menu_dialog g_MpQuickGoMenuDialog = {
 	MENUDIALOGTYPE_DEFAULT,
 	0x59cc, // "Quick Go"
 	menuitems_mpquickgo,