diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 14036c1a..7e6930bc 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -1589,24 +1589,3 @@ sub_0807DAF0: @ 0x0807DAF0 bl sub_0807DB88 pop {r4, pc} - thumb_func_start UnloadCutsceneData -UnloadCutsceneData: @ 0x0807DB08 - push {r4, r5, lr} - adds r4, r0, #0 - ldrb r1, [r4, #0x10] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - beq _0807DB28 - movs r0, #0xfd - ands r0, r1 - movs r5, #0 - strb r0, [r4, #0x10] - adds r4, #0x84 - ldr r0, [r4] - bl sub_0807DAC4 - str r5, [r4] -_0807DB28: - pop {r4, r5, pc} - .align 2, 0 - diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c index 87c4775c..54ed3e38 100644 --- a/src/code_0807CC3C.c +++ b/src/code_0807CC3C.c @@ -19,6 +19,14 @@ extern void _call_via_r6(Entity*, ScriptExecutionContext*); extern u32* sub_0807DAA0(); +void UnloadCutsceneData(Entity* entity) { + if ((entity->flags & 2)) { + entity->flags = entity->flags & 0xfd; + sub_0807DAC4(*(ScriptExecutionContext**)&entity->cutsceneBeh); + *(ScriptExecutionContext**)&entity->cutsceneBeh = NULL; + } +} + void StartPlayerScript(u32 unk1) { Entity* player;