diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
index 94ecf0a3c..343a2216b 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
@@ -490,6 +490,11 @@ OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 5788, 8)
         { 0xFE, 0x7D },
 OOVPA_END;
 
+// ******************************************************************
+// * D3DTexture_LockRect
+// ******************************************************************
+#define D3DTexture_LockRect_5788 D3DTexture_LockRect_5233
+
 // ******************************************************************
 // * D3DDevice_BeginPushBuffer
 // ******************************************************************
@@ -1354,7 +1359,7 @@ OOVPATable D3D8_5788[] = {
 	OOVPA_TABLE_ENTRY(D3DSurface_LockRect, 3925),
 	OOVPA_TABLE_ENTRY(D3DBaseTexture_GetLevelCount, 4361),
 	OOVPA_TABLE_ENTRY(D3DTexture_GetSurfaceLevel2, 4627),
-	OOVPA_TABLE_ENTRY(D3DDevice_SetLight, 5558),
+	OOVPA_TABLE_ENTRY(D3DTexture_LockRect, 5788),
 	OOVPA_TABLE_ENTRY(D3DDevice_CreateVertexBuffer2, 5788),
 	OOVPA_TABLE_ENTRY(D3DVertexBuffer_Lock, 5788),
 	OOVPA_TABLE_ENTRY(D3DVertexBuffer_Lock2, 5788),
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
index f42bee035..1acc4dc4c 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
@@ -505,20 +505,6 @@ OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 5849, 8)
         { 0xFE, 0x7D },
 OOVPA_END;
 
-// ******************************************************************
-// * D3DTexture_LockRect
-// ******************************************************************
-OOVPA_NO_XREF(D3DTexture_LockRect, 5849, 7)
-
-        { 0x03, 0x14 },
-        { 0x08, 0x8B },
-        { 0x0D, 0x8B },
-        { 0x12, 0x8B },
-        { 0x17, 0x50 },
-        { 0x20, 0xC2 },
-        { 0x21, 0x14 },
-OOVPA_END;
-
 // ******************************************************************
 // * D3DDevice_BeginPushBuffer
 // ******************************************************************
@@ -1350,7 +1336,7 @@ OOVPATable D3D8_5849[] = {
 	OOVPA_TABLE_ENTRY(D3DSurface_GetDesc, 4361),
 	OOVPA_TABLE_ENTRY(D3DDevice_CopyRects, 5233),
 	OOVPA_TABLE_ENTRY(D3DPalette_Lock2, 5233),
-	OOVPA_TABLE_ENTRY(D3DTexture_LockRect, 5849),
+	OOVPA_TABLE_ENTRY(D3DTexture_LockRect, 5788),
 	OOVPA_TABLE_ENTRY(D3DSurface_LockRect, 3925),
 	OOVPA_TABLE_ENTRY(D3DBaseTexture_GetLevelCount, 4361),
 	OOVPA_TABLE_ENTRY(D3DTexture_GetSurfaceLevel2, 4627),