diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index dac81bda1..c094c49a0 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -6882,21 +6882,10 @@ glabel func0f09ceac
 /*  f09cf54:	27bd0038 */ 	addiu	$sp,$sp,0x38
 );
 
-GLOBAL_ASM(
-glabel func0f09cf58
-/*  f09cf58:	00047900 */ 	sll	$t7,$a0,0x4
-/*  f09cf5c:	01e47823 */ 	subu	$t7,$t7,$a0
-/*  f09cf60:	000f7880 */ 	sll	$t7,$t7,0x2
-/*  f09cf64:	01e47821 */ 	addu	$t7,$t7,$a0
-/*  f09cf68:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
-/*  f09cf6c:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
-/*  f09cf70:	000f78c0 */ 	sll	$t7,$t7,0x3
-/*  f09cf74:	01e47821 */ 	addu	$t7,$t7,$a0
-/*  f09cf78:	000f7880 */ 	sll	$t7,$t7,0x2
-/*  f09cf7c:	01cfc021 */ 	addu	$t8,$t6,$t7
-/*  f09cf80:	03e00008 */ 	jr	$ra
-/*  f09cf84:	c7000840 */ 	lwc1	$f0,0x840($t8)
-);
+f32 func0f09cf58(u32 hand)
+{
+	return g_Vars.currentplayer->hands[hand].unk0840;
+}
 
 GLOBAL_ASM(
 glabel func0f09cf88
diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c
index ba6107226..365f124a5 100644
--- a/src/gvars/gvars.c
+++ b/src/gvars/gvars.c
@@ -18841,7 +18841,7 @@ struct audiohandle *g_BoostAndSlayerAudioHandles[3] = {NULL};
 u32 var800aa5bc = 0;
 s32 g_BoostAndSlayerActiveTypes[3] = {0};
 u32 var800aa5cc = 0;
-u32 var800aa5d0 = 0;
+s32 var800aa5d0 = 0;
 u32 var800aa5d4 = 0;
 u32 var800aa5d8 = 0;
 u32 var800aa5dc = 0;
diff --git a/src/include/types.h b/src/include/types.h
index 3a1622ae2..a24b02d20 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -1621,7 +1621,7 @@ struct hand {
 	/*0x0834*/ u32 unk0834;
 	/*0x0838*/ u32 unk0838;
 	/*0x083c*/ u32 unk083c;
-	/*0x0840*/ u32 unk0840;
+	/*0x0840*/ f32 unk0840;
 	/*0x0844*/ u32 unk0844;
 	/*0x0848*/ u32 unk0848;
 	/*0x084c*/ u32 unk084c;