From 46314411e96a251e05b92f4525a93723127c8caf Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 26 Feb 2021 19:02:46 +0100
Subject: [PATCH] matched sub_080B18A4

---
 asm/code_080B1520.s | 30 ------------------------------
 src/code_080B1520.c | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/asm/code_080B1520.s b/asm/code_080B1520.s
index 1debb88d..d2f9be9d 100644
--- a/asm/code_080B1520.s
+++ b/asm/code_080B1520.s
@@ -5,36 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_080B18A4
-sub_080B18A4: @ 0x080B18A4
-	push {lr}
-	adds r3, r1, #0
-	lsls r0, r0, #0x10
-	lsrs r2, r0, #0x10
-	ldr r0, _080B18CC @ =gUnk_02036A50
-	ldr r0, [r0]
-	ldr r1, [r0]
-	movs r0, #0x80
-	lsls r0, r0, #2
-	cmp r1, r0
-	beq _080B18D0
-	adds r0, r2, #0
-	adds r1, r3, #0
-	movs r2, #0
-	bl sub_080B16AC
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	b _080B18D2
-	.align 2, 0
-_080B18CC: .4byte gUnk_02036A50
-_080B18D0:
-	ldr r0, _080B18D8 @ =0x00008080
-_080B18D2:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080B18D8: .4byte 0x00008080
-
 	thumb_func_start sub_080B18DC
 sub_080B18DC: @ 0x080B18DC
 	push {r4, r5, r6, lr}
diff --git a/src/code_080B1520.c b/src/code_080B1520.c
index c5e9394e..7ff9a694 100644
--- a/src/code_080B1520.c
+++ b/src/code_080B1520.c
@@ -212,9 +212,9 @@ u32 sub_080B1864(u16 unk_1, u16* unk_2, u32 unk_3) {
 
     ret = unk_3;
 
-    for(i = 0; i < 3; i++){
+    for (i = 0; i < 3; i++) {
         ret = sub_080B1698(unk_1, unk_2);
-        if (ret == 0){
+        if (ret == 0) {
             ret = sub_080B180C(unk_1, unk_2);
             if (ret == 0)
                 break;
@@ -222,3 +222,14 @@ u32 sub_080B1864(u16 unk_1, u16* unk_2, u32 unk_3) {
     }
     return ret;
 }
+
+u32 sub_080B18A4(u16 unk_1, u16* unk_2) {
+    u16 ret;
+
+    if (*(u32*)&gUnk_02036A50->unk_00 != 0x200) {
+        ret = sub_080B16AC(unk_1, unk_2, 0);
+    } else {
+        ret = 0x8080;
+    }
+    return ret;
+}