summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenny022p <info@henny022.de>2021-02-15 14:54:40 +0100
committerHenny022p <info@henny022.de>2021-02-15 14:54:40 +0100
commitf6423768b59f7bee7a8e2db2a74ef4820d8be692 (patch)
tree44f774babedab1a2843d8b141b4bd7e8cf73c035
parent9dbbd208c9c77754e58370b59dafce237c668da6 (diff)
matched sub_0807DD80
-rw-r--r--asm/code_0807CC3C.s11
-rw-r--r--src/code_0807CC3C.c8
2 files changed, 8 insertions, 11 deletions
diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index dbffbeb0..d8835d50 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -1948,14 +1948,3 @@ sub_0807DD64: @ 0x0807DD64
adds r0, #2
strh r2, [r0]
bx lr
-
- thumb_func_start sub_0807DD80
-sub_0807DD80: @ 0x0807DD80
- push {r4, lr}
- adds r4, r0, #0
- adds r0, #0x84
- ldr r0, [r0]
- bl sub_0807DB88
- adds r0, r4, #0
- bl sub_0807DD64
- pop {r4, pc}
diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c
index 70211d78..319ddb22 100644
--- a/src/code_0807CC3C.c
+++ b/src/code_0807CC3C.c
@@ -7,6 +7,7 @@
extern u8 gUnk_0811E514[];
extern u8 gUnk_0811E510[];
+extern void sub_0807DB88(Entity*);
extern void sub_0801C4A0(u32);
extern void sub_0807DB98(Entity*, ScriptExecutionContext*);
extern void _call_via_r6(Entity*, ScriptExecutionContext*);
@@ -14,6 +15,13 @@ extern void _call_via_r6(Entity*, ScriptExecutionContext*);
void sub_0807DF38(void);
void sub_0807DE80(Entity* entity);
+void sub_0807DD80(Entity *param_1)
+
+{
+ sub_0807DB88(*(Entity**)&param_1->cutsceneBeh);
+ sub_0807DD64(param_1);
+}
+
void sub_0807DD94(Entity* entity, u32 param_2) {
sub_0807DDAC(entity, param_2);
sub_0807DDE4(entity);