diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 7e6930bc..aa61f8d0 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -1575,17 +1575,3 @@ _0807DAEA: pop {r4, r5, r6, pc} .align 2, 0 - thumb_func_start sub_0807DAF0 -sub_0807DAF0: @ 0x0807DAF0 - push {r4, lr} - ldrb r4, [r0, #0x10] - movs r3, #2 - orrs r3, r4 - strb r3, [r0, #0x10] - adds r0, #0x84 - str r1, [r0] - adds r0, r1, #0 - adds r1, r2, #0 - bl sub_0807DB88 - pop {r4, pc} - diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c index 54ed3e38..5765f9cf 100644 --- a/src/code_0807CC3C.c +++ b/src/code_0807CC3C.c @@ -17,8 +17,15 @@ 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); extern u32* sub_0807DAA0(); +void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u32 unk1) { + entity->flags = entity->flags | 2; + *(ScriptExecutionContext**)&entity->cutsceneBeh = context; + sub_0807DB88(context, unk1); +} + void UnloadCutsceneData(Entity* entity) { if ((entity->flags & 2)) { entity->flags = entity->flags & 0xfd;