pcdrv progress

Author: Niko

decompile/General/HOWL/h23_Bank_AssignSpuAddrs.c

@@ -16,7 +16,7 @@ int DECOMP_Bank_AssignSpuAddrs()
 	{
 		ret = DECOMP_LOAD_HowlSectorChainStart
 				(
-					(CdlFILE*)&sdata->KartHWL_CdLoc,  // CdLoc of HOWL
+					&sdata->KartHWL_CdFile,  // CdLoc of HOWL
 					(void*)sdata->ptrSampleBlock2, // destination in RAM for banks
 					sdata->bankSectorOffset,// bank offset on disc, from CdLoc
 					1	// one sector
@@ -75,7 +75,7 @@ int DECOMP_Bank_AssignSpuAddrs()
 
 		ret = DECOMP_LOAD_HowlSectorChainStart
 				(
-					(CdlFILE*)&sdata->KartHWL_CdLoc,  				// CdLoc of HOWL
+					&sdata->KartHWL_CdFile,  				// CdLoc of HOWL
 					(void*)((int)sdata->ptrSampleBlock2 + 0x800),	// destination
 					sdata->bankSectorOffset+1,				// offset of howl
 					sdata->numAudioSectors					// number of sectors

decompile/General/HOWL/h34_howl_LoadHeader.c

@@ -23,9 +23,9 @@ void DECOMP_howl_LoadHeader(char* filename)
 	#endif
 
 	v1 = PCopen("SOUNDS/KART.HWL", PCDRV_MODE_READ);
-	sdata->fd_kartHwl = v1;
+	int fd_kartHwl = v1;
 
-	v1 = PCread(sdata->fd_kartHwl, alloc, 0x800);
+	v1 = PCread(fd_kartHwl, alloc, 0x800);
 
 	// allocate room for howlHeader + pointerTable
 	howlHeaderSize = sizeof(struct HowlHeader) + alloc->headerSize;
@@ -35,7 +35,7 @@ void DECOMP_howl_LoadHeader(char* filename)
 	DECOMP_MEMPACK_ReallocMem(numSector << 0xb);
 
 	char* byteOffset = (char*)alloc;
-	PCread(sdata->fd_kartHwl, &byteOffset[0x800], howlHeaderSize-0x800);
+	PCread(fd_kartHwl, &byteOffset[0x800], howlHeaderSize-0x800);
 
 	// allocate room for howlHeader + pointerTable
 	howlHeaderSize = sizeof(struct HowlHeader) + alloc->headerSize;
@@ -49,14 +49,14 @@ void DECOMP_howl_LoadHeader(char* filename)
 // PS1
 #else
 
-	if (DECOMP_LOAD_FindFile(filename, (CdlFILE*)&sdata->KartHWL_CdLoc) == 0) 
+	if (DECOMP_LOAD_FindFile(filename, &sdata->KartHWL_CdFile) == 0) 
 		alloc = 0;
 
 	if (alloc != 0)
 	{
 		// read sector #1 of HOWL, just for header
 		ret = DECOMP_LOAD_HowlHeaderSectors(
-					(CdlFILE*)&sdata->KartHWL_CdLoc, 
+					&sdata->KartHWL_CdFile, 
 					alloc, 0, 1);
 
 		if(
@@ -85,7 +85,7 @@ void DECOMP_howl_LoadHeader(char* filename)
 
 			// read remaining sectors
 			ret = DECOMP_LOAD_HowlHeaderSectors(
-						(CdlFILE*)&sdata->KartHWL_CdLoc, 
+						&sdata->KartHWL_CdFile, 
 						(void*)((int)alloc + 0x800), 1, numSector - 1);
 
 			if (ret != 0)

decompile/General/HOWL/h36_howl_LoadSong.c

@@ -16,7 +16,7 @@ int DECOMP_howl_LoadSong()
 	{
 		ret = DECOMP_LOAD_HowlSectorChainStart
 				(
-					(CdlFILE*)&sdata->KartHWL_CdLoc,  // CdLoc of HOWL
+					&sdata->KartHWL_CdFile,  // CdLoc of HOWL
 					sdata->sampleBlock1, 	// destination in RAM for songs
 					sdata->songSectorOffset,// song offset on disc, from CdLoc
 					1	// one sector
@@ -42,7 +42,7 @@ int DECOMP_howl_LoadSong()
 
 		ret = DECOMP_LOAD_HowlSectorChainStart
 				(
-					(CdlFILE*)&sdata->KartHWL_CdLoc,  // CdLoc of HOWL
+					&sdata->KartHWL_CdFile,  // CdLoc of HOWL
 					sdata->tenSampleBlocks, // (sampleBlock1+0x800) RAM destination
 					sdata->songSectorOffset+1,// song offset on disc, from CdLoc
 					numSector-1

decompile/General/LOAD/LOAD_23_FindFile.c

@@ -8,5 +8,10 @@ int DECOMP_LOAD_FindFile(char* filename, CdlFILE* cdlFile)
 	DECOMP_CDSYS_SetMode_StreamData();
 	DECOMP_LOAD_StringToUpper(filename);
 
+	#ifdef USE_PCDRV
+	// for KART.HWL, cause CdSearchFile wont give size
+	cdlFile->size = 0xbae694;
+	#endif
+	
 	return (CdSearchFile(cdlFile, filename) != 0);
 }

decompile/General/MAIN/MainMain.c

@@ -874,7 +874,7 @@ void StateZero()
 	// "Start your engines, for Sony Computer..."
 	DECOMP_CDSYS_XAPlay(CDSYS_XA_TYPE_EXTRA, 0x50);
 
-#if !defined(REBUILD_PC) && !defined(USE_PCDRV)
+#if !defined(USE_PCDRV)
 	while (sdata->XA_State != 0)
 	{
 		// WARNING: Read-only address (ram, 0x8008d888) is written

include/regionsEXE.h

@@ -3615,9 +3615,6 @@ struct sData
 	// 8008d6b4
 	int bool_XnfLoaded;
 
-// PS1
-#ifndef USE_PCDRV
-
 	// 8008d6b8
 	// = 0, most of the time
 	// = 1, finished, set on IRQ
@@ -3635,16 +3632,6 @@ struct sData
 	// 8008d6c8
 	int XA_VolumeDeduct;
 
-// PC
-#else
-	
-	int fd_bigfile;
-	int fd_kartHwl;
-
-	int willUseLater[3];
-	
-#endif
-
 	// 8008d6cc
 	int* ptrArray_numSongs;
 
@@ -4703,15 +4690,7 @@ struct sData
 	struct Song songPool[2];
 
 	// 80095e7c
-	// two CdlLoc files are here
-	CdlLOC KartHWL_CdLoc;
-
-	// 80095E80
-	int KartHWL_fileSize;
-	//instead of the two above variables (80095e7c and 80095e80), it's almost certainly a `CdlFILE` instead of a `CdlLOC` & `int`
-
-	// 80095E84
-	char KartHWL_filename[0x10];
+	CdlFILE KartHWL_CdFile;
 
 	// 80095e94
 	// backed up during pause