diff --git a/asm/sprite.s b/asm/sprite.s
deleted file mode 100644
index 4d186bd53..000000000
--- a/asm/sprite.s
+++ /dev/null
@@ -1,122 +0,0 @@
-	#include "asm/constants/gba_constants.inc"
-	#include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80054BC
-sub_80054BC:
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4]
-	movs r0, 0x80
-	lsls r0, 6
-	ands r0, r1
-	cmp r0, 0
-	beq _080054D0
-	movs r0, 0
-	b _080054D2
-_080054D0:
-	lsrs r0, r1, 15
-_080054D2:
-	cmp r0, 0
-	beq _08005586
-	movs r1, 0x20
-	ldrsh r0, [r4, r1]
-	ldrh r3, [r4]
-	cmp r0, 0
-	blt _08005524
-	movs r0, 0x80
-	lsls r0, 7
-	ands r0, r3
-	cmp r0, 0
-	bne _08005586
-	ldrh r2, [r4, 0x6]
-	movs r0, 0x6
-	ldrsh r1, [r4, r0]
-	ldr r0, _0800550C
-	cmp r1, r0
-	bgt _080054FA
-	adds r0, r2, 0x1
-	strh r0, [r4, 0x6]
-_080054FA:
-	ldrh r1, [r4, 0x4]
-	movs r2, 0x4
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _08005510
-	subs r0, r1, 0x1
-	strh r0, [r4, 0x4]
-	b _08005586
-	.align 2, 0
-_0800550C: .4byte 0x0000752f
-_08005510:
-	ldrh r1, [r4, 0x2]
-	movs r2, 0x2
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _08005524
-	subs r0, r1, 0x1
-	strh r0, [r4, 0x2]
-	lsls r0, 16
-	cmp r0, 0
-	bgt _08005586
-_08005524:
-	ldr r0, [r4, 0x2C]
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08005550
-	movs r0, 0x80
-	lsls r0, 5
-	ands r0, r3
-	cmp r0, 0
-	bne _08005542
-	movs r1, 0x80
-	lsls r1, 6
-	adds r0, r1, 0
-	orrs r0, r3
-	strh r0, [r4]
-	b _08005586
-_08005542:
-	ldr r0, [r4, 0x28]
-	str r0, [r4, 0x2C]
-	bl Rand32Bit
-	movs r1, 0x1
-	ands r0, r1
-	strh r0, [r4, 0x4]
-_08005550:
-	ldrh r1, [r4]
-	movs r2, 0x80
-	lsls r2, 4
-	adds r0, r2, 0
-	orrs r0, r1
-	strh r0, [r4]
-	ldr r1, [r4, 0x2C]
-	ldrb r0, [r1]
-	strh r0, [r4, 0x2]
-	ldrh r0, [r1, 0x2]
-	strh r0, [r4, 0x20]
-	ldrh r0, [r1, 0x4]
-	strh r0, [r4, 0xC]
-	ldrh r0, [r1, 0x6]
-	strh r0, [r4, 0xE]
-	ldrh r0, [r1, 0x8]
-	strh r0, [r4, 0x10]
-	ldrh r0, [r1, 0xA]
-	strh r0, [r4, 0x12]
-	ldrb r0, [r1, 0x1]
-	str r0, [r4, 0x14]
-	ldrb r2, [r1, 0x1]
-	ldr r0, [r4, 0x18]
-	orrs r0, r2
-	str r0, [r4, 0x18]
-	adds r1, 0xC
-	str r1, [r4, 0x2C]
-_08005586:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80054BC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/axdata.h b/include/axdata.h
index e6c8d8971..e570f0e9a 100644
--- a/include/axdata.h
+++ b/include/axdata.h
@@ -55,8 +55,8 @@ struct ax_anim
 struct axdata
 {
     /* 0x0 */ u16 flags; // 0x8000 - animating, 0x2000 finished? 0x1000 continue
-    /* 0x2 */ u16 animFrames; // frames left in the current animation frame
-    /* 0x4 */ u16 animWaitFrames; // frames to not update the animation for
+    /* 0x2 */ s16 animFrames; // frames left in the current animation frame
+    /* 0x4 */ s16 animWaitFrames; // frames to not update the animation for
     /* 0x6 */ s16 totalFrames; // max 30000
     /* 0x8 */ struct axdata1 sub1;
     /* 0x28 */ struct ax_anim *nextAnimData; // next animation data (if flags&0x1000)
diff --git a/include/sprite.h b/include/sprite.h
index 653bc2702..743417a6c 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -104,5 +104,6 @@ void sub_8005304(void);
 void sub_80053AC(struct Entity_Sub28 *, struct Dungeon_Sub17B44 *, u32, u32, u32, u32, bool8);
 void sub_80053D0(struct Entity_Sub28 *, struct Dungeon_Sub17B44_Sub4 *, u32, u32, u32, u32, bool8);
 void sub_800543C(struct Entity_Sub28 *, struct Dungeon_Sub17B44 *, u32, u32, u32, bool8);
+void sub_80054BC(struct axPokemon *);
 
 #endif // GUARD_SPRITE_H
\ No newline at end of file
diff --git a/ld_script.txt b/ld_script.txt
index 9c026266e..af1e11bab 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -61,7 +61,6 @@ SECTIONS {
         src/input.o(.text);
         asm/code_8004AA0.o(.text);
         src/sprite.o(.text);
-        asm/sprite.o(.text);
         asm/code_800558C.o(.text);
         src/code_800558C_1.o(.text);
         asm/code_8005838.o(.text);
diff --git a/src/sprite.c b/src/sprite.c
index db0b4caa8..c4d67a003 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "cpu.h"
+#include "random.h"
 #include "sprite.h"
 
 extern u16 gUnknown_2025670;
@@ -939,4 +940,177 @@ void sub_800545C(struct Entity_Sub28 *a0, struct Dungeon_Sub17B44_Sub4 *a1, u32
     a0->spriteGlobalIndex = a0->spriteBaseForDirection;
     a0->unk34 = a1->unk0;
     a0->unk30 = 0;
-}
\ No newline at end of file
+}
+
+#if NONMATCHING // https://decomp.me/scratch/n4Umb
+void sub_80054BC(struct axPokemon *a0)
+{
+    struct ax_anim *aData;
+    s32 flag;
+
+    if (a0->axdata.flags & 0x2000)
+        flag = 0;
+    else
+        flag = a0->axdata.flags >> 15;
+
+    flag++; flag--;
+
+    if (flag == 0)
+        return;
+
+    if (a0->axdata.sub1.poseId >= 0) {
+        if (a0->axdata.flags & 0x4000)
+            return;
+
+        if (a0->axdata.totalFrames < 30000)
+            a0->axdata.totalFrames++;
+
+        if (a0->axdata.animWaitFrames != 0) {
+            a0->axdata.animWaitFrames--;
+            return;
+        }
+
+        if (a0->axdata.animFrames != 0 && --a0->axdata.animFrames > 0)
+            return;
+    }
+
+    if (a0->axdata.activeAnimData->frames == 0) {
+        if (!(a0->axdata.flags & 0x1000)) {
+            a0->axdata.flags |= 0x2000;
+            return;
+        }
+
+        a0->axdata.activeAnimData = a0->axdata.nextAnimData;
+        a0->axdata.animWaitFrames = Rand32Bit() & 1;
+    }
+
+    a0->axdata.flags |= 0x800;
+    
+    aData = a0->axdata.activeAnimData;
+    a0->axdata.animFrames = aData->frames;
+    a0->axdata.sub1.poseId = aData->poseId;
+    a0->axdata.sub1.xOffset = aData->xOffset;
+    a0->axdata.sub1.yOffset = aData->yOffset;
+    a0->axdata.sub1.xShadow = aData->xShadow;
+    a0->axdata.sub1.yShadow = aData->yShadow;
+    a0->axdata.sub1.unkC = aData->unkFlags;
+    a0->axdata.sub1.unk10 |= aData->unkFlags;
+    a0->axdata.activeAnimData = aData + 1;
+}
+#else
+NAKED
+void sub_80054BC(struct axPokemon *a0)
+{
+    asm_unified(
+    "push {r4,lr}\n"
+    "\tadds r4, r0, 0\n"
+    "\tldrh r1, [r4]\n"
+    "\tmovs r0, 0x80\n"
+    "\tlsls r0, 6\n"
+    "\tands r0, r1\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _080054D0\n"
+    "\tmovs r0, 0\n"
+    "\tb _080054D2\n"
+"_080054D0:\n"
+    "\tlsrs r0, r1, 15\n"
+"_080054D2:\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _08005586\n"
+    "\tmovs r1, 0x20\n"
+    "\tldrsh r0, [r4, r1]\n"
+    "\tldrh r3, [r4]\n"
+    "\tcmp r0, 0\n"
+    "\tblt _08005524\n"
+    "\tmovs r0, 0x80\n"
+    "\tlsls r0, 7\n"
+    "\tands r0, r3\n"
+    "\tcmp r0, 0\n"
+    "\tbne _08005586\n"
+    "\tldrh r2, [r4, 0x6]\n"
+    "\tmovs r0, 0x6\n"
+    "\tldrsh r1, [r4, r0]\n"
+    "\tldr r0, _0800550C\n"
+    "\tcmp r1, r0\n"
+    "\tbgt _080054FA\n"
+    "\tadds r0, r2, 0x1\n"
+    "\tstrh r0, [r4, 0x6]\n"
+"_080054FA:\n"
+    "\tldrh r1, [r4, 0x4]\n"
+    "\tmovs r2, 0x4\n"
+    "\tldrsh r0, [r4, r2]\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _08005510\n"
+    "\tsubs r0, r1, 0x1\n"
+    "\tstrh r0, [r4, 0x4]\n"
+    "\tb _08005586\n"
+    "\t.align 2, 0\n"
+"_0800550C: .4byte 0x0000752f\n"
+"_08005510:\n"
+    "\tldrh r1, [r4, 0x2]\n"
+    "\tmovs r2, 0x2\n"
+    "\tldrsh r0, [r4, r2]\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _08005524\n"
+    "\tsubs r0, r1, 0x1\n"
+    "\tstrh r0, [r4, 0x2]\n"
+    "\tlsls r0, 16\n"
+    "\tcmp r0, 0\n"
+    "\tbgt _08005586\n"
+"_08005524:\n"
+    "\tldr r0, [r4, 0x2C]\n"
+    "\tldrb r0, [r0]\n"
+    "\tcmp r0, 0\n"
+    "\tbne _08005550\n"
+    "\tmovs r0, 0x80\n"
+    "\tlsls r0, 5\n"
+    "\tands r0, r3\n"
+    "\tcmp r0, 0\n"
+    "\tbne _08005542\n"
+    "\tmovs r1, 0x80\n"
+    "\tlsls r1, 6\n"
+    "\tadds r0, r1, 0\n"
+    "\torrs r0, r3\n"
+    "\tstrh r0, [r4]\n"
+    "\tb _08005586\n"
+"_08005542:\n"
+    "\tldr r0, [r4, 0x28]\n"
+    "\tstr r0, [r4, 0x2C]\n"
+    "\tbl Rand32Bit\n"
+    "\tmovs r1, 0x1\n"
+    "\tands r0, r1\n"
+    "\tstrh r0, [r4, 0x4]\n"
+"_08005550:\n"
+    "\tldrh r1, [r4]\n"
+    "\tmovs r2, 0x80\n"
+    "\tlsls r2, 4\n"
+    "\tadds r0, r2, 0\n"
+    "\torrs r0, r1\n"
+    "\tstrh r0, [r4]\n"
+    "\tldr r1, [r4, 0x2C]\n"
+    "\tldrb r0, [r1]\n"
+    "\tstrh r0, [r4, 0x2]\n"
+    "\tldrh r0, [r1, 0x2]\n"
+    "\tstrh r0, [r4, 0x20]\n"
+    "\tldrh r0, [r1, 0x4]\n"
+    "\tstrh r0, [r4, 0xC]\n"
+    "\tldrh r0, [r1, 0x6]\n"
+    "\tstrh r0, [r4, 0xE]\n"
+    "\tldrh r0, [r1, 0x8]\n"
+    "\tstrh r0, [r4, 0x10]\n"
+    "\tldrh r0, [r1, 0xA]\n"
+    "\tstrh r0, [r4, 0x12]\n"
+    "\tldrb r0, [r1, 0x1]\n"
+    "\tstr r0, [r4, 0x14]\n"
+    "\tldrb r2, [r1, 0x1]\n"
+    "\tldr r0, [r4, 0x18]\n"
+    "\torrs r0, r2\n"
+    "\tstr r0, [r4, 0x18]\n"
+    "\tadds r1, 0xC\n"
+    "\tstr r1, [r4, 0x2C]\n"
+"_08005586:\n"
+    "\tpop {r4}\n"
+    "\tpop {r0}\n"
+    "\tbx r0");
+}
+#endif // NONMATCHING
\ No newline at end of file