diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s
index 9fea73f9ab..ee5a09c379 100644
--- a/data/fldeff_cut.s
+++ b/data/fldeff_cut.s
@@ -6,7 +6,7 @@
 
 gUnknown_0857C608:: @ 857C608
 	.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
-	.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 
+	.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00
 	
 gUnknown_0857C648:: @ 857C648
 	.2byte 0
diff --git a/data/naming_screen_strings.s b/data/naming_screen_strings.s
deleted file mode 100644
index b2ee9767b1..0000000000
--- a/data/naming_screen_strings.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-
-gUnknown_862B810:: @ 862B810
-	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
-
-gUnknown_862B832:: @ 862B832
-	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
-
-gUnknown_862B84B:: @ 862B84B
-	.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
-
-gUnknown_862B86C:: @ 862B86C
-	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
-
-gUnknown_0862B88D:: @ 862B88D
-	.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
-
-gUnknown_0862B8AE:: @ 862B8AE
-	.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
-
-gUnknown_0862B8CF:: @ 862B8CF
-	.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
-
-gUnknown_0862B8F0:: @ 862B8F0
-	.string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
-
-gUnknown_0862B911:: @ 862B911
-	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
-
-gUnknown_0862B932:: @ 862B932
-	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
-
-gUnknown_0862B953:: @ 862B953
-	.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
-
-gUnknown_0862B974:: @ 862B974
-	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
-
-gUnknown_0862B995:: @ 862B995
-	.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
-
-gUnknown_0862B9AE:: @ 862B9AE
-	.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
- 
-gUnknown_0862B9C7:: @ 862B9C7
-   .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
-	
-gUnknown_0862B9E0:: @ 862B9E0
-	.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
diff --git a/data/link_strings.s b/data/text_input_strings.s
similarity index 55%
rename from data/link_strings.s
rename to data/text_input_strings.s
index f03c0895d0..7219051a74 100644
--- a/data/link_strings.s
+++ b/data/text_input_strings.s
@@ -3,6 +3,56 @@
 
     .section .rodata
 
+	.align 2
+
+gUnknown_862B810:: @ 862B810
+	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
+
+gUnknown_862B832:: @ 862B832
+	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+
+gUnknown_862B84B:: @ 862B84B
+	.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+
+gUnknown_862B86C:: @ 862B86C
+	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_0862B88D:: @ 862B88D
+	.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
+
+gUnknown_0862B8AE:: @ 862B8AE
+	.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
+
+gUnknown_0862B8CF:: @ 862B8CF
+	.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
+
+gUnknown_0862B8F0:: @ 862B8F0
+	.string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
+
+gUnknown_0862B911:: @ 862B911
+	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
+
+gUnknown_0862B932:: @ 862B932
+	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
+
+gUnknown_0862B953:: @ 862B953
+	.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+
+gUnknown_0862B974:: @ 862B974
+	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_0862B995:: @ 862B995
+	.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
+
+gUnknown_0862B9AE:: @ 862B9AE
+	.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
+ 
+gUnknown_0862B9C7:: @ 862B9C7
+	.string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
+	
+gUnknown_0862B9E0:: @ 862B9E0
+	.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
+
 gUnknown_0862B9F9:: @ 862B9F9
     .string "ABCDE$"
 
diff --git a/ld_script.txt b/ld_script.txt
index fff1b32eff..f2a9d81963 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -540,8 +540,7 @@ SECTIONS {
         data/trainer_rematch.o(.rodata);
         data/unk_transition.o(.rodata);
         src/unk_transition.o(.rodata);
-        data/naming_screen_strings.o(.rodata);
-        data/link_strings.o(.rodata);
+        data/text_input_strings.o(.rodata);
         data/fonts.o(.rodata);
         src/mystery_event_msg.o(.rodata);
         data/mystery_event_msg.o(.rodata);
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 889956560e..54b6f0bb9d 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1738,10 +1738,10 @@ static void sub_80E4E5C(void)
 
 static void sub_80E4EF0(void)
 {
-    const u8 arr[] = { 15, 1, 2 };
+    const struct TextColor color[] = { 15, 1, 2 };
     
     FillWindowPixelBuffer(gNamingScreenData->windows[4], 0xFF);
-    box_print(gNamingScreenData->windows[4], 0, 2, 1, arr, 0, gText_MoveOkBack);
+    box_print(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack);
     PutWindowTilemap(gNamingScreenData->windows[4]);
     CopyWindowToVram(gNamingScreenData->windows[4], 3);
 }