LinkStateInteract (#135)

* Map symbol in Game

* LinkStateInteract 19%

* DebugHierarchy -> Bhio

* LinkStateInteract 89%

* LinkStateInteract 93%

* Japanese strings

* Fix build

* Fix regression

* Fix regressions

* Rename BhioBase.cpp

2 files changed, 20 insertions, 3 deletions

diff --git a/tools/configure.py b/tools/configure.py
index e3bf934b..0e5d0154 100755
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -28,7 +28,8 @@ args = parser.parse_args()
 GAME = "ph"
 DSD_VERSION = 'v0.10.1'
 WIBO_VERSION = '0.6.16'
-OBJDIFF_VERSION = 'v3.0.0-beta.6'
+SJISWRAP_VERSION = 'v1.2.2'
+OBJDIFF_VERSION = 'v3.4.0'
 MWCC_VERSION = "2.0/sp1p5"
 DECOMP_ME_COMPILER = "mwcc_30_131"
 CC_FLAGS = " ".join([
@@ -112,6 +113,7 @@ EXE = platform.exe
 WINE = args.wine if platform.system != "windows" else ""
 DSD = str(args.dsd or os.path.join('.', str(root_path / f"dsd{EXE}")))
 OBJDIFF = os.path.join('.', str(root_path / f"objdiff-cli{EXE}"))
+SJISWRAP = os.path.join('.', "sjiswrap.exe")
 CC = os.path.join('.', str(mwcc_path / "mwccarm.exe"))
 LD = os.path.join('.', str(mwcc_path / "mwldarm.exe"))
 PYTHON = sys.executable
@@ -270,8 +272,8 @@ def main():
         n.newline()
 
         # -MMD excludes all includes instead of just system includes for some reason, so use -MD instead.
-        mwcc_cmd = f'{WINE} "{CC}" {CC_FLAGS} {CC_INCLUDES} $cc_flags -d $game_version -MD -c $in -o $basedir'
-        mwcc_implicit = [CC]
+        mwcc_cmd = f'{WINE} {SJISWRAP} "{CC}" {CC_FLAGS} {CC_INCLUDES} $cc_flags -d $game_version -MD -c $in -o $basedir'
+        mwcc_implicit = [CC, SJISWRAP]
         if platform.system != "windows":
             transform_dep = "tools/transform_dep.py"
             mwcc_cmd += f" && $python {transform_dep} $basefile.d $basefile.d"
@@ -431,6 +433,17 @@ def add_download_tool_builds(n: ninja_syntax.Writer, project: Project):
         )
         n.newline()
 
+    downloads.append(SJISWRAP)
+    n.build(
+        rule="download_tool",
+        outputs=SJISWRAP,
+        variables={
+            "tool": "sjiswrap",
+            "tag": SJISWRAP_VERSION,
+            "path": SJISWRAP,
+        }
+    )
+
     n.build(
         inputs=downloads,
         rule="phony",
diff --git a/tools/download_tool.py b/tools/download_tool.py
index 755acd8f..ae43a4da 100644
--- a/tools/download_tool.py
+++ b/tools/download_tool.py
@@ -32,11 +32,15 @@ def wibo_url(tag: str) -> str:
 def objdiff_url(tag: str) -> str:
     return f'https://github.com/encounter/objdiff/releases/download/{tag}/objdiff-cli-{platform.system}-{platform.machine}{platform.exe}'
 
+def sjiswrap_url(tag: str) -> str:
+    return f'https://github.com/encounter/sjiswrap/releases/download/{tag}/sjiswrap-windows-x86.exe'
+
 TOOLS = {
     "dsd": dsd_url,
     "mwccarm": mwccarm_url,
     "wibo": wibo_url,
     "objdiff": objdiff_url,
+    "sjiswrap": sjiswrap_url,
 }