From 3e371e1eef0c9fcdb8c2b6495b26359c768203ed Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 15 Jul 2023 21:59:57 -0400 Subject: [PATCH] Matched overlay 8 --- asm/itcm.s | 1 - asm/main.s | 5 ++--- asm/overlay_00.s | 1 - asm/overlay_01.s | 1 - asm/overlay_02.s | 1 - asm/overlay_03.s | 1 - asm/overlay_04.s | 1 - asm/overlay_05.s | 1 - asm/overlay_06.s | 1 - asm/overlay_07.s | 1 - asm/overlay_08.s | 7 ++++--- asm/overlay_09.s | 1 - asm/overlay_10.s | 1 - asm/overlay_11.s | 1 - asm/overlay_13.s | 1 - asm/overlay_14.s | 1 - asm/overlay_15.s | 1 - asm/overlay_16.s | 1 - asm/overlay_17.s | 1 - asm/overlay_18.s | 1 - asm/overlay_19.s | 1 - asm/overlay_20.s | 1 - asm/overlay_21.s | 1 - asm/overlay_22.s | 1 - asm/overlay_23.s | 1 - asm/overlay_24.s | 1 - asm/overlay_25.s | 1 - asm/overlay_26.s | 1 - asm/overlay_27.s | 1 - asm/overlay_28.s | 1 - asm/overlay_29.s | 1 - asm/overlay_30.s | 1 - asm/overlay_31.s | 1 - asm/overlay_34.s | 1 - global.inc | 0 35 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 global.inc diff --git a/asm/itcm.s b/asm/itcm.s index 4f3b09dd..717f12e0 100644 --- 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 diff --git a/asm/main.s b/asm/main.s index 51c860da..b2364c77 100644 --- 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 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index 7e4eb603..bfad4b16 100644 --- 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 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 493e8001..75084a45 100644 --- 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 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 21ca4ea8..fb3618d7 100644 --- 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 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index d9484a1b..a364589a 100644 --- 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 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index 1cde0370..5fe30361 100644 --- 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 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index 016259d9..d75b07fa 100644 --- 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 diff --git a/asm/overlay_06.s b/asm/overlay_06.s index 19943958..d1286964 100644 --- 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 diff --git a/asm/overlay_07.s b/asm/overlay_07.s index a700b42b..0074aead 100644 --- 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 diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 0c203821..a2e3d278 100644 --- 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 diff --git a/asm/overlay_09.s b/asm/overlay_09.s index afe62a56..527e76fd 100644 --- 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 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 58a13b80..490540ed 100644 --- 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 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index b632a93f..1954549e 100644 --- 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 diff --git a/asm/overlay_13.s b/asm/overlay_13.s index 23f16cc2..1b0da191 100644 --- 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 diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 2692d36d..1fcea5f7 100644 --- 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 diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 9d1c183d..d4d60375 100644 --- 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 diff --git a/asm/overlay_16.s b/asm/overlay_16.s index 1bc78ed0..a98b513c 100644 --- 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 diff --git a/asm/overlay_17.s b/asm/overlay_17.s index a863a93e..5c85a03f 100644 --- 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 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 01ee3c64..df74f345 100644 --- 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 diff --git a/asm/overlay_19.s b/asm/overlay_19.s index 7e9eabd2..67ed0854 100644 --- 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 diff --git a/asm/overlay_20.s b/asm/overlay_20.s index 8f3355cd..1fddedd1 100644 --- 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 diff --git a/asm/overlay_21.s b/asm/overlay_21.s index ae699a8c..b4521973 100644 --- 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 diff --git a/asm/overlay_22.s b/asm/overlay_22.s index 790d2df4..2080c82b 100644 --- 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 diff --git a/asm/overlay_23.s b/asm/overlay_23.s index 8a1e6db1..51744da5 100644 --- 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 diff --git a/asm/overlay_24.s b/asm/overlay_24.s index 6fe4c163..23ce7266 100644 --- 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 diff --git a/asm/overlay_25.s b/asm/overlay_25.s index 778bd03a..c468c326 100644 --- 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 diff --git a/asm/overlay_26.s b/asm/overlay_26.s index a2d115c6..5f909743 100644 --- 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 diff --git a/asm/overlay_27.s b/asm/overlay_27.s index f80f0468..e617b7d0 100644 --- 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 diff --git a/asm/overlay_28.s b/asm/overlay_28.s index 6ae9750a..dead6fff 100644 --- 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 diff --git a/asm/overlay_29.s b/asm/overlay_29.s index ce3255ad..fc826246 100644 --- 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 diff --git a/asm/overlay_30.s b/asm/overlay_30.s index 4e71d513..311cbfc4 100644 --- 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 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 500fca98..d7dfe5b1 100644 --- 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 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 8fdecefe..93ea7383 100644 --- 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 diff --git a/global.inc b/global.inc deleted file mode 100644 index e69de29b..00000000