falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

matched UnloadCutsceneData

This commit is contained in:
Henny022p 2021-02-16 02:30:47 +01:00
parent 945a3fe944
commit 363efaaf86
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
asm/code_0807CC3C.s
View File

@ -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

8
src/code_0807CC3C.c
View File

@ -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;