From ea59111691fa2b31435928db252107d11ecf73d5 Mon Sep 17 00:00:00 2001
From: Henny022p <info@henny022.de>
Date: Fri, 26 Feb 2021 18:56:13 +0100
Subject: [PATCH] matched sub_080B1864

---
 asm/code_080B1520.s | 36 ------------------------------------
 src/code_080B1520.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/asm/code_080B1520.s b/asm/code_080B1520.s
index 757e533c..1debb88d 100644
--- a/asm/code_080B1520.s
+++ b/asm/code_080B1520.s
@@ -5,42 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_080B1864
-sub_080B1864: @ 0x080B1864
-	push {r4, r5, r6, lr}
-	adds r5, r1, #0
-	lsls r0, r0, #0x10
-	lsrs r4, r0, #0x10
-	movs r6, #0
-	b _080B1876
-_080B1870:
-	adds r0, r6, #1
-	lsls r0, r0, #0x18
-	lsrs r6, r0, #0x18
-_080B1876:
-	cmp r6, #2
-	bhi _080B189A
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_080B1698
-	lsls r0, r0, #0x10
-	lsrs r2, r0, #0x10
-	cmp r2, #0
-	bne _080B1870
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_080B180C
-	lsls r0, r0, #0x10
-	lsrs r2, r0, #0x10
-	cmp r2, #0
-	bne _080B1870
-_080B189A:
-	adds r0, r2, #0
-	pop {r4, r5, r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-
 	thumb_func_start sub_080B18A4
 sub_080B18A4: @ 0x080B18A4
 	push {lr}
diff --git a/src/code_080B1520.c b/src/code_080B1520.c
index 04bb4c48..c5e9394e 100644
--- a/src/code_080B1520.c
+++ b/src/code_080B1520.c
@@ -205,3 +205,20 @@ u16 sub_080B180C(u16 unk_1, u16* unk_2) {
     }
     return ret;
 }
+
+u32 sub_080B1864(u16 unk_1, u16* unk_2, u32 unk_3) {
+    u32 ret;
+    u8 i;
+
+    ret = unk_3;
+
+    for(i = 0; i < 3; i++){
+        ret = sub_080B1698(unk_1, unk_2);
+        if (ret == 0){
+            ret = sub_080B180C(unk_1, unk_2);
+            if (ret == 0)
+                break;
+        }
+    }
+    return ret;
+}