diff --git a/asm/dtcm.s b/asm/dtcm.s
index 3b328c5c88..a476710eeb 100644
--- a/asm/dtcm.s
+++ b/asm/dtcm.s
@@ -3,8 +3,8 @@
 
 	.section .dtcm, 4
 
-	.public OSi_IntrTable
-OSi_IntrTable:
+	.public OS_IRQTable
+OS_IRQTable:
     .byte 0x28, 0x13, 0x0C, 0x02, 0x28, 0x13, 0x0C, 0x02, 0x28, 0x13, 0x0C, 0x02, 0xF4, 0x13, 0x0C, 0x02
     .byte 0x04, 0x14, 0x0C, 0x02, 0x14, 0x14, 0x0C, 0x02, 0x24, 0x14, 0x0C, 0x02, 0x28, 0x13, 0x0C, 0x02
     .byte 0xB4, 0x13, 0x0C, 0x02, 0xC4, 0x13, 0x0C, 0x02, 0xD4, 0x13, 0x0C, 0x02, 0xE4, 0x13, 0x0C, 0x02
@@ -13,4 +13,7 @@ OSi_IntrTable:
     .byte 0x28, 0x13, 0x0C, 0x02, 0x28, 0x13, 0x0C, 0x02
 
 	.bss
-	.space 0x20
+
+    .public OSi_IrqThreadQueue
+OSi_IrqThreadQueue:
+	.space 0x8
diff --git a/asm/overlay5.s b/asm/overlay5.s
index 6849e21f8d..cdfd24a077 100644
--- a/asm/overlay5.s
+++ b/asm/overlay5.s
@@ -59221,7 +59221,9 @@ ov5_021ED2AC: ; 0x021ED2AC
 	pop {r4, pc}
 	; .align 2, 0
 	thumb_func_end ov5_021ED2AC
-_021ED2D0:
+
+	thumb_func_start ov5_021ED2D0
+ov5_021ED2D0:
 	ldr r3, [r2, #0]
 	cmp r3, r0
 	bne _021ED2DA
@@ -59231,10 +59233,11 @@ _021ED2DA:
 	add r2, #8
 	ldr r3, [r2, #0]
 	cmp r3, r1
-	bne _021ED2D0
+	bne ov5_021ED2D0
 	mov r0, #0
 	bx lr
 	; .align 2, 0
+	thumb_func_end ov5_021ED2D0
 
 	thumb_func_start ov5_021ED2E8
 ov5_021ED2E8: ; 0x021ED2E8
@@ -59254,7 +59257,7 @@ _021ED302:
 	ldr r2, [sp, #0x18]
 	add r0, r4, #0
 	add r1, r7, #0
-	bl _021ED2D0
+	bl ov5_021ED2D0
 	add r7, r0, #0
 	bne _021ED314
 	bl sub_02022974
@@ -59302,7 +59305,7 @@ _021ED360:
 	ldr r1, _021ED38C ; =0x0000FFFF
 	add r0, r4, #0
 	add r2, r7, #0
-	bl _021ED2D0
+	bl ov5_021ED2D0
 	add r2, r0, #0
 	bne _021ED372
 	mov r0, #2
diff --git a/lib/asm/crt0.s b/lib/asm/crt0.s
index df89ec0fba..50788404f7 100644
--- a/lib/asm/crt0.s
+++ b/lib/asm/crt0.s
@@ -136,7 +136,7 @@ _02000994:
 	ldrb r5, [r3, #-1]!
 	mov r6, #8
 _020009A4:
-	sub r6, r6, #1
+	subs r6, r6, #1
 	blt _02000994
 	tst r5, #0x80
 	bne _020009C0
@@ -153,7 +153,7 @@ _020009C0:
 _020009D8:
 	ldrb r0, [r2, r7]
 	strb r0, [r2, #-1]!
-	sub ip, ip, #0x10
+	subs ip, ip, #0x10
 	bge _020009D8
 _020009E8:
 	cmp r3, r1