From 5384f3daa916de75240d9cd82b676fa9a20f8f27 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 19 Feb 2021 14:30:49 +0100
Subject: [PATCH] nonmatch sub_080B1568

---
 asm/code_080B1520.s                           | 61 -------------------
 .../code_080B1520/sub_080B1568.inc            |  2 +-
 src/code_080B1520.c                           | 23 +++++++
 3 files changed, 24 insertions(+), 62 deletions(-)

diff --git a/asm/code_080B1520.s b/asm/code_080B1520.s
index 6a90c190..0400faab 100644
--- a/asm/code_080B1520.s
+++ b/asm/code_080B1520.s
@@ -5,67 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_080B1568
-sub_080B1568: @ 0x080B1568
-	push {r4, r5, r6, lr}
-	lsls r2, r2, #0x10
-	lsrs r2, r2, #0x10
-	ldr r4, _080B15C8 @ =0x04000208
-	ldrh r3, [r4]
-	adds r6, r3, #0
-	movs r3, #0
-	strh r3, [r4]
-	ldr r5, _080B15CC @ =0x04000204
-	ldrh r4, [r5]
-	ldr r3, _080B15D0 @ =0x0000F8FF
-	ands r4, r3
-	ldr r3, _080B15D4 @ =gUnk_02036A50
-	ldr r3, [r3]
-	ldrh r3, [r3, #6]
-	orrs r4, r3
-	strh r4, [r5]
-	ldr r3, _080B15D8 @ =0x040000D4
-	str r0, [r3]
-	ldr r0, _080B15DC @ =0x040000D8
-	str r1, [r0]
-	ldr r1, _080B15E0 @ =0x040000DC
-	movs r0, #0x80
-	lsls r0, r0, #0x18
-	orrs r2, r0
-	str r2, [r1]
-	adds r1, #2
-	movs r2, #0x80
-	lsls r2, r2, #8
-	adds r0, r2, #0
-	ldrh r1, [r1]
-	ands r0, r1
-	cmp r0, #0
-	beq _080B15BC
-	ldr r2, _080B15E4 @ =0x040000DE
-	movs r0, #0x80
-	lsls r0, r0, #8
-	adds r1, r0, #0
-_080B15B4:
-	ldrh r0, [r2]
-	ands r0, r1
-	cmp r0, #0
-	bne _080B15B4
-_080B15BC:
-	ldr r0, _080B15C8 @ =0x04000208
-	strh r6, [r0]
-	pop {r4, r5, r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B15C8: .4byte 0x04000208
-_080B15CC: .4byte 0x04000204
-_080B15D0: .4byte 0x0000F8FF
-_080B15D4: .4byte gUnk_02036A50
-_080B15D8: .4byte 0x040000D4
-_080B15DC: .4byte 0x040000D8
-_080B15E0: .4byte 0x040000DC
-_080B15E4: .4byte 0x040000DE
-
 	thumb_func_start sub_080B15E8
 sub_080B15E8: @ 0x080B15E8
 	push {r4, r5, r6, lr}
diff --git a/asm/non_matching/code_080B1520/sub_080B1568.inc b/asm/non_matching/code_080B1520/sub_080B1568.inc
index 2c79cd29..29a887f1 100644
--- a/asm/non_matching/code_080B1520/sub_080B1568.inc
+++ b/asm/non_matching/code_080B1520/sub_080B1568.inc
@@ -59,4 +59,4 @@ _080B15DC: .4byte 0x040000D8
 _080B15E0: .4byte 0x040000DC
 _080B15E4: .4byte 0x040000DE
 
-    .syntax divided
\ No newline at end of file
+    .syntax divided
diff --git a/src/code_080B1520.c b/src/code_080B1520.c
index 8f461ced..989efe66 100644
--- a/src/code_080B1520.c
+++ b/src/code_080B1520.c
@@ -21,3 +21,26 @@ u32 sub_080B1520(u16 unk_1) {
     return ret;
 }
 
+NONMATCH("asm/non_matching/code_080B1520/sub_080B1568.inc", void sub_080B1568(u32 unk_1, u32 unk_2, u32 unk_3)) {
+    u32 temp;
+
+    u16 u1;
+    u16 IME_save;
+    u16* ptr;
+
+    u1 = unk_3;
+    IME_save = REG_IME;
+    REG_IME = 0;
+    temp = REG_WAITCNT & 0xf8ff;
+    ptr = *gUnk_02036A50;
+    temp |= ptr[3];
+    REG_WAITCNT = temp;
+    REG_DMA3SAD = unk_1;
+    REG_DMA3DAD = unk_2;
+    REG_DMA3CNT = u1 | 0x80000000;
+    if ((REG_DMA3CNT_H & 0x8000) != 0) {
+        while ((REG_DMA3CNT_H & 0x8000) != 0) {}
+    }
+    REG_IME = IME_save;
+}
+END_NONMATCH