mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-11 22:40:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into match_actor_rupee

Browse Source
This commit is contained in:
Yanis42
2024-04-21 12:23:57 +02:00
parent 5da4496e3d 72a752995e
commit cfbffe5ec1
105 changed files with 75374 additions and 75069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/lcf.py
+9
View File
@@ -13,6 +13,11 @@ def name(path: str): return path.split("/")[-1]
ARM9_OBJECTS = [
'asm/main/main_02000000.s',
'asm/main/Actor/ActorType.s',
'src/Main/Actor/ActorType.cpp',
'asm/main/main_0203e8a0.s',
'libs/cpp/src/__register_global_object.c',
'asm/main/main_0204f8f4.s',
@@ -324,6 +329,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file:
for obj in ARM9_OBJECTS: file.write(f' {name(obj)}.o(.sbss)\n')
file.write(' . = ALIGN(32);\n')
file.write(' arm9_bss_end = .;\n')
file.write(' . = ALIGN(32);\n')
file.write(' } > ARM9\n')
file.write('\n')
file.write(' .itcm : {\n')
@@ -336,6 +342,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file:
file.write(' . = ALIGN(32);\n')
for obj in ITCM_OBJECTS: file.write(f' {name(obj)}.o(.bss)\n')
for obj in ITCM_OBJECTS: file.write(f' {name(obj)}.o(.sbss)\n')
file.write(' . = ALIGN(32);\n')
file.write(' } > ITCM\n')
file.write('\n')
file.write(' .dtcm : {\n')
@@ -350,6 +357,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file:
file.write(' . = ALIGN(32);\n')
for obj in DTCM_OBJECTS: file.write(f' {name(obj)}.o(.bss)\n')
for obj in DTCM_OBJECTS: file.write(f' {name(obj)}.o(.sbss)\n')
file.write(' . = ALIGN(32);\n')
file.write(' } > DTCM\n')
file.write('\n')
file.write(' .autoloads : {\n')
@@ -402,6 +410,7 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file:
for obj in ov.objects: file.write(f' {name(obj)}.o(.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(' . = ALIGN(32);\n')
file.write(' } > ' + ov.name + '\n')
file.write('\n')
file.write(' .arm9_ovt : {\n')
tools/mangle.py
+2 -2
View File
@@ -40,8 +40,8 @@ output = output.decode()
# print(output)
mangled_funcs: list[str] = re.findall(r'.text +(_Z\S+)', output)
mangled_data: list[str] = re.findall(r'(?:.data|.bss) +(_Z\S+)', output)
mangled_funcs: list[str] = re.findall(r'.text +([^\$ ]\S+)', output)
mangled_data: list[str] = re.findall(r'(?:.data|.bss) +([^\. ]\S+)', output)
if len(mangled_funcs) > 0:
print('Functions:')