matched sub_0807DB88

2 files changed, 7 insertions, 12 deletions

diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index 43b15025..5715aa7b 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -1658,12 +1658,3 @@ _0807DB84:
 	adds r0, r2, #0
 	pop {r4, r5, pc}
 
-	thumb_func_start sub_0807DB88
-sub_0807DB88: @ 0x0807DB88
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r5, r1, #0
-	movs r1, #0x24
-	bl _DmaZero
-	str r5, [r4]
-	pop {r4, r5, pc}
diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c
index 5cef7e15..28cde049 100644
--- a/src/code_0807CC3C.c
+++ b/src/code_0807CC3C.c
@@ -11,11 +11,15 @@ extern void CreateSpeechBubbleExclamationMark(Entity*, u32, u32);
 extern void CreateSpeechBubbleQuestionMark(Entity*, u32, u32);
 extern void sub_0807DAC4(ScriptExecutionContext*);
 extern void DeleteThisEntity(void);
-extern void sub_0807DB88(Entity*);
 extern void sub_0801C4A0(u32);
 extern void sub_0807DB98(Entity*, ScriptExecutionContext*);
 extern void _call_via_r6(Entity*, ScriptExecutionContext*);
 
+void sub_0807DB88(ScriptExecutionContext* context, u32 unk1) {
+    _DmaZero(context, 0x24);
+    context->unk_00 = (u16*)unk1;
+}
+
 void sub_0807DB98(Entity* entity, ScriptExecutionContext* context) {
     u32 switchVar;
 
@@ -105,8 +109,8 @@ void sub_0807DD64(Entity* entity) {
     entity->field_0x82.HWORD = 0;
 }
 
-void sub_0807DD80(Entity* entity) {
-    sub_0807DB88(*(Entity**)&entity->cutsceneBeh);
+void sub_0807DD80(Entity* entity, u32 unk1) {
+    sub_0807DB88(*(ScriptExecutionContext**)&entity->cutsceneBeh, unk1);
     sub_0807DD64(entity);
 }