Moved 3925 to 3911

Except following 3 OOVPAs
D3DDevice_SetRenderState_MultiSampleMode
D3D_EnumAdapterModes
D3D_GetAdapterModeCount

src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl

@@ -2308,7 +2308,7 @@ OOVPATable D3D8_4034[] = {
 	REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH),
 	REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
 
 	// ******************************************************************
 	// Tested on version 4039, The Simpsons - Road Rage (PAL) 4039 etc
@@ -2335,13 +2335,13 @@ OOVPATable D3D8_4034[] = {
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 4039, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 4039, XREF),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 4039, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScissors, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 4039, PATCH),
@@ -2368,33 +2368,33 @@ OOVPATable D3D8_4034[] = {
 	REGISTER_OOVPA(D3DDevice_GetViewport, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_GetType, 4034, PATCH),
-	REGISTER_OOVPA(D3D_AllocContiguousMemory, 3925, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
+	REGISTER_OOVPA(D3D_AllocContiguousMemory, 3911, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
-	REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH),
+	REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH),
@@ -2405,8 +2405,8 @@ OOVPATable D3D8_4034[] = {
 	REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), // TODO: Unused?
 	REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH),
@@ -2431,9 +2431,9 @@ OOVPATable D3D8_4034[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH),
-	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 4034, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH),
@@ -2447,15 +2447,15 @@ OOVPATable D3D8_4034[] = {
 	REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4034, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 //	REGISTER_OOVPA(D3DDevice_AddRef, 4039, PATCH),
 
 	// ******************************************************************
@@ -2464,20 +2464,20 @@ OOVPATable D3D8_4034[] = {
 	// ******************************************************************
 //	REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_Present, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH),
 	REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
 //	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF),
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH),
 //	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_InsertCallback, 4432, PATCH),
-	REGISTER_OOVPA(D3DDevice_SwitchTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH),
 //	REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
@@ -2485,13 +2485,13 @@ OOVPATable D3D8_4034[] = {
 //	REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 //	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH),
 //	REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH),
 //	REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH),
 //	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl

@@ -2721,46 +2721,46 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_End, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPalette, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_Present, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
-	REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH),
+	REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),	// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),	// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),	// Just calls Lock2DSurface
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),	// Just calls Lock2DSurface
-	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH),
 	REGISTER_OOVPA(D3D_CreateStandAloneSurface, 4134, XREF),
@@ -2783,7 +2783,7 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH),
@@ -2793,7 +2793,7 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),
@@ -2806,9 +2806,9 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH),
@@ -2817,26 +2817,26 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH),
-	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH),
 	REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH),
@@ -2845,20 +2845,20 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH),
-	REGISTER_OOVPA(D3D_BlockOnTime, 3925, PATCH),
+	REGISTER_OOVPA(D3D_BlockOnTime, 3911, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH),
 	REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF),
 	REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
@@ -2878,13 +2878,13 @@ OOVPATable D3D8_4134[] = {
 	REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScissors, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_SwitchTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl

@@ -1219,36 +1219,36 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_AddRef, 4242, PATCH),
 	REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF),
-	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4361, PATCH),
@@ -1270,7 +1270,7 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH),
@@ -1279,26 +1279,26 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_Release, 4361, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED), // TODO: This needs to be verified on 4361, not just 4242!
+	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), // TODO: This needs to be verified on 4361, not just 4242!
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
-	REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH),
+	REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),	// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),	// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),	// Just calls Lock2DSurface
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),	// Just calls Lock2DSurface
 	REGISTER_OOVPA(D3DDevice_SetPalette, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),
 	REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH),
@@ -1310,9 +1310,9 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH),
@@ -1321,11 +1321,11 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4242, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
@@ -1335,7 +1335,7 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
@@ -1348,18 +1348,18 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
-	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4361, PATCH),
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScissors, 4361, PATCH),
 	REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
@@ -1368,7 +1368,7 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH),
@@ -1380,7 +1380,7 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 4361, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH),
@@ -1397,7 +1397,7 @@ OOVPATable D3D8_4361[] = {
 	REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH),
 	REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4039, PATCH),
 };
 

src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl

@@ -661,7 +661,7 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4432, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4432, PATCH),
 	REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH),
@@ -679,11 +679,11 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH),
@@ -693,9 +693,9 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4432, PATCH),
@@ -708,9 +708,9 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPalette, 4432, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH),
 	// REGISTER_OOVPA(D3DDevice_Swap, 4531, PATCH),
 	REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH),
@@ -721,45 +721,45 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 4432, PATCH),
-	REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH),
+	REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	// REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
 	REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4432, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH),
 	// REGISTER_OOVPA(D3DVertexBuffer_Lock, 4531, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_End, 4039, PATCH),
@@ -768,11 +768,11 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4432, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH),
@@ -782,20 +782,20 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SetScissors, 4361, PATCH),
 	REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4432, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4134, PATCH),
@@ -805,7 +805,7 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH),
@@ -817,17 +817,17 @@ OOVPATable D3D8_4432[]  {
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),// Just calls Lock2DSurface
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),// Just calls Lock2DSurface
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 4361, PATCH),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF),
 	REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH),
@@ -839,7 +839,7 @@ OOVPATable D3D8_4432[]  {
 	// TODO: Need test cases
 	// ******************************************************************
 	REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH),
 	// ******************************************************************

src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl

@@ -3412,7 +3412,7 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH),
 	REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4627, PATCH),
 	REGISTER_OOVPA(D3D_KickOffAndWaitForIdle2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPush, 4627, PATCH),
@@ -3435,7 +3435,7 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_GetTile, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH),
@@ -3443,8 +3443,8 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateTexture2, 4627, PATCH),
 	// REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH),
@@ -3475,7 +3475,7 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
@@ -3498,7 +3498,7 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4627, PATCH),
@@ -3506,22 +3506,22 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(D3DResource_GetType, 4034, DISABLED),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 4627, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),	// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),	// Just calls Lock3DSurface
 	REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH),
@@ -3532,10 +3532,10 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
@@ -3550,11 +3550,11 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_InsertCallback, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 4531, PATCH),
 	// REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), // Beware of the typo...
@@ -3563,9 +3563,9 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 4627, PATCH),
 	// REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4627, PATCH),
@@ -3579,13 +3579,13 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 4627, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH),//TODO 4721,4928
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH),
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4627, PATCH), // Called D3DCubeTexture_GetCubeMapSurface2
@@ -3607,11 +3607,11 @@ OOVPATable D3D8_4627[] = {
 	REGISTER_OOVPA(D3DDevice_KickPushBuffer, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH),
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(CMiniport_IsFlipPending, 4627, XREF),
 	REGISTER_OOVPA(CMiniport_InitHardware, 4627, PATCH),
 	REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl

@@ -1144,7 +1144,7 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH),
 	REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF),
 	REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH),
@@ -1163,7 +1163,7 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_GetTile, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH),
@@ -1171,8 +1171,8 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetIndices, 5028, DISABLED),
@@ -1199,7 +1199,7 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
@@ -1222,26 +1222,26 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_LightEnable, 5028, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(D3DResource_GetType, 4034, DISABLED), // I forget why I had this in here...
 	REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),	// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),	// Just calls Lock3DSurface
 	REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH),
@@ -1252,10 +1252,10 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
@@ -1268,11 +1268,11 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 5028, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), // Beware of the typo...
@@ -1281,9 +1281,9 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH),
@@ -1293,9 +1293,9 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
@@ -1313,20 +1313,20 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH),
-	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED),
+	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 
 	// ******************************************************************
 	// Provisional registration functions in XDK 5028
@@ -1342,7 +1342,7 @@ OOVPATable D3D8_5028[] = {
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
 	// REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl

@@ -665,7 +665,7 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_SetScissors, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH),
@@ -675,18 +675,18 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast),
-	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateTexture2, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetIndices, 5028, DISABLED),
@@ -708,7 +708,7 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
@@ -721,9 +721,9 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH),
@@ -731,8 +731,8 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH),
-	REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_LightEnable, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH),
@@ -740,40 +740,40 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH),
-	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED),
+	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetViewport, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetViewport, 5028, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5233, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 5028, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPalette, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
@@ -795,7 +795,7 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
@@ -812,8 +812,8 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_CreatePalette2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5028, PATCH),
@@ -821,7 +821,7 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
 	REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF),
@@ -838,9 +838,9 @@ OOVPATable D3D8_5233[] = {
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 5028, PATCH),
 	REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl

@@ -1145,7 +1145,7 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233
 	REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH),
@@ -1154,13 +1154,13 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
 	REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF),
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
@@ -1189,7 +1189,7 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
@@ -1202,9 +1202,9 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), // Was 5233
@@ -1213,30 +1213,30 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH), // Was 4134
 	REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH),
-	REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), // Was 5233
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), // Was 4627
-	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED),
+	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH), // 5233
 	REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetViewport, 5344, PATCH), // Was 4627
 	REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH), // Was 5233
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH), // Was 5233
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH),
@@ -1248,11 +1248,11 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH), // Was 5233
 	REGISTER_OOVPA(D3D_SetFence, 5028, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPalette, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
@@ -1296,9 +1296,9 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetMaterial, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5344, PATCH),
@@ -1314,7 +1314,7 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH),
@@ -1325,11 +1325,11 @@ OOVPATable D3D8_5344[] = {
 	REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl

@@ -2070,12 +2070,12 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5558, PATCH),
@@ -2099,7 +2099,7 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH),
@@ -2107,7 +2107,7 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 5558, PATCH),
@@ -2135,27 +2135,27 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
 	REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
 	REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED),
-	REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 5558, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
-	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED),
+	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH),
@@ -2164,7 +2164,7 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5558, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED),
 	REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 4627, DISABLED),
@@ -2194,14 +2194,14 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
 	REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
 	REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH),
 	REGISTER_OOVPA(Get2DSurfaceDesc, 5558, PATCH),
 	REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_MakeSpace, 5558, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH),
@@ -2221,10 +2221,10 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
 	REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
@@ -2242,7 +2242,7 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), // for 5455
@@ -2264,8 +2264,8 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH),
@@ -2276,9 +2276,9 @@ OOVPATable D3D8_5558[] = {
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl

@@ -1070,7 +1070,7 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5788, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH),
@@ -1085,7 +1085,7 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH),
@@ -1115,22 +1115,22 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetMaterial, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
-	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED),
+	REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH),
 	REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH),
@@ -1139,12 +1139,12 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH),
 	REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED),
 	REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED),
-	REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH),
 	REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
 	REGISTER_OOVPA(Get2DSurfaceDesc, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
@@ -1155,7 +1155,7 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5788, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
+	REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5788, PATCH),
@@ -1186,7 +1186,7 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF),
 	REGISTER_OOVPA(D3D_Unknown, 5788, XREF),
 	REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
@@ -1199,9 +1199,9 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 5788, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5788, PATCH),
@@ -1217,7 +1217,7 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH),
@@ -1232,8 +1232,8 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH),
@@ -1242,17 +1242,17 @@ OOVPATable D3D8_5788[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 5558, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH),
 	REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl

@@ -187,7 +187,7 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5788, PATCH),
-	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH),
@@ -203,7 +203,7 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH),
@@ -231,18 +231,18 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetMaterial, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH),
-	REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Register, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH),
-	REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_Release, 3911, PATCH),
 	REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH),
-	REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH),
 	REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
-	REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH),
-	REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH),
 	REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED),
 	REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH),
@@ -250,14 +250,14 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH),
 	REGISTER_OOVPA(D3D_SetFence, 5558, XREF),
-	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnTime, 5849, XREF),
-	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH),
 	REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
 	REGISTER_OOVPA(Get2DSurfaceDesc, 5849, PATCH),
 	REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH),
-	REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
+	REGISTER_OOVPA(Lock2DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
@@ -297,7 +297,7 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF),
 	REGISTER_OOVPA(D3D_Unknown, 5788, XREF),
 	REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH),
@@ -310,9 +310,9 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH),
 	REGISTER_OOVPA(D3DDevice_KickOff, 5788, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH),
-	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5788, PATCH),
@@ -326,7 +326,7 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH),
@@ -339,7 +339,7 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH),
 	REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH),
 	REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF),
-	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH),
+	REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED),
 	REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetMaterial, 5788, PATCH),
@@ -349,8 +349,8 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF),
 	REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH),
-	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface
+	REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface
-	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),
+	REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),
 	REGISTER_OOVPA(Lock3DSurface, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH),
 	REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
@@ -362,9 +362,9 @@ OOVPATable D3D8_5849[] = {
 	REGISTER_OOVPA(D3DDevice_GetVertexShader, 5788, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH),
-	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPixelShader, 5788, PATCH),
 	REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH),
 	REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH),

src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl

@@ -131,211 +131,211 @@ OOVPATable D3D8_OOVPAV2[] = {
 	REGISTER_OOVPAS(D3DBaseTexture_GetLevelCount, PATCH, 3911),
 	REGISTER_OOVPAS(D3DCubeTexture_GetCubeMapSurface, PATCH, 3911, 4134, 4627, 5558), // Called D3DCubeTexture_GetCubeMapSurface2 (from 4627's comment) NOTE: Use D3DCubeTexture_GetCubeMapSurface2 for 4627 and above
 	REGISTER_OOVPAS(D3DCubeTexture_GetCubeMapSurface2, PATCH, 4627),
-	REGISTER_OOVPAS(D3DCubeTexture_LockRect, PATCH, 3925), // Just calls Lock2DSurface (from 4134, 4432's comment)
+	REGISTER_OOVPAS(D3DCubeTexture_LockRect, PATCH, 3911), // Just calls Lock2DSurface (from 4134, 4432's comment)
-	REGISTER_OOVPAS(D3DDevice_AddRef, PATCH, 3925, 4039, 4134, 4242, 4627, 5028, 5344, 5558, 5659),
+	REGISTER_OOVPAS(D3DDevice_AddRef, PATCH, 3911, 4039, 4134, 4242, 4627, 5028, 5344, 5558, 5659),
-	REGISTER_OOVPAS(D3DDevice_ApplyStateBlock, PATCH, 3925, 4361, 4627),
+	REGISTER_OOVPAS(D3DDevice_ApplyStateBlock, PATCH, 3911, 4361, 4627),
-	REGISTER_OOVPAS(D3DDevice_Begin, PATCH, 3925, 4039),
+	REGISTER_OOVPAS(D3DDevice_Begin, PATCH, 3911, 4039),
 	REGISTER_OOVPAS(D3DDevice_BeginPush, PATCH, 4134, 4432, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_BeginPushBuffer, PATCH, 3925, 4134), // Not implemented yet. (from 5788's comment)
+	REGISTER_OOVPAS(D3DDevice_BeginPushBuffer, PATCH, 3911, 4134), // Not implemented yet. (from 5788's comment)
 	REGISTER_OOVPAS(D3DDevice_BeginStateBig, XREF, 5028),
 	REGISTER_OOVPAS(D3DDevice_BeginStateBlock, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_BeginVisibilityTest, PATCH, 3925, 4034, 4361, 4627),
+	REGISTER_OOVPAS(D3DDevice_BeginVisibilityTest, PATCH, 3911, 4034, 4361, 4627),
-	REGISTER_OOVPAS(D3DDevice_BlockOnFence, PATCH, 3925/*, 4039, 4134, 5233*/),
+	REGISTER_OOVPAS(D3DDevice_BlockOnFence, PATCH, 3911/*, 4039, 4134, 5233*/),
-	REGISTER_OOVPAS(D3DDevice_BlockUntilVerticalBlank, PATCH, 3925, 4039, 4134, 4361, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_BlockUntilVerticalBlank, PATCH, 3911, 4039, 4134, 4361, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5788),
-	REGISTER_OOVPAS(D3DDevice_CaptureStateBlock, PATCH, 3925, 4134, 4627, 5455),
+	REGISTER_OOVPAS(D3DDevice_CaptureStateBlock, PATCH, 3911, 4134, 4627, 5455),
-	REGISTER_OOVPAS(D3DDevice_Clear, PATCH, 3925, 4034, 4134, 4627, 5028),
+	REGISTER_OOVPAS(D3DDevice_Clear, PATCH, 3911, 4034, 4134, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_CopyRects, PATCH, 3925, 4034, 4134, 4627, 5120),
+	REGISTER_OOVPAS(D3DDevice_CopyRects, PATCH, 3911, 4034, 4134, 4627, 5120),
-	REGISTER_OOVPAS(D3DDevice_CreateCubeTexture, PATCH, 3925, 4361, 4627),
+	REGISTER_OOVPAS(D3DDevice_CreateCubeTexture, PATCH, 3911, 4361, 4627),
-	REGISTER_OOVPAS(D3DDevice_CreateImageSurface, PATCH, 3925, 4034, 4134, 4627),//TODO 4721,4928 (from 4627's comment)
+	REGISTER_OOVPAS(D3DDevice_CreateImageSurface, PATCH, 3911, 4034, 4134, 4627),//TODO 4721,4928 (from 4627's comment)
-	REGISTER_OOVPAS(D3DDevice_CreateIndexBuffer, UNPATCHED, 3925, 4627/*, 5558*/), // TODO: This needs to be verified on 4361
+	REGISTER_OOVPAS(D3DDevice_CreateIndexBuffer, UNPATCHED, 3911, 4627/*, 5558*/), // TODO: This needs to be verified on 4361
 	REGISTER_OOVPAS(D3DDevice_CreateIndexBuffer2, UNPATCHED, 4627, 5344),
-	REGISTER_OOVPAS(D3DDevice_CreatePalette, PATCH, 3925, 4627), // Called D3DDevice_CreatePalette2 (from 4627's comment) NOTE: Use D3DDevice_CreatePalette2 for 4627 and above
+	REGISTER_OOVPAS(D3DDevice_CreatePalette, PATCH, 3911, 4627), // Called D3DDevice_CreatePalette2 (from 4627's comment) NOTE: Use D3DDevice_CreatePalette2 for 4627 and above
 	REGISTER_OOVPAS(D3DDevice_CreatePalette2, PATCH, 4627, 5344, 5455),
-	REGISTER_OOVPAS(D3DDevice_CreatePixelShader, PATCH, 3925, 5344, 5788),
+	REGISTER_OOVPAS(D3DDevice_CreatePixelShader, PATCH, 3911, 5344, 5788),
-	REGISTER_OOVPAS(D3DDevice_CreateStateBlock, PATCH, 3925, 4627),
+	REGISTER_OOVPAS(D3DDevice_CreateStateBlock, PATCH, 3911, 4627),
-	REGISTER_OOVPAS(D3DDevice_CreateTexture, PATCH, 3925, 4627),// Called D3DDevice_CreateTexture2 (from 4627's comment) NOTE: Use D3DDevice_CreateTexture2 for 4627 and above
+	REGISTER_OOVPAS(D3DDevice_CreateTexture, PATCH, 3911, 4627),// Called D3DDevice_CreateTexture2 (from 4627's comment) NOTE: Use D3DDevice_CreateTexture2 for 4627 and above
 	REGISTER_OOVPAS(D3DDevice_CreateTexture2, PATCH, 4627, 4831, 5028, 5233), // Was 4627 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer, UNPATCHED, 3925),
+	REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer, UNPATCHED, 3911),
 	REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer2, UNPATCHED, 4627, 5344, 5455),
-	REGISTER_OOVPAS(D3DDevice_CreateVertexShader, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_CreateVertexShader, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_CreateVolumeTexture, PATCH, 3925, 4627),
+	REGISTER_OOVPAS(D3DDevice_CreateVolumeTexture, PATCH, 3911, 4627),
 	REGISTER_OOVPAS(D3DDevice_DeletePatch, UNPATCHED, 4034), // (TODO) (from 4034's comment)
-	REGISTER_OOVPAS(D3DDevice_DeletePixelShader, PATCH, 3925, 5344),
+	REGISTER_OOVPAS(D3DDevice_DeletePixelShader, PATCH, 3911, 5344),
-	REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3925/*, 4361, 5788*/),
+	REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3911/*, 4361, 5788*/),
-	REGISTER_OOVPAS(D3DDevice_DeleteVertexShader, PATCH, 3925, 5344),
+	REGISTER_OOVPAS(D3DDevice_DeleteVertexShader, PATCH, 3911, 5344),
-	REGISTER_OOVPAS(D3DDevice_DrawIndexedVertices, PATCH, 3925, 4034, 4627, 5028),
+	REGISTER_OOVPAS(D3DDevice_DrawIndexedVertices, PATCH, 3911, 4034, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_DrawIndexedVerticesUP, PATCH, 3925, 4039, 4134, 4627, 5028, 5344, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_DrawIndexedVerticesUP, PATCH, 3911, 4039, 4134, 4627, 5028, 5344, 5558, 5788),
 	REGISTER_OOVPAS(D3DDevice_DrawRectPatch, PATCH, 3911), // TODO: Unused? (from 4034's comment)
 	REGISTER_OOVPAS(D3DDevice_DrawTriPatch, UNPATCHED, 3911),
-	REGISTER_OOVPAS(D3DDevice_DrawVertices, PATCH, 3925, 4034, 5028),
+	REGISTER_OOVPAS(D3DDevice_DrawVertices, PATCH, 3911, 4034, 5028),
-	REGISTER_OOVPAS(D3DDevice_DrawVerticesUP, PATCH, 3925, 4039, 4134, 4627, 5344, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_DrawVerticesUP, PATCH, 3911, 4039, 4134, 4627, 5344, 5558, 5788),
 	REGISTER_OOVPAS(D3DDevice_EnableOverlay, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_End, PATCH, 3925, 4039, 4627, 5028, 5344, 5558),
+	REGISTER_OOVPAS(D3DDevice_End, PATCH, 3911, 4039, 4627, 5028, 5344, 5558),
 	REGISTER_OOVPAS(D3DDevice_EndPush, PATCH, 4134/*, 4627*/), // Was 4627 (from 5233's comment)
-	REGISTER_OOVPAS(D3DDevice_EndPushBuffer, PATCH, 3925, 4134), // Not implemented yet. (from 5788's comment)
+	REGISTER_OOVPAS(D3DDevice_EndPushBuffer, PATCH, 3911, 4134), // Not implemented yet. (from 5788's comment)
 	REGISTER_OOVPAS(D3DDevice_EndStateBlock, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_EndVisibilityTest, PATCH, 3925, 4034, 4361, 4627, 5788),
+	REGISTER_OOVPAS(D3DDevice_EndVisibilityTest, PATCH, 3911, 4034, 4361, 4627, 5788),
-	REGISTER_OOVPAS(D3DDevice_FlushVertexCache, PATCH, 3925, 4134),
+	REGISTER_OOVPAS(D3DDevice_FlushVertexCache, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_GetBackBuffer, PATCH, 3925, 4034, 4134, 4627, 5558), // Called D3DDevice_GetBackBuffer2 (from 4627's comment) NOTE: Use D3DDevice_GetBackBuffer2 for 4627 and above
+	REGISTER_OOVPAS(D3DDevice_GetBackBuffer, PATCH, 3911, 4034, 4134, 4627, 5558), // Called D3DDevice_GetBackBuffer2 (from 4627's comment) NOTE: Use D3DDevice_GetBackBuffer2 for 4627 and above
 	REGISTER_OOVPAS(D3DDevice_GetBackBuffer2, PATCH, 4627, 5028, 5344, 5455, 5558, 5788), // 5233 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_GetBackMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
+	REGISTER_OOVPAS(D3DDevice_GetBackMaterial, PATCH, 3911, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
 	REGISTER_OOVPAS(D3DDevice_GetCreationParameters, PATCH, 3911),
 	REGISTER_OOVPAS(D3DDevice_GetDepthStencilSurface, PATCH, 3911, 4627), // Called D3DDevice_GetDepthStencilSurface2 (from 4627's comment) NOTE: Use D3DDevice_GetDepthStencilSurface2 for 4627 and above
 	REGISTER_OOVPAS(D3DDevice_GetDepthStencilSurface2, PATCH, 4627, 5028, 5788),
-	REGISTER_OOVPAS(D3DDevice_GetDeviceCaps, UNPATCHED, 3925),
+	REGISTER_OOVPAS(D3DDevice_GetDeviceCaps, UNPATCHED, 3911),
-	REGISTER_OOVPAS(D3DDevice_GetDisplayFieldStatus, PATCH, 3925, 4039, 4432, 5233, 5788),
+	REGISTER_OOVPAS(D3DDevice_GetDisplayFieldStatus, PATCH, 3911, 4039, 4432, 5233, 5788),
-	REGISTER_OOVPAS(D3DDevice_GetDisplayMode, PATCH, 3925, 4039, 4432, 4627),
+	REGISTER_OOVPAS(D3DDevice_GetDisplayMode, PATCH, 3911, 4039, 4432, 4627),
 	REGISTER_OOVPAS(D3DDevice_GetGammaRamp, PATCH, 3911/*, 3925, 4034*/),
-	REGISTER_OOVPAS(D3DDevice_GetLight, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_GetLight, PATCH, 3911),
 	REGISTER_OOVPAS(D3DDevice_GetLightEnable, PATCH, 3911, 5344),
-	REGISTER_OOVPAS(D3DDevice_GetMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
+	REGISTER_OOVPAS(D3DDevice_GetMaterial, PATCH, 3911, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
-	REGISTER_OOVPAS(D3DDevice_GetModelView, PATCH, 3925, 4134),
+	REGISTER_OOVPAS(D3DDevice_GetModelView, PATCH, 3911, 4134),
 	REGISTER_OOVPAS(D3DDevice_GetOverlayUpdateStatus, PATCH, 3911),
 	REGISTER_OOVPAS(D3DDevice_GetPersistedSurface2, PATCH, 4928), // For only on Unreal Championship (from 4627's comment)
-	REGISTER_OOVPAS(D3DDevice_GetPixelShader, PATCH, 3925, 4039, 4134, 5028, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_GetPixelShader, PATCH, 3911, 4039, 4134, 5028, 5558, 5788),
-	REGISTER_OOVPAS(D3DDevice_GetProjectionViewportMatrix, PATCH, 3925, 4134, 4432, 4627, 5344, 5558), // For 5455 (from 5558's comment)
+	REGISTER_OOVPAS(D3DDevice_GetProjectionViewportMatrix, PATCH, 3911, 4134, 4432, 4627, 5344, 5558), // For 5455 (from 5558's comment)
-	REGISTER_OOVPAS(D3DDevice_GetPushBufferOffset, PATCH, 3925, 4627),//TODO 4831 (from 4627's comment)
+	REGISTER_OOVPAS(D3DDevice_GetPushBufferOffset, PATCH, 3911, 4627),//TODO 4831 (from 4627's comment)
-	REGISTER_OOVPAS(D3DDevice_GetRenderTarget, PATCH, 3925, 4039, 4134, 4361, 4432, 4627), // Called D3DDevice_GetRenderTarget2 (from 4627's comment) NOTE: Use D3DDevice_GetRenderTarget2 for 4627 and above
+	REGISTER_OOVPAS(D3DDevice_GetRenderTarget, PATCH, 3911, 4039, 4134, 4361, 4432, 4627), // Called D3DDevice_GetRenderTarget2 (from 4627's comment) NOTE: Use D3DDevice_GetRenderTarget2 for 4627 and above
 	REGISTER_OOVPAS(D3DDevice_GetRenderTarget2, PATCH, 4627, 5028),
 	REGISTER_OOVPAS(D3DDevice_GetScissors, PATCH, 3911, 5788),
-	REGISTER_OOVPAS(D3DDevice_GetShaderConstantMode, PATCH, 3925, 4134, 4627, 5344, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_GetShaderConstantMode, PATCH, 3911, 4134, 4627, 5344, 5558, 5788),
 	REGISTER_OOVPAS(D3DDevice_GetStreamSource2, PATCH, 4627),
 	REGISTER_OOVPAS(D3DDevice_GetTexture2, PATCH, 4627),
-	REGISTER_OOVPAS(D3DDevice_GetTile, PATCH, 3925, 4134, 4627, 5028, 5344, 5455),
+	REGISTER_OOVPAS(D3DDevice_GetTile, PATCH, 3911, 4134, 4627, 5028, 5344, 5455),
-	REGISTER_OOVPAS(D3DDevice_GetTransform, PATCH, 3925, 4039),
+	REGISTER_OOVPAS(D3DDevice_GetTransform, PATCH, 3911, 4039),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShader, PATCH, 3925, 4039, 4134, 5028, 5788),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShader, PATCH, 3911, 4039, 4134, 5028, 5788),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShaderConstant, PATCH, 3925, 4039, 5028),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShaderConstant, PATCH, 3911, 4039, 5028),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShaderDeclaration, PATCH, 3925, 4134, 4627, 5455),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShaderDeclaration, PATCH, 3911, 4134, 4627, 5455),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShaderFunction, PATCH, 3925, 4134),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShaderFunction, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShaderInput, PATCH, 3925, 4134, 4627),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShaderInput, PATCH, 3911, 4134, 4627),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShaderSize, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShaderSize, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_GetVertexShaderType, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_GetVertexShaderType, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_GetViewport, PATCH, 3925, 4034, 4134, 4627, 5344, 5455/*, 5788*/), // Was 4627 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_GetViewport, PATCH, 3911, 4034, 4134, 4627, 5344, 5455/*, 5788*/), // Was 4627 (from 5344's comment)
 	REGISTER_OOVPAS(D3DDevice_GetViewportOffsetAndScale, PATCH, 4432/*, 5558*/),
-	REGISTER_OOVPAS(D3DDevice_GetVisibilityTestResult, PATCH, 3925, 5233),
+	REGISTER_OOVPAS(D3DDevice_GetVisibilityTestResult, PATCH, 3911, 5233),
-	REGISTER_OOVPAS(D3DDevice_InsertCallback, PATCH, 3925, 4134, 4627, 5028),
+	REGISTER_OOVPAS(D3DDevice_InsertCallback, PATCH, 3911, 4134, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_InsertFence, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_InsertFence, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_IsBusy, PATCH, 3925, 4034, 5028, 5344),
+	REGISTER_OOVPAS(D3DDevice_IsBusy, PATCH, 3911, 4034, 5028, 5344),
-	REGISTER_OOVPAS(D3DDevice_IsFencePending, PATCH, 3925, 4039, 5028, 5558),
+	REGISTER_OOVPAS(D3DDevice_IsFencePending, PATCH, 3911, 4039, 5028, 5558),
-	REGISTER_OOVPAS(D3DDevice_KickOff, PATCH, 3925, 4039, 4134, 4531, 5028, 5455, 5788),
+	REGISTER_OOVPAS(D3DDevice_KickOff, PATCH, 3911, 4039, 4134, 4531, 5028, 5455, 5788),
 	REGISTER_OOVPAS(D3DDevice_KickPushBuffer, PATCH, 4627),
 	REGISTER_OOVPAS(D3DDevice_LazySetStateVB, XREF, 5028),
 	REGISTER_OOVPAS(D3DDevice_LightEnable, PATCH, 3911, 5028, 5344), // Was 5233 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_LoadVertexShader, PATCH, 3925, 4034, 4627, 5028),
+	REGISTER_OOVPAS(D3DDevice_LoadVertexShader, PATCH, 3911, 4034, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_LoadVertexShaderProgram, PATCH, 3925, 4134, 4627, 5558),
+	REGISTER_OOVPAS(D3DDevice_LoadVertexShaderProgram, PATCH, 3911, 4134, 4627, 5558),
 	REGISTER_OOVPAS(D3DDevice_MakeSpace, UNPATCHED, 5558),
-	REGISTER_OOVPAS(D3DDevice_PersistDisplay, PATCH, 3925, 4039, 4627, 4831, 5455, 5558),
+	REGISTER_OOVPAS(D3DDevice_PersistDisplay, PATCH, 3911, 4039, 4627, 4831, 5455, 5558),
-	REGISTER_OOVPAS(D3DDevice_Present, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_Present, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_PrimeVertexCache, PATCH, 3925, 4134, 4361, 4627),
+	REGISTER_OOVPAS(D3DDevice_PrimeVertexCache, PATCH, 3911, 4134, 4361, 4627),
 	REGISTER_OOVPAS(D3DDevice_Release, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_Reset, PATCH, 3925, 4039),
+	REGISTER_OOVPAS(D3DDevice_Reset, PATCH, 3911, 4039),
 	REGISTER_OOVPAS(D3DDevice_RunPushBuffer, PATCH, 3911, 4039, 4627, 5120, 5558), // for 5455 (from 5558's comment)
-	REGISTER_OOVPAS(D3DDevice_RunVertexStateShader, PATCH, 3925, 4134),
+	REGISTER_OOVPAS(D3DDevice_RunVertexStateShader, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_SelectVertexShader, PATCH, 3925, 4039, 4627, 5344, 5455),
+	REGISTER_OOVPAS(D3DDevice_SelectVertexShader, PATCH, 3911, 4039, 4627, 5344, 5455),
 	REGISTER_OOVPAS(D3DDevice_SelectVertexShaderDirect, PATCH, 4361),
 	REGISTER_OOVPAS(D3DDevice_SetBackBufferScale, PATCH, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetBackMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
+	REGISTER_OOVPAS(D3DDevice_SetBackMaterial, PATCH, 3911, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
 	REGISTER_OOVPAS(D3DDevice_SetDepthClipPlanes, PATCH, 4627, 5788, 5849),
-	REGISTER_OOVPAS(D3DDevice_SetFlickerFilter, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetFlickerFilter, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetGammaRamp, PATCH, 3925, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetGammaRamp, PATCH, 3911, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetIndices, UNPATCHED, 3925, 4034, 4134, 5028, 5558),
+	REGISTER_OOVPAS(D3DDevice_SetIndices, UNPATCHED, 3911, 4034, 4134, 5028, 5558),
-	REGISTER_OOVPAS(D3DDevice_SetLight, PATCH, 3925, 4034, 4134, 5028, 5344, 5558),
+	REGISTER_OOVPAS(D3DDevice_SetLight, PATCH, 3911, 4034, 4134, 5028, 5344, 5558),
-	REGISTER_OOVPAS(D3DDevice_SetMaterial, PATCH, 3925, 4034, 4134, 4627, 5344, 5455, 5558, 5659, 5788), // Was 4627 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetMaterial, PATCH, 3911, 4034, 4134, 4627, 5344, 5455, 5558, 5659, 5788), // Was 4627 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetModelView, PATCH, 3925, 4134, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetModelView, PATCH, 3911, 4134, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetPalette, PATCH, 3925, 4034, 4134, 4432, 4627, 5233, 5344, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_SetPalette, PATCH, 3911, 4034, 4134, 4432, 4627, 5233, 5344, 5558, 5788),
-	REGISTER_OOVPAS(D3DDevice_SetPixelShader, PATCH, 3925, 4039, 4134, 4432, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetPixelShader, PATCH, 3911, 4039, 4134, 4432, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetPixelShaderConstant, PATCH, 3925, 4039, 4831/*, 5233, 5558*/),
+	REGISTER_OOVPAS(D3DDevice_SetPixelShaderConstant, PATCH, 3911, 4039, 4831/*, 5233, 5558*/),
-	REGISTER_OOVPAS(D3DDevice_SetPixelShaderProgram, PATCH, 3925, 4361, 4627, 5558),
+	REGISTER_OOVPAS(D3DDevice_SetPixelShaderProgram, PATCH, 3911, 4361, 4627, 5558),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_BackFillMode, PATCH, 3925, 4034, 4134, 4531, 5788),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_BackFillMode, PATCH, 3911, 4034, 4134, 4531, 5788),
 	REGISTER_OOVPAS(D3DDevice_SetRenderState_CullMode, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_Deferred, UNPATCHED, 3925),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_Deferred, UNPATCHED, 3911),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_DoNotCullUncompressed, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_DoNotCullUncompressed, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_Dxt1NoiseEnable, PATCH, 3925, 4034, 4134, 4627, 5028, 5344, 5558), // Was 5233 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_Dxt1NoiseEnable, PATCH, 3911, 4034, 4134, 4627, 5028, 5344, 5558), // Was 5233 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_EdgeAntiAlias, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_EdgeAntiAlias, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_FillMode, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_FillMode, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_FogColor, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_FogColor, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_FrontFace, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_FrontFace, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_LineWidth, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_LineWidth, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_LogicOp, PATCH, 3925, 4034, 4134, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_LogicOp, PATCH, 3911, 4034, 4134, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleAntiAlias, PATCH, 3925, 4034, 4134, 4432, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleAntiAlias, PATCH, 3911, 4034, 4134, 4432, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMask, PATCH, 3925, 4034, 4134, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMask, PATCH, 3911, 4034, 4134, 4627),
 	REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMode, PATCH, 3925, 4034, 4134, 4627, 5233, 5455, 5558, 5788),
 	REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, PATCH, 4034, 4134, 4627, 5233, 5344, 5455, 5558, 5788), // Was 5233 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_NormalizeNormals, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_NormalizeNormals, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_OcclusionCullEnable, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_OcclusionCullEnable, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_PSTextureModes, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_PSTextureModes, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZCmpAlwaysRead, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZCmpAlwaysRead, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZRead, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZRead, PATCH, 3911),
 	REGISTER_OOVPAS(D3DDevice_SetRenderState_SampleAlpha, PATCH, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_ShadowFunc, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_ShadowFunc, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_Simple, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_Simple, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilCullEnable, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilCullEnable, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilEnable, PATCH, 3925, 4034, 4134, 5849),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilEnable, PATCH, 3911, 4034, 4134, 5849),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilFail, PATCH, 3925, 4034, 4134, 5849),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilFail, PATCH, 3911, 4034, 4134, 5849),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_TextureFactor, PATCH, 3925, 4034, 4134, 5028, 5558, 5788),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_TextureFactor, PATCH, 3911, 4034, 4134, 5028, 5558, 5788),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_TwoSidedLighting, PATCH, 3925, 4034, 4134, 5344, 5558), // Beware of the typo... (from 4627's comment)
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_TwoSidedLighting, PATCH, 3911, 4034, 4134, 5344, 5558), // Beware of the typo... (from 4627's comment)
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_VertexBlend, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_VertexBlend, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_YuvEnable, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_YuvEnable, PATCH, 3911, 4034, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_ZBias, PATCH, 3925),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_ZBias, PATCH, 3911),
-	REGISTER_OOVPAS(D3DDevice_SetRenderState_ZEnable, PATCH, 3925, 4034, 4134, 4432, 4627, 5028),
+	REGISTER_OOVPAS(D3DDevice_SetRenderState_ZEnable, PATCH, 3911, 4034, 4134, 4432, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_SetRenderTarget, PATCH, 3925, 3948, 4039, 4134, 4627, 5344, 5455/*, 5558*/),
+	REGISTER_OOVPAS(D3DDevice_SetRenderTarget, PATCH, 3911, 3948, 4039, 4134, 4627, 5344, 5455/*, 5558*/),
 	REGISTER_OOVPAS(D3DDevice_SetRenderTargetFast, PATCH, 5233, 5344),
-	REGISTER_OOVPAS(D3DDevice_SetScissors, PATCH, 3925, 4039, 4361, 4627, 5233, 5344, 5558), // Was 5233 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetScissors, PATCH, 3911, 4039, 4361, 4627, 5233, 5344, 5558), // Was 5233 (from 5344's comment)
 	REGISTER_OOVPAS(D3DDevice_SetScreenSpaceOffset, PATCH, 4039, 5233, 5344, 5455), // Was 5233 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetShaderConstantMode, PATCH, 3925, 4039, 4134, 4361, 4627, 5028),
+	REGISTER_OOVPAS(D3DDevice_SetShaderConstantMode, PATCH, 3911, 4039, 4134, 4361, 4627, 5028),
-	REGISTER_OOVPAS(D3DDevice_SetSoftDisplayFilter, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetSoftDisplayFilter, PATCH, 3911, 4034, 4134),
 	REGISTER_OOVPAS(D3DDevice_SetStateUP, UNPATCHED, 3911, 4627),
 	REGISTER_OOVPAS(D3DDevice_SetStateVB, UNPATCHED, 3911, 4627),
 	REGISTER_OOVPAS(D3DDevice_SetStipple, PATCH, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetStreamSource, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3DDevice_SetStreamSource, PATCH, 3911, 4034),
 	REGISTER_OOVPAS(D3DDevice_SetSwapCallback, PATCH, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659),
-	REGISTER_OOVPAS(D3DDevice_SetTexture, PATCH, 3925, 4034, 4627, 4831, 5344), // Was 4928 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetTexture, PATCH, 3911, 4034, 4627, 4831, 5344), // Was 4928 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetTextureState_BorderColor, PATCH, 3925, 4034, 4361),
+	REGISTER_OOVPAS(D3DDevice_SetTextureState_BorderColor, PATCH, 3911, 4034, 4361),
-	REGISTER_OOVPAS(D3DDevice_SetTextureState_BumpEnv, PATCH, 3925, 4039),
+	REGISTER_OOVPAS(D3DDevice_SetTextureState_BumpEnv, PATCH, 3911, 4039),
-	REGISTER_OOVPAS(D3DDevice_SetTextureState_ColorKeyColor, PATCH, 3925, 4034, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetTextureState_ColorKeyColor, PATCH, 3911, 4034, 4134),
 	REGISTER_OOVPAS(D3DDevice_SetTextureState_TexCoordIndex, PATCH, 3911, 4034, 4242, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetTile, PATCH, 3925, 4039, 4134, 4627, 5028, 5455/*, 5788*/), // Then it has changed calls ?SetTileNoWait@D3D@@YGXKPBU_D3DTILE@@@Z in XDK 4627 and higher.
+	REGISTER_OOVPAS(D3DDevice_SetTile, PATCH, 3911, 4039, 4134, 4627, 5028, 5455/*, 5788*/), // Then it has changed calls ?SetTileNoWait@D3D@@YGXKPBU_D3DTILE@@@Z in XDK 4627 and higher.
-	REGISTER_OOVPAS(D3DDevice_SetTransform, PATCH, 3925, 4034, 4134, 5344, 5558), // Was 4134 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetTransform, PATCH, 3911, 4034, 4134, 5344, 5558), // Was 4134 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetVertexData2f, PATCH, 3925, 4039), // Was 4627 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetVertexData2f, PATCH, 3911, 4039), // Was 4627 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetVertexData2s, PATCH, 3925, 4134, 4361),
+	REGISTER_OOVPAS(D3DDevice_SetVertexData2s, PATCH, 3911, 4134, 4361),
-	REGISTER_OOVPAS(D3DDevice_SetVertexData4f, PATCH, 3925, 4039),
+	REGISTER_OOVPAS(D3DDevice_SetVertexData4f, PATCH, 3911, 4039),
-	REGISTER_OOVPAS(D3DDevice_SetVertexData4s, PATCH, 3925, 4134, 4361),
+	REGISTER_OOVPAS(D3DDevice_SetVertexData4s, PATCH, 3911, 4134, 4361),
-	REGISTER_OOVPAS(D3DDevice_SetVertexData4ub, PATCH, 3925, 4134),
+	REGISTER_OOVPAS(D3DDevice_SetVertexData4ub, PATCH, 3911, 4134),
-	REGISTER_OOVPAS(D3DDevice_SetVertexDataColor, PATCH, 3925, 4039, 4361),
+	REGISTER_OOVPAS(D3DDevice_SetVertexDataColor, PATCH, 3911, 4039, 4361),
-	REGISTER_OOVPAS(D3DDevice_SetVertexShader, PATCH, 3925, 4034, 4134, 5028, 5455),
+	REGISTER_OOVPAS(D3DDevice_SetVertexShader, PATCH, 3911, 4034, 4134, 5028, 5455),
-	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant, PATCH, 3925, 4034, 4627),
+	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant, PATCH, 3911, 4034, 4627),
 	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant1, PATCH, 4627, 5558, 5788),
 	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant1Fast, PATCH, 4627),
 	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant4, PATCH, 4627),
 	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstantNotInline, PATCH, 4627, 5028, 5558),
 	REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstantNotInlineFast, PATCH, 4627),
-	REGISTER_OOVPAS(D3DDevice_SetVertexShaderInput, PATCH, 3925, 4134, 4361),
+	REGISTER_OOVPAS(D3DDevice_SetVertexShaderInput, PATCH, 3911, 4134, 4361),
 	REGISTER_OOVPAS(D3DDevice_SetVertexShaderInputDirect, PATCH, 4361),
-	REGISTER_OOVPAS(D3DDevice_SetVerticalBlankCallback, PATCH, 3925, 4039, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), // Was 5233 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetVerticalBlankCallback, PATCH, 3911, 4039, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), // Was 5233 (from 5344's comment)
-	REGISTER_OOVPAS(D3DDevice_SetViewport, PATCH, 3925, 4034, 4627, 5028, 5344, 5455), // Was 5233 (from 5344's comment)
+	REGISTER_OOVPAS(D3DDevice_SetViewport, PATCH, 3911, 4034, 4627, 5028, 5344, 5455), // Was 5233 (from 5344's comment)
 	REGISTER_OOVPAS(D3DDevice_Swap, PATCH, 4034, 4531, 4627, 5028, 5233),
-	REGISTER_OOVPAS(D3DDevice_SwitchTexture, PATCH, 3925, 4361),
+	REGISTER_OOVPAS(D3DDevice_SwitchTexture, PATCH, 3911, 4361),
 	REGISTER_OOVPAS(D3DDevice_UpdateOverlay, PATCH, 3911, 4531,/* 5028,*/ 5233/*, 5344, 5558*/),
-	REGISTER_OOVPAS(D3DPalette_Lock, PATCH, 3925, 4531, 4627, 5344), // Called D3DPalette_Lock2 (from 4627's comment) NOTE: Use D3DPalette_Lock2 for 4627 and above
+	REGISTER_OOVPAS(D3DPalette_Lock, PATCH, 3911, 4531, 4627, 5344), // Called D3DPalette_Lock2 (from 4627's comment) NOTE: Use D3DPalette_Lock2 for 4627 and above
 	REGISTER_OOVPAS(D3DPalette_Lock2, PATCH, 4627),
-	REGISTER_OOVPAS(D3DResource_AddRef, PATCH, 3925),
+	REGISTER_OOVPAS(D3DResource_AddRef, PATCH, 3911),
-	REGISTER_OOVPAS(D3DResource_BlockUntilNotBusy, PATCH, 3925),
+	REGISTER_OOVPAS(D3DResource_BlockUntilNotBusy, PATCH, 3911),
-	REGISTER_OOVPAS(D3DResource_GetType, UNPATCHED, 3925, 4034), // Probably not even necessary... (from 3925's comment) // I forget why I had this in here... (from 5028's comment)
+	REGISTER_OOVPAS(D3DResource_GetType, UNPATCHED, 3911, 4034), // Probably not even necessary... (from 3925's comment) // I forget why I had this in here... (from 5028's comment)
-	REGISTER_OOVPAS(D3DResource_IsBusy, PATCH, 3925, 4039),
+	REGISTER_OOVPAS(D3DResource_IsBusy, PATCH, 3911, 4039),
-	REGISTER_OOVPAS(D3DResource_Register, PATCH, 3925),
+	REGISTER_OOVPAS(D3DResource_Register, PATCH, 3911),
-	REGISTER_OOVPAS(D3DResource_Release, PATCH, 3925, 4361),
+	REGISTER_OOVPAS(D3DResource_Release, PATCH, 3911, 4361),
-	REGISTER_OOVPAS(D3DSurface_GetDesc, PATCH, 3925),
+	REGISTER_OOVPAS(D3DSurface_GetDesc, PATCH, 3911),
-	REGISTER_OOVPAS(D3DSurface_LockRect, PATCH, 3925),
+	REGISTER_OOVPAS(D3DSurface_LockRect, PATCH, 3911),
-	REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel, PATCH, 3925, 4432, 4627),
+	REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel, PATCH, 3911, 4432, 4627),
 	REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel2, PATCH, 4627),
-	REGISTER_OOVPAS(D3DTexture_LockRect, PATCH, 3925),
+	REGISTER_OOVPAS(D3DTexture_LockRect, PATCH, 3911),
-	REGISTER_OOVPAS(D3DVertexBuffer_GetDesc, UNPATCHED, 3925),
+	REGISTER_OOVPAS(D3DVertexBuffer_GetDesc, UNPATCHED, 3911),
-	REGISTER_OOVPAS(D3DVertexBuffer_Lock, PATCH, 3925, 4034, 4531, 4627, 5788),
+	REGISTER_OOVPAS(D3DVertexBuffer_Lock, PATCH, 3911, 4034, 4531, 4627, 5788),
 	REGISTER_OOVPAS(D3DVertexBuffer_Lock2, PATCH, 4627, 5788),
-	REGISTER_OOVPAS(D3DVolumeTexture_LockBox, PATCH, 3925), // Just calls Lock3DSurface (from 4134, 4432's comment)
+	REGISTER_OOVPAS(D3DVolumeTexture_LockBox, PATCH, 3911), // Just calls Lock3DSurface (from 4134, 4432's comment)
-	REGISTER_OOVPAS(D3D_AllocContiguousMemory, UNPATCHED, 3925, 5788), // Just calls MmAllocateContiguousMemory. Was PATCH (from 3925, 5788's comment)
+	REGISTER_OOVPAS(D3D_AllocContiguousMemory, UNPATCHED, 3911, 5788), // Just calls MmAllocateContiguousMemory. Was PATCH (from 3925, 5788's comment)
-	REGISTER_OOVPAS(D3D_BlockOnResource, PATCH, 3925, 4034),
+	REGISTER_OOVPAS(D3D_BlockOnResource, PATCH, 3911, 4034),
-	REGISTER_OOVPAS(D3D_BlockOnTime, PATCH, 3925, 4039, 4361, 4627, 5028, 5558, 5849),
+	REGISTER_OOVPAS(D3D_BlockOnTime, PATCH, 3911, 4039, 4361, 4627, 5028, 5558, 5849),
 	REGISTER_OOVPAS(D3D_CMiniport_GetDisplayCapabilities, PATCH, 3911),
 	REGISTER_OOVPAS(D3D_CheckDeviceFormat, UNPATCHED, 3911, 4134),
 	REGISTER_OOVPAS(D3D_ClearStateBlockFlags, XREF, 3911, 5788),
@@ -343,23 +343,23 @@ OOVPATable D3D8_OOVPAV2[] = {
 	REGISTER_OOVPAS(D3D_CommonSetRenderTargetB, XREF, 4627),
 	REGISTER_OOVPAS(D3D_CreateDeviceX, UNPATCHED, 4627),
 	REGISTER_OOVPAS(D3D_CreateStandAloneSurface, XREF, 4134),
-	REGISTER_OOVPAS(D3D_GetAdapterIdentifier, UNPATCHED, 3925),
+	REGISTER_OOVPAS(D3D_GetAdapterIdentifier, UNPATCHED, 3911),
-	REGISTER_OOVPAS(D3D_GetDeviceCaps, UNPATCHED, 3925),
+	REGISTER_OOVPAS(D3D_GetDeviceCaps, UNPATCHED, 3911),
-	REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle, PATCH, 3925, 4034, 4627, 5028),
+	REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle, PATCH, 3911, 4034, 4627, 5028),
 	REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle2, PATCH, 4627),
 	REGISTER_OOVPAS(D3D_LazySetPointParams, PATCH, 3911, 4039),
 	REGISTER_OOVPAS(D3D_RecordStateBlock, XREF, 3911, 5788),
-	REGISTER_OOVPAS(D3D_SetCommonDebugRegisters, PATCH, 3925),
+	REGISTER_OOVPAS(D3D_SetCommonDebugRegisters, PATCH, 3911),
-	REGISTER_OOVPAS(D3D_SetFence, XREF, 3925, 4039, 4134, 5028, 5558),
+	REGISTER_OOVPAS(D3D_SetFence, XREF, 3911, 4039, 4134, 5028, 5558),
 	REGISTER_OOVPAS(D3D_SetPushBufferSize, UNPATCHED, 3911),
 	REGISTER_OOVPAS(D3D_Unknown, XREF, 5788),
 	REGISTER_OOVPAS(Direct3D_CheckDeviceMultiSampleType, UNPATCHED, 3911),
 	REGISTER_OOVPAS(Direct3D_CreateDevice, PATCH, 3911, 5028),
-	REGISTER_OOVPAS(Get2DSurfaceDesc, PATCH, 3925, 4034, 4134, 4627, 5028, 5344, 5558, 5788, 5849), // Was 5233 (from 5344's comment)
+	REGISTER_OOVPAS(Get2DSurfaceDesc, PATCH, 3911, 4034, 4134, 4627, 5028, 5344, 5558, 5788, 5849), // Was 5233 (from 5344's comment)
-	REGISTER_OOVPAS(Lock2DSurface, PATCH, 3925),
+	REGISTER_OOVPAS(Lock2DSurface, PATCH, 3911),
 	REGISTER_OOVPAS(Lock3DSurface, PATCH, 3911),
 	REGISTER_OOVPAS(D3D_MakeRequestedSpace, PATCH, 4134, 5028, 5558, 5788),
-	REGISTER_OOVPAS(XMETAL_StartPush, UNPATCHED, 3925),
+	REGISTER_OOVPAS(XMETAL_StartPush, UNPATCHED, 3911),
 };
 
 // ******************************************************************