From de847d45ba9c9abe3510a2ab146e3612b88f19eb Mon Sep 17 00:00:00 2001
From: ThothWhatsThis <leon.meiser42@gmail.com>
Date: Thu, 30 Nov 2023 08:15:47 +0000
Subject: [PATCH] Match sub_0807C8B0

---
 asm/non_matching/playerUtils/sub_0807C8B0.inc | 98 -------------------
 src/playerUtils.c                             | 40 +++++++-
 2 files changed, 39 insertions(+), 99 deletions(-)
 delete mode 100644 asm/non_matching/playerUtils/sub_0807C8B0.inc

diff --git a/asm/non_matching/playerUtils/sub_0807C8B0.inc b/asm/non_matching/playerUtils/sub_0807C8B0.inc
deleted file mode 100644
index 90f1d5db..00000000
--- a/asm/non_matching/playerUtils/sub_0807C8B0.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	mov r8, r0
-	adds r4, r1, #0
-	mov ip, r2
-	mov r0, ip
-	muls r0, r4, r0
-	lsls r0, r0, #1
-	add r0, r8
-	subs r7, r0, #2
-	mov r0, ip
-	subs r0, #1
-	lsls r0, r0, #7
-	add r0, r8
-	lsls r3, r4, #1
-	subs r1, r3, #2
-	adds r0, r0, r1
-	movs r5, #0
-	cmp r5, ip
-	bhs _0807C906
-	mov sb, r3
-_0807C8DE:
-	movs r2, #0
-	adds r6, r0, #0
-	subs r6, #0x80
-	cmp r2, r4
-	bhs _0807C8FA
-	adds r1, r7, #0
-	adds r3, r0, #0
-_0807C8EC:
-	ldrh r0, [r1]
-	strh r0, [r3]
-	subs r1, #2
-	subs r3, #2
-	adds r2, #1
-	cmp r2, r4
-	blo _0807C8EC
-_0807C8FA:
-	adds r0, r6, #0
-	mov r1, sb
-	subs r7, r7, r1
-	adds r5, #1
-	cmp r5, ip
-	blo _0807C8DE
-_0807C906:
-	movs r0, #0x40
-	subs r6, r0, r4
-	movs r5, #0
-	lsls r0, r4, #1
-	mov r2, ip
-	lsls r7, r2, #7
-	mov r2, r8
-	adds r1, r2, r0
-_0807C916:
-	lsls r0, r5, #7
-	adds r0, r1, r0
-	movs r2, #0
-	adds r3, r5, #1
-	cmp r2, r6
-	bhs _0807C92E
-	movs r4, #0
-_0807C924:
-	strh r4, [r0]
-	adds r0, #2
-	adds r2, #1
-	cmp r2, r6
-	blo _0807C924
-_0807C92E:
-	adds r5, r3, #0
-	cmp r5, #0x3f
-	bls _0807C916
-	movs r0, #0x40
-	mov r1, ip
-	subs r6, r0, r1
-	mov r2, r8
-	adds r0, r2, r7
-	movs r5, #0
-	cmp r5, r6
-	bhs _0807C956
-	adds r4, r0, #0
-_0807C946:
-	adds r0, r4, #0
-	movs r1, #0x80
-	bl MemClear
-	adds r4, #0x80
-	adds r5, #1
-	cmp r5, r6
-	blo _0807C946
-_0807C956:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-	.syntax divided
diff --git a/src/playerUtils.c b/src/playerUtils.c
index d1769c0c..1f9305b6 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -4001,7 +4001,45 @@ void sub_0807C898(void) {
     gRoomTransition.field2d = 0;
 }
 
-ASM_FUNC("asm/non_matching/playerUtils/sub_0807C8B0.inc", void sub_0807C8B0(u16* a, u32 b, u32 c))
+void sub_0807C8B0(u16* data, u32 width, u32 height) {
+    u16* dst_ptr;
+    u16* src_ptr;
+    u16* dst_ptr_cpy;
+    u16* src_ptr_cpy;
+    u32 innerIndex;
+    u32 index;
+    u16* prev_line;
+    u32 diff;
+
+    src_ptr = data + width * height - 1;
+    dst_ptr = data + (height - 1) * 0x40 + (width - 1);
+
+    for (index = 0; index < height; index++) {
+        src_ptr_cpy = src_ptr; //[index * -width];
+        dst_ptr_cpy = dst_ptr; //[index * -0x40];
+        for (innerIndex = 0; innerIndex < width; innerIndex++) {
+            dst_ptr_cpy[-innerIndex] = src_ptr_cpy[-innerIndex];
+        }
+        dst_ptr -= 0x40;
+        src_ptr -= width;
+    }
+
+    diff = 0x40 - width;
+    for (index = 0; index < 0x40; index++) {
+        dst_ptr = data + width - index * -0x40;
+
+        for (innerIndex = 0; innerIndex < diff; innerIndex++) {
+            dst_ptr[innerIndex] = 0;
+        }
+    }
+
+    diff = 0x40 - height;
+    dst_ptr = data + height * 0x40;
+    for (index = 0; index < diff; index++) {
+        MemClear(&dst_ptr[index * 0x40], 0x80);
+        // dst_ptr += 0x40;
+    }
+}
 
 void LoadCompressedMapData(void* dest, u32 offset) {
     void* src;