5 files changed, 16 insertions, 190 deletions
diff --git a/arm9/asm/CP_context.s b/arm9/asm/CP_context.s
index c756e8e2..6ab2c53f 100644
--- a/arm9/asm/CP_context.s
+++ b/arm9/asm/CP_context.s
@@ -22,8 +22,8 @@ CP_SaveContext: ; 0x020D3648
 	.balign 4
 _020D3684: .word 0x04000290
 
-	arm_func_start CP_RestoreContext
-CP_RestoreContext: ; 0x020D3688
+	arm_func_start CPi_RestoreContext
+CPi_RestoreContext: ; 0x020D3688
 	stmdb sp!, {r4}
 	ldr r1, _020D36C0 ; =0x04000290
 	ldmia r0, {r2-r4,r12}
diff --git a/arm9/asm/OS_context.s b/arm9/asm/OS_context.s
index 1b7db498..2c8feeb8 100644
--- a/arm9/asm/OS_context.s
+++ b/arm9/asm/OS_context.s
@@ -60,7 +60,7 @@ _020CBB78: .word CP_SaveContext
 OS_LoadContext: ; 0x020CBB7C
 	stmdb sp!, {r0,lr}
 	add r0, r0, #0x48
-	ldr r1, _020CBBBC ; =CP_RestoreContext
+	ldr r1, _020CBBBC ; =CPi_RestoreContext
 	blx r1
 	ldmia sp!, {r0,lr}
 	mrs r1, cpsr
@@ -75,4 +75,4 @@ OS_LoadContext: ; 0x020CBB7C
 	mov r0, r0
 	subs pc, lr, #0x4
 	.balign 4
-_020CBBBC: .word CP_RestoreContext
+_020CBBBC: .word CPi_RestoreContext
diff --git a/arm9/asm/OS_irqHandler.s b/arm9/asm/OS_irqHandler.s
deleted file mode 100644
index d0e563fb..00000000
--- a/arm9/asm/OS_irqHandler.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.section .data
-
-	.global OSi_IrqCallbackInfoIndex
-OSi_IrqCallbackInfoIndex: ; 0x02106818
-	.short  8
-	.short  9
-	.short 10
-	.short 11
-	.short  3
-	.short  4
-	.short  5
-	.short  6
-
-	; pragma section DTCM begin
-    .section .bss
-    .balign 16, 0
-    .global OSi_IrqThreadQueue
-OSi_IrqThreadQueue: ; 027E0060
-	.space 4
-	; pragma section DTCM end
-
-	.section .text
-
-	arm_func_start OS_WaitIrq
-OS_WaitIrq:
-	stmdb sp!, {r4-r6,lr}
-	mov r5, r0
-	mov r4, r1
-	bl OS_DisableInterrupts
-	cmp r5, #0x0
-	beq _020C9C3C
-	ldr r1, _020C9C80 ; =0x027E0000
-	mvn r2, r4
-	add r1, r1, #0x3000
-	ldr r3, [r1, #0xff8]
-	and r2, r3, r2
-	str r2, [r1, #0xff8]
-_020C9C3C:
-	bl OS_RestoreInterrupts
-	ldr r1, _020C9C80 ; =0x027E0000
-	add r0, r1, #0x3000
-	ldr r0, [r0, #0xff8]
-	ands r0, r4, r0
-	ldmneia sp!, {r4-r6,lr}
-	bxne lr
-	ldr r0, _020C9C84 ; =0x00003FF8
-	add r6, r1, r0
-	ldr r5, _020C9C88 ; =0x027E0060
-_020C9C64:
-	mov r0, r5
-	bl OS_SleepThread
-	ldr r0, [r6, #0x0]
-	ands r0, r4, r0
-	beq _020C9C64
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-	.balign 4
-_020C9C80: .word 0x027E0000
-_020C9C84: .word 0x00003FF8
-_020C9C88: .word 0x027E0060
diff --git a/arm9/asm/OS_irqTable.s b/arm9/asm/OS_irqTable.s
index 6c106c92..e42d600b 100644
--- a/arm9/asm/OS_irqTable.s
+++ b/arm9/asm/OS_irqTable.s
@@ -36,6 +36,18 @@ OS_IRQTable: ; 027E0000 ;10b6a0
 OSi_IrqCallbackInfo: ; 0x021D341C
 	.space 0x60
 
+	.section .data
+	.global OSi_IrqCallbackInfoIndex
+OSi_IrqCallbackInfoIndex: ; 0x02106818
+	.short  8
+	.short  9
+	.short 10
+	.short 11
+	.short  3
+	.short  4
+	.short  5
+	.short  6
+
     .section .text
 
 	arm_func_start OSi_IrqTimer3
diff --git a/arm9/asm/arm9_itcm.s b/arm9/asm/arm9_itcm.s
index 7db3d194..e53c9b74 100644
--- a/arm9/asm/arm9_itcm.s
+++ b/arm9/asm/arm9_itcm.s
@@ -3,129 +3,6 @@
 	.section .text
 
 	; OS
-	arm_func_start OS_IrqHandler
-OS_IrqHandler: ; 0x01FF8000
-	stmfd sp!, {lr}
-	mov ip, #0x04000000
-	add ip, ip, #0x210
-	ldr r1, [ip, #-8]
-	cmp r1, #0
-	ldmeqfd sp!, {pc}
-	ldmia ip, {r1, r2}
-	ands r1, r1, r2
-	ldmeqfd sp!, {pc}
-	mov r3, #0x80000000
-_01FF8028:
-	clz r0, r1
-	bics r1, r1, r3, lsr r0
-	bne _01FF8028
-	mov r1, r3, lsr r0
-	str r1, [ip, #0x4]
-	rsbs r0, r0, #0x1f
-	ldr r1, _01FF8050 ; =0x027E0000
-	ldr r0, [r1, r0, lsl #2]
-	ldr lr, _01FF8054 ; =0x01FF70B8
-	bx r0
-_01FF8050: .word OS_IRQTable
-_01FF8054: .word OS_IrqHandler_ThreadSwitch
-
-	arm_func_start OS_IrqHandler_ThreadSwitch
-OS_IrqHandler_ThreadSwitch: ; 01FF8058
-	ldr ip, _01FF81A4
-	mov r3, #0x0
-	ldr ip, [ip]
-	mov r2, #0x1
-	cmp ip, #0x0
-	beq _01FF80A8
-_01FF8070:
-	str r2, [ip, #0x64]
-	str r3, [ip, #0x78]
-	str r3, [ip, #0x7c]
-	ldr r0, [ip, #0x80]
-	str r3, [ip, #0x80]
-	mov ip, r0
-	cmp ip, #0x0
-	bne _01FF8070
-	ldr ip, _01FF81A4
-	str r3, [ip]
-	str r3, [ip, #0x4]
-	ldr ip, _01FF81A8
-	mov r1, #0x1
-	strh r1, [ip]
-_01FF80A8:
-	ldr ip, _01FF81A8
-	ldrh r1, [ip]
-	cmp r1, #0x0
-	ldreq pc, [sp], #0x4
-	mov r1, #0x0
-	strh r1, [ip]
-	mov r3, #0xd2
-	msr CPSR_c, r3
-	add r2, ip, #0x8
-	ldr r1, [r2]
-_01FF80D0:
-	cmp r1, #0x0
-	ldrneh r0, [r1, #0x64]
-	cmpne r0, #0x1
-	ldrne r1, [r1, #0x68]
-	bne _01FF80D0
-	cmp r1, #0x0
-	bne _01FF80F8
-_01FF80EC:
-	mov r3, #0x92
-	msr CPSR_c, r3
-	ldr pc, [sp], #0x4
-_01FF80F8:
-	ldr r0, [ip, #0x4]
-	cmp r1, r0
-	beq _01FF80EC
-	ldr r3, [ip, #0xC]
-	cmp r3, #0x0
-	beq _01FF8120
-	stmdb sp!, {r0, r1, ip}
-	mov lr, pc
-	bx r3
-	ldmia sp!, {r0, r1, ip}
-_01FF8120:
-	str r1, [ip, #0x4]
-	mrs r2, SPSR
-	str r2, [r0, #0x0]!
-	stmdb sp!, {r0, r1}
-	add r0, r0, #0x0
-	add r0, r0, #0x48
-	ldr r1, _01FF81AC
-	blx r1
-	ldmia sp!, {r0, r1}
-	ldmib sp!, {r2, r3}
-	stmib r0!, {r2, r3}
-	ldmib sp!, {r2, r3, ip, lr}
-	stmib r0!, {r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, sp, lr}^
-	stmib r0!, {lr}
-	mov r3, #0xd3
-	msr CPSR_c, r3
-	stmib r0!, {sp}
-	stmfd sp!, {r1}
-	add r0, r1, #0x0
-	add r0, r0, #0x48
-	ldr r1, _01FF81B0
-	blx r1
-	ldmfd sp!, {r1}
-	ldr sp, [r1, #0x44]
-	mov r3, #0xd2
-	msr CPSR_c, r3
-	ldr r2, [r1, #0x0]!
-	msr SPSR_fc, r2
-	ldr lr, [r1, #0x40]
-	ldmib r1!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, sp, lr}^
-	nop
-	stmda sp!, {r0, r1, r2, r3, ip, lr}
-	ldmfd sp!, {pc}
-_01FF81A4: .word OSi_IrqThreadQueue
-_01FF81A8: .word OSi_ThreadInfo
-_01FF81AC: .word CP_SaveContext
-_01FF81B0: .word CP_RestoreContext
-
-	.section .text
 	arm_func_start OSi_DoBoot
 OSi_DoBoot: ; 0x01FF81B4
 	mov ip, #0x04000000