Merge branch 'master' into pikalax_work

3 files changed, 0 insertions, 131 deletions

diff --git a/arm9/asm/RTC_internal.s b/arm9/asm/RTC_internal.s
deleted file mode 100644
index 408b630c..00000000
--- a/arm9/asm/RTC_internal.s
+++ /dev/null
@@ -1,53 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-    .text
-
-	arm_func_start RtcSendPxiCommand
-RtcSendPxiCommand: ; 0x020D61D4
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	mov r0, r0, lsl #0x8
-	and r1, r0, #0x7f00
-	mov r0, #0x5
-	mov r2, #0x0
-	bl PXI_SendWordByFifo
-_020D61F0: ; 0x020D61F0
-	cmp r0, #0x0
-	movge r0, #0x1
-	movlt r0, #0x0
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-
-	arm_func_start RTCi_WriteRawStatus2Async
-RTCi_WriteRawStatus2Async:
-	ldr ip, _020D6214 ; =RtcSendPxiCommand
-	mov r0, #0x27
-	bx r12
-	.balign 4
-_020D6214: .word RtcSendPxiCommand
-
-	arm_func_start RTCi_ReadRawTimeAsync
-RTCi_ReadRawTimeAsync:
-	ldr ip, _020D6224 ; =RtcSendPxiCommand
-	mov r0, #0x12
-	bx r12
-	.balign 4
-_020D6224: .word RtcSendPxiCommand
-
-	arm_func_start RTCi_ReadRawDateAsync
-RTCi_ReadRawDateAsync:
-	ldr ip, _020D6234 ; =RtcSendPxiCommand
-	mov r0, #0x11
-	bx r12
-	.balign 4
-_020D6234: .word RtcSendPxiCommand
-
-	arm_func_start RTCi_ReadRawDateTimeAsync
-RTCi_ReadRawDateTimeAsync:
-	ldr ip, _020D6244 ; =RtcSendPxiCommand
-	mov r0, #0x10
-	bx r12
-	.balign 4
-_020D6244: .word RtcSendPxiCommand
diff --git a/arm9/asm/WIFI_stubsmd5_dummy.s b/arm9/asm/WIFI_stubsmd5_dummy.s
deleted file mode 100644
index dd3f79a7..00000000
--- a/arm9/asm/WIFI_stubsmd5_dummy.s
+++ /dev/null
@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	arm_func_start MD5Final
-MD5Final: ; 0x020A8BA4
-	ldr ip, _020A8BAC ; =DGT_Hash1GetDigest_R
-	bx r12
-	.balign 4
-_020A8BAC: .word DGT_Hash1GetDigest_R
-
-	arm_func_start MD5Update
-MD5Update: ; 0x020A8BB0
-	ldr ip, _020A8BB8 ; =DGT_Hash1SetSource
-	bx r12
-	.balign 4
-_020A8BB8: .word DGT_Hash1SetSource
-
-	arm_func_start MD5Init
-MD5Init: ; 0x020A8BBC
-	ldr ip, _020A8BC4 ; =DGT_Hash1Reset
-	bx r12
-	.balign 4
-_020A8BC4: .word DGT_Hash1Reset
diff --git a/arm9/asm/unk_02022504.s b/arm9/asm/unk_02022504.s
deleted file mode 100644
index e3463538..00000000
--- a/arm9/asm/unk_02022504.s
+++ /dev/null
@@ -1,53 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02022504
-FUN_02022504: ; 0x02022504
-	ldr r3, _0202250C ; =SavArray_get
-	mov r1, #0x1b
-	bx r3
-	nop
-_0202250C: .word SavArray_get
-
-	thumb_func_start GetStoragePCPointer
-GetStoragePCPointer: ; 0x02022510
-	ldr r3, _02022518 ; =SavArray_get
-	mov r1, #0x23
-	bx r3
-	nop
-_02022518: .word SavArray_get
-
-	thumb_func_start FUN_0202251C
-FUN_0202251C: ; 0x0202251C
-	ldr r3, _02022524 ; =SavArray_get
-	mov r1, #0x1f
-	bx r3
-	nop
-_02022524: .word SavArray_get
-
-	thumb_func_start FUN_02022528
-FUN_02022528: ; 0x02022528
-	ldr r3, _02022530 ; =SavArray_get
-	mov r1, #0x20
-	bx r3
-	nop
-_02022530: .word SavArray_get
-
-	thumb_func_start LoadHallOfFame
-LoadHallOfFame: ; 0x02022534
-	push {r3, lr}
-	add r3, r2, #0x0
-	mov r2, #0x0
-	bl ReadSaveFileFromFlash
-	pop {r3, pc}
-
-	thumb_func_start SaveHallOfFame
-SaveHallOfFame: ; 0x02022540
-	ldr r3, _02022548 ; =WriteSaveFileToFlash
-	add r2, r1, #0x0
-	mov r1, #0x0
-	bx r3
-	.balign 4
-_02022548: .word WriteSaveFileToFlash