From 56ba21b875e94fbb9f326d7e9bfd1da9a31d5a76 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Mon, 15 Feb 2021 09:22:58 +0100
Subject: [PATCH] matched sub_0807DF28 and sub_0807DF38

---
 asm/code_0807CC3C.s | 22 ----------------------
 src/code_0807CC3C.c | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index b05ddf0a..d1d2a2af 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -2175,25 +2175,3 @@ sub_0807DEDC: @ 0x0807DEDC
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 _0807DF24: .4byte gUnk_0811E514
-
-	thumb_func_start sub_0807DF28
-sub_0807DF28: @ 0x0807DF28
-	push {lr}
-	bl sub_0807DF38
-	bl sub_08079184
-	bl sub_08077B20
-	pop {pc}
-
-	thumb_func_start sub_0807DF38
-sub_0807DF38: @ 0x0807DF38
-	ldr r1, _0807DF48 @ =gUnk_0200AF00
-	movs r0, #0xff
-	strb r0, [r1, #1]
-	ldr r1, _0807DF4C @ =gUnk_02034490
-	movs r0, #1
-	rsbs r0, r0, #0
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0807DF48: .4byte gUnk_0200AF00
-_0807DF4C: .4byte gUnk_02034490
diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c
index 07174792..254b13f1 100644
--- a/src/code_0807CC3C.c
+++ b/src/code_0807CC3C.c
@@ -2,9 +2,21 @@
 #include "structures.h"
 #include "functions.h"
 
+void sub_0807DF38(void);
 extern void sub_0801C4A0(int arg0);
 
-void sub_0807DF50() {
+void sub_0807DF28(void) {
+    sub_0807DF38();
+    sub_08079184();
+    sub_08077B20();
+}
+
+void sub_0807DF38(void) {
+    gUnk_0200AF00.filler0[1] = 0xff;
+    gUnk_02034490[0] = 0xff;
+}
+
+void sub_0807DF50(void) {
     gUnk_02034490[0] = 0;
     gUnk_0200AF00.filler0[1] = 0;
     sub_0801C4A0(0);