Merge branch 'main' into fix-build

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',

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',
-    '-proc', 'arm946e',
-    '-interworking',
+    '-enum', 'int',
     '-char', 'signed',
+    '-proc', 'arm946e',
+    '-gccext,on',
+    '-fp', 'soft',
+    '-inline', 'on,noauto',
+    '-Cpp_exceptions', 'off',
+    '-RTTI', 'off',
+    '-interworking',
+    '-nolink',
     '-msgstyle', 'gcc',
     '-dis',
-    f'-I{include_dir}',
+    '-gccinc',
+    '-i', include_dir,
+    '-i', libc_include_dir,
+    '-i', libcpp_include_dir,
     '-DSTUBS',
     args.file
 ])