summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/lilycove_lady.s20
-rw-r--r--src/lilycove_lady.c9
2 files changed, 9 insertions, 20 deletions
diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s
index bb044a01e..1580d9595 100644
--- a/asm/lilycove_lady.s
+++ b/asm/lilycove_lady.s
@@ -5,26 +5,6 @@
.text
- thumb_func_start sub_818E258
-sub_818E258: @ 818E258
- push {lr}
- movs r2, 0
- adds r1, r0, 0
- b _0818E268
-_0818E260:
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- adds r1, 0x1
-_0818E268:
- ldrb r0, [r1]
- cmp r0, 0xFF
- bne _0818E260
- adds r0, r2, 0
- pop {r1}
- bx r1
- thumb_func_end sub_818E258
-
thumb_func_start sub_818E274
sub_818E274: @ 818E274
push {r4,lr}
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 196867369..564b089a6 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -548,3 +548,12 @@ u8 sub_818E1F4(void)
}
return response;
}
+
+u8 sub_818E258(const u8 *str)
+{
+ u8 len;
+ const u8 *ptr;
+
+ for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++);
+ return len;
+}