diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c
index 99ddd821d..fdda0fbb3 100644
--- a/src/game/data/data_02a0e0.c
+++ b/src/game/data/data_02a0e0.c
@@ -1129,10 +1129,10 @@ struct menudialog menudialog_mplimits = {
 
 // 2b6f8
 struct menuitem menuitems_mpplayerhandicaps[] = {
-	{ MENUITEMTYPE_SLIDER,      0, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer },
-	{ MENUITEMTYPE_SLIDER,      1, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer },
-	{ MENUITEMTYPE_SLIDER,      2, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer },
-	{ MENUITEMTYPE_SLIDER,      3, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer },
+	{ MENUITEMTYPE_SLIDER,      0, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer },
+	{ MENUITEMTYPE_SLIDER,      1, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer },
+	{ MENUITEMTYPE_SLIDER,      2, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer },
+	{ MENUITEMTYPE_SLIDER,      3, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer },
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000000, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00060000, L_MPMENU(110), 0x00000000, menuhandlerMpRestoreHandicapDefaults }, // "Restore Defaults"
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000008, L_MPMENU(111), 0x00000000, NULL }, // "Back"
diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c
index 5428fd7e5..2c41d7598 100644
--- a/src/game/mplayer/setup.c
+++ b/src/game/mplayer/setup.c
@@ -3186,36 +3186,21 @@ s32 menuhandlerMpHandicapPlayer(u32 operation, struct menuitem *item, union hand
 	return 0;
 }
 
-const char var7f1b8024[] = "";
+char *mpMenuTextHandicapPlayerName(struct menuitem *item)
+{
+	if (g_MpSetup.chrslots & (1 << item->param)) {
+		return g_MpPlayers[item->param].base.name;
+	}
+
+	return "";
+}
+
 const char var7f1b8028[] = "\n";
 const char var7f1b802c[] = "%s";
 const char var7f1b8030[] = "";
 const char var7f1b8034[] = "";
 const char var7f1b8038[] = "%d:\n";
 
-GLOBAL_ASM(
-glabel func0f17c524
-/*  f17c524:	90830001 */ 	lbu	$v1,0x1($a0)
-/*  f17c528:	3c0e800b */ 	lui	$t6,%hi(g_MpSetup+0x16)
-/*  f17c52c:	95cecb9e */ 	lhu	$t6,%lo(g_MpSetup+0x16)($t6)
-/*  f17c530:	240f0001 */ 	addiu	$t7,$zero,0x1
-/*  f17c534:	006fc004 */ 	sllv	$t8,$t7,$v1
-/*  f17c538:	01d8c824 */ 	and	$t9,$t6,$t8
-/*  f17c53c:	13200008 */ 	beqz	$t9,.L0f17c560
-/*  f17c540:	3c027f1c */ 	lui	$v0,%hi(var7f1b8024)
-/*  f17c544:	00034080 */ 	sll	$t0,$v1,0x2
-/*  f17c548:	01034021 */ 	addu	$t0,$t0,$v1
-/*  f17c54c:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
-/*  f17c550:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
-/*  f17c554:	00084140 */ 	sll	$t0,$t0,0x5
-/*  f17c558:	03e00008 */ 	jr	$ra
-/*  f17c55c:	01091021 */ 	addu	$v0,$t0,$t1
-.L0f17c560:
-/*  f17c560:	24428024 */ 	addiu	$v0,$v0,%lo(var7f1b8024)
-/*  f17c564:	03e00008 */ 	jr	$ra
-/*  f17c568:	00000000 */ 	nop
-);
-
 s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menuitem *item, union handlerdata *data)
 {
 	if (operation == MENUOP_SET) {
diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h
index d3df33f4b..05bd1753c 100644
--- a/src/include/game/mplayer/setup.h
+++ b/src/include/game/mplayer/setup.h
@@ -39,7 +39,7 @@ s32 menuhandler0017bab4(u32 operation, struct menuitem *item, union handlerdata
 u32 func0f17be2c(void);
 s32 menuhandler0017bfc0(u32 operation, struct menuitem *item, union handlerdata *data);
 s32 menuhandlerMpHandicapPlayer(u32 operation, struct menuitem *item, union handlerdata *data);
-u32 func0f17c524(void);
+char *mpMenuTextHandicapPlayerName(struct menuitem *item);
 s32 menuhandler0017c6a4(u32 operation, struct menuitem *item, union handlerdata *data);
 char *mpMenuTextSimulantDescription(struct menuitem *item);
 s32 menudialog0017ccfc(u32 operation, struct menudialog *dialog, union handlerdata *data);