From 87a650dc300edf5aa4cb568f1773d43106b255c7 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sun, 21 Apr 2024 13:06:44 +0200
Subject: Delink `MapManager`

---
 tools/lcf.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools')

diff --git a/tools/lcf.py b/tools/lcf.py
index 35763449..62eaaea2 100644
--- a/tools/lcf.py
+++ b/tools/lcf.py
@@ -39,6 +39,11 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
 
     'asm/ov00/ov00_0207af9c.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',
 
-- 
cgit v1.2.3


From a8c5c49efae2c4c1489bad419fd680bc0e85800c Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Tue, 23 Apr 2024 00:30:20 +0200
Subject: Delink `Course`

---
 tools/lcf.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/lcf.py b/tools/lcf.py
index 62eaaea2..cc574903 100644
--- a/tools/lcf.py
+++ b/tools/lcf.py
@@ -37,7 +37,12 @@ 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/ov00_0207da38.s',
 
     'asm/ov00/Map/MapManager.s',
     'src/00_Core/Map/MapManager.cpp',
-- 
cgit v1.2.3


From 780b65b7a60007783fb20ee3fb27153877e00550 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Tue, 30 Apr 2024 15:09:04 +0200
Subject: Update compiler flags in `mangle.py`

---
 tools/mangle.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'tools')

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
 ])
-- 
cgit v1.2.3


From eacc6617efc80c655f5617c9d39e65ddde2235e5 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Tue, 30 Apr 2024 15:22:29 +0200
Subject: Delink `MapBase`

---
 tools/lcf.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools')

diff --git a/tools/lcf.py b/tools/lcf.py
index cc574903..7122d656 100644
--- a/tools/lcf.py
+++ b/tools/lcf.py
@@ -41,6 +41,8 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
 
     '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',
 
-- 
cgit v1.2.3