diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 1cd28f096..1d30a8f30 100644
--- a/src/game/game_176d70.c
+++ b/src/game/game_176d70.c
@@ -8658,21 +8658,15 @@ glabel func0f17f088
 /*  f17f0ac:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel menudialog0017f0b0
-/*  f17f0b0:	24010064 */ 	addiu	$at,$zero,0x64
-/*  f17f0b4:	afa50004 */ 	sw	$a1,0x4($sp)
-/*  f17f0b8:	14810006 */ 	bne	$a0,$at,.L0f17f0d4
-/*  f17f0bc:	afa60008 */ 	sw	$a2,0x8($sp)
-/*  f17f0c0:	3c02800a */ 	lui	$v0,%hi(g_Vars)
-/*  f17f0c4:	24429fc0 */ 	addiu	$v0,$v0,%lo(g_Vars)
-/*  f17f0c8:	24030001 */ 	addiu	$v1,$zero,0x1
-/*  f17f0cc:	ac430490 */ 	sw	$v1,0x490($v0)
-/*  f17f0d0:	ac43049c */ 	sw	$v1,0x49c($v0)
-.L0f17f0d4:
-/*  f17f0d4:	03e00008 */ 	jr	$ra
-/*  f17f0d8:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool menudialogMpGameSetup(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem)
+{
+	if (operation == MENUOP_100) {
+		g_Vars.unk000490 = 1;
+		g_Vars.unk00049c = 1;
+	}
+
+	return false;
+}
 
 bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem)
 {
diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h
index e99f6edc1..c03bfbd3e 100644
--- a/src/include/game/game_176d70.h
+++ b/src/include/game/game_176d70.h
@@ -176,7 +176,7 @@ s32 menudialog0017d468(u32, u32, u32 *);
 s32 menudialog0017df74(u32, u32, u32 *);
 s32 menudialog0017e3fc(u32, u32, u32 *);
 s32 menudialog0017eb34(u32, u32, u32 *);
-s32 menudialog0017f0b0(u32, u32, u32 *);
+bool menudialogMpGameSetup(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem);
 bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem);
 s32 menudialog0017f930(u32, u32, u32 *);
 s32 menudialog00184ec0(u32, u32, u32 *);
diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h
index 22efbab0b..08213aa23 100644
--- a/src/include/gvars/gvars.h
+++ b/src/include/gvars/gvars.h
@@ -160,7 +160,12 @@ struct g_vars {
 	/*000484*/ s32 mphilltime;
 	/*000488*/ u32 unk000488;
 	/*00048c*/ u32 unk00048c;
-	/*000490*/ u32 unk000490; // set to 2 when entering combat simulator, 3 when entering Quick Go
+
+	// 1 when entering game setup
+	// 2 when entering combat simulator
+	// 3 when entering Quick Go
+	/*000490*/ u32 unk000490;
+
 	/*000494*/ u32 unk000494;
 	/*000498*/ u32 unk000498;
 	/*00049c*/ u32 unk00049c;
diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c
index 56a049c9f..1b6bc4ace 100644
--- a/src/setup/setup_0160b0.c
+++ b/src/setup/setup_0160b0.c
@@ -3895,7 +3895,7 @@ struct menu_dialog g_4MbAdvancedSetupMenuDialog = {
 	MENUDIALOGTYPE_DEFAULT,
 	0x5011,
 	menuitems_mpgamesetup,
-	menudialog0017f0b0,
+	menudialogMpGameSetup,
 	0x00000810,
 	&menudialog_mpplayersetup,
 };
diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c
index 58f706ff7..1490bfb4e 100644
--- a/src/setup/setup_020df0.c
+++ b/src/setup/setup_020df0.c
@@ -11183,7 +11183,7 @@ struct menu_dialog menudialog_mpgamesetup3 = {
 	MENUDIALOGTYPE_DEFAULT,
 	0x5011,
 	menuitems_mpgamesetup3,
-	menudialog0017f0b0,
+	menudialogMpGameSetup,
 	0x00000810,
 	&menudialog_mpplayersetup4,
 };
@@ -11193,7 +11193,7 @@ struct menu_dialog menudialog_mpgamesetup2 = {
 	MENUDIALOGTYPE_DEFAULT,
 	0x5011,
 	menuitems_mpgamesetup3,
-	menudialog0017f0b0,
+	menudialogMpGameSetup,
 	0x00000810,
 	&menudialog_mpplayersetup2,
 };