USE_MOREPRIM is now feature-guarded

Author: Niko

decompile/General/LOAD/LOAD_44_TenStages.c

@@ -212,8 +212,7 @@ int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigH
 				sdata->levelLOD = 8;
 			}
 
-			// RAM optimization, dont do this OG code
-			#if 0
+			#ifndef USE_MOREPRIM
 				// OG game
 				DECOMP_MainInit_PrimMem(gGT);
 				DECOMP_MainInit_OTMem(gGT);
@@ -672,8 +671,8 @@ int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigH
 			DECOMP_MEMPACK_SwapPacks(0);
 			DECOMP_MainInit_JitPoolsNew(gGT);
 
-			// end of RAM, steal rest of heap
-			#if 1
+			#ifdef USE_MOREPRIM
+			// Stage 8: Fill remaining heap
 			DECOMP_MainInit_PrimMem(gGT, 0);
 			#endif
 

decompile/General/MAIN/MainInit_02_PrimMem.c

@@ -1,18 +1,25 @@
 #include <common.h>
 
-// force parameter is a personal optimization
-void DECOMP_MainInit_PrimMem(struct GameTracker* gGT, int force)
-{
+void DECOMP_MainInit_PrimMem(
+	struct GameTracker* gGT
+
+	#ifdef USE_MOREPRIM
+	, int force
+	#endif
+)
 
+{
 	int GetOriginalSize(struct GameTracker* gGT);
 	int size = GetOriginalSize(gGT);
 
 	int backup = 0;
 
-// On PS1
-// Stage 0 allocates PrimMem to HighMem,
-// Stage 8 allocates PrimMem to fill rest of RAM
-#ifndef REBUILD_PC
+#ifdef USE_MOREPRIM
+
+  // On PS1
+  // Stage 0 allocates PrimMem to HighMem,
+  // Stage 8 allocates PrimMem to fill rest of RAM
+  #ifndef REBUILD_PC
 
 	// optimization,
 	// LOAD_TenStages: Stage 0,
@@ -69,12 +76,12 @@ void DECOMP_MainInit_PrimMem(struct GameTracker* gGT, int force)
 		}
 	}
 
-// On PC
-// Stage 0 allocates all 24-bit RAM to primitives,
-// Stage 8 does nothing,
-// The rest of LOAD_TenStages can use 
-// 		32-bit addresses above 24-bit max
-#else
+  // On PC
+  // Stage 0 allocates all 24-bit RAM to primitives,
+  // Stage 8 does nothing,
+  // The rest of LOAD_TenStages can use 
+  // 		32-bit addresses above 24-bit max
+  #else
 
 	// optimization,
 	// LOAD_TenStages: Stage 0
@@ -93,20 +100,27 @@ void DECOMP_MainInit_PrimMem(struct GameTracker* gGT, int force)
 		return;
 	}
 
-#endif
+  #endif // PS1 or PC
+  
+#endif // USE_MOREPRIM
 
 	DECOMP_MainDB_PrimMem(&gGT->db[0].primMem, size);
 	DECOMP_MainDB_PrimMem(&gGT->db[1].primMem, size);
 
-#ifndef REBUILD_PC
+#ifdef USE_MOREPRIM
+	
+  #ifndef REBUILD_PC
 	// Stage 0:
 	// restore firstFreeByte for the rest
 	// of the LOAD_TenStages loading system
 	if(backup != 0)
 	{
 		sdata->mempack[0].firstFreeByte = (void*)backup;
 	}
+  #endif
+
 #endif
+
 }
 
 int GetOriginalSize(struct GameTracker* gGT)

include/common.h

@@ -16,6 +16,7 @@
 //#define USE_BOOSTBAR	// Super's reserve bar
 //#define USE_PROFILER	// Debug profiler from PizzaHut
 //#define USE_4PADTEST	// 1 controller for all 4 players (not done)
+//#define USE_MOREPRIM  // Bonus Primitive Memory 
 
 // 8mb
 //#define USE_RAMEX		// 8mb RAM expansion		

include/decomp_functions.h

@@ -337,7 +337,15 @@ void DECOMP_MainGameStart_Initialize(struct GameTracker* gGT, char boolStopAudio
 void DECOMP_MainInit_Drivers(struct GameTracker *gGT);
 void DECOMP_MainInit_JitPoolsNew(struct GameTracker *gGT);
 void DECOMP_MainInit_JitPoolsReset(struct GameTracker* gGT);
-void DECOMP_MainInit_PrimMem(struct GameTracker* gGT, int force);
+
+void DECOMP_MainInit_PrimMem(
+	struct GameTracker* gGT
+
+	#ifdef USE_MOREPRIM
+	, int force
+	#endif
+);
+
 void DECOMP_MainInit_OTMem(struct GameTracker* gGT);
 void DECOMP_MainInit_FinalizeInit(struct GameTracker* gGT);
 void DECOMP_MainInit_VRAMClear(void);