diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659b643b..d109a2b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ set(GLideN64_SOURCES
   F3DEX.cpp
   F3DPD.cpp
   F3DWRUS.cpp
+  F3DSWSE.cpp
   F3DEX2.cpp
   F3DEX2CBFD.cpp
   FrameBuffer.cpp
diff --git a/F3DSWSE.cpp b/F3DSWSE.cpp
new file mode 100644
index 00000000..b8ae1a85
--- /dev/null
+++ b/F3DSWSE.cpp
@@ -0,0 +1,68 @@
+#include "GLideN64.h"
+#include "Debug.h"
+#include "F3D.h"
+#include "F3DEX.h"
+#include "F3DSWSE.h"
+#include "F3DSWSE.h"
+#include "N64.h"
+#include "RSP.h"
+#include "RDP.h"
+#include "gSP.h"
+#include "gDP.h"
+#include "GBI.h"
+
+void F3DSWSE_Vtx( u32 w0, u32 w1 )
+{
+	gSPVertex(w1, _SHIFTR(w0, 4, 12) / 33 + 1, 0);
+}
+
+void F3DSWSE_Tri1( u32 w0, u32 w1 )
+{
+	gSP1Triangle( _SHIFTR( w1, 16, 8 ) / 5,
+				  _SHIFTR( w1, 8, 8 ) / 5,
+				  _SHIFTR( w1, 0, 8 ) / 5);
+}
+
+void F3DSWSE_Quad( u32 w0, u32 w1 )
+{
+	gSP1Quadrangle( _SHIFTR( w1, 24, 8 ) / 5, _SHIFTR( w1, 16, 8 ) / 5, _SHIFTR( w1, 8, 8 ) / 5, _SHIFTR( w1, 0, 8 ) / 5 );
+}
+
+
+void F3DSWSE_Init()
+{
+	gSPSetupFunctions();
+	// Set GeometryMode flags
+	GBI_InitFlags( F3D );
+
+	GBI.PCStackSize = 18;
+
+	//          GBI Command             Command Value			Command Function
+	GBI_SetGBI( G_SPNOOP,				F3D_SPNOOP,				F3D_SPNoOp );
+	GBI_SetGBI( G_MTX,					F3D_MTX,				F3D_Mtx );
+	GBI_SetGBI( G_RESERVED0,			F3D_RESERVED0,			F3D_Reserved0 );
+	GBI_SetGBI( G_MOVEMEM,				F3D_MOVEMEM,			F3D_MoveMem );
+	GBI_SetGBI( G_VTX,					F3D_VTX,				F3DSWSE_Vtx );
+	GBI_SetGBI( G_RESERVED1,			F3D_RESERVED1,			F3D_Reserved1 );
+	GBI_SetGBI( G_DL,					F3D_DL,					F3D_DList );
+	GBI_SetGBI( G_RESERVED2,			F3D_RESERVED2,			F3D_Reserved2 );
+	GBI_SetGBI( G_RESERVED3,			F3D_RESERVED3,			F3D_Reserved3 );
+	GBI_SetGBI( G_SPRITE2D_BASE,		F3D_SPRITE2D_BASE,		F3D_Sprite2D_Base );
+
+	GBI_SetGBI( G_TRI1,					F3D_TRI1,				F3DSWSE_Tri1 );
+	GBI_SetGBI( G_CULLDL,				F3D_CULLDL,				F3D_CullDL );
+	GBI_SetGBI( G_POPMTX,				F3D_POPMTX,				F3D_PopMtx );
+	GBI_SetGBI( G_MOVEWORD,				F3D_MOVEWORD,			F3D_MoveWord );
+	GBI_SetGBI( G_TEXTURE,				F3D_TEXTURE,			F3D_Texture );
+	GBI_SetGBI( G_SETOTHERMODE_H,		F3D_SETOTHERMODE_H,		F3D_SetOtherMode_H );
+	GBI_SetGBI( G_SETOTHERMODE_L,		F3D_SETOTHERMODE_L,		F3D_SetOtherMode_L );
+	GBI_SetGBI( G_ENDDL,				F3D_ENDDL,				F3D_EndDL );
+	GBI_SetGBI( G_SETGEOMETRYMODE,		F3D_SETGEOMETRYMODE,	F3D_SetGeometryMode );
+	GBI_SetGBI( G_CLEARGEOMETRYMODE,	F3D_CLEARGEOMETRYMODE,	F3D_ClearGeometryMode );
+	GBI_SetGBI( G_QUAD,					F3D_QUAD,				F3DSWSE_Quad );
+	GBI_SetGBI( G_RDPHALF_1,			F3D_RDPHALF_1,			F3D_RDPHalf_1 );
+	GBI_SetGBI( G_RDPHALF_2,			F3D_RDPHALF_2,			F3D_RDPHalf_2 );
+	GBI_SetGBI( G_RDPHALF_CONT,			F3D_RDPHALF_CONT,		F3D_RDPHalf_Cont );
+	GBI_SetGBI( G_TRI4,					F3D_TRI4,				F3D_Tri4 );
+}
+
diff --git a/F3DSWSE.h b/F3DSWSE.h
new file mode 100644
index 00000000..1a290ae9
--- /dev/null
+++ b/F3DSWSE.h
@@ -0,0 +1,7 @@
+#ifndef F3DSWSE_H
+#define F3DSWSE_H
+
+void F3DSWSE_Init();
+
+#endif
+
diff --git a/GBI.cpp b/GBI.cpp
index d550fdf7..6318e7d4 100644
--- a/GBI.cpp
+++ b/GBI.cpp
@@ -17,6 +17,7 @@
 #include "S2DEX.h"
 #include "S2DEX2.h"
 #include "F3DDKR.h"
+#include "F3DSWSE.h"
 #include "F3DWRUS.h"
 #include "F3DPD.h"
 #include "F3DEX2CBFD.h"
@@ -35,7 +36,7 @@ SpecialMicrocodeInfo specialMicrocodes[] =
 	{ F3D,		FALSE,	0xe01e14be, "Fast3D" },
 
 	{ F3DWRUS,	FALSE,	0xd17906e2, "RSP SW Version: 2.0D, 04-01-96" },
-	{ F3DWRUS,	FALSE,	0x94c4c833, "RSP SW Version: 2.0D, 04-01-96" },
+	{ F3DSWSE,	FALSE,	0x94c4c833, "RSP SW Version: 2.0D, 04-01-96" },
 
 	{ S2DEX,	FALSE,	0x9df31081, "RSP Gfx ucode S2DEX  1.06 Yoshitaka Yasumoto Nintendo." },
 
@@ -162,6 +163,7 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
 			case S2DEX2:	S2DEX2_Init();	break;
 			case F3DDKR:	F3DDKR_Init();	break;
 			case F3DJFG:	F3DJFG_Init();	break;
+			case F3DSWSE:	F3DSWSE_Init();	break;
 			case F3DWRUS:	F3DWRUS_Init();	break;
 			case F3DPD:		F3DPD_Init();	break;
 			case Turbo3D:	F3D_Init();		break;
diff --git a/GBI.h b/GBI.h
index a17ab147..63e5ecce 100644
--- a/GBI.h
+++ b/GBI.h
@@ -17,11 +17,12 @@
 #define F3DPD		8
 #define F3DDKR		9
 #define F3DJFG		10
-#define F3DWRUS		11
-#define F3DEX2CBFD	12
-#define Turbo3D		13
-#define ZSortp		14
-#define NONE		15
+#define F3DSWSE		11
+#define F3DWRUS		12
+#define F3DEX2CBFD	13
+#define Turbo3D		14
+#define ZSortp		15
+#define NONE		16
 
 // Fixed point conversion factors
 #define FIXED2FLOATRECIP1	0.5f
diff --git a/GLideN64.vcxproj b/GLideN64.vcxproj
index c26c47d0..a35127cb 100644
--- a/GLideN64.vcxproj
+++ b/GLideN64.vcxproj
@@ -250,6 +250,7 @@
     <ClCompile Include="CRC.cpp" />
     <ClCompile Include="DepthBuffer.cpp" />
     <ClCompile Include="F3DEX2CBFD.cpp" />
+    <ClCompile Include="F3DSWSE.cpp" />
     <ClCompile Include="FrameBuffer.cpp" />
     <ClCompile Include="GBI.cpp" />
     <ClCompile Include="gDP.cpp" />
@@ -342,6 +343,7 @@
     <ClInclude Include="Debug.h" />
     <ClInclude Include="DepthBuffer.h" />
     <ClInclude Include="F3DEX2CBFD.h" />
+    <ClInclude Include="F3DSWSE.h" />
     <ClInclude Include="FrameBuffer.h" />
     <ClInclude Include="GBI.h" />
     <ClInclude Include="gDP.h" />
diff --git a/GLideN64.vcxproj.filters b/GLideN64.vcxproj.filters
index 826d3ec8..458e4cc2 100644
--- a/GLideN64.vcxproj.filters
+++ b/GLideN64.vcxproj.filters
@@ -186,6 +186,9 @@
     <ClCompile Include="ZSort.cpp">
       <Filter>Source Files\uCodes</Filter>
     </ClCompile>
+    <ClCompile Include="F3DSWSE.cpp">
+      <Filter>Source Files\uCodes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="3DMath.h">
@@ -320,6 +323,9 @@
     <ClInclude Include="ZSort.h">
       <Filter>Header Files\uCodes</Filter>
     </ClInclude>
+    <ClInclude Include="F3DSWSE.h">
+      <Filter>Header Files\uCodes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">