From a60ae10b96503adda6faab504c0c1f45bc41e4f6 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 9 May 2022 18:03:17 +0300
Subject: [PATCH] Match sub_080186EC

---
 asm/kinstone.s | 20 --------------------
 src/kinstone.c | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/asm/kinstone.s b/asm/kinstone.s
index 8d27f1e9..37325da0 100644
--- a/asm/kinstone.s
+++ b/asm/kinstone.s
@@ -273,24 +273,4 @@ _080186E4:
 	.align 2, 0
 _080186E8: .4byte gArea
 
-	thumb_func_start sub_080186EC
-sub_080186EC: @ 0x080186EC
-	push {r4, r5, lr}
-	movs r5, #0
-	ldr r4, _0801870C @ =gUnk_080C9CBC
-_080186F2:
-	ldrb r0, [r4, #3]
-	cmp r0, #8
-	bne _08018700
-	ldrb r1, [r4, #4]
-	adds r0, r5, #0
-	bl sub_08018738
-_08018700:
-	adds r4, #8
-	adds r5, #1
-	cmp r5, #0x64
-	bls _080186F2
-	pop {r4, r5, pc}
-	.align 2, 0
-_0801870C: .4byte gUnk_080C9CBC
 
diff --git a/src/kinstone.c b/src/kinstone.c
index 7e31f9e3..80a3701f 100644
--- a/src/kinstone.c
+++ b/src/kinstone.c
@@ -26,12 +26,23 @@ void sub_080189EC(int);
 void sub_0801876C(int, int);
 void sub_08018738(u32, int);
 
+void sub_080186EC(u32 param_1) {
+    struct_080C9CBC* psVar1;
+    u32 i;
+
+    for (i = 0, psVar1 = gUnk_080C9CBC; i <= 100; psVar1++, i++) {
+        if (psVar1->unk3 == 8) {
+            sub_08018738(i, psVar1->evt_type);
+        }
+    }
+}
+
 void sub_08018710(u32 param_1) {
     struct_080C9CBC* psVar1;
     u32 i;
 
-    for (i = 0, psVar1 = gUnk_080C9CBC; i < 0x65; psVar1++, i++) {
-        if ((psVar1->unk3 == 8) && (param_1 != psVar1->evt_type)) {
+    for (i = 0, psVar1 = gUnk_080C9CBC; i <= 100; psVar1++, i++) {
+        if (psVar1->unk3 == 8 && param_1 != psVar1->evt_type) {
             sub_08018738(i, psVar1->evt_type);
         }
     }