diff --git a/desmume/src/FIFO.cpp b/desmume/src/FIFO.cpp
index c42518ae3..a1ea932f4 100644
--- a/desmume/src/FIFO.cpp
+++ b/desmume/src/FIFO.cpp
@@ -164,7 +164,9 @@ u16 FORCEINLINE GFX_FIFOgetSize()
 
 void GFX_PIPEclear()
 {
-	gxPIPE.tail = 0;
+	gxFIFO.head = 0;
+	gxFIFO.tail = 0;
+	gxPIPE.size = 0;
 }
 
 void GFX_FIFOclear()
@@ -185,6 +187,8 @@ void GFX_FIFOsend(u8 cmd, u32 param)
 
 	if (gxFIFO.size == 0)				// FIFO empty
 	{
+		gxstat &= 0xF000FFFF;
+		gxstat |= 0x06000000;
 		if (gxPIPE.size < 4)			// pipe not full
 		{
 			gxPIPE.cmd[gxPIPE.tail] = cmd;
@@ -201,14 +205,17 @@ void GFX_FIFOsend(u8 cmd, u32 param)
 		}
 	}
 
-	//INFO("GFX FIFO: Send GFX 3D cmd 0x%02X to FIFO - 0x%08X (%03i/%02X)\n", cmd, param, gxFIFO.tail, gxFIFO.tail);
-	if (gxstat & 0x01000000)
-	{
-		//INFO("ERROR: gxFIFO is full (cmd 0x%02X = 0x%08X) (prev cmd 0x%02X = 0x%08X)\n", cmd, param, gxFIFO.cmd[255], gxFIFO.param[255]);
-		return;		// full
-	}
-
 	gxstat &= 0xF000FFFF;
+	//INFO("GFX FIFO: Send GFX 3D cmd 0x%02X to FIFO - 0x%08X (%03i/%02X)\n", cmd, param, gxFIFO.tail, gxFIFO.tail);
+	if (gxFIFO.size > 255)					// full
+	{
+		gxstat &= 0xF000FFFF;
+		gxstat |= 0x01000000;
+		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
+		//INFO("ERROR: gxFIFO is full (cmd 0x%02X = 0x%08X) (prev cmd 0x%02X = 0x%08X)\n", cmd, param, gxFIFO.cmd[255], gxFIFO.param[255]);
+		NDS_RescheduleGXFIFO();
+		return;		
+	}
 
 	gxFIFO.cmd[gxFIFO.tail] = cmd;
 	gxFIFO.param[gxFIFO.tail] = param;
@@ -216,7 +223,6 @@ void GFX_FIFOsend(u8 cmd, u32 param)
 	gxFIFO.size = GFX_FIFOgetSize();
 	if (gxFIFO.tail > 256) gxFIFO.tail = 0;
 	
-
 #ifdef USE_GEOMETRY_FIFO_EMULATION
 	gxstat |= 0x08000000;		// set busy flag
 #endif
@@ -238,59 +244,12 @@ void GFX_FIFOsend(u8 cmd, u32 param)
 }
 
 extern void execHardware_doAllDma(EDMAMode modeNum);
-BOOL FORCEINLINE GFX_FIFOrecv(u8 *cmd, u32 *param)
-{
-	u32 gxstat = T1ReadLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600);
-
-	if (gxFIFO.size == 0)				// empty
-	{
-		gxstat &= 0xF000FFFF;
-		gxstat |= 0x06000000;
-		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
-		if ((gxstat & 0xC0000000))	// IRQ: empty
-		{
-			setIF(0, (1<<21));
-		}
-		return FALSE;
-	}
-
-	if (gxstat & 0x40000000)	// IRQ: less half
-	{
-		if (gxstat & 0x02000000) setIF(0, (1<<21));
-	}
-
-	gxstat &= 0xF000FFFF;
-	*cmd = gxFIFO.cmd[gxFIFO.head];
-	*param = gxFIFO.param[gxFIFO.head];
-	gxFIFO.head++;
-	gxFIFO.size = GFX_FIFOgetSize();
-	if (gxFIFO.head > 256) gxFIFO.head = 0;
-
-	gxstat |= ((gxFIFO.size & 0x1FF) << 16);
-
-	if (gxFIFO.size < 128)
-	{
-		gxstat |= 0x02000000;
-#ifdef USE_GEOMETRY_FIFO_EMULATION
-		execHardware_doAllDma(EDMAMode_GXFifo);
-#endif
-	}
-
-	if (gxFIFO.tail == gxFIFO.head)		// empty
-		gxstat |= 0x04000000;
-	else
-		gxstat |= 0x08000000;	// set busy flag
-
-	T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
-
-	return TRUE;
-}
-
 BOOL GFX_PIPErecv(u8 *cmd, u32 *param)
 {
 	u8	tmp_cmd = 0;
 	u32	tmp_param = 0;
-	u32 gxstat = 0;
+	u32 gxstat = T1ReadLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600);
+	gxstat &= 0xF7FFFFFF;		// clear busy flag
 
 	if (gxPIPE.size > 0)
 	{
@@ -302,39 +261,62 @@ BOOL GFX_PIPErecv(u8 *cmd, u32 *param)
 
 		if (gxPIPE.size < 2) 
 		{
-			if (GFX_FIFOrecv(&tmp_cmd, &tmp_param))
+			if (gxFIFO.size > 0)
 			{
-				gxPIPE.cmd[gxPIPE.tail] = tmp_cmd;
-				gxPIPE.param[gxPIPE.tail] = tmp_param;
+				gxstat &= 0xF000FFFF;
+
+				gxPIPE.cmd[gxPIPE.tail] = gxFIFO.cmd[gxFIFO.head];
+				gxPIPE.param[gxPIPE.tail] = gxFIFO.param[gxFIFO.head];
 				gxPIPE.tail++;
 				gxPIPE.size = GFX_PIPEgetSize();
 				if (gxPIPE.tail > 4) gxPIPE.tail = 0;
 
-				if (GFX_FIFOrecv(&tmp_cmd, &tmp_param))
+				gxFIFO.head++;
+				gxFIFO.size = GFX_FIFOgetSize();
+				if (gxFIFO.head > 256) gxFIFO.head = 0;
+
+				if (gxFIFO.size > 0)
 				{
-					gxPIPE.cmd[gxPIPE.tail] = tmp_cmd;
-					gxPIPE.param[gxPIPE.tail] = tmp_param;
+					gxPIPE.cmd[gxPIPE.tail] = gxFIFO.cmd[gxFIFO.head];
+					gxPIPE.param[gxPIPE.tail] = gxFIFO.param[gxFIFO.head];
 					gxPIPE.tail++;
 					gxPIPE.size = GFX_PIPEgetSize();
 					if (gxPIPE.tail > 4) gxPIPE.tail = 0;
+
+					gxFIFO.head++;
+					gxFIFO.size = GFX_FIFOgetSize();
+					if (gxFIFO.head > 256) gxFIFO.head = 0;
 				}
+
+				gxstat |= ((gxFIFO.size & 0x1FF) << 16);
+
+				if (gxFIFO.size < 128)
+				{
+					gxstat |= 0x02000000;
+					execHardware_doAllDma(EDMAMode_GXFifo);
+					if (gxstat & 0x40000000)	// IRQ: less half
+						setIF(0, (1<<21));
+				}
+
+				if (gxFIFO.tail == gxFIFO.head)		// empty
+					gxstat |= 0x04000000;
+			}
+			else		// FIFO empty
+			{
+				gxstat &= 0xF000FFFF;
+				gxstat |= 0x06000000;
 			}
 		}
 
-		if (gxPIPE.size == 0)
-		{
-			gxstat = T1ReadLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600);
-			gxstat &= 0xF7FFFFFF;		// clear busy flag
-			T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
-		}
+		if (gxPIPE.size > 0)
+			gxstat |= 0x08000000;	// set busy flag
+
+		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
 		return (TRUE);
 	}
-	gxstat = T1ReadLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600);
-	gxstat &= 0xF7FFFFFF;		// clear busy flag
-	if ((gxstat & 0x80000000))	// IRQ: empty
-	{
-		if (gxFIFO.tail == 0) setIF(0, (1<<21));
-	}
+
+	if (gxstat & 0x80000000)	// IRQ: empty
+			setIF(0, (1<<21));
 	T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
 	return FALSE;
 }
@@ -352,11 +334,6 @@ void GFX_FIFOcnt(u32 val)
 	T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x600, gxstat);
 
 	NDS_RescheduleGXFIFO();
-	
-	/*if (gxstat & 0xC0000000)
-	{
-		setIF(0, (1<<21));
-	}*/
 }
 
 // ========================================================= DISP FIFO
diff --git a/desmume/src/gfx3d.cpp b/desmume/src/gfx3d.cpp
index 47d1b06bd..fc104ed74 100644
--- a/desmume/src/gfx3d.cpp
+++ b/desmume/src/gfx3d.cpp
@@ -342,6 +342,8 @@ void gfx3d_reset()
 	memset(vertlists, 0, sizeof(vertlists));
 	listTwiddle = 1;
 	twiddleLists();
+	gfx3d.polylist = polylist;
+	gfx3d.vertlist = vertlist;
 
 	MatrixInit (mtxCurrent[0]);
 	MatrixInit (mtxCurrent[1]);
@@ -1663,6 +1665,8 @@ void gfx3d_VBlankSignal()
 	{
 		gfx3d_doFlush();
 		isSwapBuffers = false;
+		GFX_DELAY(392);
+		NDS_RescheduleGXFIFO();
 	}
 #else
 	//the 3d buffers are swapped when a vblank begins.
@@ -1687,12 +1691,7 @@ void gfx3d_VBlankEndSignal(bool skipFrame)
 	
 	if (!drawPending) return;
 	drawPending = FALSE;
-	if(skipFrame) 
-	{
-		GFX_DELAY(392);
-		NDS_RescheduleGXFIFO();
-		return;
-	}
+	if(skipFrame) return;
 	//if the null 3d core is chosen, then we need to clear out the 3d buffers to keep old data from being rendered
 	if(gpu3D == &gpu3DNull || !CommonSettings.showGpu.main)
 	{
@@ -1702,9 +1701,6 @@ void gfx3d_VBlankEndSignal(bool skipFrame)
 	}
 
 	gpu3D->NDS_3D_Render();
-
-	GFX_DELAY(392);
-	NDS_RescheduleGXFIFO();
 #else
 	//if we are skipping 3d frames then the 3d rendering will get held up here.
 	//but, as soon as we quit skipping frames, the held-up 3d frame will render