From 8270f99711ff88c04d85a2f7c49cbac289e42b24 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Fri, 29 Apr 2022 09:34:03 +0300
Subject: [PATCH] Match sub_08080C80

---
 asm/non_matching/scroll/sub_08080C80.inc | 22 ----------------------
 src/scroll.c                             |  6 +++++-
 2 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 asm/non_matching/scroll/sub_08080C80.inc

diff --git a/asm/non_matching/scroll/sub_08080C80.inc b/asm/non_matching/scroll/sub_08080C80.inc
deleted file mode 100644
index d61686c3..00000000
--- a/asm/non_matching/scroll/sub_08080C80.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	bl sub_080197D4
-	ldr r0, _08080CA8 @ =gMapDataBottom
-	ldr r4, _08080CAC @ =gRoomControls
-	ldrh r1, [r4, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r4, #0x20]
-	lsrs r2, r2, #4
-	bl sub_0807C8B0
-	ldr r0, _08080CB0 @ =gMapDataTop
-	ldrh r1, [r4, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r4, #0x20]
-	lsrs r2, r2, #4
-	bl sub_0807C8B0
-	pop {r4, pc}
-	.align 2, 0
-_08080CA8: .4byte gMapDataBottom
-_08080CAC: .4byte gRoomControls
-_08080CB0: .4byte gMapDataTop
-	.syntax divided
diff --git a/src/scroll.c b/src/scroll.c
index 1b8c213b..f28acaaa 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -617,6 +617,10 @@ ASM_FUNC("asm/non_matching/scroll/sub_08080B60.inc", void sub_08080B60(u8* param
 
 ASM_FUNC("asm/non_matching/scroll/sub_08080BC4.inc", void sub_08080BC4())
 
-ASM_FUNC("asm/non_matching/scroll/sub_08080C80.inc", void sub_08080C80(u32* param_1))
+void sub_08080C80(u32* param_1) {
+    sub_080197D4(param_1);
+    sub_0807C8B0(gMapDataBottom, gRoomControls.width >> 4, gRoomControls.height >> 4);
+    sub_0807C8B0(gMapDataTop, gRoomControls.width >> 4, gRoomControls.height >> 4);
+}
 
 ASM_FUNC("asm/non_matching/scroll/sub_08080CB4.inc", void sub_08080CB4(Entity* a))