through sub_809EC54

3 files changed, 262 insertions, 755 deletions

diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index fd065f6f6..a4f237008 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -5,723 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_809E700
-sub_809E700: @ 809E700
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _0809E718
-	adds r0, r5, 0
-	movs r1, 0
-	bl StartSpriteAnim
-_0809E718:
-	ldrh r0, [r5, 0x36]
-	movs r1, 0xFF
-	ands r1, r0
-	adds r6, r5, 0
-	adds r6, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r6]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r6]
-	movs r0, 0x2E
-	ldrsh r4, [r5, r0]
-	bl GetCurrentPageColumnCount
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	bne _0809E74C
-	ldrb r0, [r6]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r6]
-_0809E74C:
-	ldrb r1, [r6]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	bne _0809E77C
-	movs r1, 0x36
-	ldrsh r0, [r5, r1]
-	movs r1, 0xFF
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809E77C
-	movs r2, 0x2E
-	ldrsh r1, [r5, r2]
-	movs r2, 0x32
-	ldrsh r0, [r5, r2]
-	cmp r1, r0
-	bne _0809E77C
-	movs r0, 0x30
-	ldrsh r1, [r5, r0]
-	movs r2, 0x34
-	ldrsh r0, [r5, r2]
-	cmp r1, r0
-	beq _0809E786
-_0809E77C:
-	movs r0, 0
-	strh r0, [r5, 0x38]
-	movs r0, 0x2
-	strh r0, [r5, 0x3A]
-	strh r0, [r5, 0x3C]
-_0809E786:
-	ldrh r0, [r5, 0x3C]
-	subs r0, 0x1
-	strh r0, [r5, 0x3C]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0809E7AE
-	ldrh r1, [r5, 0x3A]
-	ldrh r2, [r5, 0x38]
-	adds r0, r1, r2
-	strh r0, [r5, 0x38]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	beq _0809E7A6
-	cmp r0, 0
-	bne _0809E7AA
-_0809E7A6:
-	negs r0, r1
-	strh r0, [r5, 0x3A]
-_0809E7AA:
-	movs r0, 0x2
-	strh r0, [r5, 0x3C]
-_0809E7AE:
-	movs r1, 0x36
-	ldrsh r0, [r5, r1]
-	movs r1, 0xFF
-	lsls r1, 8
-	ands r0, r1
-	cmp r0, 0
-	beq _0809E7E4
-	ldrh r4, [r5, 0x38]
-	lsls r5, r4, 24
-	lsrs r5, 24
-	lsls r4, 16
-	asrs r4, 17
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x5
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	ldr r2, _0809E7EC @ =0x01010000
-	adds r0, r2
-	lsrs r0, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r5, 0
-	bl MultiplyInvertedPaletteRGBComponents
-_0809E7E4:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809E7EC: .4byte 0x01010000
-	thumb_func_end sub_809E700
-
-	thumb_func_start sub_809E7F0
-sub_809E7F0: @ 809E7F0
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _0809E838 @ =gUnknown_83E2364
-	mov r0, sp
-	movs r2, 0x8
-	bl memcpy
-	ldrh r1, [r4, 0x2E]
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _0809E814
-	subs r0, r1, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0809E822
-_0809E814:
-	movs r0, 0x8
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	strh r0, [r4, 0x30]
-_0809E822:
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	strh r0, [r4, 0x24]
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809E838: .4byte gUnknown_83E2364
-	thumb_func_end sub_809E7F0
-
-	thumb_func_start sub_809E83C
-sub_809E83C: @ 809E83C
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _0809E864 @ =gUnknown_83E236C
-	mov r0, sp
-	movs r2, 0x8
-	bl memcpy
-	bl sub_809F668
-	lsls r0, 24
-	ldrh r1, [r4, 0x2E]
-	lsls r1, 24
-	cmp r0, r1
-	beq _0809E868
-	movs r0, 0
-	strh r0, [r4, 0x26]
-	strh r0, [r4, 0x30]
-	b _0809E88E
-	.align 2, 0
-_0809E864: .4byte gUnknown_83E236C
-_0809E868:
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x32]
-	adds r0, 0x1
-	strh r0, [r4, 0x32]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x8
-	ble _0809E890
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	strh r0, [r4, 0x30]
-	movs r0, 0
-_0809E88E:
-	strh r0, [r4, 0x32]
-_0809E890:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809E83C
-
-	thumb_func_start sub_809E898
-sub_809E898: @ 809E898
-	push {lr}
-	bl sub_809E8B4
-	bl sub_809EB5C
-	bl sub_809EDE8
-	bl sub_809EE60
-	bl sub_809EF24
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809E898
-
-	thumb_func_start sub_809E8B4
-sub_809E8B4: @ 809E8B4
-	push {r4-r6,lr}
-	ldr r0, _0809E938 @ =gUnknown_83E25EC
-	movs r1, 0x26
-	movs r2, 0x58
-	movs r3, 0x1
-	bl CreateSprite
-	ldr r5, _0809E93C @ =gNamingScreenData
-	ldr r1, [r5]
-	ldr r4, _0809E940 @ =0x00001e23
-	adds r1, r4
-	strb r0, [r1]
-	movs r0, 0x1
-	bl sub_809EA0C
-	ldr r6, _0809E944 @ =gSprites
-	ldr r0, [r5]
-	adds r0, r4
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldrb r3, [r1, 0x5]
-	movs r2, 0xD
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r3
-	movs r3, 0x4
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-	ldr r0, [r5]
-	adds r0, r4
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r1, [r0, 0x1]
-	ands r2, r1
-	orrs r2, r3
-	strb r2, [r0, 0x1]
-	ldr r2, [r5]
-	adds r2, r4
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	movs r1, 0x1
-	strh r1, [r0, 0x3A]
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	movs r1, 0x2
-	strh r1, [r0, 0x3A]
-	movs r0, 0
-	movs r1, 0
-	bl SetCursorPos
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809E938: .4byte gUnknown_83E25EC
-_0809E93C: .4byte gNamingScreenData
-_0809E940: .4byte 0x00001e23
-_0809E944: .4byte gSprites
-	thumb_func_end sub_809E8B4
-
-	thumb_func_start SetCursorPos
-SetCursorPos: @ 809E948
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 16
-	lsls r1, 16
-	lsrs r7, r1, 16
-	ldr r1, _0809E994 @ =gNamingScreenData
-	ldr r1, [r1]
-	ldr r2, _0809E998 @ =0x00001e23
-	adds r1, r2
-	ldrb r2, [r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	ldr r2, _0809E99C @ =gSprites
-	adds r5, r1, r2
-	lsrs r1, r0, 16
-	mov r8, r1
-	asrs r6, r0, 16
-	ldr r4, _0809E9A0 @ =gUnknown_83E2330
-	bl sub_809DE50
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _0809E9A8
-	bl sub_809DE50
-	ldr r1, _0809E9A4 @ =gUnknown_83E2333
-	lsls r0, 24
-	lsrs r0, 21
-	adds r0, r6, r0
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r0, 0x26
-	b _0809E9AA
-	.align 2, 0
-_0809E994: .4byte gNamingScreenData
-_0809E998: .4byte 0x00001e23
-_0809E99C: .4byte gSprites
-_0809E9A0: .4byte gUnknown_83E2330
-_0809E9A4: .4byte gUnknown_83E2333
-_0809E9A8:
-	movs r0, 0
-_0809E9AA:
-	strh r0, [r5, 0x20]
-	lsls r0, r7, 16
-	asrs r0, 12
-	adds r0, 0x58
-	strh r0, [r5, 0x22]
-	ldrh r0, [r5, 0x2E]
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x30]
-	strh r0, [r5, 0x34]
-	mov r2, r8
-	strh r2, [r5, 0x2E]
-	strh r7, [r5, 0x30]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end SetCursorPos
-
-	thumb_func_start GetCursorPos
-GetCursorPos: @ 809E9CC
-	ldr r2, _0809E9EC @ =gNamingScreenData
-	ldr r2, [r2]
-	ldr r3, _0809E9F0 @ =0x00001e23
-	adds r2, r3
-	ldrb r3, [r2]
-	lsls r2, r3, 4
-	adds r2, r3
-	lsls r2, 2
-	ldr r3, _0809E9F4 @ =gSprites
-	adds r2, r3
-	ldrh r3, [r2, 0x2E]
-	strh r3, [r0]
-	ldrh r0, [r2, 0x30]
-	strh r0, [r1]
-	bx lr
-	.align 2, 0
-_0809E9EC: .4byte gNamingScreenData
-_0809E9F0: .4byte 0x00001e23
-_0809E9F4: .4byte gSprites
-	thumb_func_end GetCursorPos
-
-	thumb_func_start MoveCursorToOKButton
-MoveCursorToOKButton: @ 809E9F8
-	push {lr}
-	bl GetCurrentPageColumnCount
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x2
-	bl SetCursorPos
-	pop {r0}
-	bx r0
-	thumb_func_end MoveCursorToOKButton
-
-	thumb_func_start sub_809EA0C
-sub_809EA0C: @ 809EA0C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r5, _0809EA54 @ =gSprites
-	ldr r1, _0809EA58 @ =gNamingScreenData
-	ldr r4, [r1]
-	ldr r1, _0809EA5C @ =0x00001e23
-	adds r4, r1
-	ldrb r1, [r4]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	adds r2, r5
-	ldrh r3, [r2, 0x36]
-	ldr r1, _0809EA60 @ =0xffffff00
-	ands r1, r3
-	strh r1, [r2, 0x36]
-	ldrb r2, [r4]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r5
-	ldrh r2, [r1, 0x36]
-	orrs r0, r2
-	strh r0, [r1, 0x36]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0
-	bl StartSpriteAnim
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EA54: .4byte gSprites
-_0809EA58: .4byte gNamingScreenData
-_0809EA5C: .4byte 0x00001e23
-_0809EA60: .4byte 0xffffff00
-	thumb_func_end sub_809EA0C
-
-	thumb_func_start sub_809EA64
-sub_809EA64: @ 809EA64
-	push {r4,r5,lr}
-	lsls r0, 24
-	ldr r5, _0809EA9C @ =gSprites
-	ldr r1, _0809EAA0 @ =gNamingScreenData
-	ldr r4, [r1]
-	ldr r1, _0809EAA4 @ =0x00001e23
-	adds r4, r1
-	ldrb r1, [r4]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	adds r2, r5
-	ldrh r3, [r2, 0x36]
-	movs r1, 0xFF
-	ands r1, r3
-	strh r1, [r2, 0x36]
-	ldrb r2, [r4]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r5
-	lsrs r0, 16
-	ldrh r2, [r1, 0x36]
-	orrs r0, r2
-	strh r0, [r1, 0x36]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EA9C: .4byte gSprites
-_0809EAA0: .4byte gNamingScreenData
-_0809EAA4: .4byte 0x00001e23
-	thumb_func_end sub_809EA64
-
-	thumb_func_start sub_809EAA8
-sub_809EAA8: @ 809EAA8
-	push {lr}
-	ldr r0, _0809EAC8 @ =gNamingScreenData
-	ldr r0, [r0]
-	ldr r1, _0809EACC @ =0x00001e23
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0809EAD0 @ =gSprites
-	adds r0, r1
-	movs r1, 0x1
-	bl StartSpriteAnim
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EAC8: .4byte gNamingScreenData
-_0809EACC: .4byte 0x00001e23
-_0809EAD0: .4byte gSprites
-	thumb_func_end sub_809EAA8
-
-	thumb_func_start IsCursorAnimFinished
-IsCursorAnimFinished: @ 809EAD4
-	ldr r2, _0809EAF4 @ =gSprites
-	ldr r0, _0809EAF8 @ =gNamingScreenData
-	ldr r0, [r0]
-	ldr r1, _0809EAFC @ =0x00001e23
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3F
-	ldrb r0, [r0]
-	lsls r0, 27
-	lsrs r0, 31
-	bx lr
-	.align 2, 0
-_0809EAF4: .4byte gSprites
-_0809EAF8: .4byte gNamingScreenData
-_0809EAFC: .4byte 0x00001e23
-	thumb_func_end IsCursorAnimFinished
-
-	thumb_func_start sub_809EB00
-sub_809EB00: @ 809EB00
-	push {r4,r5,lr}
-	sub sp, 0x4
-	mov r5, sp
-	adds r5, 0x2
-	mov r0, sp
-	adds r1, r5, 0
-	bl GetCursorPos
-	mov r0, sp
-	movs r1, 0
-	ldrsh r4, [r0, r1]
-	bl GetCurrentPageColumnCount
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	blt _0809EB34
-	ldr r0, _0809EB30 @ =gUnknown_83E2374
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	adds r1, r0
-	ldrb r0, [r1]
-	b _0809EB36
-	.align 2, 0
-_0809EB30: .4byte gUnknown_83E2374
-_0809EB34:
-	movs r0, 0
-_0809EB36:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809EB00
-
-	thumb_func_start GetCurrentPageColumnCount
-GetCurrentPageColumnCount: @ 809EB40
-	push {r4,lr}
-	ldr r4, _0809EB58 @ =gUnknown_83E2330
-	bl sub_809DE50
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, r4
-	ldrb r0, [r0]
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0809EB58: .4byte gUnknown_83E2330
-	thumb_func_end GetCurrentPageColumnCount
-
-	thumb_func_start sub_809EB5C
-sub_809EB5C: @ 809EB5C
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	ldr r0, _0809EC00 @ =gUnknown_83E2574
-	movs r1, 0xCC
-	movs r2, 0x58
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0809EC04 @ =gNamingScreenData
-	ldr r1, [r1]
-	ldr r2, _0809EC08 @ =0x00001e24
-	adds r1, r2
-	strb r0, [r1]
-	lsls r5, r0, 4
-	adds r5, r0
-	lsls r5, 2
-	ldr r0, _0809EC0C @ =gSprites
-	mov r8, r0
-	add r5, r8
-	ldr r1, _0809EC10 @ =gUnknown_83E2504
-	adds r0, r5, 0
-	bl SetSubspriteTables
-	adds r1, r5, 0
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r6, 0x4
-	orrs r0, r6
-	strb r0, [r1]
-	ldr r0, _0809EC14 @ =gUnknown_83E25A4
-	movs r1, 0xCC
-	movs r2, 0x54
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x3A]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	add r4, r8
-	ldr r1, _0809EC18 @ =gUnknown_83E250C
-	adds r0, r4, 0
-	bl SetSubspriteTables
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	orrs r0, r6
-	strb r0, [r4]
-	ldr r0, _0809EC1C @ =gUnknown_83E258C
-	movs r1, 0xCC
-	movs r2, 0x53
-	movs r3, 0x2
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	add r2, r8
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	orrs r1, r6
-	strb r1, [r2, 0x5]
-	strh r0, [r5, 0x3C]
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	orrs r0, r6
-	strb r0, [r2]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EC00: .4byte gUnknown_83E2574
-_0809EC04: .4byte gNamingScreenData
-_0809EC08: .4byte 0x00001e24
-_0809EC0C: .4byte gSprites
-_0809EC10: .4byte gUnknown_83E2504
-_0809EC14: .4byte gUnknown_83E25A4
-_0809EC18: .4byte gUnknown_83E250C
-_0809EC1C: .4byte gUnknown_83E258C
-	thumb_func_end sub_809EB5C
-
-	thumb_func_start sub_809EC20
-sub_809EC20: @ 809EC20
-	ldr r0, _0809EC44 @ =gNamingScreenData
-	ldr r2, [r0]
-	ldr r1, _0809EC48 @ =0x00001e24
-	adds r0, r2, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0809EC4C @ =gSprites
-	adds r0, r1
-	movs r1, 0x2
-	strh r1, [r0, 0x2E]
-	ldr r1, _0809EC50 @ =0x00001e22
-	adds r2, r1
-	ldrb r1, [r2]
-	strh r1, [r0, 0x30]
-	bx lr
-	.align 2, 0
-_0809EC44: .4byte gNamingScreenData
-_0809EC48: .4byte 0x00001e24
-_0809EC4C: .4byte gSprites
-_0809EC50: .4byte 0x00001e22
-	thumb_func_end sub_809EC20
-
-	thumb_func_start sub_809EC54
-sub_809EC54: @ 809EC54
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _0809EC78 @ =gUnknown_83E2378
-_0809EC5A:
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809EC5A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EC78: .4byte gUnknown_83E2378
-	thumb_func_end sub_809EC54
-
 	thumb_func_start sub_809EC7C
 sub_809EC7C: @ 809EC7C
 	push {r4-r6,lr}
@@ -914,8 +197,8 @@ _0809EDE0: .4byte gUnknown_83E2388
 _0809EDE4: .4byte gUnknown_83E238E
 	thumb_func_end sub_809ED88
 
-	thumb_func_start sub_809EDE8
-sub_809EDE8: @ 809EDE8
+	thumb_func_start CreateBackOkSprites
+CreateBackOkSprites: @ 809EDE8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -969,10 +252,10 @@ _0809EE50: .4byte gUnknown_83E25BC
 _0809EE54: .4byte gSprites
 _0809EE58: .4byte gUnknown_83E2524
 _0809EE5C: .4byte gUnknown_83E25D4
-	thumb_func_end sub_809EDE8
+	thumb_func_end CreateBackOkSprites
 
-	thumb_func_start sub_809EE60
-sub_809EE60: @ 809EE60
+	thumb_func_start CreateUnderscoreSprites
+CreateUnderscoreSprites: @ 809EE60
 	push {r4-r6,lr}
 	ldr r5, _0809EF0C @ =gNamingScreenData
 	ldr r0, [r5]
@@ -1065,10 +348,10 @@ _0809EF14: .4byte gUnknown_83E2604
 _0809EF18: .4byte gSprites
 _0809EF1C: .4byte 0x00001e28
 _0809EF20: .4byte gUnknown_83E261C
-	thumb_func_end sub_809EE60
+	thumb_func_end CreateUnderscoreSprites
 
-	thumb_func_start sub_809EF24
-sub_809EF24: @ 809EF24
+	thumb_func_start CreateInputTargetIcon
+CreateInputTargetIcon: @ 809EF24
 	push {lr}
 	ldr r1, _0809EF44 @ =gUnknown_83E2394
 	ldr r0, _0809EF48 @ =gNamingScreenData
@@ -1087,7 +370,7 @@ sub_809EF24: @ 809EF24
 _0809EF44: .4byte gUnknown_83E2394
 _0809EF48: .4byte gNamingScreenData
 _0809EF4C: .4byte 0x00001e28
-	thumb_func_end sub_809EF24
+	thumb_func_end CreateInputTargetIcon
 
 	thumb_func_start nullsub_54
 nullsub_54: @ 809EF50
@@ -1278,7 +561,7 @@ HandleKeyboardEvent: @ 809F0CC
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r5, r4, 0
-	bl sub_809EB00
+	bl GetKeyRoleAtCursorPos
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x8
@@ -2023,8 +1306,8 @@ sub_809F634: @ 809F634
 _0809F664: .4byte gUnknown_83E22D0
 	thumb_func_end sub_809F634
 
-	thumb_func_start sub_809F668
-sub_809F668: @ 809F668
+	thumb_func_start GetTextCaretPosition
+GetTextCaretPosition: @ 809F668
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r0, _0809F690 @ =gNamingScreenData
@@ -2070,7 +1353,7 @@ _0809F6B2:
 	bx r1
 	.align 2, 0
 _0809F6B8: .4byte 0x00001e28
-	thumb_func_end sub_809F668
+	thumb_func_end GetTextCaretPosition
 
 	thumb_func_start sub_809F6BC
 sub_809F6BC: @ 809F6BC
@@ -2134,7 +1417,7 @@ sub_809F700: @ 809F700
 	adds r0, r4
 	movs r1, 0xFF
 	strb r1, [r0]
-	bl sub_809EB00
+	bl GetKeyRoleAtCursorPos
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -2211,7 +1494,7 @@ sub_809F7C4: @ 809F7C4
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_809F668
+	bl GetTextCaretPosition
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _0809F7E8 @ =gNamingScreenData
diff --git a/data/naming_screen.s b/data/naming_screen.s
index e06159b00..366638746 100644
--- a/data/naming_screen.s
+++ b/data/naming_screen.s
@@ -6,22 +6,6 @@
 	.section .rodata
 	.align 2
 
-gUnknown_83E2364:: @ 83E2364
-	.2byte 0x0000, 0xfffc, 0xfffe, 0xffff
-
-gUnknown_83E236C:: @ 83E236C
-	.2byte 0x0002, 0x0003, 0x0002, 0x0001
-
-gUnknown_83E2374:: @ 83E2374
-	.byte 0x01, 0x02, 0x03
-
-	.align 2
-gUnknown_83E2378:: @ 83E2378
-	.4byte sub_809EC7C
-	.4byte sub_809ECD0
-	.4byte sub_809ECD4
-	.4byte sub_809ED48
-
 gUnknown_83E2388:: @ 83E2388
 	.2byte 0x0001, 0x0003, 0x0002
 
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 40d099c55..a5a6b5a5b 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -46,6 +46,14 @@ enum
     INPUT_STATE_2,
 };
 
+enum
+{
+    KEY_ROLE_CHAR,
+    KEY_ROLE_PAGE,
+    KEY_ROLE_BACKSPACE,
+    KEY_ROLE_OK,
+};
+
 struct NamingScreenTemplate
 {
     u8 copyExistingString;
@@ -115,23 +123,36 @@ void Task_809E58C(u8 taskId);
 u16 sub_809E644(u8 tag);
 void sub_809E6B8(u8 a0);
 void sub_809E6E0(struct Task * task, u8 a1, u8 a2);
+void sub_809E700(struct Sprite * sprite);
+void sub_809E7F0(struct Sprite * sprite);
+void sub_809E83C(struct Sprite * sprite);
+void sub_809E898(void);
+void CursorInit(void);
+void SetCursorPos(s16 x, s16 y);
 void GetCursorPos(s16 *xP, s16 *yP);
+void MoveCursorToOKButton();
+void sub_809EA0C(u8 a0);
+void sub_809EA64(u8 a0);
+bool8 IsCursorAnimFinished();
 u8 GetCurrentPageColumnCount(void);
-void SetCursorPos(s16 x, s16 y);
+void CreatePageSwitcherSprites(void);
+void sub_809EC20(void);
+bool8 sub_809EC7C(struct Sprite * sprite);
+bool8 sub_809ECD0(struct Sprite * sprite);
+bool8 sub_809ECD4(struct Sprite * sprite);
+bool8 sub_809ED48(struct Sprite * sprite);
+void CreateBackOkSprites(void);
+void CreateUnderscoreSprites(void);
+void CreateInputTargetIcon(void);
 void sub_809FA60(void);
 bool8 NamingScreen_InitDisplayMode(void);
 void NamingScreen_TurnOffScreen(void);
 void choose_name_or_words_screen_apply_bg_pals(void);
 void choose_name_or_words_screen_load_bg_tile_patterns(void);
-void sub_809E898(void);
-bool8 IsCursorAnimFinished();
-void MoveCursorToOKButton();
-void sub_809EA0C(u8 a0);
-void sub_809EA64(u8 a0);
-void sub_809EC20(void);
 bool8 HandleKeyboardEvent(void);
 void SetInputState(u8 state);
 void sub_809F56C(void);
+u8 GetTextCaretPosition(void);
 void sub_809F7EC(void);
 void sub_809F8C0(void);
 void sub_809F900(u8 bgId, const u32 * tmap);
@@ -141,6 +162,19 @@ void sub_809FAE4(void);
 void sub_809FB70(void);
 void sub_809FC34(void);
 
+extern const struct SubspriteTable gUnknown_83E2504[];
+extern const struct SubspriteTable gUnknown_83E250C[];
+
+extern const struct SpriteTemplate gUnknown_83E2574;
+extern const struct SpriteTemplate gUnknown_83E258C;
+extern const struct SpriteTemplate gUnknown_83E25A4;
+extern const struct SpriteTemplate gUnknown_83E25BC;
+extern const struct SpriteTemplate gUnknown_83E25D4;
+extern const struct SpriteTemplate gUnknown_83E25EC;
+extern const struct SpriteTemplate gUnknown_83E2604;
+extern const struct SpriteTemplate gUnknown_83E261C;
+extern const struct SpriteTemplate gUnknown_83E2634;
+
 const u16 gUnknown_83E1800[] = INCBIN_U16("graphics/interface/naming_screen_83E1800.4bpp");
 const u16 gUnknown_83E18C0[] = INCBIN_U16("graphics/interface/naming_screen_83E18C0.4bpp");
 const u16 gUnknown_83E1980[] = INCBIN_U16("graphics/interface/naming_screen_83E1980.4bpp");
@@ -887,3 +921,209 @@ void sub_809E6E0(struct Task *task, u8 b, u8 c)
     task->data[5] = 0;
     task->data[6] = 4;
 }
+
+//--------------------------------------------------
+// Cursor
+//--------------------------------------------------
+
+void sub_809E700(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        StartSpriteAnim(sprite, 0);
+    sprite->invisible = (sprite->data[4] & 0xFF);
+    if (sprite->data[0] == GetCurrentPageColumnCount())
+        sprite->invisible = TRUE;
+    if (sprite->invisible || (sprite->data[4] & 0xFF00) == 0
+        || sprite->data[0] != sprite->data[2] || sprite->data[1] != sprite->data[3])
+    {
+        sprite->data[5] = 0;
+        sprite->data[6] = 2;
+        sprite->data[7] = 2;
+    }
+    sprite->data[7]--;
+    if (sprite->data[7] == 0)
+    {
+        sprite->data[5] += sprite->data[6];
+        if (sprite->data[5] == 16 || sprite->data[5] == 0)
+            sprite->data[6] = -sprite->data[6];
+        sprite->data[7] = 2;
+    }
+    if ((sprite->data[4] & 0xFF00) != 0)
+    {
+        s8 gb = sprite->data[5];
+        s8 r = sprite->data[5] >> 1;
+        u16 index = IndexOfSpritePaletteTag(5) * 16 + 0x0101;
+
+        MultiplyInvertedPaletteRGBComponents(index, r, gb, gb);
+    }
+}
+
+void sub_809E7F0(struct Sprite *sprite)
+{
+    const s16 arr[] = {0, -4, -2, -1};
+
+    if (sprite->data[0] == 0 || --sprite->data[0] == 0)
+    {
+        sprite->data[0] = 8;
+        sprite->data[1] = (sprite->data[1] + 1) & 3;
+    }
+    sprite->pos2.x = arr[sprite->data[1]];
+}
+
+void sub_809E83C(struct Sprite *sprite)
+{
+    const s16 arr[] = {2, 3, 2, 1};
+    u8 var;
+
+    var = GetTextCaretPosition();
+    if (var != (u8)sprite->data[0])
+    {
+        sprite->pos2.y = 0;
+        sprite->data[1] = 0;
+        sprite->data[2] = 0;
+    }
+    else
+    {
+        sprite->pos2.y = arr[sprite->data[1]];
+        sprite->data[2]++;
+        if (sprite->data[2] > 8)
+        {
+            sprite->data[1] = (sprite->data[1] + 1) & 3;
+            sprite->data[2] = 0;
+        }
+    }
+}
+
+void sub_809E898(void)
+{
+    CursorInit();
+    CreatePageSwitcherSprites();
+    CreateBackOkSprites();
+    CreateUnderscoreSprites();
+    CreateInputTargetIcon();
+}
+
+void CursorInit(void)
+{
+    gNamingScreenData->cursorSpriteId = CreateSprite(&gUnknown_83E25EC, 38, 88, 1);
+    sub_809EA0C(1);
+    gSprites[gNamingScreenData->cursorSpriteId].oam.priority = 1;
+    gSprites[gNamingScreenData->cursorSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+    gSprites[gNamingScreenData->cursorSpriteId].data[6] = 1;
+    gSprites[gNamingScreenData->cursorSpriteId].data[6] = 2;
+    SetCursorPos(0, 0);
+}
+
+void SetCursorPos(s16 x, s16 y)
+{
+    struct Sprite *cursorSprite = &gSprites[gNamingScreenData->cursorSpriteId];
+
+    if (x < gUnknown_83E2330[sub_809DE50()])
+        cursorSprite->pos1.x = gUnknown_83E2333[sub_809DE50()][x] + 38;
+    else
+        cursorSprite->pos1.x = 0;
+
+    cursorSprite->pos1.y = y * 16 + 88;
+    cursorSprite->data[2] = cursorSprite->data[0];
+    cursorSprite->data[3] = cursorSprite->data[1];
+    cursorSprite->data[0] = x;
+    cursorSprite->data[1] = y;
+}
+
+void GetCursorPos(s16 *x, s16 *y)
+{
+    struct Sprite *cursorSprite = &gSprites[gNamingScreenData->cursorSpriteId];
+
+    *x = cursorSprite->data[0];
+    *y = cursorSprite->data[1];
+}
+
+void MoveCursorToOKButton(void)
+{
+    SetCursorPos(GetCurrentPageColumnCount(), 2);
+}
+
+void sub_809EA0C(u8 a)
+{
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] &= ~0xFF;
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] |= a;
+    StartSpriteAnim(&gSprites[gNamingScreenData->cursorSpriteId], 0);
+}
+
+void sub_809EA64(u8 a)
+{
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] &= 0xFF;
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] |= a << 8;
+}
+
+void sub_809EAA8(void)
+{
+    StartSpriteAnim(&gSprites[gNamingScreenData->cursorSpriteId], 1);
+}
+
+bool8 IsCursorAnimFinished(void)
+{
+    return gSprites[gNamingScreenData->cursorSpriteId].animEnded;
+}
+
+const u8 sKeyRoles[] = {KEY_ROLE_PAGE, KEY_ROLE_BACKSPACE, KEY_ROLE_OK};
+
+u8 GetKeyRoleAtCursorPos(void)
+{
+    s16 cursorX;
+    s16 cursorY;
+
+    GetCursorPos(&cursorX, &cursorY);
+    if (cursorX < GetCurrentPageColumnCount())
+        return KEY_ROLE_CHAR;
+    else
+        return sKeyRoles[cursorY];
+}
+
+u8 GetCurrentPageColumnCount(void)
+{
+    return gUnknown_83E2330[sub_809DE50()];
+}
+
+void CreatePageSwitcherSprites(void)
+{
+    u8 spriteId1;
+    u8 spriteId2;
+    u8 spriteId3;
+
+    spriteId1 = CreateSprite(&gUnknown_83E2574, 0xCC, 0x58, 0);
+    gNamingScreenData->selectBtnFrameSpriteId = spriteId1;
+    SetSubspriteTables(&gSprites[spriteId1], gUnknown_83E2504);
+    gSprites[spriteId1].invisible = TRUE;
+
+    spriteId2 = CreateSprite(&gUnknown_83E25A4, 0xCC, 0x54, 1);
+    gSprites[spriteId1].data[6] = spriteId2;
+    SetSubspriteTables(&gSprites[spriteId2], gUnknown_83E250C);
+    gSprites[spriteId2].invisible = TRUE;
+
+    spriteId3 = CreateSprite(&gUnknown_83E258C, 0xCC, 0x53, 2);
+    gSprites[spriteId3].oam.priority = 1;
+    gSprites[spriteId1].data[7] = spriteId3;
+    gSprites[spriteId3].invisible = TRUE;
+}
+
+void sub_809EC20(void)
+{
+    struct Sprite *sprite = &gSprites[gNamingScreenData->selectBtnFrameSpriteId];
+
+    sprite->data[0] = 2;
+    sprite->data[1] = gNamingScreenData->currentPage;
+}
+
+bool8 (*const gUnknown_83E2378[])(struct Sprite * sprite) = {
+    sub_809EC7C,
+    sub_809ECD0,
+    sub_809ECD4,
+    sub_809ED48
+};
+
+void sub_809EC54(struct Sprite *sprite)
+{
+    while (gUnknown_83E2378[sprite->data[0]](sprite))
+        ;
+}