Add arm_func_end to already-split libnnsfnd files

5 files changed, 44 insertions, 1 deletions

diff --git a/arm9/asm/NNS_FND_allocator.s b/arm9/asm/NNS_FND_allocator.s
index f6e77344..404b1983 100644
--- a/arm9/asm/NNS_FND_allocator.s
+++ b/arm9/asm/NNS_FND_allocator.s
@@ -22,6 +22,7 @@ FUN_020AE82C: ; 0x020AE82C
 	bx lr
 	.balign 4
 _020AE848: .word UNK_020FF7CC
+	arm_func_end FUN_020AE82C
 
 	arm_func_start FUN_020AE84C
 FUN_020AE84C: ; 0x020AE84C
@@ -32,6 +33,7 @@ FUN_020AE84C: ; 0x020AE84C
 	blx r2
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020AE84C
 
 	arm_func_start FUN_020AE868
 FUN_020AE868: ; 0x020AE868
@@ -42,6 +44,7 @@ FUN_020AE868: ; 0x020AE868
 	blx r2
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020AE868
 
 	arm_func_start FUN_020AE884
 FUN_020AE884: ; 0x020AE884
@@ -50,6 +53,7 @@ FUN_020AE884: ; 0x020AE884
 	bx r12
 	.balign 4
 _020AE890: .word FUN_020ADDF0
+	arm_func_end FUN_020AE884
 
 	arm_func_start FUN_020AE894
 FUN_020AE894: ; 0x020AE894
@@ -60,3 +64,4 @@ FUN_020AE894: ; 0x020AE894
 	bx r12
 	.balign 4
 _020AE8A8: .word tempName_NNS_FndAllocFromExpHeapEx
+	arm_func_end FUN_020AE894
diff --git a/arm9/asm/NNS_FND_expheap.s b/arm9/asm/NNS_FND_expheap.s
index c30c6e88..cb42f116 100644
--- a/arm9/asm/NNS_FND_expheap.s
+++ b/arm9/asm/NNS_FND_expheap.s
@@ -10,6 +10,7 @@
 FUN_020ADDC0: ; 0x020ADDC0
 	ldr r0, [r0, #-0xc]
 	bx lr
+	arm_func_end FUN_020ADDC0
 
 	arm_func_start FUN_020ADDC8
 FUN_020ADDC8: ; 0x020ADDC8
@@ -24,6 +25,7 @@ _020ADDD8:
 	cmp r2, #0x0
 	bne _020ADDD8
 	bx lr
+	arm_func_end FUN_020ADDC8
 
 	arm_func_start FUN_020ADDF0
 FUN_020ADDF0: ; 0x020ADDF0
@@ -42,6 +44,7 @@ FUN_020ADDF0: ; 0x020ADDF0
 	bl FUN_020AE02C
 	add sp, sp, #0xc
 	ldmia sp!, {r4-r5,pc}
+	arm_func_end FUN_020ADDF0
 
 	arm_func_start FUN_020ADE2C
 FUN_020ADE2C: ; 0x020ADE2C
@@ -146,6 +149,7 @@ _020ADF90:
 	ldmia sp!, {r4-r10,pc}
 	.balign 4
 _020ADF9C: .word 0x00004652
+	arm_func_end FUN_020ADE2C
 
 	arm_func_start tempName_NNS_FndAllocFromExpHeapEx
 tempName_NNS_FndAllocFromExpHeapEx: ; 0x020ADFA0
@@ -165,6 +169,7 @@ _020ADFCC:
 	bl FUN_020AE11C
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end tempName_NNS_FndAllocFromExpHeapEx
 
 	arm_func_start thunk_FUN_020adc8c
 thunk_FUN_020adc8c: ; 0x020ADFDC
@@ -172,6 +177,7 @@ thunk_FUN_020adc8c: ; 0x020ADFDC
 	bx r12
 	.balign 4
 _020ADFE4: .word FUN_020ADC8C
+	arm_func_end thunk_FUN_020adc8c
 
 	arm_func_start tempName_NNS_FndCreateExpHeapEx
 tempName_NNS_FndCreateExpHeapEx: ; 0x020ADFE8
@@ -194,6 +200,7 @@ _020AE020:
 	bl FUN_020AE420
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end tempName_NNS_FndCreateExpHeapEx
 
 	arm_func_start FUN_020AE02C
 FUN_020AE02C:
@@ -262,6 +269,7 @@ _020AE0D4:
 	ldmia sp!, {r4-r6,pc}
 	.balign 4
 _020AE118: .word 0x00004652
+	arm_func_end FUN_020AE02C
 
 	arm_func_start FUN_020AE11C
 FUN_020AE11C: ; 0x020AE11C
@@ -315,6 +323,7 @@ _020AE1B0:
 	bl FUN_020AE298
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r9,pc}
+	arm_func_end FUN_020AE11C
 
 	arm_func_start FUN_020AE1D8
 FUN_020AE1D8: ; 0x020AE1D8
@@ -369,6 +378,7 @@ _020AE270:
 	bl FUN_020AE298
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r9,pc}
+	arm_func_end FUN_020AE1D8
 
 	arm_func_start FUN_020AE298
 FUN_020AE298: ; 0x020AE298
@@ -474,6 +484,7 @@ _020AE378:
 	.balign 4
 _020AE418: .word 0x00004652
 _020AE41C: .word 0x00005544
+	arm_func_end FUN_020AE298
 
 	arm_func_start FUN_020AE420
 FUN_020AE420: ; 0x020AE420
@@ -510,6 +521,7 @@ FUN_020AE420: ; 0x020AE420
 	.balign 4
 _020AE498: .word 0x45585048
 _020AE49C: .word 0x00004652
+	arm_func_end FUN_020AE420
 
 	arm_func_start FUN_020AE4A0
 FUN_020AE4A0: ; 0x020AE4A0
@@ -525,6 +537,7 @@ FUN_020AE4A0: ; 0x020AE4A0
 	mov r0, r3
 	str r2, [r3, #0xc]
 	bx lr
+	arm_func_end FUN_020AE4A0
 
 	arm_func_start FUN_020AE4D0
 FUN_020AE4D0: ; 0x020AE4D0
@@ -540,6 +553,7 @@ FUN_020AE4D0: ; 0x020AE4D0
 	streq r1, [r0, #0x4]
 	mov r0, r1
 	bx lr
+	arm_func_end FUN_020AE4D0
 
 	arm_func_start FUN_020AE500
 FUN_020AE500: ; 0x020AE500
@@ -553,6 +567,7 @@ FUN_020AE500: ; 0x020AE500
 	streq r2, [r0, #0x4]
 	mov r0, r2
 	bx lr
+	arm_func_end FUN_020AE500
 
 	arm_func_start FUN_020AE528
 FUN_020AE528: ; 0x020AE528
@@ -567,3 +582,4 @@ FUN_020AE528: ; 0x020AE528
 	add r1, r1, r3
 	str r1, [r0, #0x4]
 	bx lr
+	arm_func_end FUN_020AE528
diff --git a/arm9/asm/NNS_FND_frameheap.s b/arm9/asm/NNS_FND_frameheap.s
index 4dc662d7..078180b5 100644
--- a/arm9/asm/NNS_FND_frameheap.s
+++ b/arm9/asm/NNS_FND_frameheap.s
@@ -33,6 +33,7 @@ _020AE584:
 	ldr r1, [r3, #0xc]
 	str r1, [r2, #0x8]
 	bx lr
+	arm_func_end FUN_020AE554
 
 	arm_func_start FUN_020AE5B0
 FUN_020AE5B0: ; 0x020AE5B0
@@ -56,6 +57,7 @@ FUN_020AE5B0: ; 0x020AE5B0
 	str r0, [r4, #0x8]
 	mov r0, #0x1
 	ldmia sp!, {r4-r6,pc}
+	arm_func_end FUN_020AE5B0
 
 	arm_func_start FUN_020AE600
 FUN_020AE600: ; 0x020AE600
@@ -74,6 +76,7 @@ _020AE61C:
 	bl FUN_020AE6C8
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r5,pc}
+	arm_func_end FUN_020AE600
 
 	arm_func_start FUN_020AE638
 FUN_020AE638: ; 0x020AE638
@@ -94,6 +97,7 @@ _020AE668:
 	bl FUN_020AE710
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020AE638
 
 	arm_func_start thunk_FUN_020adc8c_2
 thunk_FUN_020adc8c_2: ; 0x020AE678
@@ -101,6 +105,7 @@ thunk_FUN_020adc8c_2: ; 0x020AE678
 	bx r12
 	.balign 4
 _020AE680: .word FUN_020ADC8C
+	arm_func_end thunk_FUN_020adc8c_2
 
 	arm_func_start FUN_020AE684
 FUN_020AE684: ; 0x020AE684
@@ -123,6 +128,7 @@ _020AE6BC:
 	bl FUN_020AE7E0
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020AE684
 
 	arm_func_start FUN_020AE6C8
 FUN_020AE6C8: ; 0x020AE6C8
@@ -140,6 +146,7 @@ _020AE6EC:
 	ldr r0, [r0, #0x1c]
 	str r0, [r2, #0x4]
 	bx lr
+	arm_func_end FUN_020AE6C8
 
 	arm_func_start FUN_020AE6F8
 FUN_020AE6F8: ; 0x020AE6F8
@@ -149,6 +156,7 @@ FUN_020AE6F8: ; 0x020AE6F8
 	mov r0, #0x0
 	str r0, [r2, #0x8]
 	bx lr
+	arm_func_end FUN_020AE6F8
 
 	arm_func_start FUN_020AE710
 FUN_020AE710: ; 0x020AE710
@@ -180,6 +188,7 @@ _020AE76C:
 	str r4, [r5, #0x4]
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r5,pc}
+	arm_func_end FUN_020AE710
 
 	arm_func_start FUN_020AE77C
 FUN_020AE77C:
@@ -209,6 +218,7 @@ _020AE7D4:
 	mov r0, r5
 	str r4, [r6, #0x0]
 	ldmia sp!, {r4-r6,pc}
+	arm_func_end FUN_020AE77C
 
 	arm_func_start FUN_020AE7E0
 FUN_020AE7E0: ; 0x020AE7E0
@@ -232,3 +242,4 @@ FUN_020AE7E0: ; 0x020AE7E0
 	ldmia sp!, {r4-r5,pc}
 	.balign 4
 _020AE828: .word 0x46524D48
+	arm_func_end FUN_020AE7E0
diff --git a/arm9/asm/NNS_FND_heapcommon.s b/arm9/asm/NNS_FND_heapcommon.s
index 196d12b0..0aa40512 100644
--- a/arm9/asm/NNS_FND_heapcommon.s
+++ b/arm9/asm/NNS_FND_heapcommon.s
@@ -21,6 +21,7 @@ FUN_020ADC8C: ; 0x020ADC8C
 	mov r1, r4
 	bl FUN_020ADAB0
 	ldmia sp!, {r4,pc}
+	arm_func_end FUN_020ADC8C
 
 	arm_func_start FUN_020ADCA4
 FUN_020ADCA4:
@@ -61,6 +62,7 @@ _020ADD14:
 	.balign 4
 _020ADD28: .word UNK_021CCD38
 _020ADD2C: .word UNK_021CCD3C
+	arm_func_end FUN_020ADCA4
 
 	arm_func_start FUN_020ADD30
 FUN_020ADD30: ; 0x020ADD30
@@ -75,6 +77,7 @@ FUN_020ADD30: ; 0x020ADD30
 	ldmia sp!, {r4,pc}
 	.balign 4
 _020ADD54: .word UNK_021CCD3C
+	arm_func_end FUN_020ADD30
 
 	arm_func_start FUN_020ADD58
 FUN_020ADD58:
@@ -107,3 +110,4 @@ _020ADDA4:
 _020ADDB8:
 	mov r0, #0x0
 	ldmia sp!, {r4-r6,pc}
+	arm_func_end FUN_020ADD58
diff --git a/arm9/asm/NNS_FND_list.s b/arm9/asm/NNS_FND_list.s
index 9f9ff1e0..b88b2159 100644
--- a/arm9/asm/NNS_FND_list.s
+++ b/arm9/asm/NNS_FND_list.s
@@ -10,6 +10,7 @@ FUN_020ADA84: ; 0x020ADA84
 	ldrneh r0, [r0, #0xa]
 	ldrne r0, [r1, r0]
 	bx lr
+	arm_func_end FUN_020ADA84
 
 	arm_func_start FUN_020ADA98
 FUN_020ADA98: ; 0x020ADA98
@@ -19,6 +20,7 @@ FUN_020ADA98: ; 0x020ADA98
 	addne r0, r1, r0
 	ldrne r0, [r0, #0x4]
 	bx lr
+	arm_func_end FUN_020ADA98
 
 	arm_func_start FUN_020ADAB0
 FUN_020ADAB0: ; 0x020ADAB0
@@ -48,6 +50,7 @@ FUN_020ADAB0: ; 0x020ADAB0
 	strh r1, [r0, #0x8]
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020ADAB0
 
 	arm_func_start FUN_020ADB18
 FUN_020ADB18: ; 0x020ADB18
@@ -82,6 +85,7 @@ _020ADB54:
 	strh r1, [r0, #0x8]
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020ADB18
 
 	arm_func_start FUN_020ADB8C
 FUN_020ADB8C: ; 0x020ADB8C
@@ -109,6 +113,7 @@ _020ADBAC:
 	strh r1, [r0, #0x8]
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020ADB8C
 
 	arm_func_start FUN_020ADBE8
 FUN_020ADBE8: ; 0x020ADBE8
@@ -137,6 +142,7 @@ _020ADC08:
 	strh r1, [r0, #0x8]
 	add sp, sp, #0x4
 	ldmia sp!, {pc}
+	arm_func_end FUN_020ADBE8
 
 	arm_func_start FUN_020ADC48
 FUN_020ADC48: ; 0x020ADC48
@@ -151,6 +157,7 @@ FUN_020ADC48: ; 0x020ADC48
 	add r1, r1, #0x1
 	strh r1, [r0, #0x8]
 	bx lr
+	arm_func_end FUN_020ADC48
 
 	arm_func_start FUN_020ADC74
 FUN_020ADC74: ; 0x020ADC74
@@ -160,4 +167,4 @@ FUN_020ADC74: ; 0x020ADC74
 	strh r2, [r0, #0x8]
 	strh r1, [r0, #0xa]
 	bx lr
-
+	arm_func_end FUN_020ADC74