diff options
| author | Aetias <aetias@outlook.com> | 2024-05-03 15:35:43 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-05-03 15:35:43 +0200 |
| commit | cdf3bb7553cccec867256d6713ca77c8cf3cbd26 (patch) | |
| tree | 1367270fbeee50d6405588af8b15cb5e732f8b7c /tools | |
| parent | 6bce0e739d89da2f75149e4cab11393866b7427e (diff) | |
| parent | 5c08baf1c24e50891ea12e8dcd0038c935875631 (diff) | |
Merge branch 'main' into fix-build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lcf.py | 14 | ||||
| -rw-r--r-- | tools/mangle.py | 18 |
2 files changed, 28 insertions, 4 deletions
diff --git a/tools/lcf.py b/tools/lcf.py index 869f1cc5..f0fc74d8 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -37,7 +37,19 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[ 'src/00_Core/Player/TouchControl.cpp', 'asm/ov00/Player/TouchControl.s', - 'asm/ov00/ov00_0207af9c.s', + 'asm/ov00/ov00_0207afa0.s', + + 'asm/ov00/Map/Course.s', + 'src/00_Core/Map/Course.cpp', + 'asm/ov00/Map/MapBase.s', + 'src/00_Core/Map/MapBase.cpp', + + 'asm/ov00/ov00_0207da38.s', + + 'asm/ov00/Map/MapManager.s', + 'src/00_Core/Map/MapManager.cpp', + + 'asm/ov00/ov00_02086cd0.s', 'src/00_Core/Save/AdventureFlags.cpp', 'asm/ov00/Save/AdventureFlags.s', diff --git a/tools/mangle.py b/tools/mangle.py index 50bf9538..a9bfcadf 100644 --- a/tools/mangle.py +++ b/tools/mangle.py @@ -12,6 +12,9 @@ tools_dir = Path(os.path.dirname(os.path.realpath(__file__))) cc_path = tools_dir / 'mwccarm' / '2.0' / 'sp1p5' / 'mwccarm.exe' root_dir = tools_dir.parent include_dir = root_dir / 'include' +libs_dir = root_dir / 'libs' +libc_include_dir = libs_dir / 'c' / 'include' +libcpp_include_dir = libs_dir / 'cpp' / 'include' if platform.system() == 'Windows': cc = [str(cc_path)] else: cc = ['wine', str(cc_path)] @@ -19,13 +22,22 @@ else: cc = ['wine', str(cc_path)] args = parser.parse_args() cc.extend([ - '-nolink', + '-enum', 'int', + '-char', 'signed', '-proc', 'arm946e', + '-gccext,on', + '-fp', 'soft', + '-inline', 'on,noauto', + '-Cpp_exceptions', 'off', + '-RTTI', 'off', '-interworking', - '-char', 'signed', + '-nolink', '-msgstyle', 'gcc', '-dis', - f'-I{include_dir}', + '-gccinc', + '-i', include_dir, + '-i', libc_include_dir, + '-i', libcpp_include_dir, '-DSTUBS', args.file ]) |