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

matched sub_0807DAF0

This commit is contained in:
Henny022p 2021-02-16 02:33:49 +01:00
parent 363efaaf86
commit 38691d8e47
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
asm/code_0807CC3C.s
View File

@ -1575,17 +1575,3 @@ _0807DAEA:
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
.align 2, 0 .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}

7
src/code_0807CC3C.c
View File

@ -17,8 +17,15 @@ extern void sub_0801C4A0(u32);
extern void sub_0807DB98(Entity*, ScriptExecutionContext*); extern void sub_0807DB98(Entity*, ScriptExecutionContext*);
extern void _call_via_r6(Entity*, ScriptExecutionContext*); extern void _call_via_r6(Entity*, ScriptExecutionContext*);
void sub_0807DB88(ScriptExecutionContext* context, u32 unk1);
extern u32* sub_0807DAA0(); 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) { void UnloadCutsceneData(Entity* entity) {
if ((entity->flags & 2)) { if ((entity->flags & 2)) {
entity->flags = entity->flags & 0xfd; entity->flags = entity->flags & 0xfd;