sub_818DAEC, sub_818DB04

2 files changed, 13 insertions, 34 deletions

diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s
index 51e288331..fbdcc10dd 100644
--- a/asm/lilycove_lady.s
+++ b/asm/lilycove_lady.s
@@ -5,40 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_818DAEC
-sub_818DAEC: @ 818DAEC
-	push {r4,lr}
-	ldr r4, =gScriptResult
-	bl GetLilycoveLadyId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_818DAEC
-
-	thumb_func_start sub_818DB04
-sub_818DB04: @ 818DB04
-	push {lr}
-	adds r1, r0, 0
-	movs r2, 0
-	b _0818DB14
-_0818DB0C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r1, 0x2
-_0818DB14:
-	ldrh r0, [r1]
-	cmp r0, 0
-	bne _0818DB0C
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_818DB04
-
 	thumb_func_start sub_818DB20
 sub_818DB20: @ 818DB20
 	push {r4-r6,lr}
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index ab1c24914..579eca5cb 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -94,3 +94,16 @@ void SetLilycoveLadyRandomly(void)
             break;
     }
 }
+
+void sub_818DAEC(void)
+{
+    gScriptResult = GetLilycoveLadyId();
+}
+
+u8 sub_818DB04(u16 *data)
+{
+    u8 len;
+
+    for (len = 0; *data != 0; len ++, data ++);
+    return len;
+}