diff --git a/asm/object/minishEmoticon.s b/asm/object/minishEmoticon.s
deleted file mode 100644
index 3a8f533e..00000000
--- a/asm/object/minishEmoticon.s
+++ /dev/null
@@ -1,258 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start MinishEmoticon
-MinishEmoticon: @ 0x08082040
-	push {lr}
-	ldr r2, _08082054 @ =gUnk_0811EE5C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08082054: .4byte gUnk_0811EE5C
-
-	thumb_func_start sub_08082058
-sub_08082058: @ 0x08082058
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r1, [r4, #0x11]
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #6
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x20
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #3
-	bl LoadSwapGFX
-	adds r0, r4, #0
-	bl sub_08082098
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08082098
-sub_08082098: @ 0x08082098
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	ldr r0, _08082100 @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #0x80
-	ands r0, r1
-	cmp r0, #0
-	bne _080820AC
-	bl DeleteThisEntity
-_080820AC:
-	ldr r5, _08082104 @ =gPlayerEntity
-	adds r0, r4, #0
-	bl sub_08079BD8
-	ldrb r1, [r4, #0x1b]
-	movs r0, #0x3f
-	ands r0, r1
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r4, #0x1b]
-	ldrb r1, [r5, #0x1a]
-	lsls r1, r1, #0x1c
-	lsrs r1, r1, #0x1c
-	ldrb r2, [r4, #0x1a]
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x1a]
-	ldrb r1, [r5, #0x14]
-	movs r0, #0xe
-	ands r0, r1
-	strb r0, [r4, #0x14]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r0, [r5, #0x14]
-	lsrs r3, r0, #1
-	adds r7, r3, #0
-	ldrb r0, [r5, #0xc]
-	cmp r0, #0x14
-	beq _08082122
-	cmp r0, #0x14
-	bgt _08082108
-	cmp r0, #0xa
-	beq _0808212A
-	b _0808212E
-	.align 2, 0
-_08082100: .4byte gPlayerState
-_08082104: .4byte gPlayerEntity
-_08082108:
-	cmp r0, #0x16
-	beq _08082112
-	cmp r0, #0x18
-	beq _08082126
-	b _0808212E
-_08082112:
-	ldrb r0, [r4, #0x14]
-	movs r3, #0xd
-	adds r5, r4, #0
-	adds r5, #0x58
-	cmp r0, #2
-	bne _080821F2
-	movs r3, #0xe
-	b _080821F2
-_08082122:
-	movs r3, #0xc
-	b _080821EE
-_08082126:
-	adds r3, #0xf
-	b _080821EE
-_0808212A:
-	movs r3, #0x13
-	b _080821EE
-_0808212E:
-	adds r0, r5, #0
-	adds r0, #0x42
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0808213E
-	adds r3, r7, #0
-	adds r3, #8
-	b _080821EE
-_0808213E:
-	ldr r2, _0808215C @ =gPlayerState
-	ldrb r1, [r2, #2]
-	adds r6, r1, #0
-	cmp r6, #0
-	beq _08082160
-	movs r0, #0x10
-	ands r0, r1
-	adds r5, r4, #0
-	adds r5, #0x58
-	cmp r0, #0
-	bne _080821F2
-	adds r3, r7, #0
-	adds r3, #0x19
-	b _080821F2
-	.align 2, 0
-_0808215C: .4byte gPlayerState
-_08082160:
-	adds r0, r2, #0
-	adds r0, #0xa8
-	ldrb r0, [r0]
-	cmp r0, #1
-	beq _0808216E
-	cmp r0, #0x19
-	bne _080821C8
-_0808216E:
-	adds r3, r7, #4
-	adds r0, r4, #0
-	adds r0, #0x58
-	ldrb r1, [r0]
-	adds r5, r0, #0
-	cmp r1, r3
-	beq _08082180
-	str r6, [r4, #0x34]
-	b _080821BA
-_08082180:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	movs r7, #0xff
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0xff
-	bne _080821F2
-	adds r2, r4, #0
-	adds r2, #0x63
-	movs r1, #0
-	ldrsb r1, [r2, r1]
-	movs r0, #1
-	rsbs r0, r0, #0
-	cmp r1, r0
-	beq _080821C0
-	cmp r1, r0
-	bgt _080821AC
-	subs r0, #1
-	cmp r1, r0
-	beq _080821B4
-	b _080821F2
-_080821AC:
-	cmp r1, #0
-	bne _080821F2
-	movs r0, #0xfe
-	b _080821B8
-_080821B4:
-	ldrb r0, [r2]
-	orrs r0, r7
-_080821B8:
-	strb r0, [r2]
-_080821BA:
-	movs r0, #6
-	strb r0, [r4, #0xe]
-	b _080821F2
-_080821C0:
-	strb r6, [r2]
-	movs r0, #3
-	strb r0, [r4, #0xe]
-	b _080821F2
-_080821C8:
-	adds r0, r2, #0
-	adds r0, #0x26
-	ldrb r2, [r0]
-	adds r1, r2, #0
-	cmp r1, #0
-	beq _080821E8
-	movs r0, #0x80
-	ands r0, r2
-	adds r3, r7, #0
-	adds r3, #0x14
-	adds r5, r4, #0
-	adds r5, #0x58
-	cmp r0, #0
-	beq _080821F2
-	movs r3, #0x18
-	b _080821F2
-_080821E8:
-	adds r0, r4, #0
-	adds r0, #0x63
-	strb r1, [r0]
-_080821EE:
-	adds r5, r4, #0
-	adds r5, #0x58
-_080821F2:
-	ldrb r0, [r5]
-	cmp r0, r3
-	beq _08082202
-	adds r0, r4, #0
-	adds r1, r3, #0
-	bl InitAnimationForceUpdate
-	b _08082208
-_08082202:
-	adds r0, r4, #0
-	bl UpdateAnimationSingleFrame
-_08082208:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
diff --git a/data/const/object/minishEmoticon.s b/data/const/object/minishEmoticon.s
deleted file mode 100644
index 2cf717cb..00000000
--- a/data/const/object/minishEmoticon.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0811EE5C:: @ 0811EE5C
-	.4byte sub_08082058
-	.4byte sub_08082098
diff --git a/linker.ld b/linker.ld
index abf6b7af..fa652f41 100644
--- a/linker.ld
+++ b/linker.ld
@@ -624,7 +624,7 @@ SECTIONS {
         src/object/deathFx.o(.text);
         src/object/itemForSale.o(.text);
         src/object/button.o(.text);
-        asm/object/minishEmoticon.o(.text);
+        src/object/minishEmoticon.o(.text);
         src/object/pot.o(.text);
         src/object/ezloCap.o(.text);
         src/object/blockPushed.o(.text);
@@ -1338,7 +1338,7 @@ SECTIONS {
         data/animations/object/deathFx.o(.rodata);
         src/object/itemForSale.o(.rodata);
         data/const/object/button.o(.rodata);
-        data/const/object/minishEmoticon.o(.rodata);
+        src/object/minishEmoticon.o(.rodata);
         data/animations/object/minishEmoticon.o(.rodata);
         data/const/object/pot.o(.rodata);
         data/animations/object/pot.o(.rodata);
diff --git a/src/object/minishEmoticon.c b/src/object/minishEmoticon.c
new file mode 100644
index 00000000..5ba969b7
--- /dev/null
+++ b/src/object/minishEmoticon.c
@@ -0,0 +1,108 @@
+#include "entity.h"
+#include "functions.h"
+
+void sub_08082058(Entity*);
+void sub_08082098(Entity*);
+
+void MinishEmoticon(Entity* this) {
+    static EntityAction* const actionFuncs[] = {
+        sub_08082058,
+        sub_08082098,
+    };
+
+    actionFuncs[this->action](this);
+}
+
+void sub_08082058(Entity* this) {
+    this->updatePriority = 6;
+    this->flags |= ENT_PERSIST;
+    this->spriteSettings.draw = 1;
+    this->action = 1;
+    LoadSwapGFX(this, 1, 3);
+    sub_08082098(this);
+}
+
+void sub_08082098(Entity* this) {
+    u32 animIndex;
+    u32 origAnimIndex;
+    u32 animationState;
+    Entity* playerEnt;
+
+    if ((gPlayerState.flags & PL_MINISH) == 0) {
+        DeleteThisEntity();
+    }
+    playerEnt = &gPlayerEntity;
+    sub_08079BD8(this);
+    this->spriteOrientation.flipY = 1;
+    this->palette.b.b0 = playerEnt->palette.b.b0;
+    this->animationState = playerEnt->animationState & 0xe;
+    this->spritePriority.b0 = 0;
+    animationState = playerEnt->animationState;
+    animIndex = animationState >> 1;
+    origAnimIndex = animIndex;
+    switch (playerEnt->action) {
+        case 0x16:
+            if (this->animationState == 2) {
+                animIndex = 0xe;
+            } else {
+                animIndex = 0xd;
+            }
+            break;
+        case 0x14:
+            animIndex = 0xc;
+            break;
+        case 0x18:
+            animIndex += 0xf;
+            break;
+        case 0xa:
+            animIndex = 0x13;
+            break;
+        default:
+            if (playerEnt->knockbackDuration != 0) {
+                animIndex = origAnimIndex + 8;
+            } else {
+                if (gPlayerState.jump_status != 0) {
+                    if ((gPlayerState.jump_status & 0x10) == 0) {
+                        animIndex = origAnimIndex + 0x19;
+                    }
+                } else {
+                    if ((gPlayerState.framestate == 1) || (gPlayerState.framestate == 25)) {
+                        animIndex = origAnimIndex + 4;
+                        if (this->animIndex != animIndex) {
+                            this->z.WORD = 0;
+                            this->actionDelay = 6;
+                        } else if (--this->actionDelay == 0xff) {
+                            switch (this->spriteOffsetY) {
+                                case 0:
+                                    this->spriteOffsetY = -2;
+                                    this->actionDelay = 6;
+                                    break;
+                                case -2:
+                                    this->spriteOffsetY = -1;
+                                    this->actionDelay = 6;
+                                    break;
+                                case -1:
+                                    this->spriteOffsetY = 0;
+                                    this->actionDelay = 3;
+                                    break;
+                            }
+                        }
+                    } else if (gPlayerState.swim_state != 0) {
+                        if ((gPlayerState.swim_state & 0x80) != 0) {
+                            animIndex = 0x18;
+                        } else {
+                            animIndex = origAnimIndex + 0x14;
+                        }
+                    } else {
+                        this->spriteOffsetY = 0;
+                    }
+                }
+            }
+    }
+
+    if (this->animIndex != animIndex) {
+        InitAnimationForceUpdate(this, animIndex);
+    } else {
+        UpdateAnimationSingleFrame(this);
+    }
+}