From c339a272f64f5d994e62b7ca83ae7ea710ee970c Mon Sep 17 00:00:00 2001
From: gamemasterplc <gamemasterplc@gmail.com>
Date: Sun, 26 Nov 2023 00:04:23 -0600
Subject: [PATCH] Upgrade dtk and "decompile" font.c

font.c just has ank8x8_4b extracted raw.
---
 config/GMPE01_00/config.yml | 6 ++++++
 configure.py                | 5 +++--
 src/game/font.c             | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 src/game/font.c

diff --git a/config/GMPE01_00/config.yml b/config/GMPE01_00/config.yml
index 2865ba88..d44ae03d 100644
--- a/config/GMPE01_00/config.yml
+++ b/config/GMPE01_00/config.yml
@@ -502,3 +502,9 @@ modules:
   symbols: config/GMPE01_00/rels/m401Dll/symbols.txt
   splits: config/GMPE01_00/rels/m401Dll/splits.txt
   links: [_minigameDll]
+
+extract:
+- symbol: ank8x8_4b
+  binary: game/ank8x8_4b.bin
+  header: game/ank8x8_4b.inc
+  
\ No newline at end of file
diff --git a/configure.py b/configure.py
index 52082b6b..8f204d0c 100755
--- a/configure.py
+++ b/configure.py
@@ -118,7 +118,7 @@ if not is_windows():
 
 # Tool versions
 config.compilers_tag = "20231018"
-config.dtk_tag = "v0.6.0"
+config.dtk_tag = "v0.6.2"
 config.sjiswrap_tag = "v1.1.1"
 config.wibo_tag = "0.6.3"
 
@@ -150,6 +150,7 @@ cflags_base = [
     "-fp_contract on",
     "-str reuse",
     "-i include",
+    f"-i build/{config.version}/include",
     "-multibyte",
     f"-DVERSION={version_num}",
 ]
@@ -234,7 +235,7 @@ config.libs = [
             Object(Matching, "game/dvd.c"),
             Object(NonMatching, "game/data.c"),
             Object(Matching, "game/decode.c"),
-            Object(NonMatching, "game/font.c"),
+            Object(Matching, "game/font.c"),
             Object(Matching, "game/init.c"),
             Object(NonMatching, "game/jmp.c"),
             Object(Matching, "game/malloc.c"),
diff --git a/src/game/font.c b/src/game/font.c
new file mode 100644
index 00000000..88935f00
--- /dev/null
+++ b/src/game/font.c
@@ -0,0 +1 @@
+#include "game/ank8x8_4b.inc"
\ No newline at end of file