From 1593967f2bae04a67990c3969f0221bdaa1c87f8 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Wed, 7 Aug 2024 20:22:29 -0700
Subject: [PATCH] decomp sub_800E9E4 and sub_800E9FC

---
 asm/code_800E9E4.s | 59 ----------------------------------------------
 src/code_800E9A8.c | 37 ++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/asm/code_800E9E4.s b/asm/code_800E9E4.s
index 081b86b62..e450bde7a 100644
--- a/asm/code_800E9E4.s
+++ b/asm/code_800E9E4.s
@@ -5,65 +5,6 @@
 
   	.text
 
-	thumb_func_start sub_800E9E4
-sub_800E9E4:
-	push {lr}
-	bl sub_800E2C0
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	bne _0800E9F6
-	movs r0, 0
-	b _0800E9F8
-_0800E9F6:
-	movs r0, 0x1
-_0800E9F8:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_800E9E4
-
-	thumb_func_start sub_800E9FC
-sub_800E9FC:
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, _0800EA38
-	ldr r1, [r0]
-	movs r2, 0
-	movs r4, 0x1
-	negs r4, r4
-_0800EA0C:
-	ldr r0, [r1, 0x4]
-	cmp r0, r4
-	beq _0800EA20
-	cmp r3, 0
-	bne _0800EA3C
-	adds r0, r1, 0
-	adds r0, 0x54
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0800EA3C
-_0800EA20:
-	adds r2, 0x1
-	adds r1, 0xD0
-	cmp r2, 0x1F
-	ble _0800EA0C
-	bl sub_800EC74
-	lsls r0, 24
-	cmp r0, 0
-	bne _0800EA3C
-	movs r0, 0
-	b _0800EA3E
-	.align 2, 0
-_0800EA38: .4byte gUnknown_203B0CC
-_0800EA3C:
-	movs r0, 0x1
-_0800EA3E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_800E9FC
-
 	thumb_func_start sub_800EA44
 sub_800EA44:
 	push {r4-r6,lr}
diff --git a/src/code_800E9A8.c b/src/code_800E9A8.c
index ffca6e9db..3a97bbc71 100644
--- a/src/code_800E9A8.c
+++ b/src/code_800E9A8.c
@@ -1,6 +1,9 @@
 #include "global.h"
 #include "code_800E9A8.h"
 
+s32 sub_800E2C0(void);
+u8 sub_800EC74(void);
+
 struct unkStruct_203B0CC *gUnknown_203B0CC;
 
 bool8 sub_800E9A8(s32 a0)
@@ -21,4 +24,36 @@ bool8 sub_800E9A8(s32 a0)
     }
 
     return FALSE;
-}
\ No newline at end of file
+}
+
+bool8 sub_800E9E4(void)
+{
+    if(sub_800E2C0() != -1)
+    {
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+bool8 sub_800E9FC(u8 a0)
+{
+    s32 i;
+    struct unkStruct_203B0CC_sub *ptr;
+
+
+    ptr = gUnknown_203B0CC->unk0;
+    for (i = 0; i < 32; i++, ptr++) {
+        if (ptr->unk4 != -1) {
+            if(a0 != 0)
+                return TRUE;
+            if (ptr->unk54 == 0)
+                return TRUE;
+        }
+    }
+
+    if(sub_800EC74())
+        return TRUE;
+    return FALSE;
+}