From 90ddc02815d8b74f208f5da5eba0aea8f0cdafe0 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 22 Nov 2022 17:08:49 -0500
Subject: [PATCH] Fix some longjumps miscategorized as functions.

---
 asm/overlay16.s | 16 +++++-----------
 asm/overlay4.s  | 44 ++++++++++++++++++++++----------------------
 asm/overlay6.s  | 11 ++++-------
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/asm/overlay16.s b/asm/overlay16.s
index 44eaaf6f2b..74abe085d6 100644
--- a/asm/overlay16.s
+++ b/asm/overlay16.s
@@ -34024,10 +34024,7 @@ _0224BB4C:
 	mov r1, #1
 	and r0, r1
 	str r0, [sp, #0x20]
-	thumb_func_end ov16_0224BB28
-
-	thumb_func_start FUN_0224BBA8
-FUN_0224BBA8: ; 0x0224BBA8
+_0224BBA8:
 	ldr r0, [sp, #0x1c]
 	add r5, r0, r4
 	ldrb r0, [r0, r4]
@@ -35084,7 +35081,7 @@ _0224C3AE:
 	ldr r0, [sp, #0x64]
 	cmp r4, r0
 	bge _0224C3E8
-	bl FUN_0224BBA8
+	bl _0224BBA8
 _0224C3E8:
 	ldr r1, [sp, #0x60]
 	ldr r0, [sp, #0x64]
@@ -35131,7 +35128,7 @@ _0224C438: .word 0x000003BB
 _0224C43C: .word 0x00000319
 _0224C440: .word 0x000021A8
 _0224C444: .word 0x000021A0
-	thumb_func_end FUN_0224BBA8
+	thumb_func_end ov16_0224BB28
 
 	thumb_func_start ov16_0224C448
 ov16_0224C448: ; 0x0224C448
@@ -37942,10 +37939,7 @@ _0224D98E:
 	str r0, [r4, #0x1c]
 	mov r0, #0xb
 	str r0, [r4, #8]
-	thumb_func_end ov16_0224CF7C
-
-	thumb_func_start FUN_0224D998
-FUN_0224D998: ; 0x0224D998
+_0224D998:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	; .align 2, 0
@@ -37959,7 +37953,7 @@ _0224D9B4: .word 0x00002DCC
 _0224D9B8: .word 0xFFFF1FFF
 _0224D9BC: .word 0xFFF8FFFF
 _0224D9C0: .word 0xFFC7FFFF
-	thumb_func_end FUN_0224D998
+	thumb_func_end ov16_0224CF7C
 
 	thumb_func_start ov16_0224D9C4
 ov16_0224D9C4: ; 0x0224D9C4
diff --git a/asm/overlay4.s b/asm/overlay4.s
index 1ca8672b82..f607be1a6b 100644
--- a/asm/overlay4.s
+++ b/asm/overlay4.s
@@ -78433,8 +78433,8 @@ ov4_02211438: ; 0x02211438
 _0221149C: .word 0x0221A264
 	arm_func_end ov4_02211438
 
-	arm_func_start FUN_022114A0
-FUN_022114A0: ; 0x022114A0
+	arm_func_start ov4_022114A0
+ov4_022114A0: ; 0x022114A0
 	add r2, r0, #0xd
 	add ip, r0, #2
 	and r3, r2, #0xf
@@ -78452,7 +78452,7 @@ FUN_022114A0: ; 0x022114A0
 	str r2, [r1, r0, lsl #2]
 	mov r0, r2
 	bx lr
-	arm_func_end FUN_022114A0
+	arm_func_end ov4_022114A0
 
 	arm_func_start ov4_022114E4
 ov4_022114E4: ; 0x022114E4
@@ -78593,7 +78593,7 @@ _022115A0:
 	orr r6, r2, r5, lsl #30
 	mov r0, #0
 	add sb, sb, r3
-	bl FUN_022114A0
+	bl ov4_022114A0
 	eor r1, r6, r7
 	lsr r3, sb, #0x1b
 	and r1, r4, r1
@@ -78608,7 +78608,7 @@ _022115A0:
 	orr r5, r2, r4, lsl #30
 	mov r0, #1
 	add r8, r8, r3
-	bl FUN_022114A0
+	bl ov4_022114A0
 	eor r1, r5, r6
 	lsr r2, r8, #0x1b
 	and r1, sb, r1
@@ -78623,7 +78623,7 @@ _022115A0:
 	add r7, r7, r0
 	add r1, sp, #0x10
 	mov r0, #2
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r7, #0x1b
 	orr r2, r1, r7, lsl #5
 	eor r1, sb, r5
@@ -78638,7 +78638,7 @@ _022115A0:
 	add r6, r6, r0
 	mov r0, #3
 	add r1, sp, #0x10
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r6, #0x1b
 	orr r2, r1, r6, lsl #5
 	eor r1, r8, sb
@@ -78659,7 +78659,7 @@ _022115A0:
 _022117D8:
 	mov r0, sl
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r2, r5, #0x1b
 	eor r1, r6, r7
 	orr r2, r2, r5, lsl #5
@@ -78672,7 +78672,7 @@ _022117D8:
 	orr r6, r0, r6, lsl #30
 	add r0, sl, #1
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, sb, #0x1b
 	orr r2, r1, sb, lsl #5
 	eor r1, r5, r6
@@ -78687,7 +78687,7 @@ _022117D8:
 	and sl, r0, #0xf
 	mov r0, sl
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r8, #0x1b
 	orr r2, r1, r8, lsl #5
 	eor r1, sb, r5
@@ -78700,7 +78700,7 @@ _022117D8:
 	orr sb, r0, sb, lsl #30
 	add r0, sl, #1
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r7, #0x1b
 	orr r2, r1, r7, lsl #5
 	eor r1, r8, sb
@@ -78713,7 +78713,7 @@ _022117D8:
 	orr r8, r0, r8, lsl #30
 	add r0, sl, #2
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r6, #0x1b
 	orr r2, r1, r6, lsl #5
 	eor r1, r7, r8
@@ -78737,7 +78737,7 @@ _022117D8:
 _0221190C:
 	mov r0, sl
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	orr r2, r7, r8
 	lsr r1, r5, #0x1b
 	orr r1, r1, r5, lsl #5
@@ -78752,7 +78752,7 @@ _0221190C:
 	orr r6, r0, r6, lsl #30
 	add r0, sl, #1
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, sb, #0x1b
 	orr r1, r1, sb, lsl #5
 	orr r2, r6, r7
@@ -78767,7 +78767,7 @@ _0221190C:
 	orr r5, r0, r5, lsl #30
 	add r0, sl, #2
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r8, #0x1b
 	orr r1, r1, r8, lsl #5
 	orr r2, r5, r6
@@ -78784,7 +78784,7 @@ _0221190C:
 	and sl, r0, #0xf
 	mov r0, sl
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r7, #0x1b
 	orr r1, r1, r7, lsl #5
 	orr r2, sb, r5
@@ -78799,7 +78799,7 @@ _0221190C:
 	orr r8, r0, r8, lsl #30
 	add r0, sl, #1
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r6, #0x1b
 	orr r1, r1, r6, lsl #5
 	orr r2, r8, sb
@@ -78825,7 +78825,7 @@ _0221190C:
 _02211A68:
 	mov r0, sl
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r2, r5, #0x1b
 	eor r1, r6, r7
 	orr r2, r2, r5, lsl #5
@@ -78838,7 +78838,7 @@ _02211A68:
 	orr r6, r0, r6, lsl #30
 	add r0, sl, #1
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, sb, #0x1b
 	orr r2, r1, sb, lsl #5
 	eor r1, r5, r6
@@ -78851,7 +78851,7 @@ _02211A68:
 	orr r5, r0, r5, lsl #30
 	add r0, sl, #2
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r8, #0x1b
 	orr r2, r1, r8, lsl #5
 	eor r1, sb, r5
@@ -78864,7 +78864,7 @@ _02211A68:
 	orr sb, r0, sb, lsl #30
 	add r0, sl, #3
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r7, #0x1b
 	orr r2, r1, r7, lsl #5
 	eor r1, r8, sb
@@ -78879,7 +78879,7 @@ _02211A68:
 	and sl, r0, #0xf
 	mov r0, sl
 	mov r1, fp
-	bl FUN_022114A0
+	bl ov4_022114A0
 	lsr r1, r6, #0x1b
 	orr r2, r1, r6, lsl #5
 	eor r1, r7, r8
diff --git a/asm/overlay6.s b/asm/overlay6.s
index 11366de1cd..3d607c014b 100644
--- a/asm/overlay6.s
+++ b/asm/overlay6.s
@@ -1735,7 +1735,7 @@ ov6_0223EE5C: ; 0x0223EE5C
 _0223EE6C:
 	cmp r1, #0x14
 	bls _0223EE74
-	bl FUN_0223F6CA
+	bl _0223F6CA
 _0223EE74:
 	add r0, r1, r1
 	add r0, pc
@@ -1770,7 +1770,7 @@ _0223EEAA:
 	bne _0223EEB0
 	b _0223F668
 _0223EEB0:
-	bl FUN_0223F6CA
+	bl _0223F6CA
 _0223EEB4:
 	add r1, r4, #0
 	mov r0, #0
@@ -2759,10 +2759,7 @@ _0223F668:
 	add r0, r0, #1
 	str r0, [r4, #0x18]
 	b _0223F6D4
-	thumb_func_end ov6_0223EE5C
-
-	non_word_aligned_thumb_func_start FUN_0223F6CA
-FUN_0223F6CA: ; 0x0223F6CA
+_0223F6CA:
 	mov r0, #0
 	str r0, [r4, #0x18]
 	add sp, #0x14
@@ -2822,7 +2819,7 @@ _0223F738:
 	pop {r4, r5, r6, r7, pc}
 	nop
 _0223F740: .word 0x02248EAC
-	thumb_func_end FUN_0223F6CA
+	thumb_func_end ov6_0223EE5C
 
 	thumb_func_start ov6_0223F744
 ov6_0223F744: ; 0x0223F744