From cc66a0615b755fae7c8d709d25e6ca6c594b322a Mon Sep 17 00:00:00 2001
From: jarupxx <jarup@gmx.com>
Date: Thu, 19 Oct 2017 07:36:25 +0900
Subject: [PATCH] Replaced Set #if 1~#endif to  #if 0~#endif

---
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl | 20 +++---
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl | 80 +++++++++++-----------
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl | 34 ++++-----
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl | 18 ++---
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4531.inl |  2 +-
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl | 50 +++++++-------
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl | 38 +++++-----
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 18 ++---
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl | 24 +++----
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl | 18 ++---
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl | 38 +++++-----
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl | 46 ++++++-------
 src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl |  6 +-
 13 files changed, 196 insertions(+), 196 deletions(-)

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
index 3c3b6d48b..648f57065 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
@@ -132,7 +132,7 @@ OOVPA_NO_XREF(D3DDevice_GetCreationParameters, 4034, 7)
         { 0x36, 0xC9 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetViewport
 // ******************************************************************
@@ -391,7 +391,7 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor, 4034, 8)
         { 0x36, 0xC2 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_DrawVertices
 // ******************************************************************
@@ -537,7 +537,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode, 4034, 8)
         { 0x40, 0x5E },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_BackFillMode
 // ******************************************************************
@@ -983,7 +983,7 @@ OOVPA_NO_XREF(D3DDevice_Clear, 4034, 9)
         { 0x039A, 0x18 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetLight
 // ******************************************************************
@@ -1840,7 +1840,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, 12)
         { 0x2B, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_IsBusy
 // ******************************************************************
@@ -1881,7 +1881,7 @@ OOVPA_NO_XREF(D3DDevice_GetRenderTarget, 4039, 11)
         { 0x1E, 0x04 },
 OOVPA_END;
 
-#if 1 // Moved to 3911
+#if 0 // Moved to 3911
 // ******************************************************************
 // * D3DDevice_GetDisplayFieldStatus
 // ******************************************************************
@@ -2184,7 +2184,7 @@ OOVPA_NO_XREF(D3DDevice_KickOff, 4039, 15)
         { 0x87, 0xB8 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetScissors
 // ******************************************************************
@@ -2208,7 +2208,7 @@ OOVPA_NO_XREF(D3DDevice_SetScissors, 4039, 10)
         { 0x1C, 0x95 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetPixelShaderConstant
 // ******************************************************************
@@ -2278,7 +2278,7 @@ OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 4039, 8)
         { 0xFE, 0x24 },
 OOVPA_END;
 
-#if 1 // Moved to 3911
+#if 0 // Moved to 3911
 // ******************************************************************
 // * D3DDevice_Reset
 // ******************************************************************
@@ -2326,7 +2326,7 @@ OOVPA_XREF(D3D_BlockOnTime, 4039, 10,
         { 0x2F, 0x53 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_BlockOnFence
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
index 883ab1052..1e559d8ac 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
@@ -62,7 +62,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4134, 1+10,
         { 0xB6, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetTransform
 // ******************************************************************
@@ -90,7 +90,7 @@ OOVPA_NO_XREF(D3DDevice_SetTransform, 4134, 11)
         { 0x93, 0x10 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3D_CheckDeviceFormat
 // ******************************************************************
@@ -163,7 +163,7 @@ OOVPA_NO_XREF(D3D_EnumAdapterModes, 4134, 10)
         { 0xF8, 0x1E },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_FogColor
 // ******************************************************************
@@ -214,7 +214,7 @@ OOVPA_NO_XREF(D3DDevice_Swap, 4134, 11)
         { 0xAF, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_Clear
 // ******************************************************************
@@ -370,7 +370,7 @@ OOVPA_NO_XREF(D3DDevice_SelectVertexShader, 4134, 11)
         { 0x56, 0x06 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_CopyRects
 // ******************************************************************
@@ -466,7 +466,7 @@ OOVPA_NO_XREF(D3DDevice_CreateImageSurface, 4134, 28)
 
 	OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetPixelShader
 // ******************************************************************
@@ -519,7 +519,7 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_BumpEnv, 4134, 12)
         { 0x52, 0x05 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetIndices
 // ******************************************************************
@@ -545,7 +545,7 @@ OOVPA_NO_XREF(D3DDevice_SetIndices, 4134, 11)
         { 0x79, 0x03 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_VertexBlend
 // ******************************************************************
@@ -571,7 +571,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_VertexBlend, 4134, 11)
         { 0x3F, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_TextureFactor
 // ******************************************************************
@@ -595,7 +595,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor, 4134, 9)
         { 0x4F, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_EdgeAntiAlias
 // ******************************************************************
@@ -648,7 +648,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable, 4134, 13)
         { 0x99, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_StencilEnable
 // ******************************************************************
@@ -674,7 +674,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable, 4134, 11)
         { 0x82, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleAntiAlias
 // ******************************************************************
@@ -734,7 +734,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShader, 4134, 14)
         { 0xB4, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_DrawVerticesUP
 // ******************************************************************
@@ -757,7 +757,7 @@ OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 4134, 10)
         { 0xC3, 0x80 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetLight
 // ******************************************************************
@@ -905,7 +905,7 @@ OOVPA_NO_XREF(D3DDevice_LightEnable, 4134, 13)
         { 0xE2, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_NormalizeNormals
 // ******************************************************************
@@ -926,7 +926,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals, 4134, 8)
         { 0x37, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * Get2DSurfaceDesc
 // ******************************************************************
@@ -974,7 +974,7 @@ OOVPA_NO_XREF(D3DDevice_Reset, 4134, 10)
         { 0x38, 0x10 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_TwoSidedLighting
 // ******************************************************************
@@ -1030,7 +1030,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode, 4134, 13)
         { 0x4F, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetTextureState_ColorKeyColor
 // ******************************************************************
@@ -1055,7 +1055,7 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor, 4134, 12)
         { 0x37, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_FrontFace
 // ******************************************************************
@@ -1084,7 +1084,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_FrontFace, 4134, 11,
         { 0x22, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_LogicOp
 // ******************************************************************
@@ -1106,7 +1106,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LogicOp, 4134, 9)
         { 0x50, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_StencilFail
 // ******************************************************************
@@ -1193,7 +1193,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4134, 13,
         { 0x60, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_FillMode
 // ******************************************************************
@@ -1219,7 +1219,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode, 4134, 11)
         { 0x37, 0x0C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_Dxt1NoiseEnable
 // ******************************************************************
@@ -1241,7 +1241,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, 9)
         { 0x7D, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleMask
 // ******************************************************************
@@ -1322,7 +1322,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, 12)
         { 0x2B, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_ShadowFunc
 // ******************************************************************
@@ -1352,7 +1352,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc, 4134, 13)
         { 0x28, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_YuvEnable
 // ******************************************************************
@@ -1382,7 +1382,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_YuvEnable, 4134, 13)
         { 0x29, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_DrawIndexedVerticesUP
 // ******************************************************************
@@ -1595,7 +1595,7 @@ OOVPA_NO_XREF(D3DDevice_SetSwapCallback, 4134, 12)
         { 0x11, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetTile
 // ******************************************************************
@@ -1621,7 +1621,7 @@ OOVPA_NO_XREF(D3DDevice_GetTile, 4134, 11)
         { 0x24, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetTile
 // ******************************************************************
@@ -1660,7 +1660,7 @@ OOVPA_NO_XREF(D3DDevice_IsBusy, 4134, 7)
         { 0x2F, 0xD2 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3D::CDevice::KickOff
 // ******************************************************************
@@ -1684,7 +1684,7 @@ OOVPA_NO_XREF(D3DDevice_KickOff, 4134, 12)
 	{ 0xE3, 0xC3 }
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_BlockOnFence
 // ******************************************************************
@@ -1781,7 +1781,7 @@ OOVPA_NO_XREF(D3DDevice_GetDisplayMode, 4134, 13)
         { 0x93, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetShaderConstantMode
 // ******************************************************************
@@ -1923,7 +1923,7 @@ OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter, 4134, 13)
 
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette
 // ******************************************************************
@@ -2181,7 +2181,7 @@ OOVPA_NO_XREF(D3DDevice_BeginPushBuffer, 4134, 10)
         { 0x57, 0x83 },
 OOVPA_END;
 
-#if 1 // Moved to 3911
+#if 0 // Moved to 3911
 // ******************************************************************
 // * D3DDevice_EndPushBuffer
 // ******************************************************************
@@ -2322,7 +2322,7 @@ OOVPA_NO_XREF(D3DDevice_InsertCallback, 4134, 13)
         { 0x28, 0x08 },
 OOVPA_END;
 
-#if 1 // Moved to 3911
+#if 0 // Moved to 3911
 // ******************************************************************
 // * D3DDevice_LoadVertexShaderProgram
 // ******************************************************************
@@ -2372,7 +2372,7 @@ OOVPA_NO_XREF(D3DDevice_GetShaderConstantMode, 4134, 16)
         { 0x13, 0x00 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetVertexShaderInput
 // ******************************************************************
@@ -2411,7 +2411,7 @@ OOVPA_NO_XREF(D3DDevice_RunVertexStateShader, 4134, 7)
         { 0x4B, 0x08 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetVertexShaderDeclaration
 // ******************************************************************
@@ -2433,7 +2433,7 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderDeclaration, 4134, 14)
         { 0x1F, 0x0C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetVertexShaderFunction
 // ******************************************************************
@@ -2493,7 +2493,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData4ub, 4134, 7)
         { 0x44, 0x89 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DCubeTexture_GetCubeMapSurface
 // ******************************************************************
@@ -2508,7 +2508,7 @@ OOVPA_NO_XREF(D3DCubeTexture_GetCubeMapSurface, 4134, 7)
         { 0x4B, 0x5E },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetViewport
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
index 2497ddc88..44098ec3d 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
@@ -32,7 +32,7 @@
 // *
 // ******************************************************************
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * CMiniport::InitHardware
 // ******************************************************************
@@ -379,7 +379,7 @@ OOVPA_NO_XREF(D3DDevice_DeleteStateBlock, 4361, 7)
 	{ 0x83, 0xEB },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_ApplyStateBlock
 // ******************************************************************
@@ -426,7 +426,7 @@ OOVPA_XREF(D3DDevice_EndStateBlock, 4361, 6,
         { 0x08, 0xDF },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_GetRenderTarget
 // ******************************************************************
@@ -475,7 +475,7 @@ OOVPA_NO_XREF(D3DDevice_GetViewport, 4361, 10)
         { 0x1B, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetTextureState_BorderColor
 // ******************************************************************
@@ -505,7 +505,7 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_BorderColor, 4361, 15)
         { 0x3B, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SwitchTexture
 // ******************************************************************
@@ -638,7 +638,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4242, 1+10,
         { 0xB5, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DResource_Release
 // ******************************************************************
@@ -722,7 +722,7 @@ OOVPA_NO_XREF(D3DBaseTexture_GetLevelCount, 4361, 13)
         { 0x0C, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetShaderConstantMode
 // ******************************************************************
@@ -771,7 +771,7 @@ OOVPA_NO_XREF(D3DDevice_SetFlickerFilter, 4361, 11)
         { 0x40, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_PrimeVertexCache
 // ******************************************************************
@@ -924,7 +924,7 @@ OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 4361, 8)
         { 0xFE, 0x24 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_CreateCubeTexture
 // ******************************************************************
@@ -955,7 +955,7 @@ OOVPA_NO_XREF(D3DCubeTexture_GetCubeMapSurface, 4361, 7)
         { 0x4B, 0x5E },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetScissors
 // ******************************************************************
@@ -978,7 +978,7 @@ OOVPA_NO_XREF(D3DDevice_SetScissors, 4361, 10)
         { 0x1E, 0x09 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetPixelShaderProgram
 // ******************************************************************
@@ -1011,7 +1011,7 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShader, 4361, 7)
         { 0x13, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetVertexDataColor
 // ******************************************************************
@@ -1026,7 +1026,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexDataColor, 4361, 7)
         { 0x44, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_SetVertexShaderInput
 // ******************************************************************
@@ -1042,7 +1042,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShaderInput, 4361, 8)
         { 0xFE, 0x89 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_SetVertexData2s
 // ******************************************************************
@@ -1058,7 +1058,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData2s, 4361, 8)
         { 0x1F, 0xBF },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_SetVertexData4s
 // ******************************************************************
@@ -1089,7 +1089,7 @@ OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest, 4361, 7)
         { 0x28, 0x06 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_EndVisibilityTest@4
 // ******************************************************************
@@ -1149,7 +1149,7 @@ OOVPA_NO_XREF(D3DDevice_SetTexture, 4361, 28)
 		{ 0x1F, 0x24 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3D::BlockOnTime
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
index dbe440501..3c0e66f13 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
@@ -55,7 +55,7 @@ OOVPA_NO_XREF(Direct3D_CreateDevice, 4432, 8)
         { 0xA1, 0x18 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_GetRenderTarget
 // ******************************************************************
@@ -115,7 +115,7 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface, 4432, 11)
         { 0x26, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetPixelShader
 // ******************************************************************
@@ -190,7 +190,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable, 4432, 13)
         { 0x8D, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleAntiAlias
 // ******************************************************************
@@ -241,7 +241,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth, 4432, 10)
         { 0x63, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette
 // ******************************************************************
@@ -436,7 +436,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode, 4531, 9)
         { 0x43, 0x0C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_BeginPush
 // ******************************************************************
@@ -469,7 +469,7 @@ OOVPA_NO_XREF(D3DDevice_Release, 4432, 11)
 	{ 0x1F, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DTexture_GetSurfaceLevel
 // ******************************************************************
@@ -504,7 +504,7 @@ OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel, 4432, 14)
         { 0x4D, 0x0C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_GetDisplayMode
 // ******************************************************************
@@ -608,7 +608,7 @@ OOVPA_NO_XREF(D3DVertexBuffer_Lock, 4531, 11)
         { 0x55, 0x14 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_GetProjectionViewportMatrix
 // ******************************************************************
@@ -638,7 +638,7 @@ OOVPA_NO_XREF(D3DDevice_SetModelView, 4432, 7)
         { 0x9F, 0x75 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetDisplayFieldStatus
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4531.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4531.inl
index 2eee4ec32..ee09e3118 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4531.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4531.inl
@@ -58,7 +58,7 @@ OOVPA_NO_XREF(D3DDevice_Swap, 4531, 11)
         { 0xBA, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_BackFillMode
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
index bcf80fa01..3353422e5 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
@@ -255,7 +255,7 @@ OOVPA_NO_XREF(D3DDevice_BeginPush, 4627, 7)
         { 0x44, 0x52 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetViewport
 // ******************************************************************
@@ -418,7 +418,7 @@ OOVPA_NO_XREF(D3DDevice_SetGammaRamp, 4627, 17) // Up to 5849
         { 0x77, 0x00 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetShaderConstantMode
 // ******************************************************************
@@ -636,7 +636,7 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2, 4627, 10)
         { 0x1D, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetTile
 // ******************************************************************
@@ -1133,7 +1133,7 @@ OOVPA_NO_XREF(D3DDevice_SetTexture_unused, 4627, 10) // Deprecated in favor of 4
         { 0xDA, 0x4D },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetTexture
 // ******************************************************************
@@ -1213,7 +1213,7 @@ OOVPA_NO_XREF(D3DDevice_SetTexture, 4831, 15)
         { 0x56, 0x45 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_GetDisplayMode
 // ******************************************************************
@@ -1350,7 +1350,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData4f, 4627, 11)
         { 0x60, 0x14 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_End
 // ******************************************************************
@@ -1370,7 +1370,7 @@ OOVPA_NO_XREF(D3DDevice_End, 4627, 12)
         { 0x3C, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_Clear
 // ******************************************************************
@@ -1586,7 +1586,7 @@ OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback, 4627, 12)
         { 0x11, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetViewport
 // ******************************************************************
@@ -1732,7 +1732,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, 9)
         { 0x75, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4432 version
+#if 0 // No longer used, replaced by generic 4432 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_ZEnable
 // ******************************************************************
@@ -1832,7 +1832,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, 12)
         { 0x70, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_DrawVerticesUP
 // ******************************************************************
@@ -2078,7 +2078,7 @@ OOVPA_NO_XREF(D3DSurface_LockRect, 4627, 17)
         { 0x1E, 0x10 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * Get2DSurfaceDesc
 // ******************************************************************
@@ -2242,7 +2242,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShaderInputDirect, 4627, 7)
         { 0x2F, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetVertexShaderInput
 // ******************************************************************
@@ -2311,7 +2311,7 @@ OOVPA_NO_XREF(D3DDevice_LoadVertexShader, 4627, 7)
         { 0x4B, 0x8D },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_LoadVertexShaderProgram
 // ******************************************************************
@@ -2327,7 +2327,7 @@ OOVPA_NO_XREF(D3DDevice_LoadVertexShaderProgram, 4627, 8)
         { 0x32, 0x5F },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SelectVertexShader
 // ******************************************************************
@@ -2343,7 +2343,7 @@ OOVPA_NO_XREF(D3DDevice_SelectVertexShader, 4627, 8)
         { 0x7E, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetVertexShaderDeclaration
 // ******************************************************************
@@ -2483,7 +2483,7 @@ OOVPA_NO_XREF(CMiniport_IsFlipPending, 4627, 18) // Was D3DDevice_Reset
 		{ 0x11, 0x81 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetPixelShaderProgram
 // ******************************************************************
@@ -2516,7 +2516,7 @@ OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus, 4627, 7)
 		{ 0x26, 0xD2 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_CreateStateBlock
 // ******************************************************************
@@ -2535,7 +2535,7 @@ OOVPA_NO_XREF(D3DDevice_CreateStateBlock, 4627, 11)
 		{ 0x8C, 0xC0 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_InsertCallback
 // ******************************************************************
@@ -2607,7 +2607,7 @@ OOVPA_NO_XREF(D3DDevice_GetProjectionViewportMatrix, 4627, 7)
         { 0x1A, 0x5E },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetScissors@12
 // ******************************************************************
@@ -2623,7 +2623,7 @@ OOVPA_NO_XREF(D3DDevice_SetScissors, 4627, 8)
         { 0xFE, 0x4C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette@8
 // ******************************************************************
@@ -2654,7 +2654,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMask, 4627, 8)
         { 0x4E, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_LogicOp
 // ******************************************************************
@@ -3049,7 +3049,7 @@ OOVPA_NO_XREF(D3DDevice_ApplyStateBlock, 4627, 8)
         { 0xFE, 0x33 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_CaptureStateBlock
 // ******************************************************************
@@ -3394,7 +3394,7 @@ OOVPA_NO_XREF(D3D_LazySetPointParams, 4627, 7)
         { 0x75, 0x41 },
 OOVPA_END;
 
-#if 1 // Moved to 4432
+#if 0 // Moved to 4432
 // ******************************************************************
 // * D3DDevice_SetDepthClipPlanes
 // ******************************************************************
@@ -3481,7 +3481,7 @@ OOVPA_NO_XREF(D3DDevice_GetBackMaterial, 4627, 8)
         { 0x1A, 0xC2 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_PrimeVertexCache
 // ******************************************************************
@@ -3532,7 +3532,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_SampleAlpha, 4627, 7)
         { 0x44, 0x83 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * CMiniport::InitHardware
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
index 55e88144b..e8dc3911b 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
@@ -62,7 +62,7 @@ OOVPA_NO_XREF(Direct3D_CreateDevice, 5028, 20) // Also for 5120, 5233, 5344 (545
 		{ 0x1F, 0xC7 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_TextureFactor
 // ******************************************************************
@@ -86,7 +86,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor, 5028, 9)
         { 0x4F, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_Dxt1NoiseEnable
 // ******************************************************************
@@ -101,7 +101,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5028, 7)
         { 0x75, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4432 version
+#if 0 // No longer used, replaced by generic 4432 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_ZEnable
 // ******************************************************************
@@ -132,7 +132,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_SampleAlpha, 5028, 7)
         { 0x44, 0x83 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4831 version
+#if 0 // No longer used, replaced by generic 4831 version
 // ******************************************************************
 // * D3DDevice_CreateTexture2
 // ******************************************************************
@@ -192,7 +192,7 @@ OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank, 5028, 7)
         { 0x23, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetBackBuffer2
 // ******************************************************************
@@ -219,7 +219,7 @@ OOVPA_NO_XREF(D3DDevice_GetBackBuffer2, 5028, 12)
         { 0x41, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetRenderTarget2
 // ******************************************************************
@@ -233,7 +233,7 @@ OOVPA_NO_XREF(D3DDevice_GetRenderTarget2, 5028, 6)
         { 0x17, 0xC6 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetDepthStencilSurface2
 // ******************************************************************
@@ -248,7 +248,7 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2, 5028, 7)
         { 0x1B, 0xC6 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetViewport
 // ******************************************************************
@@ -270,7 +270,7 @@ OOVPA_NO_XREF(D3DDevice_SetViewport, 5028, 9)
         { 0xE1, 0x0F },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetLight
 // ******************************************************************
@@ -297,7 +297,7 @@ OOVPA_NO_XREF(D3DDevice_SetLight, 5028, 12)
         { 0xFF, 0x68 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_LightEnable
 // ******************************************************************
@@ -327,7 +327,7 @@ OOVPA_NO_XREF(D3DDevice_LightEnable, 5028, 13)
         { 0xE2, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetIndices
 // ******************************************************************
@@ -342,7 +342,7 @@ OOVPA_NO_XREF(D3DDevice_SetIndices, 5028, 7)
         { 0x75, 0x10 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetTile
 // ******************************************************************
@@ -367,7 +367,7 @@ OOVPA_NO_XREF(D3DDevice_SetTile, 5028, 11)
         { 0x43, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetTile
 // ******************************************************************
@@ -391,7 +391,7 @@ OOVPA_NO_XREF(D3DDevice_GetTile, 5028, 13)
         { 0x24, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_Clear
 // ******************************************************************
@@ -406,7 +406,7 @@ OOVPA_NO_XREF(D3DDevice_Clear, 5028, 8)
         { 0xF6, 0xFF },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_DrawVertices
 // ******************************************************************
@@ -468,7 +468,7 @@ OOVPA_NO_XREF(D3DDevice_LoadVertexShader, 5028, 7)
         { 0x4B, 0x5E },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetShaderConstantMode
 // ******************************************************************
@@ -513,7 +513,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShader, 5028, 14)
         { 0xB4, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_Swap
 // ******************************************************************
@@ -599,7 +599,7 @@ OOVPA_NO_XREF(D3D_KickOffAndWaitForIdle, 5028, 9)
         { 0x10, 0xC3 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * Get2DSurfaceDesc
 // ******************************************************************
@@ -869,7 +869,7 @@ OOVPA_NO_XREF(D3DDevice_BeginPush, 5028, 6)
         { 0x16, 0xE9 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_End
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
index 94de6ed94..f0ae37cdc 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
@@ -32,7 +32,7 @@
 // *
 // ******************************************************************
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetDisplayFieldStatus
 // ******************************************************************
@@ -94,7 +94,7 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShader, 5233, 7)
         { 0xE1, 0xF6 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4831 version
+#if 0 // No longer used, replaced by generic 4831 version
 // ******************************************************************
 // * D3DDevice_CreateTexture2
 // ******************************************************************
@@ -178,7 +178,7 @@ OOVPA_NO_XREF(D3DDevice_SetTexture, 5233, 10)
         { 0xFE, 0xE2 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_Swap
 // ******************************************************************
@@ -324,7 +324,7 @@ OOVPA_NO_XREF(D3DDevice_CopyRects, 5120, 8)
         { 0xFE, 0x4C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetScissors
 // ******************************************************************
@@ -340,7 +340,7 @@ OOVPA_NO_XREF(D3DDevice_SetScissors, 5233, 8)
         { 0xFE, 0x4C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetScreenSpaceOffset
 // ******************************************************************
@@ -393,7 +393,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 5233, 13)
         { 0x26, 0x00 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode
 // ******************************************************************
@@ -432,7 +432,7 @@ OOVPA_XREF(D3D_CommonSetRenderTarget, 5233, 8,
         { 0xFF, 0x75 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_BlockOnFence
 // ******************************************************************
@@ -450,7 +450,7 @@ OOVPA_XREF(D3DDevice_BlockOnFence, 5233, 6,
         { 0x0D, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette
 // ******************************************************************
@@ -623,7 +623,7 @@ OOVPA_NO_XREF(D3DDevice_GetVisibilityTestResult, 5233, 7)
         { 0x5F, 0x0C },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4831 version
+#if 0 // No longer used, replaced by generic 4831 version
 // ******************************************************************
 // * D3DDevice_SetPixelShaderConstant
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
index c0f35b8fa..de306633f 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
@@ -102,7 +102,7 @@ OOVPA_XREF(D3D_MakeRequestedSpace, 5344, 28,
 		{ 0x1F, 0x03 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_Dxt1NoiseEnable
 // ******************************************************************
@@ -225,7 +225,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TwoSidedLighting, 5344, 13)
         { 0x7E, 0x04 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SetScreenSpaceOffset
 // ******************************************************************
@@ -240,7 +240,7 @@ OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset, 5344, 7)
         { 0x44, 0x06 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetViewport
 // ******************************************************************
@@ -255,7 +255,7 @@ OOVPA_NO_XREF(D3DDevice_GetViewport, 5344, 7)
         { 0x1A, 0xC2 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetBackBuffer2
 // ******************************************************************
@@ -431,7 +431,7 @@ OOVPA_NO_XREF(D3DDevice_SetMaterial, 5344, 9)
         { 0x2E, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * Get2DSurfaceDesc
 // ******************************************************************
@@ -579,7 +579,7 @@ OOVPA_NO_XREF(D3DDevice_SetSwapCallback, 5344, 7)
         { 0x10, 0xC2 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 5233 version
+#if 0 // No longer used, replaced by generic 5233 version
 // ******************************************************************
 // * D3DDevice_SetRenderTargetFast
 // ******************************************************************
@@ -595,7 +595,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTargetFast, 5344, 8)
         { 0xF6, 0xC5 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4039 version
+#if 0 // No longer used, replaced by generic 4039 version
 // ******************************************************************
 // * D3DDevice_SelectVertexShader
 // ******************************************************************
@@ -628,7 +628,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 5344, 9)
         { 0x34, 0x14 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette
 // ******************************************************************
@@ -653,7 +653,7 @@ OOVPA_NO_XREF(D3DDevice_SetPalette, 5344, 12)
         { 0x8B, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5028 version
+#if 0 // No longer used, replaced by generic 5028 version
 // ******************************************************************
 // * D3DDevice_IsBusy
 // ******************************************************************
@@ -1005,7 +1005,7 @@ OOVPA_NO_XREF(D3DDevice_GetMaterial, 5344, 8)
         { 0x1A, 0xC2 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DPalette_Lock
 // ******************************************************************
@@ -1114,7 +1114,7 @@ OOVPA_NO_XREF(D3DDevice_GetProjectionViewportMatrix, 5344, 7)
         { 0x1A, 0x5E },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetTile
 // ******************************************************************
@@ -1150,7 +1150,7 @@ OOVPA_XREF(D3DDevice_CreateIndexBuffer2, 5344, 7,
         { 0x2F, 0x48 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4831 version
+#if 0 // No longer used, replaced by generic 4831 version
 // ******************************************************************
 // * D3DDevice_SetTexture
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl
index 3b8d9f147..77c05366f 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl
@@ -105,7 +105,7 @@ OOVPA_NO_XREF(D3DDevice_CreatePalette2, 5455, 7)
         { 0x52, 0x89 },
 OOVPA_END;
 
-#if 1 // Moved to 5344
+#if 0 // Moved to 5344
 // ******************************************************************
 // * D3DDevice_SetMaterial
 // ******************************************************************
@@ -126,7 +126,7 @@ OOVPA_NO_XREF(D3DDevice_SetMaterial, 5455, 11)
         { 0x2E, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_GetMaterial
 // ******************************************************************
@@ -160,7 +160,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShader, 5455, 8)
         { 0xFE, 0xC1 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetBackBuffer2
 // ******************************************************************
@@ -273,7 +273,7 @@ OOVPA_XREF(D3DDevice_GetViewport, 5455, 1+17,
         { 0x31, 0x04 },
 OOVPA_END;
 
-#if 1 // Moved to 5344
+#if 0 // Moved to 5344
 // ******************************************************************
 // * D3DDevice_SetBackMaterial
 // ******************************************************************
@@ -294,7 +294,7 @@ OOVPA_NO_XREF(D3DDevice_SetBackMaterial, 5455, 11)
         { 0x2E, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_GetBackMaterial
 // ******************************************************************
@@ -385,7 +385,7 @@ OOVPA_NO_XREF(D3DDevice_PersistDisplay, 5455, 12)
         { 0x6F, 0xE1 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 5233 version
+#if 0 // No longer used, replaced by generic 5233 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleMode
 // ******************************************************************
@@ -402,7 +402,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 5455, 9)
         { 0x26, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode
 // ******************************************************************
@@ -446,7 +446,7 @@ OOVPA_NO_XREF(D3DDevice_SetTile, 5455, 16)
         { 0x9B, 0xCB },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_CaptureStateBlock
 // ******************************************************************
@@ -551,7 +551,7 @@ OOVPA_NO_XREF(D3DDevice_KickOff, 5455, 15)
 //        { 0xAF, 0xC3 }
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetVertexShaderDeclaration
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
index 43bf4df25..48969d1c5 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
@@ -118,7 +118,7 @@ OOVPA_NO_XREF(D3DDevice_SelectVertexShader, 5558, 7)
         { 0x8A, 0x89 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetVertexShaderConstant1
 // ******************************************************************
@@ -329,7 +329,7 @@ OOVPA_NO_XREF(D3DDevice_CreateTexture2, 5558, 8)
         { 0xAE, 0x1C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_End
 // ******************************************************************
@@ -344,7 +344,7 @@ OOVPA_NO_XREF(D3DDevice_End, 5558, 7)
         { 0x40, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // Moved to 5344
+#if 0 // Moved to 5344
 // ******************************************************************
 // * D3DDevice_SetLight
 // ******************************************************************
@@ -508,7 +508,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShader, 5455, 8)
         { 0xFE, 0xC1 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette
 // ******************************************************************
@@ -574,7 +574,7 @@ OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank, 5558, 7)
         { 0x23, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_DrawIndexedVerticesUP
 // ******************************************************************
@@ -620,7 +620,7 @@ OOVPA_NO_XREF(D3DDevice_SetTransform, 5558, 12)
         { 0x9D, 0x00 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetBackBuffer2
 // ******************************************************************
@@ -833,7 +833,7 @@ OOVPA_NO_XREF(D3DDevice_AddRef, 5659, 10)
         { 0x0F, 0x09 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_DrawVerticesUP
 // ******************************************************************
@@ -960,7 +960,7 @@ OOVPA_NO_XREF(D3DDevice_SetSwapCallback, 5558, 7)
         { 0x10, 0xC2 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_TextureFactor
 // ******************************************************************
@@ -1175,7 +1175,7 @@ OOVPA_NO_XREF(D3DDevice_GetBackMaterial, 5659, 8)
         { 0x1A, 0xC2 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_TwoSidedLighting
 // ******************************************************************
@@ -1191,7 +1191,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TwoSidedLighting, 5558, 8)
         { 0x7E, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * Get2DSurfaceDesc
 // ******************************************************************
@@ -1302,7 +1302,7 @@ OOVPA_NO_XREF(D3DTexture_LockRect, 5558, 8)
         { 0x21, 0x14 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4831 version
+#if 0 // No longer used, replaced by generic 4831 version
 // ******************************************************************
 // * D3DDevice_SetPixelShaderConstant
 // ******************************************************************
@@ -1496,7 +1496,7 @@ OOVPA_NO_XREF(D3DDevice_LightEnable, 5455, 13)
         { 0xFC, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetIndices
 // ******************************************************************
@@ -1511,7 +1511,7 @@ OOVPA_NO_XREF(D3DDevice_SetIndices, 5558, 7)
         { 0x75, 0x10 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetBackBuffer
 // ******************************************************************
@@ -1584,7 +1584,7 @@ OOVPA_NO_XREF(D3DDevice_PersistDisplay, 5558, 7)
         { 0xDE, 0x8B },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DCubeTexture_GetCubeMapSurface
 // ******************************************************************
@@ -1630,7 +1630,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData2f, 5558, 8)
         { 0x36, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_LoadVertexShaderProgram
 // ******************************************************************
@@ -1645,7 +1645,7 @@ OOVPA_NO_XREF(D3DDevice_LoadVertexShaderProgram, 5558, 7)
         { 0x5C, 0x89 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_SetPixelShaderProgram
 // ******************************************************************
@@ -1660,7 +1660,7 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShaderProgram, 5558, 7)
         { 0x36, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5233 version
+#if 0 // No longer used, replaced by generic 5233 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleMode
 // ******************************************************************
@@ -1728,7 +1728,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5558, 9)
         { 0x26, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_Dxt1NoiseEnable
 // ******************************************************************
@@ -1744,7 +1744,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, 8)
         { 0x76, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5028 version
+#if 0 // No longer used, replaced by generic 5028 version
 // ******************************************************************
 // * D3DDevice_IsFencePending
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
index 471996026..aebf9a0a2 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
@@ -32,7 +32,7 @@
 // *
 // ******************************************************************
 
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_EndVisibilityTest
 // ******************************************************************
@@ -78,7 +78,7 @@ OOVPA_NO_XREF(D3DDevice_SetBackBufferScale, 5788, 7)
         { 0xDE, 0xC0 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetBackBuffer2
 // ******************************************************************
@@ -105,7 +105,7 @@ OOVPA_NO_XREF(D3DDevice_GetBackBuffer2, 5788, 12)
         { 0x41, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_GetDepthStencilSurface2
 // ******************************************************************
@@ -134,7 +134,7 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2, 5788, 10)
         { 0x1D, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_CreatePixelShader
 // ******************************************************************
@@ -151,7 +151,7 @@ OOVPA_NO_XREF(D3DDevice_CreatePixelShader, 5788, 9)
         { 0x46, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_TextureFactor
 // ******************************************************************
@@ -166,7 +166,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor, 5788, 7)
         { 0x4D, 0x5E },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_DrawIndexedVerticesUP
 // ******************************************************************
@@ -182,7 +182,7 @@ OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP, 5788, 8)
         { 0xFF, 0x0C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5659 version
+#if 0 // No longer used, replaced by generic 5659 version
 // ******************************************************************
 // * D3DDevice_SetMaterial
 // ******************************************************************
@@ -199,7 +199,7 @@ OOVPA_NO_XREF(D3DDevice_SetMaterial, 5788, 9)
         { 0x2E, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5659 version
+#if 0 // No longer used, replaced by generic 5659 version
 // ******************************************************************
 // * D3DDevice_GetMaterial
 // ******************************************************************
@@ -238,7 +238,7 @@ OOVPA_NO_XREF(D3DDevice_BeginStateBig, 5788, 15)
         { 0x40, 0x5E },
 OOVPA_END;
 #endif
-#if 1 // This one _IDirect3DVertexBuffer8_Lock@20, replaced by generic 4627 version
+#if 0 // This one _IDirect3DVertexBuffer8_Lock@20, replaced by generic 4627 version
 // ******************************************************************
 // * D3DVertexBuffer8_Lock
 // ******************************************************************
@@ -285,7 +285,7 @@ OOVPA_NO_XREF(D3D_AllocContiguousMemory, 5788, 7)
         { 0x2F, 0x24 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DTexture8_GetLevelDesc
 // ******************************************************************
@@ -330,7 +330,7 @@ OOVPA_XREF(D3DDevice_CreateTexture2, 5788, 8,
         { 0xAE, 0x1C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4627 version
+#if 0 // No longer used, replaced by generic 4627 version
 // ******************************************************************
 // * D3DDevice_SetVertexShaderConstant1
 // ******************************************************************
@@ -374,7 +374,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData2f, 5788, 8)
         { 0x35, 0x0C },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5344 version
+#if 0 // No longer used, replaced by generic 5344 version
 // ******************************************************************
 // * D3DDevice_DrawVerticesUP
 // ******************************************************************
@@ -492,7 +492,7 @@ OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank, 5788, 7)
         { 0x23, 0xC3 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5659 version
+#if 0 // No longer used, replaced by generic 5659 version
 // ******************************************************************
 // * D3DDevice_SetBackMaterial
 // ******************************************************************
@@ -625,7 +625,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth, 5788, 13)
         { 0x43, 0x04 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4432 version
+#if 0 // No longer used, replaced by generic 4432 version
 // ******************************************************************
 // * D3DDevice8::SetDepthClipPlanes
 // ******************************************************************
@@ -680,7 +680,7 @@ OOVPA_NO_XREF(D3DDevice_SetDepthClipPlanes, 5788, 13)
         { 0x17, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * D3DDevice_SetPalette
 // ******************************************************************
@@ -710,7 +710,7 @@ OOVPA_NO_XREF(D3DDevice_GetPushBufferOffset, 5788, 7)
         { 0x91, 0x5F },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5558 version
+#if 0 // No longer used, replaced by generic 5558 version
 // ******************************************************************
 // * D3D::MakeRequestedSpace
 // ******************************************************************
@@ -785,7 +785,7 @@ OOVPA_NO_XREF(D3DDevice_AddRef, 5788, 7)
         { 0x13, 0xC1 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3D::ClearStateBlockFlags
 // ******************************************************************
@@ -836,7 +836,7 @@ OOVPA_XREF(D3D_RecordStateBlock, 5788, 10,
         { 0xD8, 0x01 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 4134 version
+#if 0 // No longer used, replaced by generic 4134 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_BackFillMode
 // ******************************************************************
@@ -866,7 +866,7 @@ OOVPA_NO_XREF(D3DDevice_GetTile, 5788, 7)
         { 0x36, 0x14 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5455 version
+#if 0 // No longer used, replaced by generic 5455 version
 // ******************************************************************
 // * D3D::CDevice::KickOff
 // ******************************************************************
@@ -894,7 +894,7 @@ OOVPA_NO_XREF(D3DDevice_KickOff, 5788, 13)
 	{ 0xAF, 0xC3 }
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5233 version
+#if 0 // No longer used, replaced by generic 5233 version
 // ******************************************************************
 // * D3DDevice_SetRenderState_MultiSampleMode
 // ******************************************************************
@@ -943,7 +943,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias, 5788, 7)
         { 0x6B, 0x5F },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetDisplayFieldStatus
 // ******************************************************************
@@ -958,7 +958,7 @@ OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus, 5788, 7)
         { 0x36, 0x00 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 3911 version
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_GetScissors
 // ******************************************************************
@@ -973,7 +973,7 @@ OOVPA_NO_XREF(D3DDevice_GetScissors, 5788, 7)
         { 0x4B, 0xA4 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 5659 version
+#if 0 // No longer used, replaced by generic 5659 version
 // ******************************************************************
 // * D3DDevice_GetBackMaterial
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
index ddec94b8b..1bd38627e 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
@@ -65,7 +65,7 @@ OOVPA_XREF(D3D_SetFence, 5849, 7,
         { 0xA8, 0x75 },
 OOVPA_END;
 
-#if 1 // No longer used, replaced by generic 5558 version
+#if 0 // No longer used, replaced by generic 5558 version
 // ******************************************************************
 // * D3D::BlockOnTime
 // * Source: Spiderman 2
@@ -83,7 +83,7 @@ OOVPA_XREF(D3D_BlockOnTime, 5849, 6,
         { 0xF8, 0x47 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4034 version
+#if 0 // No longer used, replaced by generic 4034 version
 // ******************************************************************
 // * Get2DSurfaceDesc
 // ******************************************************************
@@ -128,7 +128,7 @@ OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset, 5849, 8)
 	{ 0x47, 0x08 },
 OOVPA_END;
 #endif
-#if 1 // No longer used, replaced by generic 4432 version
+#if 0 // No longer used, replaced by generic 4432 version
 // ******************************************************************
 // * D3DDevice8::SetDepthClipPlanes
 // ******************************************************************