split InitString asm into common/string.asm

2 files changed, 40 insertions, 37 deletions

diff --git a/common/string.asm b/common/string.asm
new file mode 100644
index 000000000..a871b4d2a
--- /dev/null
+++ b/common/string.asm
@@ -0,0 +1,39 @@
+InitString: ; 2ef6
+; Init a string of length c.
+	push hl
+	jr _InitString
+; 2ef9
+
+InitName: ; 2ef9
+; Intended for names, so this function is limited to ten characters.
+	push hl
+	ld c, 10
+; 2efc
+
+_InitString: ; 2efc
+; if the string pointed to by hl is empty (defined as "zero or more spaces
+; followed by a null"), then initialize it to the string pointed to by de.
+	push bc
+.loop
+	ld a, [hli]
+	cp "@"
+	jr z, .blank
+	cp " "
+	jr nz, .notblank
+	dec c
+	jr nz, .loop
+.blank
+	pop bc
+	ld l, e
+	ld h, d
+	pop de
+	ld b, 0
+	inc c
+	call CopyBytes
+	ret
+.notblank
+	pop bc
+	pop hl
+	ret
+; 2f17
+
diff --git a/main.asm b/main.asm
index fc77d60ed..9a096202f 100644
--- a/main.asm
+++ b/main.asm
@@ -765,44 +765,8 @@ Function2ee4: ; 2ee4
 ; 2ef6
 
 
-InitString: ; 2ef6
-; Init a string of length c.
-	push hl
-	jr _InitString
-; 2ef9
-
-InitName: ; 2ef9
-; Intended for names, so this function is limited to ten characters.
-	push hl
-	ld c, 10
-; 2efc
+INCLUDE "common/string.asm"
 
-_InitString: ; 2efc
-; if the string pointed to by hl is empty (defined as "zero or more spaces
-; followed by a null"), then initialize it to the string pointed to by de.
-	push bc
-.loop
-	ld a, [hli]
-	cp "@"
-	jr z, .blank
-	cp " "
-	jr nz, .notblank
-	dec c
-	jr nz, .loop
-.blank
-	pop bc
-	ld l, e
-	ld h, d
-	pop de
-	ld b, $0
-	inc c
-	call CopyBytes
-	ret
-.notblank
-	pop bc
-	pop hl
-	ret
-; 2f17
 
 Function2f17: ; 2f17
 	ld a, [MapGroup]