diff --git a/src/game/game_000130.c b/src/game/game_000130.c
index 7632c0c93..6eaa870b3 100644
--- a/src/game/game_000130.c
+++ b/src/game/game_000130.c
@@ -183,23 +183,14 @@ glabel func0f00052c
 /*  f00058c:	27bd0028 */ 	addiu	$sp,$sp,0x28
 );
 
-GLOBAL_ASM(
-glabel func0f000590
-/*  f000590:	848e0000 */ 	lh	$t6,0x0($a0)
-/*  f000594:	00001825 */ 	or	$v1,$zero,$zero
-/*  f000598:	00801025 */ 	or	$v0,$a0,$zero
-/*  f00059c:	19c00006 */ 	blez	$t6,.L0f0005b8
-/*  f0005a0:	00000000 */ 	nop
-/*  f0005a4:	844f001c */ 	lh	$t7,0x1c($v0)
-.L0f0005a8:
-/*  f0005a8:	24630001 */ 	addiu	$v1,$v1,0x1
-/*  f0005ac:	2442001c */ 	addiu	$v0,$v0,0x1c
-/*  f0005b0:	5de0fffd */ 	bgtzl	$t7,.L0f0005a8
-/*  f0005b4:	844f001c */ 	lh	$t7,0x1c($v0)
-.L0f0005b8:
-/*  f0005b8:	03e00008 */ 	jr	$ra
-/*  f0005bc:	00601025 */ 	or	$v0,$v1,$zero
-);
+s32 func0f000590(struct animtablerow *rows)
+{
+	s32 i;
+
+	for (i = 0; rows[i].animnum > 0; i++);
+
+	return i;
+}
 
 f32 func0f0005c0(s16 animnum)
 {
diff --git a/src/include/game/game_000130.h b/src/include/game/game_000130.h
index 636ae1520..a08752b48 100644
--- a/src/include/game/game_000130.h
+++ b/src/include/game/game_000130.h
@@ -9,7 +9,7 @@ u16 func0f0002a0(s16 animnum, s32 frame, s32 endframe);
 s32 func0f000358(s16 animnum, s32 startframe, s32 endframe);
 void func0f00040c(struct attackanimconfig *config);
 void func0f00052c(struct attackanimgroup **group);
-u32 func0f000590(struct animtablerow *row);
+s32 func0f000590(struct animtablerow *rows);
 f32 func0f0005c0(s16 animnum);
 void func0f000648(void);