import strlen

4 files changed, 2 insertions, 52 deletions

diff --git a/asm/unknown_lib_2.s b/asm/unknown_lib_2.s
deleted file mode 100755
index 8d72a45..0000000
--- a/asm/unknown_lib_2.s
+++ /dev/null
@@ -1,46 +0,0 @@
-    .include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_55A24
-sub_55A24: @ 0x08055A24
-	push {r4, r5, lr}
-	adds r1, r0, #0
-	adds r5, r1, #0
-	movs r0, #3
-	ands r0, r1
-	cmp r0, #0
-	bne _08055A5C
-	adds r2, r1, #0
-	ldr r1, [r2]
-	ldr r4, _08055A40 @ =0xFEFEFEFF
-	adds r0, r1, r4
-	bics r0, r1
-	ldr r3, _08055A44 @ =0x80808080
-	b _08055A50
-	.align 2, 0
-_08055A40: .4byte 0xFEFEFEFF
-_08055A44: .4byte 0x80808080
-_08055A48:
-	adds r2, #4
-	ldr r1, [r2]
-	adds r0, r1, r4
-	bics r0, r1
-_08055A50:
-	ands r0, r3
-	cmp r0, #0
-	beq _08055A48
-	adds r1, r2, #0
-	b _08055A5C
-_08055A5A:
-	adds r1, #1
-_08055A5C:
-	ldrb r0, [r1]
-	cmp r0, #0
-	bne _08055A5A
-	subs r0, r1, r5
-	pop {r4, r5, pc}
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/functions.h b/include/functions.h
index c1d64cf..5846d0e 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -830,8 +830,4 @@ extern void sub_1175C(void);
 extern void sub_11968(void);
 extern void sub_11B74(void);
 
-// asm/unknown_lib_2.s
-
-extern int sub_55A24(u8*); // Rumble Pak?
-
 #endif  // GUARD_FUNCTIONS_H
\ No newline at end of file
diff --git a/ld_script.txt b/ld_script.txt
index 6254b5a..2f53a9e 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,7 +59,7 @@ SECTIONS
         *libgcc.a:_umodsi3.o(.text);
         *libc.a:memcpy.o(.text);
         *libc.a:memset.o(.text);
-        asm/unknown_lib_2.o(.text);
+        *libc.a:strlen.o(.text);
     }=0
 
     .rodata :
diff --git a/src/util.c b/src/util.c
index f0d0b05..d0f3f42 100755
--- a/src/util.c
+++ b/src/util.c
@@ -186,7 +186,7 @@ void sub_578(void)
 void sub_678(u8 *arg0, s16 arg1, s16 arg2)
 {
     // Rumble Pak related?
-    s16 var0 = sub_55A24(arg0) - 1;
+    s16 var0 = strlen(arg0) - 1;
     u16 *dest = &gUnknown_03005C00[arg1 * 32 + arg2];
     do
     {