Merge branch 'master' into master

3 files changed, 0 insertions, 304 deletions

diff --git a/arm7/asm/MI_dma.s b/arm7/asm/MI_dma.s
deleted file mode 100644
index 8cbc8cb5..00000000
--- a/arm7/asm/MI_dma.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-    .text
-
-	arm_func_start MI_StopDma
-MI_StopDma: ; 0x037FB20C
-	stmdb	sp!, {r4, lr}
-	mov	r4, r0
-	bl	OS_DisableInterrupts
-	mov	r1, #6
-	mul	r1, r4, r1
-	add	r1, r1, #5
-	mov	r1, r1, lsl #1
-	add	r1, r1, #67108864	; 0x4000000
-	ldrh	r2, [r1, #176]	; 0xb0
-	bic	r2, r2, #12800	; 0x3200
-	strh	r2, [r1, #176]	; 0xb0
-	ldrh	r2, [r1, #176]	; 0xb0
-	bic	r2, r2, #32768	; 0x8000
-	strh	r2, [r1, #176]	; 0xb0
-	ldrh	r2, [r1, #176]	; 0xb0
-	ldrh	r1, [r1, #176]	; 0xb0
-	cmp	r4, #0
-	bne	_037FB27C
-	mov	r1, #12
-	mul	r3, r4, r1
-	ldr	r1, _037FB288	; =0x040000B0
-	add	r4, r3, r1
-	mov	r2, #0
-	add	r1, r3, #67108864	; 0x4000000
-	str	r2, [r1, #176]	; 0xb0
-	str	r2, [r4, #4]
-	ldr	r1, _037FB28C	; =0x81400001
-	str	r1, [r4, #8]
-_037FB27C:
-	bl	OS_RestoreInterrupts
-	ldmia	sp!, {r4, lr}
-	bx	lr
-_037FB288:	.word	0x040000B0
-_037FB28C:	.word	0x81400001
-
-	arm_func_start MI_WaitDma
-MI_WaitDma: ; 0x037FB290
-	stmdb	sp!, {r4, lr}
-	mov	r4, r0
-	bl	OS_DisableInterrupts
-	mov	r1, #3
-	mul	r1, r4, r1
-	add	r2, r1, #2
-	ldr	r1, _037FB2F8	; =0x040000B0
-	add	r2, r1, r2, lsl #2
-_037FB2B0:
-	ldr	r1, [r2]
-	ands	r1, r1, #-2147483648	; 0x80000000
-	bne	_037FB2B0
-	cmp	r4, #0
-	bne	_037FB2EC
-	mov	r1, #12
-	mul	r3, r4, r1
-	ldr	r1, _037FB2F8	; =0x040000B0
-	add	r4, r3, r1
-	mov	r2, #0
-	add	r1, r3, #67108864	; 0x4000000
-	str	r2, [r1, #176]	; 0xb0
-	str	r2, [r4, #4]
-	ldr	r1, _037FB2FC	; =0x81400001
-	str	r1, [r4, #8]
-_037FB2EC:
-	bl	OS_RestoreInterrupts
-	ldmia	sp!, {r4, lr}
-	bx	lr
-_037FB2F8:	.word	0x040000B0
-_037FB2FC:	.word	0x81400001
diff --git a/arm7/asm/MI_memory.s b/arm7/asm/MI_memory.s
deleted file mode 100644
index 7f3fdef2..00000000
--- a/arm7/asm/MI_memory.s
+++ /dev/null
@@ -1,221 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-    .text
-
-	arm_func_start MIi_CpuClear16
-MIi_CpuClear16: ; 0x037FB300
-	mov	r3, #0
-_037FB304:
-	cmp	r3, r2
-	strlth	r0, [r1, r3]
-	addlt	r3, r3, #2
-	blt	_037FB304
-	bx	lr
-
-	arm_func_start MIi_CpuCopy16
-MIi_CpuCopy16: ; 0x037FB318
-	mov	ip, #0
-_037FB31C:
-	cmp	ip, r2
-	ldrlth	r3, [r0, ip]
-	strlth	r3, [r1, ip]
-	addlt	ip, ip, #2
-	blt	_037FB31C
-	bx	lr
-
-	arm_func_start MIi_CpuClear32
-MIi_CpuClear32: ; 0x037FB334
-	add	ip, r1, r2
-_037FB338:
-	cmp	r1, ip
-	stmltia	r1!, {r0}
-	blt	_037FB338
-	bx	lr
-
-	arm_func_start MIi_CpuCopy32
-MIi_CpuCopy32: ; 0x037FB348
-	add	ip, r1, r2
-_037FB34C:
-	cmp	r1, ip
-	ldmltia	r0!, {r2}
-	stmltia	r1!, {r2}
-	blt	_037FB34C
-	bx	lr
-
-	arm_func_start MIi_CpuClearFast
-MIi_CpuClearFast: ; 0x037FB360
-	stmdb	sp!, {r4, r5, r6, r7, r8, r9}
-	add	r9, r1, r2
-	mov	ip, r2, lsr #5
-	add	ip, r1, ip, lsl #5
-	mov	r2, r0
-	mov	r3, r2
-	mov	r4, r2
-	mov	r5, r2
-	mov	r6, r2
-	mov	r7, r2
-	mov	r8, r2
-_037FB38C:
-	cmp	r1, ip
-	stmltia	r1!, {r0, r2, r3, r4, r5, r6, r7, r8}
-	blt	_037FB38C
-_037FB398:
-	cmp	r1, r9
-	stmltia	r1!, {r0}
-	blt	_037FB398
-	ldmia	sp!, {r4, r5, r6, r7, r8, r9}
-	bx	lr
-
-	arm_func_start MIi_CpuCopyFast
-MIi_CpuCopyFast: ; 0x037FB3AC
-	stmdb	sp!, {r4, r5, r6, r7, r8, r9, sl}
-	add	sl, r1, r2
-	mov	ip, r2, lsr #5
-	add	ip, r1, ip, lsl #5
-_037FB3BC:
-	cmp	r1, ip
-	ldmltia	r0!, {r2, r3, r4, r5, r6, r7, r8, r9}
-	stmltia	r1!, {r2, r3, r4, r5, r6, r7, r8, r9}
-	blt	_037FB3BC
-_037FB3CC:
-	cmp	r1, sl
-	ldmltia	r0!, {r2}
-	stmltia	r1!, {r2}
-	blt	_037FB3CC
-	ldmia	sp!, {r4, r5, r6, r7, r8, r9, sl}
-	bx	lr
-
-	arm_func_start MI_CpuFill8
-MI_CpuFill8: ; 0x037FB3E4
-	cmp	r2, #0
-	bxeq	lr
-	tst	r0, #1
-	beq	_037FB410
-	ldrh	ip, [r0, #-1]
-	and	ip, ip, #255	; 0xff
-	orr	r3, ip, r1, lsl #8
-	strh	r3, [r0, #-1]
-	add	r0, r0, #1
-	subs	r2, r2, #1
-	bxeq	lr
-_037FB410:
-	cmp	r2, #2
-	bcc	_037FB458
-	orr	r1, r1, r1, lsl #8
-	tst	r0, #2
-	beq	_037FB430
-	strh	r1, [r0], #2
-	subs	r2, r2, #2
-	bxeq	lr
-_037FB430:
-	orr	r1, r1, r1, lsl #16
-	bics	r3, r2, #3
-	beq	_037FB450
-	sub	r2, r2, r3
-	add	ip, r3, r0
-_037FB444:
-	str	r1, [r0], #4
-	cmp	r0, ip
-	bcc	_037FB444
-_037FB450:
-	tst	r2, #2
-	strneh	r1, [r0], #2
-_037FB458:
-	tst	r2, #1
-	bxeq	lr
-	ldrh	r3, [r0]
-	and	r3, r3, #65280	; 0xff00
-	and	r1, r1, #255	; 0xff
-	orr	r1, r1, r3
-	strh	r1, [r0]
-	bx	lr
-
-	arm_func_start MI_CpuCopy8
-MI_CpuCopy8: ; 0x037FB478
-	cmp	r2, #0
-	bxeq	lr
-	tst	r1, #1
-	beq	_037FB4B8
-	ldrh	ip, [r1, #-1]
-	and	ip, ip, #255	; 0xff
-	tst	r0, #1
-	ldrneh	r3, [r0, #-1]
-	movne	r3, r3, lsr #8
-	ldreqh	r3, [r0]
-	orr	r3, ip, r3, lsl #8
-	strh	r3, [r1, #-1]
-	add	r0, r0, #1
-	add	r1, r1, #1
-	subs	r2, r2, #1
-	bxeq	lr
-_037FB4B8:
-	eor	ip, r1, r0
-	tst	ip, #1
-	beq	_037FB50C
-	bic	r0, r0, #1
-	ldrh	ip, [r0], #2
-	mov	r3, ip, lsr #8
-	subs	r2, r2, #2
-	bcc	_037FB4F0
-_037FB4D8:
-	ldrh	ip, [r0], #2
-	orr	ip, r3, ip, lsl #8
-	strh	ip, [r1], #2
-	mov	r3, ip, lsr #16
-	subs	r2, r2, #2
-	bcs	_037FB4D8
-_037FB4F0:
-	tst	r2, #1
-	bxeq	lr
-	ldrh	ip, [r1]
-	and	ip, ip, #65280	; 0xff00
-	orr	ip, ip, r3
-	strh	ip, [r1]
-	bx	lr
-_037FB50C:
-	tst	ip, #2
-	beq	_037FB538
-	bics	r3, r2, #1
-	beq	_037FB584
-	sub	r2, r2, r3
-	add	ip, r3, r1
-_037FB524:
-	ldrh	r3, [r0], #2
-	strh	r3, [r1], #2
-	cmp	r1, ip
-	bcc	_037FB524
-	b	_037FB584
-_037FB538:
-	cmp	r2, #2
-	bcc	_037FB584
-	tst	r1, #2
-	beq	_037FB558
-	ldrh	r3, [r0], #2
-	strh	r3, [r1], #2
-	subs	r2, r2, #2
-	bxeq	lr
-_037FB558:
-	bics	r3, r2, #3
-	beq	_037FB578
-	sub	r2, r2, r3
-	add	ip, r3, r1
-_037FB568:
-	ldr	r3, [r0], #4
-	str	r3, [r1], #4
-	cmp	r1, ip
-	bcc	_037FB568
-_037FB578:
-	tst	r2, #2
-	ldrneh	r3, [r0], #2
-	strneh	r3, [r1], #2
-_037FB584:
-	tst	r2, #1
-	bxeq	lr
-	ldrh	r2, [r1]
-	ldrh	r0, [r0]
-	and	r2, r2, #65280	; 0xff00
-	and	r0, r0, #255	; 0xff
-	orr	r0, r2, r0
-	strh	r0, [r1]
-	bx	lr
diff --git a/arm7/asm/MI_swap.s b/arm7/asm/MI_swap.s
deleted file mode 100644
index a5f08796..00000000
--- a/arm7/asm/MI_swap.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-    .text
-
-	arm_func_start MI_SwapWord
-MI_SwapWord: ; 0x037FB5A8
-	swp	r0, r0, [r1]
-	bx	lr