From c7e8f278d25edf23d0a3571bde75145c5985eaaa Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 23 Feb 2020 09:46:15 +1000
Subject: [PATCH] Decompile animGetFrame

---
 src/include/types.h         |  2 +-
 src/library/library_1a500.c | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/include/types.h b/src/include/types.h
index 40b7e5e40..955b7b5cb 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -89,7 +89,7 @@ struct anim {
 	/*0x09*/ u8 flip2;
 	/*0x0a*/ u8 looping;
 	/*0x0b*/ u8 average;
-	/*0x0c*/ u32 frame;
+	/*0x0c*/ f32 frame;
 	/*0x10*/ u32 frac;
 	/*0x14*/ u16 framea;
 	/*0x16*/ u16 frameb;
diff --git a/src/library/library_1a500.c b/src/library/library_1a500.c
index e5de1fac4..9c9d19815 100644
--- a/src/library/library_1a500.c
+++ b/src/library/library_1a500.c
@@ -3571,19 +3571,14 @@ glabel func0001d15c
 /*    1d178:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel animGetFrame
-/*    1d17c:	8c820020 */ 	lw	$v0,0x20($a0)
-/*    1d180:	50400004 */ 	beqzl	$v0,.L0001d194
-/*    1d184:	44800000 */ 	mtc1	$zero,$f0
-/*    1d188:	03e00008 */ 	jr	$ra
-/*    1d18c:	c440000c */ 	lwc1	$f0,0xc($v0)
-/*    1d190:	44800000 */ 	mtc1	$zero,$f0
-.L0001d194:
-/*    1d194:	00000000 */ 	sll	$zero,$zero,0x0
-/*    1d198:	03e00008 */ 	jr	$ra
-/*    1d19c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+f32 animGetFrame(struct animdata *animdata)
+{
+	if (animdata->anim) {
+		return animdata->anim->frame;
+	}
+
+	return 0;
+}
 
 GLOBAL_ASM(
 glabel func0001d1a0