1 files changed, 5 insertions, 98 deletions

diff --git a/asm/battle_link_817C95C.s b/asm/battle_link_817C95C.s
index aa887bc25..fedb50c45 100644
--- a/asm/battle_link_817C95C.s
+++ b/asm/battle_link_817C95C.s
@@ -110,7 +110,7 @@ _0817CA4C:
 	ldr r1, =gStringInfo
 	ldr r1, [r1]
 	ldrh r1, [r1]
-	bl sub_817F33C
+	bl GetBankMoveSlotId
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
@@ -2572,7 +2572,7 @@ _0817E122:
 	mov r1, r10
 	ldrb r0, [r1]
 	adds r1, r7, 0
-	bl sub_817F33C
+	bl GetBankMoveSlotId
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x3
@@ -4793,8 +4793,8 @@ _0817F324:
 	.pool
 	thumb_func_end sub_817F2A8
 
-	thumb_func_start sub_817F33C
-sub_817F33C: @ 817F33C
+	thumb_func_start GetBankMoveSlotId
+GetBankMoveSlotId: @ 817F33C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -4835,7 +4835,7 @@ _0817F388:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_817F33C
+	thumb_func_end GetBankMoveSlotId
 
 	thumb_func_start sub_817F394
 sub_817F394: @ 817F394
@@ -4888,97 +4888,4 @@ _0817F3E6:
 	bx r0
 	thumb_func_end sub_817F394
 
-	thumb_func_start nullsub_69
-nullsub_69: @ 817F3EC
-	bx lr
-	thumb_func_end nullsub_69
-
-	thumb_func_start sub_817F3F0
-sub_817F3F0: @ 817F3F0
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	sub sp, 0x4
-	mov r9, r0
-	mov r8, r1
-	adds r5, r2, 0
-	adds r4, r3, 0
-	lsls r5, 16
-	negs r5, r5
-	lsls r4, 16
-	negs r4, r4
-	lsrs r4, 16
-	mov r0, r8
-	lsls r0, 16
-	asrs r0, 16
-	mov r8, r0
-	asrs r5, 16
-	adds r1, r5, 0
-	bl Cos
-	adds r6, r0, 0
-	lsls r4, 16
-	asrs r4, 16
-	mov r0, r8
-	adds r1, r4, 0
-	bl Sin
-	subs r6, r0
-	lsls r6, 16
-	lsrs r6, 16
-	mov r0, r8
-	adds r1, r4, 0
-	bl Cos
-	adds r2, r0, 0
-	mov r0, r8
-	adds r1, r5, 0
-	str r2, [sp]
-	bl Sin
-	ldr r2, [sp]
-	adds r2, r0
-	negs r5, r5
-	negs r4, r4
-	lsls r6, 16
-	asrs r6, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r6, r5
-	mov r0, r9
-	strh r6, [r0, 0x24]
-	lsls r2, 16
-	asrs r2, 16
-	lsls r4, 16
-	asrs r4, 16
-	adds r2, r4
-	strh r2, [r0, 0x26]
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_817F3F0
-
-	thumb_func_start GetSpeciesBackAnimId
-GetSpeciesBackAnimId: @ 817F474
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, =gUnknown_0860A8C8
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0817F48C
-	movs r0, 0
-	b _0817F492
-	.pool
-_0817F48C:
-	subs r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-_0817F492:
-	pop {r1}
-	bx r1
-	thumb_func_end GetSpeciesBackAnimId
-
 	.align 2, 0 @ Don't pad with nop.