Add FontRes split

Author: Dogmander

configs/main.yaml

@@ -183,6 +183,7 @@ segments:
       - [0x1CB560, cpp, text_002CA560]
       - [0x1D3D80, cpp, FGDK3/Code/GameShell] # -O0 - Guessed filepath and name
       - [0x1D4598, cpp, text_002D3598]
+      - [0x1D79B8, cpp, FGDK3/Code/FontRes]
       - [0x1D7BE8, cpp, text_002D6BE8]
       - [0x1DA560, cpp, text_002D9560]
       - [0x1DBB38, cpp, FGDK3/Code/DrawShape]
@@ -370,7 +371,9 @@ segments:
 
       - [0x343CE8, .rodata, FGDK3/Code/GameShell]
       - [0x343D68, .rodata, text_002D3598]
+      - [0x344A98, .rodata, FGDK3/Code/FontRes]
       - [0x344B70, .rodata, text_002D6BE8]
+
       - [0x344DC8, .rodata, text_002D9560]
       - [0x345438, .rodata, FGDK3/Code/DrawShape]
       - [0x345498, .rodata, text_002DE720]

src/FGDK3/Code/FontRes.cpp

@@ -0,0 +1,70 @@
+#include "common.h"
+#include "unk.h"
+
+#include "FGDK3/FontRes.h"
+#include "FGDK3/ThrowCat.h"
+#include "FGDK3/RelRecv.h"
+
+
+#ifdef NON_MATCHING
+Status FontRes_InternalInitialise() {
+    return Status(0xFFFFFFFF, "c:/coding/fgdk3/Code/Common/FontRes.cpp", 47);
+}
+#else
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", FontRes_InternalInitialise__Fv);
+#endif
+
+void FontRes_InternalFinalise() {
+    return;
+}
+
+#ifdef NON_MATCHING
+
+StdInit_ModuleDescription FontRes_StdInit_Description = {
+    0,
+    &FontRes_StdInit_UsedModules
+};
+
+void * const FontRes_StdInit_UsedModules[] = {
+    &FontRes_InternalInitialise,
+    &FontRes_InternalFinalise,
+    &ThrowCatch_Initialise,
+    &ThrowCatch_Finalise,
+    &RelRecv_Initialise,
+    &RelRecv_Finalise,
+    0,
+    0,
+};
+
+Status FontRes_Initialise() {
+    return StdInit_InitialisationSequence(&FontRes_StdInit_Description);
+}
+
+void FontRes_Finalise() {
+    StdInit_FinalisationSequence(&FontRes_StdInit_Description);
+}
+
+#else
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", FontRes_Initialise__Fv);
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", FontRes_Finalise__Fv);
+#endif
+
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", func_002D6A58); // load
+
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", func_002D6B18); // unload
+
+INCLUDE_RODATA("asm/nonmatchings/FGDK3/Code/FontRes", _vt$14Font_Resources);
+
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", __tf14Font_Resources);
+
+#ifdef NON_MATCHING
+char * func_002D6B88() { // Font_Resources virtual
+    return "Font";
+}
+
+#else
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", func_002D6B88);
+#endif
+
+INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/FontRes", __tft8Resource1Z11Font_Header);
+

src/text_002D3598.cpp

@@ -379,68 +379,4 @@ INCLUDE_ASM("asm/nonmatchings/text_002D3598", func_002D6978);
 
 INCLUDE_ASM("asm/nonmatchings/text_002D3598", func_002D6998);
 
-// FontRes.cpp
-
-#ifdef NON_MATCHING
-Status FontRes_InternalInitialise(void) {
-    return Status(0xFFFFFFFF, "c:/coding/fgdk3/Code/Common/FontRes.cpp", 47);
-}
-#else
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", FontRes_InternalInitialise__Fv);
-#endif
-
-void FontRes_InternalFinalise() {
-    return;
-}
-
-#ifdef NON_MATCHING
-
-StdInit_ModuleDescription FontRes_StdInit_Description = {
-    0,
-    &FontRes_StdInit_UsedModules
-};
-
-void * const FontRes_StdInit_UsedModules[] = {
-    &FontRes_InternalInitialise,
-    &FontRes_InternalFinalise,
-    &ThrowCatch_Initialise,
-    &ThrowCatch_Finalise,
-    &RelRecv_Initialise,
-    &RelRecv_Finalise,
-    0,
-    0,
-};
-
-Status FontRes_Initialise() {
-    return StdInit_InitialisationSequence(&FontRes_StdInit_Description);
-}
-
-void FontRes_Finalise() {
-    StdInit_FinalisationSequence(&FontRes_StdInit_Description);
-}
-
-#else
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", FontRes_Initialise__Fv);
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", FontRes_Finalise__Fv);
-#endif
-
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", func_002D6A58); // load
-
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", func_002D6B18); // unload
-
-INCLUDE_RODATA("asm/nonmatchings/text_002D3598", _vt$14Font_Resources);
-
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", __tf14Font_Resources);
-
-#ifdef NON_MATCHING
-char * func_002D6B88() { // Font_Resources virtual
-    return "Font";
-}
-
-#else
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", func_002D6B88);
-#endif
-
-INCLUDE_ASM("asm/nonmatchings/text_002D3598", __tft8Resource1Z11Font_Header);
-