From f03267388fa59dd0d99b88c99ef9da92a658f52c Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Fri, 26 Mar 2021 00:13:25 +0100
Subject: [PATCH] port ATI3DCIF_NullSub

---
 docs/progress.svg  | 12 ++++++------
 docs/progress.txt  |  2 +-
 src/specific/ati.c |  6 ++++++
 src/specific/ati.h |  1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/progress.svg b/docs/progress.svg
index 7cd83f9a4..d6235a3a1 100644
--- a/docs/progress.svg
+++ b/docs/progress.svg
@@ -700,7 +700,7 @@
 <rect width="12.00" height="12.00" x="658.00" y="199.00" class="named"><title>gourA</title></rect>
 <rect width="12.00" height="12.00" x="672.00" y="199.00" class="named"><title>gtmapA</title></rect>
 <rect width="12.00" height="12.00" x="686.00" y="199.00" class="named"><title>wgtmapA</title></rect>
-<rect width="12.00" height="12.00" x="0.00" y="213.00" class="named"><title>ATI3DCIF_NullSub</title></rect>
+<rect width="12.00" height="12.00" x="0.00" y="213.00" class="decompiled"><title>ATI3DCIF_NullSub</title></rect>
 <rect width="12.00" height="12.00" x="14.00" y="213.00" class="named"><title>InitATI3DCIF</title></rect>
 <rect width="12.00" height="12.00" x="28.00" y="213.00" class="decompiled"><title>ATI3DCIF_GetInfo</title></rect>
 <rect width="12.00" height="12.00" x="42.00" y="213.00" class="decompiled"><title>ATI3DCIF_TextureReg</title></rect>
@@ -1422,7 +1422,7 @@
 <rect width="0.86" height="0.65" x="689.79" y="535.35" class="decompiled"><title>SeedRandomControl</title></rect>
 <rect width="1.35" height="0.26" x="692.65" y="529.79" class="decompiled"><title>SeedRandomDraw</title></rect>
 <rect width="0.01" height="0.26" x="695.99" y="529.79" class="todo"><title>sub_437AC0</title></rect>
-<rect width="-0.22" height="0.55" x="692.65" y="532.05" class="named"><title>ATI3DCIF_NullSub</title></rect>
+<rect width="-0.22" height="0.55" x="692.65" y="532.05" class="decompiled"><title>ATI3DCIF_NullSub</title></rect>
 <rect width="-0.22" height="0.55" x="694.43" y="532.05" class="decompiled"><title>ATI3DCIF_ContextCreate</title></rect>
 <rect width="-0.22" height="0.55" x="696.22" y="532.05" class="decompiled"><title>ATI3DCIF_RenderEnd</title></rect>
 <rect width="0.23" height="-0.30" x="692.65" y="534.60" class="named"><title>DoNothing</title></rect>
@@ -1431,10 +1431,10 @@
 <rect width="-0.44" height="0.43" x="696.44" y="534.60" class="decompiled"><title>SampleLoader</title></rect>
 <rect width="0.34" height="-1.03" x="694.88" y="537.03" class="decompiled"><title>KeyGet</title></rect>
 <rect width="-1.22" height="-1.03" x="697.22" y="537.03" class="decompiled"><title>S_CDVolume</title></rect>
-<rect width="12.00" height="12.00" x="0.00" y="564.50" class="decompiled"/><text x="17.00" y="570.50">Functions decompiled (count): 81.26%</text>
-<rect width="12.00" height="12.00" x="0.00" y="582.50" class="decompiled"/><text x="17.00" y="588.50">Functions decompiled (bytesize): 74.95%</text>
-<rect width="12.00" height="12.00" x="0.00" y="600.50" class="named"/><text x="17.00" y="606.50">Functions not decompiled, but with known names (count): 10.77%</text>
-<rect width="12.00" height="12.00" x="0.00" y="618.50" class="named"/><text x="17.00" y="624.50">Functions not decompiled, but with known names (bytesize): 11.92%</text>
+<rect width="12.00" height="12.00" x="0.00" y="564.50" class="decompiled"/><text x="17.00" y="570.50">Functions decompiled (count): 81.40%</text>
+<rect width="12.00" height="12.00" x="0.00" y="582.50" class="decompiled"/><text x="17.00" y="588.50">Functions decompiled (bytesize): 74.96%</text>
+<rect width="12.00" height="12.00" x="0.00" y="600.50" class="named"/><text x="17.00" y="606.50">Functions not decompiled, but with known names (count): 10.63%</text>
+<rect width="12.00" height="12.00" x="0.00" y="618.50" class="named"/><text x="17.00" y="624.50">Functions not decompiled, but with known names (bytesize): 11.91%</text>
 <rect width="12.00" height="12.00" x="0.00" y="636.50" class="todo"/><text x="17.00" y="642.50">Functions not decompiled, with unknown names (count): 7.97%</text>
 <rect width="12.00" height="12.00" x="0.00" y="654.50" class="todo"/><text x="17.00" y="660.50">Functions not decompiled, with unknown names (bytesize): 13.13%</text>
 </svg>
diff --git a/docs/progress.txt b/docs/progress.txt
index 76d14b807..ca363bca7 100644
--- a/docs/progress.txt
+++ b/docs/progress.txt
@@ -980,7 +980,7 @@ transA                          0x0043EAE4  0x00000139  -
 gourA                           0x0043EC1D  0x00000185  -
 gtmapA                          0x0043EDA2  0x00000311  -
 wgtmapA                         0x0043F0B3  0x00000355  -
-ATI3DCIF_NullSub                0x00450500  0x00000006  -
+ATI3DCIF_NullSub                0x00450500  0x00000006  +
 InitATI3DCIF                    0x00450510  0x00000296  -
 ATI3DCIF_GetInfo                0x004507B0  0x0000000E  +
 ATI3DCIF_TextureReg             0x004507C0  0x00000013  +
diff --git a/src/specific/ati.c b/src/specific/ati.c
index ecf073bfa..2fe05cf49 100644
--- a/src/specific/ati.c
+++ b/src/specific/ati.c
@@ -19,6 +19,11 @@
 #define ATI3DCIF_RenderPrimList_lib         ((C3D_EC (**)(C3D_VLIST vList, C3D_UINT32 u32NumVert))0x00459D2C)
 // clang-format on
 
+C3D_EC ATI3DCIF_NullSub()
+{
+    return C3D_EC_GENFAIL;
+}
+
 C3D_EC __stdcall ATI3DCIF_GetInfo(PC3D_3DCIFINFO info)
 {
     return (*ATI3DCIF_GetInfo_lib)(info);
@@ -85,6 +90,7 @@ C3D_EC __stdcall ATI3DCIF_RenderPrimList(C3D_VLIST vList, C3D_UINT32 u32NumVert)
 
 void T1MInjectSpecificATI()
 {
+    INJECT(0x00450500, ATI3DCIF_NullSub);
     INJECT(0x004507B0, ATI3DCIF_GetInfo);
     INJECT(0x004507C0, ATI3DCIF_TextureReg);
     INJECT(0x004507E0, ATI3DCIF_TextureUnreg);
diff --git a/src/specific/ati.h b/src/specific/ati.h
index bce7383ba..6af849155 100644
--- a/src/specific/ati.h
+++ b/src/specific/ati.h
@@ -442,6 +442,7 @@ typedef enum {
 
 #pragma pack(pop)
 
+C3D_EC ATI3DCIF_NullSub();
 C3D_EC __stdcall ATI3DCIF_GetInfo(C3D_3DCIFINFO *info);
 C3D_EC __stdcall ATI3DCIF_TextureReg(C3D_PTMAP ptmapToReg, C3D_PHTX phtmap);
 C3D_EC __stdcall ATI3DCIF_TextureUnreg(C3D_HTX htxToUnreg);