through NamingScreen_CreateRivalIcon

2 files changed, 7 insertions, 556 deletions

diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index e9ddd9ebc..d09ee8e97 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -1470,8 +1470,8 @@ _0805E8E0:
 	bx r1
 	thumb_func_end TrySpawnObjectEvent
 
-	thumb_func_start sub_805E8E8
-sub_805E8E8: @ 805E8E8
+	thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfo
+MakeObjectTemplateFromObjectEventGraphicsInfo: @ 805E8E8
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	adds r4, r2, 0
@@ -1515,7 +1515,7 @@ _0805E936:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_805E8E8
+	thumb_func_end MakeObjectTemplateFromObjectEventGraphicsInfo
 
 	thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
 MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940
@@ -1527,7 +1527,7 @@ MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940
 	lsrs r1, 14
 	adds r1, r4
 	ldr r1, [r1]
-	bl sub_805E8E8
+	bl MakeObjectTemplateFromObjectEventGraphicsInfo
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1565,7 +1565,7 @@ AddPseudoObjectEvent: @ 805E978
 	lsrs r4, 24
 	add r3, sp, 0x18
 	mov r2, sp
-	bl sub_805E8E8
+	bl MakeObjectTemplateFromObjectEventGraphicsInfo
 	mov r0, sp
 	ldrh r1, [r0, 0x2]
 	ldr r0, _0805E9F0 @ =0x0000ffff
@@ -1649,7 +1649,7 @@ sprite_new: @ 805E9F8
 	add r3, sp, 0x1C
 	adds r0, r5, 0
 	mov r2, sp
-	bl sub_805E8E8
+	bl MakeObjectTemplateFromObjectEventGraphicsInfo
 	mov r1, sp
 	ldr r2, _0805EB3C @ =0x0000ffff
 	adds r0, r2, 0
@@ -1799,7 +1799,7 @@ sub_805EB44: @ 805EB44
 	add r3, sp, 0x18
 	adds r0, r6, 0
 	mov r2, sp
-	bl sub_805E8E8
+	bl MakeObjectTemplateFromObjectEventGraphicsInfo
 	mov r1, sp
 	ldr r2, _0805EC28 @ =0x0000ffff
 	adds r0, r2, 0
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index a4f237008..f3931d1fe 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -5,555 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_809EC7C
-sub_809EC7C: @ 809EC7C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r1, 0x3A
-	ldrsh r0, [r6, r1]
-	lsls r5, r0, 4
-	adds r5, r0
-	lsls r5, 2
-	ldr r1, _0809ECC4 @ =gSprites
-	adds r5, r1
-	movs r2, 0x3C
-	ldrsh r0, [r6, r2]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	adds r4, r1
-	ldr r0, _0809ECC8 @ =gNamingScreenData
-	ldr r0, [r0]
-	ldr r1, _0809ECCC @ =0x00001e22
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_809DE20
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl sub_809ED88
-	ldrh r0, [r6, 0x2E]
-	adds r0, 0x1
-	strh r0, [r6, 0x2E]
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0809ECC4: .4byte gSprites
-_0809ECC8: .4byte gNamingScreenData
-_0809ECCC: .4byte 0x00001e22
-	thumb_func_end sub_809EC7C
-
-	thumb_func_start sub_809ECD0
-sub_809ECD0: @ 809ECD0
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_809ECD0
-
-	thumb_func_start sub_809ECD4
-sub_809ECD4: @ 809ECD4
-	push {r4,r5,lr}
-	adds r3, r0, 0
-	movs r0, 0x3A
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r2, _0809ED40 @ =gSprites
-	adds r4, r0, r2
-	movs r0, 0x3C
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r5, r0, r2
-	ldrh r0, [r4, 0x26]
-	adds r0, 0x1
-	strh r0, [r4, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	ble _0809ED38
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	ldr r0, _0809ED44 @ =0x0000fffc
-	strh r0, [r4, 0x26]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldrh r0, [r3, 0x30]
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x1
-	movs r1, 0x3
-	bl __modsi3
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_809DE20
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_809ED88
-_0809ED38:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0809ED40: .4byte gSprites
-_0809ED44: .4byte 0x0000fffc
-	thumb_func_end sub_809ECD4
-
-	thumb_func_start sub_809ED48
-sub_809ED48: @ 809ED48
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x3A
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0809ED84 @ =gSprites
-	adds r2, r0, r1
-	adds r3, r2, 0
-	adds r3, 0x3E
-	ldrb r1, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3]
-	ldrh r0, [r2, 0x26]
-	adds r0, 0x1
-	strh r0, [r2, 0x26]
-	lsls r0, 16
-	cmp r0, 0
-	blt _0809ED7C
-	movs r0, 0
-	strh r0, [r2, 0x26]
-	movs r0, 0x1
-	strh r0, [r4, 0x2E]
-_0809ED7C:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0809ED84: .4byte gSprites
-	thumb_func_end sub_809ED48
-
-	thumb_func_start sub_809ED88
-sub_809ED88: @ 809ED88
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	mov r8, r2
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r0, _0809EDE0 @ =gUnknown_83E2388
-	lsls r4, r5, 1
-	adds r0, r4, r0
-	ldrh r0, [r0]
-	bl IndexOfSpritePaletteTag
-	lsls r0, 4
-	mov r1, r8
-	ldrb r2, [r1, 0x5]
-	movs r1, 0xF
-	ands r1, r2
-	orrs r1, r0
-	mov r0, r8
-	strb r1, [r0, 0x5]
-	ldr r0, _0809EDE4 @ =gUnknown_83E238E
-	adds r4, r0
-	ldrh r0, [r4]
-	bl GetSpriteTileStartByTag
-	adds r1, r6, 0
-	adds r1, 0x40
-	strh r0, [r1]
-	adds r6, 0x42
-	movs r1, 0x3F
-	ands r1, r5
-	ldrb r2, [r6]
-	movs r0, 0x40
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r6]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EDE0: .4byte gUnknown_83E2388
-_0809EDE4: .4byte gUnknown_83E238E
-	thumb_func_end sub_809ED88
-
-	thumb_func_start CreateBackOkSprites
-CreateBackOkSprites: @ 809EDE8
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	ldr r0, _0809EE50 @ =gUnknown_83E25BC
-	movs r1, 0xCC
-	movs r2, 0x74
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r6, _0809EE54 @ =gSprites
-	adds r4, r6
-	ldr r0, _0809EE58 @ =gUnknown_83E2524
-	mov r8, r0
-	adds r0, r4, 0
-	mov r1, r8
-	bl SetSubspriteTables
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	movs r5, 0x4
-	orrs r0, r5
-	strb r0, [r4]
-	ldr r0, _0809EE5C @ =gUnknown_83E25D4
-	movs r1, 0xCC
-	movs r2, 0x8C
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	adds r4, r6
-	adds r0, r4, 0
-	mov r1, r8
-	bl SetSubspriteTables
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	orrs r0, r5
-	strb r0, [r4]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EE50: .4byte gUnknown_83E25BC
-_0809EE54: .4byte gSprites
-_0809EE58: .4byte gUnknown_83E2524
-_0809EE5C: .4byte gUnknown_83E25D4
-	thumb_func_end CreateBackOkSprites
-
-	thumb_func_start CreateUnderscoreSprites
-CreateUnderscoreSprites: @ 809EE60
-	push {r4-r6,lr}
-	ldr r5, _0809EF0C @ =gNamingScreenData
-	ldr r0, [r5]
-	ldr r4, _0809EF10 @ =0x00001e16
-	adds r0, r4
-	ldrh r1, [r0]
-	subs r1, 0x5
-	ldr r0, _0809EF14 @ =gUnknown_83E2604
-	lsls r1, 16
-	asrs r1, 16
-	movs r2, 0x38
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r3, _0809EF18 @ =gSprites
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrb r1, [r0, 0x5]
-	movs r2, 0xC
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r0, [r5]
-	adds r4, r0, r4
-	ldrh r1, [r4]
-	movs r5, 0
-	ldr r2, _0809EF1C @ =0x00001e28
-	adds r0, r2
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x1]
-	cmp r5, r0
-	bcs _0809EF04
-	adds r6, r3, 0
-_0809EEB2:
-	lsls r1, 16
-	asrs r4, r1, 16
-	movs r0, 0xC0
-	lsls r0, 10
-	adds r1, r0
-	asrs r1, 16
-	ldr r0, _0809EF20 @ =gUnknown_83E261C
-	movs r2, 0x3C
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r1, r0, 24
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r1, [r0, 0x5]
-	movs r2, 0xC
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	strh r5, [r0, 0x2E]
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r4, 0x8
-	lsls r4, 16
-	lsrs r1, r4, 16
-	ldr r0, _0809EF0C @ =gNamingScreenData
-	ldr r0, [r0]
-	ldr r2, _0809EF1C @ =0x00001e28
-	adds r0, r2
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x1]
-	cmp r5, r0
-	bcc _0809EEB2
-_0809EF04:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EF0C: .4byte gNamingScreenData
-_0809EF10: .4byte 0x00001e16
-_0809EF14: .4byte gUnknown_83E2604
-_0809EF18: .4byte gSprites
-_0809EF1C: .4byte 0x00001e28
-_0809EF20: .4byte gUnknown_83E261C
-	thumb_func_end CreateUnderscoreSprites
-
-	thumb_func_start CreateInputTargetIcon
-CreateInputTargetIcon: @ 809EF24
-	push {lr}
-	ldr r1, _0809EF44 @ =gUnknown_83E2394
-	ldr r0, _0809EF48 @ =gNamingScreenData
-	ldr r0, [r0]
-	ldr r2, _0809EF4C @ =0x00001e28
-	adds r0, r2
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EF44: .4byte gUnknown_83E2394
-_0809EF48: .4byte gNamingScreenData
-_0809EF4C: .4byte 0x00001e28
-	thumb_func_end CreateInputTargetIcon
-
-	thumb_func_start nullsub_54
-nullsub_54: @ 809EF50
-	bx lr
-	thumb_func_end nullsub_54
-
-	thumb_func_start sub_809EF54
-sub_809EF54: @ 809EF54
-	push {lr}
-	sub sp, 0x4
-	ldr r0, _0809EFA0 @ =gNamingScreenData
-	ldr r0, [r0]
-	ldr r1, _0809EFA4 @ =0x00001e34
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0
-	bl sub_805C7C8
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0809EFA8 @ =SpriteCallbackDummy
-	movs r2, 0
-	str r2, [sp]
-	movs r2, 0x38
-	movs r3, 0x25
-	bl AddPseudoObjectEvent
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _0809EFAC @ =gSprites
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x5]
-	movs r2, 0xC
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	movs r1, 0x4
-	bl StartSpriteAnim
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EFA0: .4byte gNamingScreenData
-_0809EFA4: .4byte 0x00001e34
-_0809EFA8: .4byte SpriteCallbackDummy
-_0809EFAC: .4byte gSprites
-	thumb_func_end sub_809EF54
-
-	thumb_func_start sub_809EFB0
-sub_809EFB0: @ 809EFB0
-	push {r4,lr}
-	ldr r0, _0809EFE4 @ =gUnknown_83E2634
-	movs r1, 0x38
-	movs r2, 0x29
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _0809EFE8 @ =gSprites
-	adds r4, r0
-	ldr r1, _0809EFEC @ =gUnknown_83E252C
-	adds r0, r4, 0
-	bl SetSubspriteTables
-	ldrb r0, [r4, 0x5]
-	movs r1, 0xC
-	orrs r0, r1
-	strb r0, [r4, 0x5]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809EFE4: .4byte gUnknown_83E2634
-_0809EFE8: .4byte gSprites
-_0809EFEC: .4byte gUnknown_83E252C
-	thumb_func_end sub_809EFB0
-
-	thumb_func_start sub_809EFF0
-sub_809EFF0: @ 809EFF0
-	push {lr}
-	sub sp, 0xC
-	bl LoadMonIconPalettes
-	ldr r0, _0809F038 @ =gNamingScreenData
-	ldr r3, [r0]
-	ldr r1, _0809F03C @ =0x00001e34
-	adds r0, r3, r1
-	ldrh r0, [r0]
-	ldr r1, _0809F040 @ =SpriteCallbackDummy
-	movs r2, 0
-	str r2, [sp]
-	ldr r2, _0809F044 @ =0x00001e38
-	adds r3, r2
-	ldr r2, [r3]
-	str r2, [sp, 0x4]
-	movs r2, 0x1
-	str r2, [sp, 0x8]
-	movs r2, 0x38
-	movs r3, 0x28
-	bl CreateMonIcon
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _0809F048 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r0, [r1, 0x5]
-	movs r2, 0xC
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809F038: .4byte gNamingScreenData
-_0809F03C: .4byte 0x00001e34
-_0809F040: .4byte SpriteCallbackDummy
-_0809F044: .4byte 0x00001e38
-_0809F048: .4byte gSprites
-	thumb_func_end sub_809EFF0
-
-	thumb_func_start sub_809F04C
-sub_809F04C: @ 809F04C
-	push {r4,lr}
-	sub sp, 0x2C
-	ldr r0, _0809F0B8 @ =gUnknown_83E23C0
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp, 0x1C]
-	str r1, [sp, 0x20]
-	ldr r0, _0809F0BC @ =gUnknown_83E23C8
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp, 0x24]
-	str r1, [sp, 0x28]
-	ldr r1, _0809F0C0 @ =SpriteCallbackDummy
-	add r3, sp, 0x18
-	movs r0, 0
-	mov r2, sp
-	bl sub_805E8E8
-	mov r2, sp
-	add r0, sp, 0x1C
-	ldrh r1, [r0, 0x6]
-	strh r1, [r2]
-	add r4, sp, 0x24
-	ldrh r1, [r4, 0x4]
-	strh r1, [r2, 0x2]
-	ldr r1, _0809F0C4 @ =gUnknown_83E23BC
-	str r1, [sp, 0x8]
-	bl LoadSpriteSheet
-	adds r0, r4, 0
-	bl LoadSpritePalette
-	mov r0, sp
-	movs r1, 0x38
-	movs r2, 0x25
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _0809F0C8 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r0, [r1, 0x5]
-	movs r2, 0xC
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	add sp, 0x2C
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809F0B8: .4byte gUnknown_83E23C0
-_0809F0BC: .4byte gUnknown_83E23C8
-_0809F0C0: .4byte SpriteCallbackDummy
-_0809F0C4: .4byte gUnknown_83E23BC
-_0809F0C8: .4byte gSprites
-	thumb_func_end sub_809F04C
-
 	thumb_func_start HandleKeyboardEvent
 HandleKeyboardEvent: @ 809F0CC
 	push {r4,r5,lr}