From 7848a3e248061e79fdc293bb336b58597447a322 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 7 Nov 2023 19:01:27 +0100 Subject: [PATCH] Add .sbss to overlay 0 --- asm/ov00.s | 2 ++ tools/lcf.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/asm/ov00.s b/asm/ov00.s index 21da5a5c..c2607e60 100644 --- a/asm/ov00.s +++ b/asm/ov00.s @@ -167567,6 +167567,8 @@ data_ov00_020ec710: data_ov00_020ec714: .space 0x4 .global data_ov00_020ec718 + + .sbss data_ov00_020ec718: .space 0x4 .global data_ov00_020ec71c diff --git a/tools/lcf.py b/tools/lcf.py index 9e188d3a..2986c8cf 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -249,6 +249,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file: file.write(' . = ALIGN(32);\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.data)\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.bss)\n') + for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.sbss)\n') file.write(' . = ALIGN(32);\n') file.write(' } > ARM9\n') file.write('\n') @@ -259,6 +260,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file: file.write(' itcm_end = .;\n') file.write(' itcm_size = itcm_end - itcm_start;\n') for obj in ITCM_OBJECTS: file.write(f' {name(obj)}(.bss)\n') + for obj in ITCM_OBJECTS: file.write(f' {name(obj)}(.sbss)\n') file.write(' } > ITCM\n') file.write('\n') file.write(' .dtcm : {\n') @@ -267,6 +269,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file: file.write(' dtcm_end = .;\n') file.write(' dtcm_size = dtcm_end - dtcm_start;\n') for obj in DTCM_OBJECTS: file.write(f' {name(obj)}(.bss)\n') + for obj in DTCM_OBJECTS: file.write(f' {name(obj)}(.sbss)\n') file.write(' } > DTCM\n') file.write('\n') file.write(' .autoloads : {\n') @@ -306,6 +309,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file: file.write('\n') file.write(f' {ov.name}_bss_start = .;\n') for obj in ov.objects: file.write(f' {name(obj)}(.bss)\n') + for obj in ov.objects: file.write(f' {name(obj)}(.sbss)\n') file.write(f' {ov.name}_bss_end = .;\n') file.write(f' {ov.name}_bss_size = {ov.name}_bss_end - {ov.name}_bss_start;\n') file.write(' } > ' + ov.name + '\n')