18 files changed, 11 insertions, 10 deletions
diff --git a/arm9/asm/CARD_arm9.s b/arm9/asm/libcard.s
index 664e85f5..664e85f5 100644
--- a/arm9/asm/CARD_arm9.s
+++ b/arm9/asm/libcard.s
diff --git a/arm9/asm/CP_arm9.s b/arm9/asm/libcp.s
index c756e8e2..c756e8e2 100644
--- a/arm9/asm/CP_arm9.s
+++ b/arm9/asm/libcp.s
diff --git a/arm9/asm/CTRDG_arm9.s b/arm9/asm/libctrdg.s
index 301ea233..301ea233 100644
--- a/arm9/asm/CTRDG_arm9.s
+++ b/arm9/asm/libctrdg.s
diff --git a/arm9/asm/DGT_arm9.s b/arm9/asm/libdgt.s
index d5ef358d..d5ef358d 100644
--- a/arm9/asm/DGT_arm9.s
+++ b/arm9/asm/libdgt.s
diff --git a/arm9/asm/FS_arm9.s b/arm9/asm/libfs.s
index d9b791b8..d9b791b8 100644
--- a/arm9/asm/FS_arm9.s
+++ b/arm9/asm/libfs.s
diff --git a/arm9/asm/MATH_arm9.s b/arm9/asm/libmath.s
index 02dcfbcf..02dcfbcf 100644
--- a/arm9/asm/MATH_arm9.s
+++ b/arm9/asm/libmath.s
diff --git a/arm9/asm/MI_arm9.s b/arm9/asm/libmi.s
index 82747b38..82747b38 100644
--- a/arm9/asm/MI_arm9.s
+++ b/arm9/asm/libmi.s
diff --git a/arm9/asm/PM_arm9.s b/arm9/asm/libpm.s
index 331c0fa9..331c0fa9 100644
--- a/arm9/asm/PM_arm9.s
+++ b/arm9/asm/libpm.s
diff --git a/arm9/asm/PXI_arm9.s b/arm9/asm/libpxi.s
index ab3af5de..ab3af5de 100644
--- a/arm9/asm/PXI_arm9.s
+++ b/arm9/asm/libpxi.s
diff --git a/arm9/asm/RTC_arm9.s b/arm9/asm/librtc.s
index 8116f8de..8116f8de 100644
--- a/arm9/asm/RTC_arm9.s
+++ b/arm9/asm/librtc.s
diff --git a/arm9/asm/SND_arm9.s b/arm9/asm/libsnd.s
index 99351712..99351712 100644
--- a/arm9/asm/SND_arm9.s
+++ b/arm9/asm/libsnd.s
diff --git a/arm9/asm/SPI_arm9.s b/arm9/asm/libspi.s
index 915bb22c..915bb22c 100644
--- a/arm9/asm/SPI_arm9.s
+++ b/arm9/asm/libspi.s
diff --git a/arm9/asm/STD_arm9.s b/arm9/asm/libstd.s
index 39946c46..39946c46 100644
--- a/arm9/asm/STD_arm9.s
+++ b/arm9/asm/libstd.s
diff --git a/arm9/asm/WM_arm9.s b/arm9/asm/libwm.s
index cc3e7998..cc3e7998 100644
--- a/arm9/asm/WM_arm9.s
+++ b/arm9/asm/libwm.s
diff --git a/arm9/asm/secure.s b/arm9/asm/secure.s
index f9d8f159..632f43bc 100644
--- a/arm9/asm/secure.s
+++ b/arm9/asm/secure.s
@@ -5,11 +5,11 @@
 
 .incbin "baserom.nds", 0x4000, 0x19E
 
-	non_word_aligned_thumb_func_start FUN_0200019E
-FUN_0200019E: ; 0x0200019E
+	non_word_aligned_thumb_func_start SVC_Sqrt
+SVC_Sqrt: ; 0x0200019E
 	swi 13
 	bx lr
-	thumb_func_end FUN_0200019E
+	thumb_func_end SVC_Sqrt
 
 .incbin "baserom.nds", 0x41A2, 0x15C
 
@@ -20,7 +20,6 @@ FUN_020002FE: ; 0x020002FE
 
 .incbin "baserom.nds", 0x4302, 0x2F0
 
-
 	non_word_aligned_thumb_func_start SVC_WaitByLoop
 SVC_WaitByLoop:
 	swi 3
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index f212d36f..fbfb90df 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -95240,7 +95240,7 @@ _02031CEE:
 	bl FUN_02033590
 	cmp r0, #0x0
 	beq _02031D04
-	blx FUN_021DDB08
+	bl FUN_021DDB08
 	mov r1, #0x3
 	sub r0, r1, r0
 	bl FUN_02033EEC
@@ -98149,10 +98149,10 @@ _020333AA:
 	bne _020333C8
 	add r0, sp, #0x4
 	add r1, sp, #0x0
-	blx FUN_021DD718
+	bl FUN_021DD718
 	cmp r0, #0x0
 	beq _020333E4
-	blx FUN_021DD6F0
+	bl FUN_021DD6F0
 	add sp, #0x8
 	mov r0, #0x1
 	pop {r3, pc}
@@ -98161,7 +98161,7 @@ _020333C8:
 	bne _020333E4
 	add r0, sp, #0x4
 	add r1, sp, #0x0
-	blx FUN_021DD718
+	bl FUN_021DD718
 	cmp r0, #0x0
 	beq _020333E4
 	ldr r0, [sp, #0x0]
diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s
index 30b8ee4c..b70ef94e 100644
--- a/arm9/asm/unk_02046030.s
+++ b/arm9/asm/unk_02046030.s
@@ -107533,7 +107533,7 @@ FUN_020799F4: ; 0x020799F4
 	mul r0, r1
 	add r0, r2, r0
 	lsl r0, r0, #0x4
-	bl FUN_0200019E
+	bl SVC_Sqrt
 	lsr r0, r0, #0x2
 	pop {r3, pc}
 	.balign 4
diff --git a/arm9/asm/unk_0208AC14.s b/arm9/asm/unk_0208AC14.s
index 0adafb8b..8fbcff45 100644
--- a/arm9/asm/unk_0208AC14.s
+++ b/arm9/asm/unk_0208AC14.s
@@ -13644,7 +13644,9 @@ _02096C6C:
 	mov r0, #0x0
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r7,pc}
-_02096C78: ; 0x02096C78
+
+	arm_func_start FUN_02096C78
+FUN_02096C78: ; 0x02096C78
 	ldr ip, _02096C8C ; =FUN_02097218
 	mov r3, r0
 	mov r0, r1