Add ut_RomFont.cpp split for jp

stupid
xbret · Sep 17, 2024 · 194584e · 194584e
1 parent b8e6f28
commit 194584e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/config/eu/symbols.txt b/config/eu/symbols.txt
@@ -41480,8 +41480,8 @@ lbl_eu_8056AE1C = .data:0x8056AE1C; // type:object size:0x14
 lbl_eu_8056AE30 = .data:0x8056AE30; // type:object size:0x30 data:4byte
 lbl_eu_8056AE60 = .data:0x8056AE60; // type:object size:0xC data:4byte
 __vt__Q34nw4r2ut7RomFont = .data:0x8056AE6C; // type:object size:0x5C
-__vt__Q34nw4r2ut4Font = .data:0x8056AEC8; // type:object size:0x60
-lbl_eu_8056AF28 = .data:0x8056AF28; // type:object size:0xC data:4byte
+__vt__Q34nw4r2ut4Font = .data:0x8056AEC8; // type:object size:0x5C
+lbl_eu_8056AF28 = .data:0x8056AF28; // type:object size:0xC align:8 data:4byte
 lbl_eu_8056AF34 = .data:0x8056AF34; // type:object size:0x5C
 lbl_eu_8056AF90 = .data:0x8056AF90; // type:object size:0x60
 lbl_eu_8056AFF0 = .data:0x8056AFF0; // type:object size:0x60

diff --git a/config/jp/splits.txt b/config/jp/splits.txt
@@ -5784,9 +5784,12 @@ libs/nw4r/ut/ut_Font.cpp:
 	.text       start:0x8042BFCC end:0x8042C074
 	.data       start:0x8056E710 end:0x8056E740
 
+libs/nw4r/ut/ut_RomFont.cpp:
+	.data       start:0x8056E740 end:0x8056E7A0
+
 libs/nw4r/ut/ut_ResFontBase.cpp:
 	.text       start:0x8042C074 end:0x8042C928
-	.data       start:0x8056E740 end:0x8056E808
+	.data       start:0x8056E7A0 end:0x8056E808
 
 libs/nw4r/ut/ut_ResFont.cpp:
 	.text       start:0x8042C928 end:0x8042CC2C

diff --git a/config/jp/symbols.txt b/config/jp/symbols.txt
@@ -41305,8 +41305,8 @@ __vt__Q34nw4r2ut19TagProcessorBase<c> = .data:0x8056E6FC; // type:object size:0x
 @574 = .data:0x8056E71C; // type:object size:0xC scope:local align:4
 @575 = .data:0x8056E728; // type:object size:0xC scope:local align:4
 @576 = .data:0x8056E734; // type:object size:0xC scope:local align:4
-__vt__Q34nw4r2ut4Font = .data:0x8056E740; // type:object size:0x60 scope:global align:4
-@3511 = .data:0x8056E7A0; // type:object size:0xC scope:local align:4 data:4byte
+__vt__Q34nw4r2ut4Font = .data:0x8056E740; // type:object size:0x5C scope:global align:4
+@3511 = .data:0x8056E7A0; // type:object size:0xC scope:local align:8 data:4byte
 __vt__Q44nw4r2ut6detail11ResFontBase = .data:0x8056E7AC; // type:object size:0x5C scope:global align:4
 __vt__Q34nw4r2ut7ResFont = .data:0x8056E808; // type:object size:0x5C scope:global align:4
 lbl_8056E868 = .data:0x8056E868; // type:object size:0x60 scope:global align:4

diff --git a/config/us/symbols.txt b/config/us/symbols.txt
@@ -41480,8 +41480,8 @@ lbl_eu_8056AE1C = .data:0x8056AE1C; // type:object size:0x14
 lbl_eu_8056AE30 = .data:0x8056AE30; // type:object size:0x30 data:4byte
 lbl_eu_8056AE60 = .data:0x8056AE60; // type:object size:0xC data:4byte
 __vt__Q34nw4r2ut7RomFont = .data:0x8056AE6C; // type:object size:0x5C
-__vt__Q34nw4r2ut4Font = .data:0x8056AEC8; // type:object size:0x60
-lbl_eu_8056AF28 = .data:0x8056AF28; // type:object size:0xC data:4byte
+__vt__Q34nw4r2ut4Font = .data:0x8056AEC8; // type:object size:0x5C
+lbl_eu_8056AF28 = .data:0x8056AF28; // type:object size:0xC align:8 data:4byte
 lbl_eu_8056AF34 = .data:0x8056AF34; // type:object size:0x5C
 lbl_eu_8056AF90 = .data:0x8056AF90; // type:object size:0x60
 lbl_eu_8056AFF0 = .data:0x8056AFF0; // type:object size:0x60

diff --git a/configure.py b/configure.py
@@ -1566,7 +1566,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
             Object(Matching, "ut/ut_DvdFileStream.cpp"),
             Object(Matching, "ut/ut_LockedCache.cpp"),
             Object(Matching, "ut/ut_Font.cpp"),
-            Object(NonMatching, "ut/ut_RomFont.cpp"), #EU/US only
+            Object(Matching, "ut/ut_RomFont.cpp"),
             Object(NonMatching, "ut/ut_ResFontBase.cpp"),
             Object(Matching, "ut/ut_ResFont.cpp"),
             Object(NonMatching, "ut/ut_ArchiveFontBase.cpp"),