From 801a324a535c86d4051f312b52f5fe52c1291891 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 9 May 2022 17:55:58 +0300
Subject: [PATCH] Match sub_08018710

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

diff --git a/asm/kinstone.s b/asm/kinstone.s
index 0529c8eb..8d27f1e9 100644
--- a/asm/kinstone.s
+++ b/asm/kinstone.s
@@ -294,26 +294,3 @@ _08018700:
 	.align 2, 0
 _0801870C: .4byte gUnk_080C9CBC
 
-	thumb_func_start sub_08018710
-sub_08018710: @ 0x08018710
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	movs r5, #0
-	ldr r4, _08018734 @ =gUnk_080C9CBC
-_08018718:
-	ldrb r0, [r4, #3]
-	cmp r0, #8
-	bne _0801872A
-	ldrb r1, [r4, #4]
-	cmp r6, r1
-	beq _0801872A
-	adds r0, r5, #0
-	bl sub_08018738
-_0801872A:
-	adds r4, #8
-	adds r5, #1
-	cmp r5, #0x64
-	bls _08018718
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08018734: .4byte gUnk_080C9CBC
diff --git a/src/kinstone.c b/src/kinstone.c
index aaf12d1e..7e31f9e3 100644
--- a/src/kinstone.c
+++ b/src/kinstone.c
@@ -4,6 +4,7 @@
 #include "common.h"
 #include "flags.h"
 #include "player.h"
+#include "kinstone.h"
 
 extern EntityData gUnk_080FEC28[];
 extern EntityData gUnk_080FEBE8[];
@@ -23,6 +24,18 @@ void sub_08018A58(int);
 void sub_08018B50(int);
 void sub_080189EC(int);
 void sub_0801876C(int, int);
+void sub_08018738(u32, int);
+
+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)) {
+            sub_08018738(i, psVar1->evt_type);
+        }
+    }
+}
 
 void sub_08018738(u32 param_1, int param_2) {
     struct_080FE320* ptr = &gUnk_080FE320[param_2];