From 9dbbd208c9c77754e58370b59dafce237c668da6 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Mon, 15 Feb 2021 14:43:20 +0100
Subject: [PATCH] matched sub_0807DD94

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

diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index cdc22ea6..dbffbeb0 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -1959,15 +1959,3 @@ sub_0807DD80: @ 0x0807DD80
 	adds r0, r4, #0
 	bl sub_0807DD64
 	pop {r4, pc}
-
-	thumb_func_start sub_0807DD94
-sub_0807DD94: @ 0x0807DD94
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0807DDAC
-	adds r0, r4, #0
-	bl sub_0807DDE4
-	adds r0, r4, #0
-	bl sub_0807DE80
-	pop {r4, pc}
-	.align 2, 0
diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c
index e189a2a8..70211d78 100644
--- a/src/code_0807CC3C.c
+++ b/src/code_0807CC3C.c
@@ -7,21 +7,28 @@
 extern u8 gUnk_0811E514[];
 extern u8 gUnk_0811E510[];
 
-void sub_0807DF38(void);
 extern void sub_0801C4A0(u32);
 extern void sub_0807DB98(Entity*, ScriptExecutionContext*);
 extern void _call_via_r6(Entity*, ScriptExecutionContext*);
 
+void sub_0807DF38(void);
+void sub_0807DE80(Entity* entity);
+
+void sub_0807DD94(Entity* entity, u32 param_2) {
+    sub_0807DDAC(entity, param_2);
+    sub_0807DDE4(entity);
+    sub_0807DE80(entity);
+}
+
 /**
  *
  * @param entity
  * @param address this is the fuction called via r6
  */
-void sub_0807DDAC(Entity* entity, u32 address)
-{
-    ScriptExecutionContext **piVar1;
+void sub_0807DDAC(Entity* entity, u32 address) {
+    ScriptExecutionContext** piVar1;
 
-    piVar1 = (ScriptExecutionContext **)&entity->cutsceneBeh;
+    piVar1 = (ScriptExecutionContext**)&entity->cutsceneBeh;
     if (*piVar1) {
         ExecuteScriptCommandSet(entity, *piVar1);
         if (address) {