Disassemble all code in overlays

4 files changed, 14 insertions, 13 deletions

diff --git a/asm/ov01.s b/asm/ov01.s
index 94ae87c0..e846ca7e 100644
--- a/asm/ov01.s
+++ b/asm/ov01.s
@@ -10848,9 +10848,9 @@ _020f539c:
 	add sb, sb, #0xc
 	add r8, r8, #1
 	b _020f5334
-	arm_func_end func_ov01_020f52fc
 _020f53a8:
-	.byte 0xf8, 0x8f, 0xbd, 0xe8
+	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
+	arm_func_end func_ov01_020f52fc
 _020f53ac: .word data_027e0d54
 
 	.global func_ov01_020f53b0
diff --git a/asm/ov29.s b/asm/ov29.s
index 1d80ebc6..901487bb 100644
--- a/asm/ov29.s
+++ b/asm/ov29.s
@@ -467,9 +467,9 @@ _0216dbfc:
 	ldmhiia sp!, {r4, r5, r6, pc}
 	add r3, r3, #1
 	b _0216dbe0
-	arm_func_end func_ov29_0216dba8
 _0216dc34:
-	.byte 0x70, 0x80, 0xbd, 0xe8
+	ldmia sp!, {r4, r5, r6, pc}
+	arm_func_end func_ov29_0216dba8
 
 	.global func_ov29_0216dc38
 	arm_func_start func_ov29_0216dc38
diff --git a/asm/ov60.s b/asm/ov60.s
index 32b0ae95..7392d14d 100644
--- a/asm/ov60.s
+++ b/asm/ov60.s
@@ -10034,9 +10034,9 @@ _02145c28:
 	mov r0, r6
 	bl func_0200ee60
 	b _02145b3c
-	arm_func_end func_ov60_02145b2c
 _02145c50:
-	.byte 0xf8, 0x83, 0xbd, 0xe8
+	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
+	arm_func_end func_ov60_02145b2c
 _02145c54: .word data_ov60_02148580
 
 	.global func_ov60_02145c58
diff --git a/asm/ov61.s b/asm/ov61.s
index fad45a10..c59857ab 100644
--- a/asm/ov61.s
+++ b/asm/ov61.s
@@ -19705,9 +19705,9 @@ _0214e32c:
 	add r0, r0, #0x1000
 	bl func_0200e0c8
 	b _0214e0a4
-	arm_func_end func_ov61_0214e09c
 _0214e33c:
-	.byte 0xf8, 0x8f, 0xbd, 0xe8
+	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
+	arm_func_end func_ov61_0214e09c
 _0214e340: .word data_ov61_0217f368
 _0214e344: .word 0x00004e84
 _0214e348: .word 0x000082ea
@@ -30007,7 +30007,8 @@ _02156d8c:
 	b _02156d18
 	arm_func_end func_ov61_02156cfc
 _02156da4:
-	.byte 0x04, 0xd0, 0x8d, 0xe2, 0xf8, 0x87, 0xbd, 0xe8
+    add sp, sp, #4
+	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
 
 	.global func_ov61_02156dac
 	arm_func_start func_ov61_02156dac
@@ -34301,9 +34302,9 @@ _0215a3d8:
 	sub r0, r4, r0
 	add r6, r6, r0
 	b _0215a3d8
-	arm_func_end func_ov61_0215a3bc
 _0215a424:
-	.byte 0x70, 0x80, 0xbd, 0xe8
+	ldmia sp!, {r4, r5, r6, pc}
+	arm_func_end func_ov61_0215a3bc
 
 	.global func_ov61_0215a428
 	arm_func_start func_ov61_0215a428
@@ -36631,9 +36632,9 @@ _0215c41c:
 	ldr r0, [r7, #0x20]
 	str r0, [r7, #0x1c]
 	b _0215c41c
-	arm_func_end func_ov61_0215c408
 _0215c474:
-	.byte 0xf8, 0x80, 0xbd, 0xe8
+	ldmia sp!, {r3, r4, r5, r6, r7, pc}
+	arm_func_end func_ov61_0215c408
 
 	.global func_ov61_0215c478
 	arm_func_start func_ov61_0215c478