From 111e4d1eb0c27c5521c2a5ff0d3e4705115dabbe Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 14 Aug 2023 21:12:29 -0400 Subject: [PATCH] Fixed overlay 1 SINIT --- asm/overlay_01.s | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/asm/overlay_01.s b/asm/overlay_01.s index cbe0f005..be978e93 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -9,7 +9,7 @@ ov01_02329520: ; 0x02329520 ldr r0, [r0, #8] bx lr .align 2, 0 -_0232952C: .word 0x0233C0C0 +_0232952C: .word _0233C0B4 arm_func_end ov01_02329520 arm_func_start ov01_02329530 @@ -19,7 +19,7 @@ ov01_02329530: ; 0x02329530 str r1, [r0, #8] bx lr .align 2, 0 -_02329540: .word 0x0233C0C0 +_02329540: .word _0233C0B4 arm_func_end ov01_02329530 arm_func_start ov01_02329544 @@ -43,7 +43,7 @@ ov01_0232956C: ; 0x0232956C ldr r0, [r0, #4] bx lr .align 2, 0 -_02329578: .word 0x0233C0C0 +_02329578: .word _0233C0B4 arm_func_end ov01_0232956C arm_func_start ov01_0232957C @@ -53,7 +53,7 @@ ov01_0232957C: ; 0x0232957C str r1, [r0, #4] bx lr .align 2, 0 -_0232958C: .word 0x0233C0C0 +_0232958C: .word _0233C0B4 arm_func_end ov01_0232957C arm_func_start ov01_02329590 @@ -244,7 +244,7 @@ _02329760: bl ov00_022BE964 ldmia sp!, {r4, pc} .align 2, 0 -_02329828: .word 0x0233C0C0 +_02329828: .word _0233C0B4 _0232982C: .word _0233C240 arm_func_end ov01_0232965C @@ -297,7 +297,7 @@ _023298A0: ldmia sp!, {r3, pc} .align 2, 0 _023298E0: .word _0233C240 -_023298E4: .word 0x0233C0C0 +_023298E4: .word _0233C0B4 arm_func_end ov01_02329830 arm_func_start ov01_023298E8 @@ -351,7 +351,7 @@ _0232997C: bl ov01_0232AB88 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02329994: .word 0x0233C0C0 +_02329994: .word _0233C0B4 _02329998: .word _0233C240 arm_func_end ov01_023298E8 @@ -400,7 +400,7 @@ _02329A18: bl ov01_0232AB88 ldmia sp!, {r3, pc} .align 2, 0 -_02329A30: .word 0x0233C0C0 +_02329A30: .word _0233C0B4 _02329A34: .word _0233C240 arm_func_end ov01_0232999C @@ -581,7 +581,7 @@ ov01_02329BC8: ; 0x02329BC8 ldmia sp!, {r3, pc} .align 2, 0 _02329C2C: .word _0233C240 -_02329C30: .word 0x0233C0C0 +_02329C30: .word _0233C0B4 arm_func_end ov01_02329BC8 arm_func_start ov01_02329C34 @@ -758,7 +758,7 @@ _02329E50: ldmia sp!, {r4, pc} .align 2, 0 _02329E5C: .word _0233C240 -_02329E60: .word 0x0233C0C0 +_02329E60: .word _0233C0B4 arm_func_end ov01_02329DAC arm_func_start ov01_02329E64 @@ -861,7 +861,7 @@ _02329FB4: ldmia sp!, {r4, pc} .align 2, 0 _02329FC0: .word _0233C240 -_02329FC4: .word 0x0233C0C0 +_02329FC4: .word _0233C0B4 arm_func_end ov01_02329E64 arm_func_start ov01_02329FC8 @@ -1005,7 +1005,7 @@ _0232A180: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232A18C: .word _0233C240 -_0232A190: .word 0x0233C0C0 +_0232A190: .word _0233C0B4 arm_func_end ov01_0232A078 arm_func_start ov01_0232A194 @@ -1062,7 +1062,7 @@ _0232A234: .align 2, 0 _0232A240: .word _0233C240 _0232A244: .word ov01_0232A24C -_0232A248: .word 0x0233C0C0 +_0232A248: .word _0233C0B4 arm_func_end ov01_0232A194 arm_func_start ov01_0232A24C @@ -1156,7 +1156,7 @@ _0232A36C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232A378: .word _0233C240 -_0232A37C: .word 0x0233C0C0 +_0232A37C: .word _0233C0B4 arm_func_end ov01_0232A24C arm_func_start ov01_0232A380 @@ -1277,7 +1277,7 @@ _0232A518: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232A524: .word _0233C240 -_0232A528: .word 0x0233C0C0 +_0232A528: .word _0233C0B4 arm_func_end ov01_0232A380 arm_func_start ov01_0232A52C @@ -1443,7 +1443,7 @@ _0232A73C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232A748: .word _0233C240 -_0232A74C: .word 0x0233C0C0 +_0232A74C: .word _0233C0B4 arm_func_end ov01_0232A5E0 arm_func_start ov01_0232A750 @@ -1892,7 +1892,7 @@ _0232ACBC: moveq r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232ACCC: .word 0x0233C0C0 +_0232ACCC: .word _0233C0B4 _0232ACD0: .word _0233C240 _0232ACD4: .word ov01_0232A5E0 arm_func_end ov01_0232AC78 @@ -21383,8 +21383,11 @@ _0233AE74: .word 0x0233C0A4 .byte 0x54, 0x69, 0x6D, 0x65, 0x4F, 0x75, 0x74, 0x2E, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00 .byte 0x55, 0x6E, 0x6B, 0x6E, 0x6F, 0x77, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x43, 0x6F .byte 0x64, 0x65, 0x20, 0x3A, 0x20, 0x25, 0x30, 0x35, 0x64, 0x0A, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - .byte 0xEC, 0xAD, 0x33, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0xAE, 0x33, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xEC, 0xAD, 0x33, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0xAE, 0x33, 0x02 + + .data +_0233C0B4: + .byte 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, 0x00, 0x00, 0x00, 0x00, 0x68, 0x05, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x39, 0x09, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -21407,7 +21410,8 @@ _0233AE74: .word 0x0233C0A4 .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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 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 .bss _0233C240: