From 80e361a33e70a7c7c05c1c59e5f5f8d9aca909c5 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Mon, 15 Feb 2021 14:56:41 +0100
Subject: [PATCH] matched sub_0807DD64

---
 asm/code_0807CC3C.s | 17 -----------------
 src/code_0807CC3C.c | 13 +++++++++----
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index d8835d50..924dfa2c 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -1931,20 +1931,3 @@ sub_0807DD50: @ 0x0807DD50
 	bl sub_0807DD94
 	pop {r4, pc}
 	.align 2, 0
-
-	thumb_func_start sub_0807DD64
-sub_0807DD64: @ 0x0807DD64
-	adds r3, r0, #0
-	ldrb r0, [r3, #0x14]
-	movs r2, #0
-	strb r0, [r3, #0xf]
-	adds r1, r3, #0
-	adds r1, #0x58
-	movs r0, #0xff
-	strb r0, [r1]
-	adds r0, r3, #0
-	adds r0, #0x80
-	strh r2, [r0]
-	adds r0, #2
-	strh r2, [r0]
-	bx lr
diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c
index 319ddb22..904074d6 100644
--- a/src/code_0807CC3C.c
+++ b/src/code_0807CC3C.c
@@ -15,11 +15,16 @@ extern void _call_via_r6(Entity*, ScriptExecutionContext*);
 void sub_0807DF38(void);
 void sub_0807DE80(Entity* entity);
 
-void sub_0807DD80(Entity *param_1)
+void sub_0807DD64(Entity* entity) {
+    entity->field_0xf = entity->animationState;
+    entity->animIndex = 0xff;
+    entity->field_0x80.HWORD = 0;
+    entity->field_0x82.HWORD = 0;
+}
 
-{
-    sub_0807DB88(*(Entity**)&param_1->cutsceneBeh);
-    sub_0807DD64(param_1);
+void sub_0807DD80(Entity* entity) {
+    sub_0807DB88(*(Entity**)&entity->cutsceneBeh);
+    sub_0807DD64(entity);
 }
 
 void sub_0807DD94(Entity* entity, u32 param_2) {