Remove dead code, no more size pointers in load queue

decompile/General/LOAD/LOAD_17_DramFile.c

@@ -2,7 +2,7 @@
 
 void DECOMP_LOAD_DramFileCallback();
 
-void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, int* size, int callbackOrFlags)
+void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, int callbackOrFlags)
 {
 	struct LoadQueueSlot lqs;
 
@@ -12,8 +12,7 @@ void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestinati
 		lqs.flags = 0;
 		lqs.type = LT_DRAM;
 		lqs.subfileIndex = subfileIndex;
-		lqs.ptrDestination = DECOMP_LOAD_ReadFile(bigfilePtr, LT_DRAM, subfileIndex, 0, size, 0);
-		lqs.size = *size;
+		lqs.ptrDestination = DECOMP_LOAD_ReadFile(bigfilePtr, LT_DRAM, subfileIndex, 0, 0);
 		lqs.callback.funcPtr = NULL;
 
 		DECOMP_LOAD_DramFileCallback(&lqs);
@@ -27,7 +26,7 @@ void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestinati
 
 	if(callbackOrFlags == -2)
 	{
-		void* ptrDest = DECOMP_LOAD_ReadFile(bigfilePtr, LT_DRAM, subfileIndex, 0, size, DECOMP_LOAD_DramFileCallback);
+		void* ptrDest = DECOMP_LOAD_ReadFile(bigfilePtr, LT_DRAM, subfileIndex, 0, DECOMP_LOAD_DramFileCallback);
 
 		*ptrDestination = (int)ptrDest;
 		data.currSlot.ptrDestination = ptrDest;
@@ -37,5 +36,5 @@ void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestinati
 
 	// valid callback
 
-	return DECOMP_LOAD_ReadFile(bigfilePtr, LT_DRAM, subfileIndex, ptrDestination, size, DECOMP_LOAD_DramFileCallback);
+	return DECOMP_LOAD_ReadFile(bigfilePtr, LT_DRAM, subfileIndex, ptrDestination, DECOMP_LOAD_DramFileCallback);
 }

decompile/General/LOAD/LOAD_19_VramFile.c

@@ -1,6 +1,6 @@
 #include <common.h>
 
-void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, int* size, int callbackOrFlags)
+void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, int callbackOrFlags)
 {
 	struct LoadQueueSlot lqs;
 
@@ -10,8 +10,7 @@ void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestinati
 		lqs.flags = 0;
 		lqs.type = LT_VRAM;
 		lqs.subfileIndex = subfileIndex;
-		lqs.ptrDestination = DECOMP_LOAD_ReadFile(bigfilePtr, LT_VRAM, subfileIndex, 0, size, 0);
-		lqs.size = *size;
+		lqs.ptrDestination = DECOMP_LOAD_ReadFile(bigfilePtr, LT_VRAM, subfileIndex, 0, 0);
 		lqs.callback.funcPtr = NULL;
 
 		DECOMP_LOAD_VramFileCallback(&lqs);
@@ -29,7 +28,7 @@ void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestinati
 
 	if(callbackOrFlags == -2)
 	{
-		void* ptrDest = DECOMP_LOAD_ReadFile(bigfilePtr, LT_VRAM, subfileIndex, 0, size, &DECOMP_LOAD_VramFileCallback);
+		void* ptrDest = DECOMP_LOAD_ReadFile(bigfilePtr, LT_VRAM, subfileIndex, 0, &DECOMP_LOAD_VramFileCallback);
 
 		*ptrDestination = (int)ptrDest;
 		data.currSlot.ptrDestination = ptrDest;
@@ -39,5 +38,5 @@ void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestinati
 
 	// valid callback
 
-	return DECOMP_LOAD_ReadFile(bigfilePtr, LT_VRAM, subfileIndex, ptrDestination, size, &DECOMP_LOAD_VramFileCallback);
+	return DECOMP_LOAD_ReadFile(bigfilePtr, LT_VRAM, subfileIndex, ptrDestination, &DECOMP_LOAD_VramFileCallback);
 }

decompile/General/LOAD/LOAD_21_ReadFile.c

@@ -1,6 +1,6 @@
 #include <common.h>
 
-void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfileIndex, void *ptrDst, int *size, void * callback)
+void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfileIndex, void *ptrDst, void * callback)
 {
 	// param1 is the Pointer to CD position of BIGFILE
 
@@ -14,8 +14,6 @@ void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfil
 	struct BigEntry* entry = BIG_GETENTRY(bigfile);
 	int eSize = entry[subfileIndex].size;
 	int eOffs = entry[subfileIndex].offset;
-
-	*size = eSize;
 
 	#ifndef USE_PCDRV
 	CdIntToPos(bigfile->cdpos + eOffs, &cdLoc);
@@ -30,11 +28,11 @@ void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfil
 		lqs->flags |= 1;
 
 		// make sure RAM has room for sector alignment
-		ptrDst = (void *)DECOMP_MEMPACK_AllocMem((*size + 0x7ffU) & 0xfffff800); // "FILE"
+		ptrDst = (void *)DECOMP_MEMPACK_AllocMem((eSize + 0x7ffU) & 0xfffff800); // "FILE"
 
 		// undo sector-align alloc,
 		// allocate just "needed" bytes
-		DECOMP_MEMPACK_ReallocMem(*size);
+		DECOMP_MEMPACK_ReallocMem(eSize);
 
 		if (loadType == LT_VRAM)
 			DECOMP_MEMPACK_ReallocMem(0);
@@ -69,7 +67,7 @@ void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfil
 	while (1)
 	{
 		uVar5 =  CdControl(CdlSetloc, &cdLoc, &paramOutput[0]);		
-		uVar5 &= CdRead(*size + 0x7ffU >> 0xb, ptrDst, 0x80);
+		uVar5 &= CdRead(eSize + 0x7ffU >> 0xb, ptrDst, 0x80);
 
 		#ifndef REBUILD_PC
 		// if no errors

decompile/General/LOAD/LOAD_32_LangFile.c

@@ -33,7 +33,7 @@ void DECOMP_LOAD_LangFile(int bigfilePtr, int lang)
 	lngFile =
 		DECOMP_LOAD_ReadFile(
 			(struct BigHeader*)bigfilePtr, 1, BI_LANGUAGEFILE + lang, 
-			(void*)sdata->lngFile, &size, NULL);
+			(void*)sdata->lngFile, NULL);
 
 	// This is not ReadFileAsync, this is ReadFile,
 	// so the program halts until completion of read

decompile/General/LOAD/LOAD_34_AppendQueue.c

@@ -15,7 +15,6 @@ void DECOMP_LOAD_AppendQueue(int bigfile, int type, int fileIndex, void* destina
 	lqs->type = type;
 	lqs->subfileIndex = fileIndex;
 	lqs->ptrDestination = destinationPtr;
-	lqs->size = 0;
 	lqs->callback.funcPtr = callback;
 
 	sdata->queueLength++;

decompile/General/LOAD/LOAD_36_NextQueuedFile.c

@@ -38,7 +38,6 @@ void DECOMP_LOAD_NextQueuedFile()
 					LT_RAW,
 					curr->subfileIndex,
 					curr->ptrDestination,
-					&curr->size,
 					DECOMP_LOAD_CDRequestCallback);
 		}
 
@@ -49,7 +48,6 @@ void DECOMP_LOAD_NextQueuedFile()
 					(void*)curr->ptrBigfileCdPos,
 					(int)curr->subfileIndex,
 					(int*)curr->ptrDestination,
-					(int*)&curr->size,
 					(int)curr->callback.funcPtr);
 		}
 
@@ -60,7 +58,6 @@ void DECOMP_LOAD_NextQueuedFile()
 					(void*)curr->ptrBigfileCdPos,
 					(int)curr->subfileIndex,
 					(int*)curr->ptrDestination,
-					(int*)&curr->size,
 					(int)curr->callback.funcPtr);
 		}
 
@@ -79,7 +76,8 @@ void DECOMP_LOAD_NextQueuedFile()
 	{
 		struct LoadQueueSlot* curr = &data.currSlot;
 
-		// Use callback if present
+		// UNUSED, there's no callback after completion
+		// of any VRAM file because its never the last in the queue
 		if(curr->callback.funcPtr != 0)
 		{
 			(*curr->callback.funcPtr)(curr);

decompile/General/LOAD/LOAD_44_TenStages.c

@@ -56,7 +56,7 @@ int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigH
 
 				#ifndef REBUILD_PC
 				// Load Intro TIM for Copyright Page from VRAM file
-				DECOMP_LOAD_VramFile(bigfile, 0x1fe, 0, &vramSize, 0xffffffff);
+				DECOMP_LOAD_VramFile(bigfile, 0x1fe, 0, 0xffffffff);
 				DECOMP_MainInit_VRAMDisplay();
 				#endif
 

decompile/General/MAIN/MainMain.c

@@ -845,7 +845,7 @@ void StateZero()
 	#ifndef FastBoot
 	#ifndef REBUILD_PC
 	// Load Intro TIM for "SCEA Presents" from VRAM file
-	DECOMP_LOAD_VramFile(sdata->ptrBigfile1, 0x1fd, 0, &vramSize, 0xffffffff);
+	DECOMP_LOAD_VramFile(sdata->ptrBigfile1, 0x1fd, 0, 0xffffffff);
 	DECOMP_MainInit_VRAMDisplay();
 	#endif
 	#endif
@@ -882,7 +882,7 @@ void StateZero()
 	// 	the area between 2 screen buffers and top right corner in vram
 	// sdata->ptrBigfile1 is the Pointer to "cd position of bigfile"
 	// Add a bookmark before loading (param_3 is 0 in the call)
-	DECOMP_LOAD_VramFile(sdata->ptrBigfile1, 0x102, 0, &vramSize, 0xffffffff);
+	DECOMP_LOAD_VramFile(sdata->ptrBigfile1, 0x102, 0, 0xffffffff);
 
 	sdata->mainGameState = 3;
 

decompile/General/zGlobal_DATA.c

@@ -2728,7 +2728,7 @@ struct Data data =
 		.type = 0,
 		.subfileIndex = -1,
 		.ptrDestination = 0,
-		.size = 0,
+		.size_UNUSED = 0,
 		.callback.flags = 0
 	},
 

include/decomp_functions.h

@@ -281,8 +281,9 @@ void DECOMP_LOAD_Callback_Overlay_231(void);
 void DECOMP_LOAD_Callback_Overlay_232(void);
 void DECOMP_LOAD_Callback_Overlay_233(void);
 void DECOMP_LOAD_ReadFileASyncCallback(CdlIntrResult result, uint8_t* unk);
-void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfileIndex, void* destination, int *size, void * callback);
-void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, int* size, int callbackOrFlags);
+void* DECOMP_LOAD_ReadFile(struct BigHeader* bigfile, u_int loadType, int subfileIndex, void* destination, /*int *size,*/ void * callback);
+void* DECOMP_LOAD_VramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, /*int* size,*/ int callbackOrFlags);
+void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, /*int* size,*/ int callbackOrFlags);
 void* DECOMP_LOAD_ReadDirectory(char* filename);
 void* DECOMP_LOAD_XnfFile(char* filename, void* ptrDestination, int* size);
 int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader* bigfile);
@@ -828,7 +829,6 @@ void DECOMP_LOAD_GlobalModelPtrs_MPK(void);
 void DECOMP_LOAD_OvrEndRace(unsigned int param_1);
 void DECOMP_LOAD_OvrLOD(unsigned int param_1);
 void DECOMP_LOAD_OvrThreads(unsigned int param_1);
-void* DECOMP_LOAD_DramFile(void* bigfilePtr, int subfileIndex, int* ptrDestination, int* size, int callbackOrFlags);
 void DECOMP_LOAD_DriverMPK(unsigned int param_1, int levelLOD, void (*param_3)(struct LoadQueueSlot*));
 void DECOMP_LibraryOfModels_Clear(struct GameTracker* gGT);
 void DECOMP_DecalGlobal_Store(struct GameTracker* gGT, struct LevTexLookup* LTL);

include/namespace_Load.h

@@ -157,7 +157,7 @@ struct LoadQueueSlot
 	void* ptrDestination;
 
 	// 0x10
-	unsigned int size;
+	unsigned int size_UNUSED;
 
 	// 0x14
 	union