PCDRV progress

Author: Niko

decompile/General/AltMods/PCDRV/pcdrv.c

@@ -56,9 +56,11 @@ CdlFILE *pcCdSearchFile(CdlFILE *loc, const char *filename)
 
 	v1 = PCopen(&filename[1], PCDRV_MODE_READ);
 
-	// if Error: return 0;
-	
+	#ifdef REBUILD_PC
 	fileFD[fileCount] = v1;
+	#else
+	fileFD[fileCount] = fileCount;
+	#endif
 
 	// max of 256 files
 	// CTR has 40 files,

decompile/General/HOWL/h23_Bank_AssignSpuAddrs.c

@@ -5,6 +5,14 @@ int DECOMP_Bank_AssignSpuAddrs()
 	int i;
 	int ret;
 
+// Make PS1 PCDRV boot,
+// will mean that sound does NOT load
+#ifdef USE_PCDRV
+#ifndef REBUILD_PC
+	return 1;
+#endif
+#endif
+	
 	// if Stage 4: Complete
 	if(sdata->bankLoadStage == 4)
 	{

decompile/General/HOWL/h31_howl_InitGlobals.c

@@ -1,13 +1,7 @@
 #include <common.h>
 
 void DECOMP_howl_InitGlobals(char* filename)
-{
-	// TEMPORARY
-	#ifdef USE_PCDRV
-	sdata->boolAudioEnabled = 0;
-	return;
-	#endif
-	
+{	
 	if(sdata->boolAudioEnabled == 1) return;
 	sdata->boolAudioEnabled = 1;
 

decompile/General/HOWL/h34_howl_LoadHeader.c

@@ -12,43 +12,6 @@ void DECOMP_howl_LoadHeader(char* filename)
 	// allocate room for one sector
 	alloc = DECOMP_MEMPACK_AllocMem(0x800/*, filename*/);
 
-// PC
-#ifdef USE_PCDRV
-	
-	#ifdef REBUILD_PC
-	int v1;
-	#else
-	// because this API is STRANGE
-	register int v1 asm("v1");
-	#endif
-	
-	v1 = PCopen("SOUNDS/KART.HWL", PCDRV_MODE_READ);
-	int fd_kartHwl = v1;
-	
-	v1 = PCread(fd_kartHwl, alloc, 0x800);
-	
-	// allocate room for howlHeader + pointerTable
-	howlHeaderSize = sizeof(struct HowlHeader) + alloc->headerSize;
-				
-	// align up for sector size
-	numSector = (howlHeaderSize + 0x800 - 1) >> 0xb;
-	DECOMP_MEMPACK_ReallocMem(numSector << 0xb);
-	
-	char* byteOffset = (char*)alloc;
-	PCread(fd_kartHwl, &byteOffset[0x800], howlHeaderSize-0x800);
-	
-	// allocate room for howlHeader + pointerTable
-	howlHeaderSize = sizeof(struct HowlHeader) + alloc->headerSize;
-	
-	// reallocate room just howlHeader + pointerTable,
-	// deallocate sector-alignment padding
-	DECOMP_MEMPACK_ReallocMem(howlHeaderSize);
-	
-	return;
-
-// PS1
-#else
-	
 	if (DECOMP_LOAD_FindFile(filename, &sdata->KartHWL_CdFile) == 0) 
 		alloc = 0;
 
@@ -58,7 +21,7 @@ void DECOMP_howl_LoadHeader(char* filename)
 		ret = DECOMP_LOAD_HowlHeaderSectors(
 					&sdata->KartHWL_CdFile, 
 					alloc, 0, 1);
-	
+					
 		if(
 			// confirm first sector loaded properly
 			(ret != 0)
@@ -104,6 +67,4 @@ void DECOMP_howl_LoadHeader(char* filename)
 	}
 
 	DECOMP_MEMPACK_PopState();
-	
-#endif
 }

decompile/General/LOAD/LOAD_23_FindFile.c

@@ -8,10 +8,5 @@ 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/LOAD/LOAD_24_HowlHeaderSectors.c

@@ -2,19 +2,17 @@
 
 int DECOMP_LOAD_HowlHeaderSectors(CdlFILE* cdlFileHWL, void* ptrDestination, int firstSector, int numSector)
 {
-	
-// PS1
-#ifndef USE_PCDRV
-
 	CdlLOC loc;
 
 	DECOMP_CDSYS_SetMode_StreamData();
 
+#ifndef USE_PCDRV
 	int sizeOver = ((firstSector + numSector) * 0x800 - cdlFileHWL->size);
 
 	// If reading out of file bounds, quit
 	if (sizeOver >= 0x800 )
 		return 0;
+#endif
 
 	CdIntToPos(CdPosToInt(&cdlFileHWL->pos) + firstSector, &loc);
 
@@ -28,7 +26,4 @@ int DECOMP_LOAD_HowlHeaderSectors(CdlFILE* cdlFileHWL, void* ptrDestination, int
 		return 0;
 
 	return 1;
-
-#endif
-
 }

decompile/General/LOAD/LOAD_26_HowlSectorChainStart.c

@@ -1,13 +1,17 @@
 #include <common.h>
 
 int DECOMP_LOAD_HowlSectorChainStart(CdlFILE* cdlFileHWL, void* ptrDestination, int firstSector, int numSector)
-{
-	#ifdef USE_PCDRV
-	return 1;
-	#endif
-	
+{	
 	CdlLOC loc;
 
+// Make PS1 PCDRV boot,
+// will mean that sound does NOT load
+#ifdef USE_PCDRV
+#ifndef REBUILD_PC
+	return 1;
+#endif
+#endif
+	
 	if(numSector == 0) 
 		return 1;
 
@@ -19,11 +23,13 @@ int DECOMP_LOAD_HowlSectorChainStart(CdlFILE* cdlFileHWL, void* ptrDestination,
 
 	DECOMP_CDSYS_SetMode_StreamData();
 
+#ifndef USE_PCDRV
 	int sizeOver = ((firstSector + numSector) * 0x800 - cdlFileHWL->size);
 
 	// If reading out of file bounds, quit
 	if (sizeOver >= 0x800 )
 		return 0;
+#endif
 
 	CdIntToPos(CdPosToInt(&cdlFileHWL->pos) + firstSector, &loc);
 

decompile/General/LOAD/LOAD_27_HowlSectorChainEnd.c

@@ -6,6 +6,14 @@ int DECOMP_LOAD_HowlSectorChainEnd()
 	int howlChainState = sdata->howlChainState;
 	howlChainParams = sdata->howlChainParams;
 
+// Make PS1 PCDRV boot,
+// will mean that sound does NOT load
+#ifdef USE_PCDRV
+#ifndef REBUILD_PC
+	return 1;
+#endif
+#endif
+	
 	if(howlChainState == -1)
 	{
 		DECOMP_LOAD_HowlSectorChainStart(