60fps fix

decompile/General/AltMods/Mods1.c

@@ -103,6 +103,30 @@ struct Particle* NewParticleInit(struct LinkedList* param_1)
 	return (struct Particle*)LIST_RemoveFront(param_1);
 }
 
+void NewParticleDestroy(struct Particle* p)
+{
+  struct Particle *pp;
+
+  // unpatch
+  p->prev = (int)p->prev & ~(1);
+
+  pp = p->prev;
+
+  while (pp != NULL)
+  {
+	// unpatch
+	pp->prev = (int)pp->prev & ~(1);
+
+    pp = pp->next;
+
+	// unpatch
+	pp->prev = (int)pp->prev & ~(1);
+
+	// free list of Oscillator Pool
+    LIST_AddFront(&sdata->gGT->JitPools.oscillator.free, pp);
+  }
+}
+
 // This executes one time, before the
 // Crash Team Racing exe boots
 void ui60_entryHook()
@@ -111,6 +135,10 @@ void ui60_entryHook()
 
 	// replace call to LIST_RemoveFront inside Particle_Init
 	*(unsigned int*)0x80040348 = JAL(NewParticleInit);
+
+	// hook to remove bit tagging
+	*(unsigned int*)0x8003eeb0 = JMP(NewParticleDestroy);
+	*(unsigned int*)0x8003eeb4 = 0;
 
 	// Starting line
 	{

decompile/General/MAIN/MainFrame_GameLogic.c

@@ -260,19 +260,11 @@ void DECOMP_MainFrame_GameLogic(struct GameTracker* gGT, struct GamepadSystem* g
 		// This does not fix Underwater, or particles with function pointers
 		for(struct Particle* p = gGT->particleList_ordinary; p != 0; p = p->next)
 		{
-			// good thing PSX supports address mirroring,
-			// use the top bit to determine if particle is patched
-			unsigned int pointer = p->ptrIconGroup;
-			unsigned int topBit = pointer & 0xC0000000;
+			// skip if already tagged
+			if( ((int)p->prev) & 1 ) continue;
 
-			// topBit will be 00000000 (if null) or 80000000 (not null),
-			// set the bit 40000000 to prove it was patched, and the 
-			// pointer will behave as if it was never edited (thanks psx mirroring)
-			if(topBit == 0x40000000) continue;
-
-			pointer = pointer & 0xfffffff;
-			pointer |= 0x40000000;
-			p->ptrIconGroup = pointer;
+			// tag to show that it's patched
+			p->prev = (unsigned int)p->prev | 1;
 
 			p->framesLeftInLife *= 2;