Matched overlay 8

2026-10-01 14:48:14 -05:00 · 2023-07-15 21:59:57 -04:00
parent f4018f9d2a
commit 3e371e1eef
35 changed files with 6 additions and 38 deletions
--- a/asm/itcm.s
+++ b/asm/itcm.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "itcm.inc"
-	.include "global.inc"

 	.section .itcm,4,1,4

--- a/asm/main.s
+++ b/asm/main.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "main.inc"
-	.include "global.inc"

 	.text

@@ -170494,7 +170493,7 @@ sub_020907F4: ; 0x020907F4
 	mov r1, r0
 	mov r0, #3
 	swi 0x123456
-	ldmia sp!, {pc}
+	ldr pc, [sp], #4
 	arm_func_end sub_020907F4

 	arm_func_start sub_02090808
@@ -170503,7 +170502,7 @@ sub_02090808: ; 0x02090808
 	mov r1, #0
 	mov r0, #7
 	swi 0x123456
-	ldmia sp!, {pc}
+	ldr pc, [sp], #4
 	arm_func_end sub_02090808
 _0209081C:
 	.byte 0xF8, 0x40, 0x2D, 0xE9
--- a/asm/overlay_00.s
+++ b/asm/overlay_00.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_00.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_01.s
+++ b/asm/overlay_01.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_01.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_02.s
+++ b/asm/overlay_02.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_02.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_03.s
+++ b/asm/overlay_03.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_03.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_04.s
+++ b/asm/overlay_04.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_04.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_05.s
+++ b/asm/overlay_05.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_05.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_06.s
+++ b/asm/overlay_06.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_06.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_07.s
+++ b/asm/overlay_07.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_07.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_08.s
+++ b/asm/overlay_08.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_08.inc"
-	.include "global.inc"

 	.text

@@ -46,7 +45,7 @@ ov08_0233CAD8: ; 0x0233CAD8
 	bl ov08_0233CF04
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_0233CAFC: .word 0x0233EC20
+_0233CAFC: .word ov08_0233EC20
 	arm_func_end ov08_0233CAD8

 	arm_func_start ov08_0233CB00
@@ -2436,7 +2435,9 @@ _0233E8A4:
 	.byte 0x0A, 0x00, 0x00, 0x00, 0xD6, 0x36, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0xD7, 0x36, 0x00, 0x00
 	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x73, 0x65, 0x74, 0x20
 	.byte 0x6D, 0x61, 0x69, 0x6E, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.data
+	.global ov08_0233EC20
+ov08_0233EC20:
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
--- a/asm/overlay_09.s
+++ b/asm/overlay_09.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_09.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_10.s
+++ b/asm/overlay_10.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_10.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_11.s
+++ b/asm/overlay_11.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_11.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_13.s
+++ b/asm/overlay_13.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_13.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_14.s
+++ b/asm/overlay_14.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_14.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_15.s
+++ b/asm/overlay_15.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_15.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_16.s
+++ b/asm/overlay_16.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_16.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_17.s
+++ b/asm/overlay_17.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_17.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_18.s
+++ b/asm/overlay_18.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_18.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_19.s
+++ b/asm/overlay_19.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_19.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_20.s
+++ b/asm/overlay_20.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_20.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_21.s
+++ b/asm/overlay_21.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_21.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_22.s
+++ b/asm/overlay_22.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_22.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_23.s
+++ b/asm/overlay_23.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_23.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_24.s
+++ b/asm/overlay_24.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_24.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_25.s
+++ b/asm/overlay_25.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_25.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_26.s
+++ b/asm/overlay_26.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_26.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_27.s
+++ b/asm/overlay_27.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_27.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_28.s
+++ b/asm/overlay_28.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_28.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_29.s
+++ b/asm/overlay_29.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_29.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_30.s
+++ b/asm/overlay_30.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_30.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_31.s
+++ b/asm/overlay_31.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_31.inc"
-	.include "global.inc"

 	.text

--- a/asm/overlay_34.s
+++ b/asm/overlay_34.s
@@ -1,6 +1,5 @@
 	.include "asm/macros.inc"
 	.include "overlay_34.inc"
-	.include "global.inc"

 	.text

--- a/global.inc
+++ b/global.inc