Merge branch 'master' into master

4 files changed, 0 insertions, 142 deletions

diff --git a/arm9/asm/WM_ks.s b/arm9/asm/WM_ks.s
deleted file mode 100644
index 3dd46c1b..00000000
--- a/arm9/asm/WM_ks.s
+++ /dev/null
@@ -1,26 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	arm_func_start WM_EndKeySharing
-WM_EndKeySharing: ; 0x020DAD3C
-	ldr ip, _020DAD44 ; =WM_EndDataSharing
-	bx r12
-	.balign 4
-_020DAD44: .word WM_EndDataSharing
-
-	arm_func_start WM_StartKeySharing
-WM_StartKeySharing: ; 0x020DAD48
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	ldr r2, _020DAD70 ; =0x0000FFFF
-	mov r12, #0x1
-	mov r3, #0x2
-	str r12, [sp, #0x0]
-	bl WM_StartDataSharing
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-	.balign 4
-_020DAD70: .word 0x0000FFFF
diff --git a/arm9/asm/unk_020061E8.s b/arm9/asm/unk_020061E8.s
deleted file mode 100644
index 22f390c7..00000000
--- a/arm9/asm/unk_020061E8.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-
-	thumb_func_start FUN_020061E8
-FUN_020061E8: ; 0x020061E8
-	push {r3-r7, lr}
-	add r5, r1, #0x0
-	add r6, r0, #0x0
-	add r7, r2, #0x0
-	cmp r5, #0x0
-	beq _0200620C
-	add r0, r3, #0x0
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	bne _02006202
-	mov r0, #0x0
-	pop {r3-r7, pc}
-_02006202:
-	mov r1, #0x0
-	add r2, r5, #0x0
-	bl memset
-	b _0200620E
-_0200620C:
-	mov r4, #0x0
-_0200620E:
-	add r0, r6, #0x0
-	add r1, r4, #0x0
-	add r2, r7, #0x0
-	bl FUN_0200CA44
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0200621C
-FUN_0200621C: ; 0x0200621C
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl FUN_0201B6C8
-	cmp r0, #0x0
-	beq _0200622C
-	bl FreeToHeap
-_0200622C:
-	add r0, r4, #0x0
-	bl FUN_0200CAB4
-	pop {r4, pc}
diff --git a/arm9/asm/unk_020222E8.s b/arm9/asm/unk_020222E8.s
deleted file mode 100644
index 047712a5..00000000
--- a/arm9/asm/unk_020222E8.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_020222E8
-FUN_020222E8: ; 0x020222E8
-	mov r0, #0x5
-	lsl r0, r0, #0x18
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_020222F0
-FUN_020222F0: ; 0x020222F0
-	mov r0, #0x2
-	lsl r0, r0, #0x8
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_020222F8
-FUN_020222F8: ; 0x020222F8
-	ldr r0, _020222FC ; =0x05000400
-	bx lr
-	.balign 4
-_020222FC: .word 0x05000400
-
-	thumb_func_start FUN_02022300
-FUN_02022300: ; 0x02022300
-	mov r0, #0x2
-	lsl r0, r0, #0x8
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02022308
-FUN_02022308: ; 0x02022308
-	ldr r0, _0202230C ; =0x05000200
-	bx lr
-	.balign 4
-_0202230C: .word 0x05000200
-
-	thumb_func_start FUN_02022310
-FUN_02022310: ; 0x02022310
-	ldr r0, _02022314 ; =0x05000600
-	bx lr
-	.balign 4
-_02022314: .word 0x05000600
diff --git a/arm9/asm/unk_02064E20.s b/arm9/asm/unk_02064E20.s
deleted file mode 100644
index 19ada5a3..00000000
--- a/arm9/asm/unk_02064E20.s
+++ /dev/null
@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02064E20
-FUN_02064E20: ; 0x02064E20
-	push {r4, lr}
-	bl ScriptEnvironment_GetSav2Ptr
-	bl FUN_02024ED8
-	add r4, r0, #0x0
-	bl FUN_020254B4
-	cmp r0, #0x6
-	beq _02064E48
-	add r0, r4, #0x0
-	mov r1, #0x6
-	bl FUN_02025490
-	add r0, r4, #0x0
-	mov r1, #0x6
-	bl FUN_020254A0
-	mov r1, #0x2
-	strh r1, [r0, #0x0]
-_02064E48:
-	pop {r4, pc}
-	.balign 4